summaryrefslogtreecommitdiff
path: root/ia32
diff options
context:
space:
mode:
authorGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-07-23 13:14:02 +0000
committerGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-07-23 13:14:02 +0000
commit783288d052bbcf75e250dff5018443d109c6101c (patch)
treec7254dde41f1bb1229cad9f49a0bfd4482293aba /ia32
parentae6f7b8d4cf30fbc2f56c3f2baa8f028fb7f9c10 (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 'ia32')
-rw-r--r--ia32/Conventions1.v (renamed from ia32/standard/Conventions1.v)5
-rw-r--r--ia32/Stacklayout.v (renamed from ia32/standard/Stacklayout.v)0
2 files changed, 5 insertions, 0 deletions
diff --git a/ia32/standard/Conventions1.v b/ia32/Conventions1.v
index d1f7acd..ef9ab6b 100644
--- a/ia32/standard/Conventions1.v
+++ b/ia32/Conventions1.v
@@ -364,3 +364,8 @@ Proof.
simpl typesize. apply Zle_trans with (ofs + 2). omega. apply size_arguments_rec_above.
Qed.
+Lemma loc_arguments_main:
+ loc_arguments signature_main = nil.
+Proof.
+ reflexivity.
+Qed.
diff --git a/ia32/standard/Stacklayout.v b/ia32/Stacklayout.v
index f9d1daf..f9d1daf 100644
--- a/ia32/standard/Stacklayout.v
+++ b/ia32/Stacklayout.v