diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2016-10-27 16:26:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 16:26:08 +0200 |
| commit | 9922feea537ced718a3822dd50eabc87da060338 (patch) | |
| tree | 6f67bb6707ef59e50d6bb81c61b2ed0b3c6097ab /driver/Driver.ml | |
| parent | f2d6637c7d4a11f961ff289e64f70bf4de93d0aa (diff) | |
| parent | d50773e537ec6729f9152b545c6f938ab19eb7b8 (diff) | |
| download | compcert-9922feea537ced718a3822dd50eabc87da060338.tar.gz compcert-9922feea537ced718a3822dd50eabc87da060338.zip | |
Merge pull request #145 from AbsInt/64
Support for 64-bit target processors + support for x86 in 64-bit mode
Diffstat (limited to 'driver/Driver.ml')
| -rw-r--r-- | driver/Driver.ml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml index a273a91a..145de6c5 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -511,9 +511,12 @@ let _ = | "arm" -> if Configuration.is_big_endian then Machine.arm_bigendian else Machine.arm_littleendian - | "ia32" -> if Configuration.abi = "macosx" - then Machine.x86_32_macosx - else Machine.x86_32 + | "x86" -> if Configuration.model = "64" then + Machine.x86_64 + else + if Configuration.abi = "macosx" + then Machine.x86_32_macosx + else Machine.x86_32 | _ -> assert false end; Builtins.set C2C.builtins; |