diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
commit | e30aa60a06817ed67c14a80430a7275defc41e76 (patch) | |
tree | b4bb512416a40578db1f32eb3a7836ddb6f8582d /checklink/Check.ml | |
parent | aa780c7145a418b4a7264e828258034fc4629313 (diff) | |
parent | 2f31c1867b75040067a1ef74ae32f197e8d296c1 (diff) | |
download | compcert-e30aa60a06817ed67c14a80430a7275defc41e76.tar.gz compcert-e30aa60a06817ed67c14a80430a7275defc41e76.zip |
Merge branch 'master' into json_export
Conflicts:
driver/Driver.ml
Diffstat (limited to 'checklink/Check.ml')
-rw-r--r-- | checklink/Check.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/checklink/Check.ml b/checklink/Check.ml index bfd03c97..0e69ab72 100644 --- a/checklink/Check.ml +++ b/checklink/Check.ml @@ -1024,7 +1024,7 @@ let rec compare_code ccode ecode pc: checker = fun fw -> >>= recur_simpl | _ -> error end - | Pcntlz(r1, r2) -> + | Pcntlzw(r1, r2) -> begin match ecode with | CNTLZWx(rS, rA, rc) :: es -> OK(fw) @@ -2573,7 +2573,7 @@ let check_data (pv: (ident * unit globvar) list) (sfw: s_framework) (** Read a .sdump file *) -let sdump_magic_number = "CompCertSDUMP" ^ Configuration.version +let sdump_magic_number = "CompCertSDUMP" ^ Version.version let read_sdump file = let ic = open_in_bin file in |