From be30292126af451e67d19b4dbd367876d7f4424e Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Fri, 1 Mar 2019 18:34:05 +0100 Subject: [PATCH] STYLE: relocate -mcpu into compiler instead of compiler-flags (#1225) --- wmake/rules/linuxARM64Arm/c | 2 +- wmake/rules/linuxARM7Gcc/c | 2 +- wmake/rules/linuxARM7Gcc/c++ | 2 +- wmake/rules/linuxARM7Gcc/c++Opt | 4 ++-- wmake/rules/linuxARM7Gcc/cOpt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wmake/rules/linuxARM64Arm/c b/wmake/rules/linuxARM64Arm/c index 3ae8cf8f6e..06b574e59f 100644 --- a/wmake/rules/linuxARM64Arm/c +++ b/wmake/rules/linuxARM64Arm/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cc = armclang -mpcu=native +cc = armclang -mcpu=native cWARN = -Wall diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c index 77c03e62f8..47425f974b 100644 --- a/wmake/rules/linuxARM7Gcc/c +++ b/wmake/rules/linuxARM7Gcc/c @@ -1,6 +1,6 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc +cc = gcc -mcpu=cortex-a9 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++ index 00a88b07a1..a1cf1ad6cf 100644 --- a/wmake/rules/linuxARM7Gcc/c++ +++ b/wmake/rules/linuxARM7Gcc/c++ @@ -1,6 +1,6 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 +CC = g++ -std=c++11 -mcpu=cortex-a9 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt index fe7b457de7..ab2bfabcd0 100644 --- a/wmake/rules/linuxARM7Gcc/c++Opt +++ b/wmake/rules/linuxARM7Gcc/c++Opt @@ -1,5 +1,5 @@ c++DBUG = -#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp +#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=hard +c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=softfp ROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt index c80aa2b5c1..6efb6d39bf 100644 --- a/wmake/rules/linuxARM7Gcc/cOpt +++ b/wmake/rules/linuxARM7Gcc/cOpt @@ -1,3 +1,3 @@ cDBUG = -#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp +#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=hard +cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=softfp -- GitLab