diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-10-11 10:16:51 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-10-11 10:16:51 +0200 |
| commit | 9a62a6663a25c74c537f79bfc767f75fd4994181 (patch) | |
| tree | c92c3c2a881a54208ad4f63295daec0dd6836c02 /lib | |
| parent | 378ac3925503e6efd24cc34796e85d95c031e72d (diff) | |
| parent | 659b735ed2dbefcbe8bcb2ec2123b66019ddaf14 (diff) | |
| download | compcert-9a62a6663a25c74c537f79bfc767f75fd4994181.tar.gz compcert-9a62a6663a25c74c537f79bfc767f75fd4994181.zip | |
Merge branch 'master' into ppc64
Resolved conflicts in:configure powerpc/Asmexpand.ml
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Camlcoq.ml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Camlcoq.ml b/lib/Camlcoq.ml index 68c095f0..c50b3230 100644 --- a/lib/Camlcoq.ml +++ b/lib/Camlcoq.ml @@ -295,8 +295,7 @@ let intern_string s = next_atom := Pos.succ !next_atom; Hashtbl.add atom_of_string s a; Hashtbl.add string_of_atom a s; - a - + a let extern_atom a = try Hashtbl.find string_of_atom a |