diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-07-23 13:14:02 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-07-23 13:14:02 +0000 |
| commit | 783288d052bbcf75e250dff5018443d109c6101c (patch) | |
| tree | c7254dde41f1bb1229cad9f49a0bfd4482293aba /backend | |
| parent | ae6f7b8d4cf30fbc2f56c3f2baa8f028fb7f9c10 (diff) | |
Merge the various $(ARCH)/$(VARIANT)/xxx.v files into $(ARCH)/xxx.v.
The only platform where we have two variants is ARM, and it's easier
to share the callling convention code between the two than to maintain
both variants separately.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2540 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/Stackingproof.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/Stackingproof.v b/backend/Stackingproof.v index 28b155a..c25721b 100644 --- a/backend/Stackingproof.v +++ b/backend/Stackingproof.v @@ -2850,7 +2850,7 @@ Proof. intros. change (Mem.valid_block m0 b0). eapply Genv.find_symbol_not_fresh; eauto. intros. change (Mem.valid_block m0 b0). eapply Genv.find_funct_ptr_not_fresh; eauto. intros. change (Mem.valid_block m0 b0). eapply Genv.find_var_info_not_fresh; eauto. - rewrite H3. red; intros. contradiction. + rewrite H3. red; intros. rewrite loc_arguments_main in H. contradiction. unfold Locmap.init. red; intros; auto. unfold parent_locset. red; auto. Qed. |