From 796f85dcc918f40ac12ea01b9cdeb3d8224beaeb Mon Sep 17 00:00:00 2001 From: Marin Tsanov Date: Wed, 16 Oct 2024 17:57:11 +0300 Subject: [PATCH 1/3] Fix darwin arch hint on arm64 when using use64bitall When calling Configure with use64bitall on arm64 macOS, it compiles a test program using clang and an -arch flag that is not followed by anything. Seems like the darwin arch hint when using use64bitall couldn't work with the 'arm' result from uname -p. --- hints/darwin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hints/darwin.sh b/hints/darwin.sh index 9794ea6f805e..77ec9dc67168 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -427,6 +427,7 @@ EOM case `uname -p` in powerpc) arch=ppc64 ;; i386) arch=x86_64 ;; + arm) arch=arm64 ;; *) cat <&4 *** Don't recognize processor, can't specify 64 bit compilation. From 4efa26ac229ee61a978cb453798e103b7a532722 Mon Sep 17 00:00:00 2001 From: Marin Tsanov Date: Wed, 16 Oct 2024 17:59:05 +0300 Subject: [PATCH 2/3] Exit on unrecognized darwin arch hint Not sure if Apple are to introduce another CPU architecture to their device lineup - but they already did it 2 times. When building this on arm64 macOS, before adding the arm64 arch hint, Configure with use64bitall wouldn't exit, but a rather cryptic clang error would be thrown for an unknown arch name, simply because nothing was passed after the -arch flag. --- hints/darwin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hints/darwin.sh b/hints/darwin.sh index 77ec9dc67168..3a989d602a82 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -433,6 +433,7 @@ EOM *** Don't recognize processor, can't specify 64 bit compilation. EOM + exit 1 ;; esac for var in ccflags cppflags ld ldflags From 3df005cb4b98a877a1fcba72076e034f856d641e Mon Sep 17 00:00:00 2001 From: Marin Tsanov Date: Sat, 26 Oct 2024 15:20:06 +0300 Subject: [PATCH 3/3] Fix failing AUTHORS test --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 7be10ab59e8a..b80ab7b7291d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -886,6 +886,7 @@ Marco Fontani Marco Peereboom Marcus Holland-Moritz Marek Rouchal +Marin Tsanov Mark A Biggar Mark A. Hershberger Mark A. Stratman