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 /common/Sections.ml | |
| 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 'common/Sections.ml')
| -rw-r--r-- | common/Sections.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/Sections.ml b/common/Sections.ml index c0c95848..cc8b0758 100644 --- a/common/Sections.ml +++ b/common/Sections.ml @@ -27,8 +27,10 @@ type section_name = | Section_literal | Section_jumptable | Section_user of string * bool (*writable*) * bool (*executable*) - | Section_debug_info + | Section_debug_info of string | Section_debug_abbrev + | Section_debug_loc + | Section_debug_line of string type access_mode = | Access_default |