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/Unblock.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/Unblock.ml')
| -rw-r--r-- | cparser/Unblock.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cparser/Unblock.ml b/cparser/Unblock.ml index 66b497cc..d25f70c6 100644 --- a/cparser/Unblock.ml +++ b/cparser/Unblock.ml @@ -399,4 +399,4 @@ let rec unblock_glob env accu = function let program p = next_scope_id := 0; {gloc = no_loc; gdesc = Gdecl(Storage_extern, debug_id, debug_ty, None)} :: - unblock_glob (Builtins.environment()) [] p + unblock_glob (Env.initial()) [] p |