From 85ca003ae7174ac00857c9c75ddfd53589c4918e Mon Sep 17 00:00:00 2001 From: Chris Sidebottom Date: Mon, 29 Jul 2024 11:14:25 +0100 Subject: [PATCH 1/2] Add fallback compile options for A64FX target --- Makefile.arm64 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.arm64 b/Makefile.arm64 index 6ba63e94e0..2c68d215f5 100644 --- a/Makefile.arm64 +++ b/Makefile.arm64 @@ -276,12 +276,19 @@ endif endif endif -ifeq (1, $(filter 1,$(GCCVERSIONGTEQ11) $(ISCLANG))) ifeq ($(CORE), A64FX) +ifeq (1, $(filter 1,$(GCCVERSIONGTEQ10) $(ISCLANG))) +ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ3))) CCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx ifneq ($(F_COMPILER), NAG) FCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx endif +else +CCOMMON_OPT += -march=armv8.4-a+sve -mtune=neoverse-n1 +ifneq ($(F_COMPILER), NAG) +FCOMMON_OPT += -march=armv8.4-a -mtune=neoverse-n1 +endif +endif endif endif From 3ed226d3f8a724b163a69986a679e329b2fce056 Mon Sep 17 00:00:00 2001 From: Chris Sidebottom Date: Mon, 29 Jul 2024 11:32:59 +0100 Subject: [PATCH 2/2] Re-add ISCLANG filter --- Makefile.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.arm64 b/Makefile.arm64 index 2c68d215f5..d3ea7522d9 100644 --- a/Makefile.arm64 +++ b/Makefile.arm64 @@ -278,7 +278,7 @@ endif ifeq ($(CORE), A64FX) ifeq (1, $(filter 1,$(GCCVERSIONGTEQ10) $(ISCLANG))) -ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ3))) +ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ3) $(ISCLANG))) CCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx ifneq ($(F_COMPILER), NAG) FCOMMON_OPT += -march=armv8.2-a+sve -mtune=a64fx