diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-09-03 10:52:23 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-09-03 10:52:23 +0200 |
| commit | 0cb5a0b65b4fbeb5bc1c14f75951798f20500177 (patch) | |
| tree | 767381d2490c86dcee95da2631ac5c94e14de8f5 /cparser/Rename.ml | |
| parent | 1fbd5d18a9f4398d7ecb9b9ab148a96f575fd1e0 (diff) | |
| parent | 2f7f68f69b6408e4de6210c827b108eff011af51 (diff) | |
| download | compcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.tar.gz compcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.zip | |
Merge remote-tracking branch 'origin/mppa-work-upstream-merge' into mppa-work
Conflicts:
configure
mppa_k1c/Archi.v
mppa_k1c/Asmexpand.ml
Diffstat (limited to 'cparser/Rename.ml')
| -rw-r--r-- | cparser/Rename.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cparser/Rename.ml b/cparser/Rename.ml index eb31eaf0..64412194 100644 --- a/cparser/Rename.ml +++ b/cparser/Rename.ml @@ -246,7 +246,7 @@ let rec globdecls env accu = function (* Reserve names of builtins *) let reserve_builtins () = - List.fold_left enter_public empty_env (Builtins.identifiers()) + List.fold_left enter_public empty_env (Env.initial_identifiers()) (* Reserve global declarations with public visibility *) |