diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
| commit | 4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a (patch) | |
| tree | 0068ca2f3c45ffb7e07db62d681ccd3b96bcb167 /cfrontend/Ctypes.v | |
| parent | a34b64ee2e7a535ebc0fc731243ab520c4ba430f (diff) | |
| parent | 9147350fdb47f3471ce6d9202b7c996f79ffab2d (diff) | |
| download | compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.tar.gz compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.zip | |
Merge branch 'debugscopes' into debug_locations
Conflicts:
debug/CtoDwarf.ml
debug/DwarfPrinter.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 |