From ec93384c1d88d1a087ebf9b673a291c2ed6a6cc7 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 1 Mar 2019 18:20:41 +0100 Subject: [PATCH] COMP: adjust ARM compilation flags (#1225) - with -mcpu=native for automatic detection and -armpl for linking in the performance libraries STYLE: relocate -mcpu into compiler instead of compiler-flags (#1225) --- wmake/rules/linuxARM64Arm/c | 6 +++--- wmake/rules/linuxARM64Arm/c++ | 6 +++--- wmake/rules/linuxARM64Arm/c++Opt | 2 +- wmake/rules/linuxARM64Arm/cOpt | 2 +- wmake/rules/linuxARM7Gcc/c | 2 +- wmake/rules/linuxARM7Gcc/c++ | 2 +- wmake/rules/linuxARM7Gcc/c++Opt | 4 ++-- wmake/rules/linuxARM7Gcc/cOpt | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wmake/rules/linuxARM64Arm/c b/wmake/rules/linuxARM64Arm/c index 91a1e739af..06b574e59f 100644 --- a/wmake/rules/linuxARM64Arm/c +++ b/wmake/rules/linuxARM64Arm/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cc = armclang +cc = armclang -mcpu=native cWARN = -Wall @@ -12,5 +12,5 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ LINK_LIBS = $(cDBUG) -LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs +LINKLIBSO = $(cc) -shared -armpl +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs -armpl diff --git a/wmake/rules/linuxARM64Arm/c++ b/wmake/rules/linuxARM64Arm/c++ index 5704e839a9..4bbc646aec 100644 --- a/wmake/rules/linuxARM64Arm/c++ +++ b/wmake/rules/linuxARM64Arm/c++ @@ -1,6 +1,6 @@ include $(GENERAL_RULES)/Clang/c++ -CC = armclang++ -std=c++11 +CC = armclang++ -std=c++11 -mcpu=native include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) @@ -13,5 +13,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed +LINKLIBSO = $(CC) $(c++FLAGS) -shared -armpl +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -armpl diff --git a/wmake/rules/linuxARM64Arm/c++Opt b/wmake/rules/linuxARM64Arm/c++Opt index c427c3d08b..7a4e09d9f4 100644 --- a/wmake/rules/linuxARM64Arm/c++Opt +++ b/wmake/rules/linuxARM64Arm/c++Opt @@ -1,2 +1,2 @@ c++DBUG = -c++OPT = -mcpu=thunderx2t99 -ffp-contract=fast -ffast-math -O3 -funsafe-math-optimizations +c++OPT = -ffp-contract=fast -ffast-math -O3 -funsafe-math-optimizations -fsimdmath -armpl diff --git a/wmake/rules/linuxARM64Arm/cOpt b/wmake/rules/linuxARM64Arm/cOpt index 0086d1849e..10aa6fc610 100644 --- a/wmake/rules/linuxARM64Arm/cOpt +++ b/wmake/rules/linuxARM64Arm/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -mcpu=thunderx2t99 -ffp-contract=fast -ffast-math -O3 +cOPT = -ffp-contract=fast -ffast-math -O3 -armpl diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c index 6845d94483..2cff6a24d7 100644 --- a/wmake/rules/linuxARM7Gcc/c +++ b/wmake/rules/linuxARM7Gcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cc = gcc +cc = gcc -mcpu=cortex-a9 cWARN = -Wall 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