From 047f526eccc23c4d1b4e41427070610fc4db2c0f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
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
---
 wmake/rules/linuxARM64Arm/c      | 6 +++---
 wmake/rules/linuxARM64Arm/c++    | 6 +++---
 wmake/rules/linuxARM64Arm/c++Opt | 2 +-
 wmake/rules/linuxARM64Arm/cOpt   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wmake/rules/linuxARM64Arm/c b/wmake/rules/linuxARM64Arm/c
index 91a1e739af..3ae8cf8f6e 100644
--- a/wmake/rules/linuxARM64Arm/c
+++ b/wmake/rules/linuxARM64Arm/c
@@ -1,6 +1,6 @@
 SUFFIXES += .c
 
-cc          = armclang
+cc          = armclang -mpcu=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
-- 
GitLab