diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-10-20 14:45:56 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-10-20 14:45:56 +0200 |
| commit | ed6043fe910f7a320f7af6d3f9d35f39f5cf7ee1 (patch) | |
| tree | 3fab134f5444f0472a1ff8c06e5b7686a40648dc /common | |
| parent | 4d542bc7eafadb16b845cf05d1eb4988eb55ed0f (diff) | |
| parent | 8a95c3e07fd02eaa87f8cca447bc7d7c2642eb22 (diff) | |
| download | compcert-ed6043fe910f7a320f7af6d3f9d35f39f5cf7ee1.tar.gz compcert-ed6043fe910f7a320f7af6d3f9d35f39f5cf7ee1.zip | |
Merge remote-tracking branch 'origin/master' into named-externals
Conflicts:
arm/TargetPrinter.ml
backend/CMparser.mly
backend/SelectLongproof.v
backend/Selectionproof.v
cfrontend/C2C.ml
checklink/Asm_printers.ml
checklink/Check.ml
checklink/Fuzz.ml
common/AST.v
debug/DebugInformation.ml
debug/DebugInit.ml
debug/DwarfPrinter.ml
debug/DwarfTypes.mli
debug/Dwarfgen.ml
exportclight/ExportClight.ml
ia32/TargetPrinter.ml
powerpc/Asm.v
powerpc/SelectOpproof.v
powerpc/TargetPrinter.ml
Diffstat (limited to 'common')
| -rw-r--r-- | common/Sections.ml | 6 | ||||
| -rw-r--r-- | common/Sections.mli | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/common/Sections.ml b/common/Sections.ml index 0400bbc4..ec5b6412 100644 --- a/common/Sections.ml +++ b/common/Sections.ml @@ -27,10 +27,12 @@ type section_name = | Section_literal | Section_jumptable | Section_user of string * bool (*writable*) * bool (*executable*) - | Section_debug_info of string | Section_debug_abbrev + | Section_debug_info of string option | Section_debug_loc - | Section_debug_line of string + | Section_debug_line of string option + | Section_debug_ranges + | Section_debug_str type access_mode = | Access_default diff --git a/common/Sections.mli b/common/Sections.mli index 7a8c8225..8a13fb8a 100644 --- a/common/Sections.mli +++ b/common/Sections.mli @@ -26,10 +26,12 @@ type section_name = | Section_literal | Section_jumptable | Section_user of string * bool (*writable*) * bool (*executable*) - | Section_debug_info of string | Section_debug_abbrev + | Section_debug_info of string option | Section_debug_loc - | Section_debug_line of string + | Section_debug_line of string option + | Section_debug_ranges + | Section_debug_str type access_mode = | Access_default |