diff options
| author | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-06-10 18:28:26 +0200 |
|---|---|---|
| committer | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-06-10 18:28:26 +0200 |
| commit | f16fa31ec9cc90da750c8cc10f447023962cd153 (patch) | |
| tree | 28eed4d4b5bc964907f20332d1eed470a393d07b /driver | |
| parent | 485a4c0dd450e65745c83e59acdb40b42058e556 (diff) | |
| parent | d703ae1ad5e1fcdc63e07b2a50a3e8576a11e61e (diff) | |
| download | compcert-kvx-f16fa31ec9cc90da750c8cc10f447023962cd153.tar.gz compcert-kvx-f16fa31ec9cc90da750c8cc10f447023962cd153.zip | |
Merge branch 'kvx-work' into BTL
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/CommonOptions.ml | 1 | ||||
| -rw-r--r-- | driver/Configuration.ml | 2 | ||||
| -rw-r--r-- | driver/Frontend.ml | 9 |
3 files changed, 7 insertions, 5 deletions
diff --git a/driver/CommonOptions.ml b/driver/CommonOptions.ml index e8a6941c..a816dd41 100644 --- a/driver/CommonOptions.ml +++ b/driver/CommonOptions.ml @@ -77,7 +77,6 @@ let general_help = -v Print external commands before invoking them -timings Show the time spent in various compiler passes -version Print the version string and exit - -version-file <file> Print version inforation to <file> and exit -target <value> Generate code for the given target -conf <file> Read configuration from file @<file> Read command line options from <file> diff --git a/driver/Configuration.ml b/driver/Configuration.ml index ecc2aba6..deca85f2 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -158,4 +158,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 c8890046..480932df 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 @@ -119,9 +119,12 @@ let init () = else Machine.rv32 | "kvx" -> if Configuration.os = "cos" then Machine.kvxcos else if Configuration.os = "mbr" then Machine.kvxmbr + else if Configuration.os = "elf" then Machine.kvxelf else (Printf.eprintf "Configuration OS = %s\n" Configuration.os; failwith "Wrong OS configuration for KVX") - | "aarch64" -> Machine.aarch64 + | "aarch64" -> if Configuration.abi = "apple" + then Machine.aarch64_apple + else Machine.aarch64 | _ -> assert false end; Env.set_builtins C2C.builtins; |