From ab62e1bed37d2efe4d2a9e0139839bae21b1cdd9 Mon Sep 17 00:00:00 2001 From: Xavier Leroy 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". --- aarch64/CBuiltins.ml | 2 +- aarch64/TargetPrinter.ml | 2 +- aarch64/extractionMachdep.v | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'aarch64') 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 *) -- cgit