From ab62e1bed37d2efe4d2a9e0139839bae21b1cdd9 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@college-de-france.fr>
Date: Mon, 18 Jan 2021 19:56:44 +0100
Subject: "macosx" is now called "macos"

The configure script still accepts "macosx" for backward compatibility,
but every other part of CompCert now uses "macos".
---
 configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a6cf84f7..4b75509e 100755
--- a/configure
+++ b/configure
@@ -53,12 +53,12 @@ Supported targets:
   x86_32-cygwin        (x86 32 bits, Cygwin environment under Windows)
   x86_64-linux         (x86 64 bits, Linux)
   x86_64-bsd           (x86 64 bits, BSD)
-  x86_64-macosx        (x86 64 bits, MacOS X)
+  x86_64-macos         (x86 64 bits, MacOS X)
   x86_64-cygwin        (x86 64 bits, Cygwin environment under Windows)
   rv32-linux           (RISC-V 32 bits, Linux)
   rv64-linux           (RISC-V 64 bits, Linux)
   aarch64-linux        (AArch64, i.e. ARMv8 in 64-bit mode, Linux)
-  aarch64-macosx       (AArch64, i.e. Apple silicon, MacOS)
+  aarch64-macos        (AArch64, i.e. Apple silicon, MacOS)
   manual               (edit configuration file by hand)
 
 For x86 targets, the "x86_32-" prefix can also be written "ia32-" or "i386-".
@@ -357,15 +357,15 @@ if test "$arch" = "x86" -a "$bitsize" = "64"; then
         cprepro_options="-std=c99 -m64 -U__GNUC__ -E"
         system="linux"
         ;;
-    macosx)
-        abi="macosx"
+    macos|macosx)
+        abi="macos"
         cc_options="-arch x86_64"
         casm_options="-arch x86_64 -c"
         clinker_options="-arch x86_64"
         clinker_needs_no_pie=false
         cprepro_options="-std=c99 -arch x86_64 -U__GNUC__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' '-D_Nullable=' '-D_Nonnull=' -Wno-\\#warnings -E"
         libmath=""
-        system="macosx"
+        system="macos"
         ;;
     cygwin)
         abi="standard"
@@ -409,7 +409,7 @@ if test "$arch" = "aarch64"; then
         abi="standard"
         cprepro_options="-std=c99 -U__GNUC__ -E"
         system="linux";;
-    macosx)
+    macos|macosx)
         abi="apple"
         casm="${toolprefix}cc"
         casm_options="-c -arch arm64"
@@ -419,7 +419,7 @@ if test "$arch" = "aarch64"; then
         cprepro="${toolprefix}cc"
         cprepro_options="-std=c99 -arch arm64 -U__GNUC__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' '-D_Nullable=' '-D_Nonnull=' -Wno-\\#warnings -E"
         libmath=""
-        system="macosx"
+        system="macos"
         ;;
     *)
         echo "Error: invalid eabi/system '$target' for architecture AArch64." 1>&2
@@ -708,7 +708,7 @@ ENDIANNESS=
 # Possible choices for x86:
 # SYSTEM=linux
 # SYSTEM=bsd
-# SYSTEM=macosx
+# SYSTEM=macos
 # SYSTEM=cygwin
 SYSTEM=
 
-- 
cgit