From 01f8ea9dd50a84680872d75fdc3d933fa5d673cd Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 22 Jun 2020 16:27:17 +0200 Subject: [PATCH] CONFIG: update Fujitsu rules (#1671) - openmp using the libfjomp - fastmath as per the ArmClang compiler --- wmake/rules/linuxARM64Fujitsu/c++Opt | 2 +- wmake/rules/linuxARM64Fujitsu/cOpt | 2 +- wmake/rules/linuxARM64Fujitsu/general | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/wmake/rules/linuxARM64Fujitsu/c++Opt b/wmake/rules/linuxARM64Fujitsu/c++Opt index 2aedabd628..5736749269 100644 --- a/wmake/rules/linuxARM64Fujitsu/c++Opt +++ b/wmake/rules/linuxARM64Fujitsu/c++Opt @@ -1,2 +1,2 @@ c++DBUG = -c++OPT = -O3 +c++OPT = -ffp-contract=fast -ffast-math -O3 -funsafe-math-optimizations diff --git a/wmake/rules/linuxARM64Fujitsu/cOpt b/wmake/rules/linuxARM64Fujitsu/cOpt index 17318709f1..8e0de06120 100644 --- a/wmake/rules/linuxARM64Fujitsu/cOpt +++ b/wmake/rules/linuxARM64Fujitsu/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -O3 +cOPT = -ffp-contract=fast -ffast-math -O3 diff --git a/wmake/rules/linuxARM64Fujitsu/general b/wmake/rules/linuxARM64Fujitsu/general index 9ada28972d..34cc312f0b 100644 --- a/wmake/rules/linuxARM64Fujitsu/general +++ b/wmake/rules/linuxARM64Fujitsu/general @@ -3,7 +3,16 @@ CPP = cpp -traditional-cpp $(GFLAGS) PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard -include $(GENERAL_RULES)/Clang/openmp +## include $(GENERAL_RULES)/Clang/openmp + +# Fujitsu-specific +# ---- +COMP_OPENMP = -DUSE_OMP -fopenmp +LINK_OPENMP = -lfjomp +# ---- +# Or disable +# include $(GENERAL_RULES)/no-openmp +# ---- include $(DEFAULT_RULES)/c include $(DEFAULT_RULES)/c++