aboutsummaryrefslogtreecommitdiffstats
path: root/checklink/Check.ml
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-07-14 22:41:24 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2015-07-14 22:41:24 +0200
commit4c146156a36d48209a6206f61f80dc5d4c48ce93 (patch)
treedc8e3b1c7daf41cdf965c9e3e6119dcb5d6a41e5 /checklink/Check.ml
parentd03d47c6e4ce9324d6d59ae36cb8db78b013be54 (diff)
parentf995a671ceb28c2a83e5e5574c3cdb46fd5e0f57 (diff)
downloadcompcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.tar.gz
compcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.zip
Merge branch 'master' into asmexpand
Diffstat (limited to 'checklink/Check.ml')
-rw-r--r--checklink/Check.ml4
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