"macosx" is now called "macos"

The configure script still accepts "macosx" for backward compatibility,
but every other part of CompCert now uses "macos".

16 files changed, 25 insertions, 25 deletions

diff --git a/aarch64/CBuiltins.ml b/aarch64/CBuiltins.ml
index 4ba7e5ae..4cfb7edf 100644
--- a/aarch64/CBuiltins.ml
+++ b/aarch64/CBuiltins.ml
@@ -35,7 +35,7 @@ let int128_type = TArray(TInt(IULong, []), Some 2L, [])
 let builtins = {
   builtin_typedefs =
   [ "__builtin_va_list", va_list_type ] @
-  (if Configuration.system = "macosx" then
+  (if Configuration.system = "macos" then
   [ "__int128_t", int128_type;
     "__uint128_t", int128_type ]
   else []);
diff --git a/aarch64/TargetPrinter.ml b/aarch64/TargetPrinter.ml
index 6e7b3fba..800348a7 100644
--- a/aarch64/TargetPrinter.ml
+++ b/aarch64/TargetPrinter.ml
@@ -706,7 +706,7 @@ let sel_target () =
   let module S =
     (val (match Configuration.system with
           | "linux" -> (module ELF_System : SYSTEM)
-          | "macosx" -> (module MacOS_System : SYSTEM)
+          | "macos" -> (module MacOS_System : SYSTEM)
           | _ -> invalid_arg ("System " ^ Configuration.system ^ " not supported"))
      : SYSTEM) in
   (module Target(S) : TARGET)
diff --git a/aarch64/extractionMachdep.v b/aarch64/extractionMachdep.v
index ee0e3631..5b81ed4c 100644
--- a/aarch64/extractionMachdep.v
+++ b/aarch64/extractionMachdep.v
@@ -28,7 +28,7 @@ Extract Constant Archi.abi =>
 
 Extract Constant SelectOp.symbol_is_relocatable =>
   "match Configuration.system with
-    | ""macosx"" -> C2C.atom_is_extern
+    | ""macos"" -> C2C.atom_is_extern
     | _ -> (fun _ -> false)".
 
 (* Asm *)
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=
 
diff --git a/cparser/Machine.ml b/cparser/Machine.ml
index 43b6351b..8de4ed07 100644
--- a/cparser/Machine.ml
+++ b/cparser/Machine.ml
@@ -178,12 +178,12 @@ let x86_32 =
                    struct_passing_style = SP_split_args;
                    struct_return_style = SR_ref}
 
-let x86_32_macosx =
+let x86_32_macos =
   {x86_32 with struct_passing_style = SP_split_args;
                struct_return_style = SR_int1248 }
 
 let x86_32_bsd =
-  x86_32_macosx
+  x86_32_macos
 
 let x86_64 =
   { i32lpll64 with name = "x86_64"; char_signed = true;
diff --git a/cparser/Machine.mli b/cparser/Machine.mli
index 6d7ffbac..aa99f1aa 100644
--- a/cparser/Machine.mli
+++ b/cparser/Machine.mli
@@ -71,7 +71,7 @@ val ilp32ll64 : t
 val i32lpll64 : t
 val il32pll64 : t
 val x86_32 : t
-val x86_32_macosx : t
+val x86_32_macos : t
 val x86_32_bsd : t
 val x86_64 : t
 val win32 : t
diff --git a/debug/Dwarfgen.ml b/debug/Dwarfgen.ml
index 020ac60e..d9e941fb 100644
--- a/debug/Dwarfgen.ml
+++ b/debug/Dwarfgen.ml
@@ -594,7 +594,7 @@ let gnu_file_loc (f,l) =
 let string_table: (string,int) Hashtbl.t = Hashtbl.create 7
 
 let gnu_string_entry s =
-  if (String.length s < 4 && Configuration.system <> "macosx") (* macosx needs debug_str *)
+  if (String.length s < 4 && Configuration.system <> "macos") (* macos needs debug_str *)
   || Configuration.system = "cygwin" then (*Cygwin does not use the debug_str section*)
     Simple_string s
   else
diff --git a/driver/Configuration.ml b/driver/Configuration.ml
index 2188acf0..4b0c116e 100644
--- a/driver/Configuration.ml
+++ b/driver/Configuration.ml
@@ -157,4 +157,4 @@ let response_file_style =
 
 let gnu_toolchain = system <> "diab"
 
-let elf_target = system <> "macosx" && system <> "cygwin"
+let elf_target = system <> "macos" && system <> "cygwin"
diff --git a/driver/Frontend.ml b/driver/Frontend.ml
index 183908d3..6590e793 100644
--- a/driver/Frontend.ml
+++ b/driver/Frontend.ml
@@ -109,8 +109,8 @@ let init () =
     | "x86"     -> if Configuration.model = "64" then
                      Machine.x86_64
                    else
-                     if Configuration.abi = "macosx"
-                     then Machine.x86_32_macosx
+                     if Configuration.abi = "macos"
+                     then Machine.x86_32_macos
                      else if Configuration.system = "bsd"
                      then Machine.x86_32_bsd
                      else Machine.x86_32
diff --git a/runtime/aarch64/sysdeps.h b/runtime/aarch64/sysdeps.h
index e688961a..b098cf1c 100644
--- a/runtime/aarch64/sysdeps.h
+++ b/runtime/aarch64/sysdeps.h
@@ -34,7 +34,7 @@
 
 // System dependencies
 
-#if defined(SYS_macosx)
+#if defined(SYS_macos)
 
 #define GLOB(x) _##x
 
diff --git a/runtime/x86_32/sysdeps.h b/runtime/x86_32/sysdeps.h
index 9d957a88..973bbe2f 100644
--- a/runtime/x86_32/sysdeps.h
+++ b/runtime/x86_32/sysdeps.h
@@ -48,7 +48,7 @@ f:
 
 #endif
 
-#if defined(SYS_macosx)
+#if defined(SYS_macos)
 
 #define GLOB(x) _##x
 #define FUNCTION(f) \
diff --git a/runtime/x86_64/sysdeps.h b/runtime/x86_64/sysdeps.h
index aacef8f0..9031d5d0 100644
--- a/runtime/x86_64/sysdeps.h
+++ b/runtime/x86_64/sysdeps.h
@@ -48,7 +48,7 @@ f:
 
 #endif
 
-#if defined(SYS_macosx)
+#if defined(SYS_macos)
 
 #define GLOB(x) _##x
 #define FUNCTION(f) \
diff --git a/runtime/x86_64/vararg.S b/runtime/x86_64/vararg.S
index c5225b34..d3634e4d 100644
--- a/runtime/x86_64/vararg.S
+++ b/runtime/x86_64/vararg.S
@@ -38,7 +38,7 @@
 
 // ELF ABI
 
-#if defined(SYS_linux) || defined(SYS_bsd) || defined(SYS_macosx)
+#if defined(SYS_linux) || defined(SYS_bsd) || defined(SYS_macos)
 
 // typedef struct {
 //    unsigned int gp_offset;
diff --git a/test/clightgen/annotations.c b/test/clightgen/annotations.c
index e91c7fbc..993fa7d0 100644
--- a/test/clightgen/annotations.c
+++ b/test/clightgen/annotations.c
@@ -1,6 +1,6 @@
 int f(int x, long y)
 {
-#if !defined(SYSTEM_macosx) && !defined(SYSTEM_cygwin)
+#if !defined(SYSTEM_macos) && !defined(SYSTEM_cygwin)
   __builtin_ais_annot("x is %e1, y is %e2", x, y);
 #endif
   __builtin_annot("x is %1, y is %2", x, y);
diff --git a/x86/TargetPrinter.ml b/x86/TargetPrinter.ml
index da47d5c7..39d0c7dc 100644
--- a/x86/TargetPrinter.ml
+++ b/x86/TargetPrinter.ml
@@ -945,7 +945,7 @@ end
 let sel_target () =
  let module S = (val (match Configuration.system with
   | "linux" | "bsd" -> (module ELF_System:SYSTEM)
-  | "macosx" -> (module MacOS_System:SYSTEM)
+  | "macos" -> (module MacOS_System:SYSTEM)
   | "cygwin" -> (module Cygwin_System:SYSTEM)
   | _ -> invalid_arg ("System " ^ Configuration.system ^ " not supported")  ):SYSTEM) in
  (module Target(S):TARGET)
diff --git a/x86/extractionMachdep.v b/x86/extractionMachdep.v
index 20c6a521..614ec589 100644
--- a/x86/extractionMachdep.v
+++ b/x86/extractionMachdep.v
@@ -28,6 +28,6 @@ Extract Constant Archi.win64 =>
 
 Extract Constant SelectOp.symbol_is_external =>
   "match Configuration.system with
-    | ""macosx"" -> C2C.atom_is_extern
+    | ""macos"" -> C2C.atom_is_extern
     | ""cygwin"" when Archi.ptr64 -> C2C.atom_is_extern
     | _ -> (fun _ -> false)".