From 68277282df4adaafaf9b4a01c2eeb629eed99528 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Tue, 30 Aug 2022 22:26:16 +0200
Subject: [PATCH 1/2] Work around XCode assembler SVE bug

---
 Makefile.arm64 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.arm64 b/Makefile.arm64
index 4efa55286..2ef0caa8b 100644
--- a/Makefile.arm64
+++ b/Makefile.arm64
@@ -124,7 +124,11 @@ ifeq ($(CORE), NEOVERSEN2)
 ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
 ifeq ($(GCCVERSIONGTEQ9), 1)
 ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ10)))
+ifneq ($(OSNAME), Darwin)
 CCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
+else
+CCOMMON_OPT += -march=armv8.5-a+sve -mtune=neoverse-n2
+endif
 ifneq ($(F_COMPILER), NAG)
 FCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
 endif

From ae3bcc8949cfaa8f37cfba864971227dc972fd96 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 31 Aug 2022 10:41:01 +0200
Subject: [PATCH 2/2] Drop NeoverseN2 to armv8.2-a on OSX to make it build with
 gcc11 too

---
 Makefile.arm64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.arm64 b/Makefile.arm64
index 2ef0caa8b..480684422 100644
--- a/Makefile.arm64
+++ b/Makefile.arm64
@@ -127,7 +127,7 @@ ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ10)))
 ifneq ($(OSNAME), Darwin)
 CCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
 else
-CCOMMON_OPT += -march=armv8.5-a+sve -mtune=neoverse-n2
+CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
 endif
 ifneq ($(F_COMPILER), NAG)
 FCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2