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 /cfrontend/Ctypes.v | |
| 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 'cfrontend/Ctypes.v')
| -rw-r--r-- | cfrontend/Ctypes.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cfrontend/Ctypes.v b/cfrontend/Ctypes.v index a555f792..1f55da7f 100644 --- a/cfrontend/Ctypes.v +++ b/cfrontend/Ctypes.v @@ -802,13 +802,13 @@ Program Definition composite_of_def Next Obligation. apply Zle_ge. eapply Zle_trans. eapply sizeof_composite_pos. apply align_le; apply alignof_composite_pos. -Qed. +Defined. Next Obligation. apply align_attr_two_p. apply alignof_composite_two_p. -Qed. +Defined. Next Obligation. apply align_divides. apply alignof_composite_pos. -Qed. +Defined. (** The composite environment for a program is obtained by entering its composite definitions in sequence. The definitions are assumed |