diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:05 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:23 +0200 |
| commit | 9ee131bd329d1941eb37eb347f36a0c613a719a9 (patch) | |
| tree | 25760a2f9e796a0f3436463852bb819c288f0a50 /driver | |
| parent | 72378d9371bc5da342266bcf14231ab568e0f919 (diff) | |
| parent | e1725209b2b4401adc63ce5238fa5db7c134609c (diff) | |
| download | compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.tar.gz compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.zip | |
[regression to check!] Merge tag 'v3.6' into mppa-work
Conflicts:
.gitignore
backend/Lineartyping.v
common/Values.v
configure
cparser/Machine.ml
cparser/Machine.mli
driver/Configuration.ml
driver/Frontend.ml
runtime/Makefile
test/c/Makefile
test/c/aes.c
test/compression/Makefile
test/regression/Makefile
test/regression/extasm.c
test/regression/floats-basics.c
test/regression/floats.c
Note : test/regression should be checked, didn't test it yet
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Configuration.ml | 2 | ||||
| -rw-r--r-- | driver/Frontend.ml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/driver/Configuration.ml b/driver/Configuration.ml index dcd0d60b..08084720 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -123,7 +123,7 @@ let get_bool_config key = let arch = match get_config_string "arch" with - | "powerpc"|"arm"|"x86"|"riscV"|"mppa_k1c" as a -> a + | "powerpc"|"arm"|"x86"|"riscV"|"mppa_k1c"|"aarch64" as a -> a | v -> bad_config "arch" [v] let model = get_config_string "model" let abi = get_config_string "abi" diff --git a/driver/Frontend.ml b/driver/Frontend.ml index 2584db90..b9db0d23 100644 --- a/driver/Frontend.ml +++ b/driver/Frontend.ml @@ -117,6 +117,7 @@ let init () = then Machine.rv64 else Machine.rv32 | "mppa_k1c" -> Machine.mppa_k1c + | "aarch64" -> Machine.aarch64 | _ -> assert false end; Env.set_builtins C2C.builtins; |