diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
| commit | a80705575b12c9813d6a7ecf92bb33aedd10b09e (patch) | |
| tree | 0b260d771fcd5aef702f3389769a6dae65b8e9bf /common | |
| parent | e86596ae60132b0821cb8b15409074e4cd76243a (diff) | |
| parent | c1daedb244d1f7586c12749642b0d78ae910e60a (diff) | |
| download | compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.tar.gz compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'common')
| -rw-r--r-- | common/Sections.ml | 12 | ||||
| -rw-r--r-- | common/Sections.mli | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/Sections.ml b/common/Sections.ml index d7ae8195..c6d4c4c2 100644 --- a/common/Sections.ml +++ b/common/Sections.ml @@ -21,8 +21,8 @@ type section_name = | Section_text | Section_data of bool (* true = init data, false = uninit data *) | Section_small_data of bool - | Section_const - | Section_small_const + | Section_const of bool + | Section_small_const of bool | Section_string | Section_literal | Section_jumptable @@ -68,13 +68,13 @@ let builtin_sections = [ sec_writable = true; sec_executable = false; sec_access = Access_near}; "CONST", - {sec_name_init = Section_const; - sec_name_uninit = Section_const; + {sec_name_init = Section_const true; + sec_name_uninit = Section_const false; sec_writable = false; sec_executable = false; sec_access = Access_default}; "SCONST", - {sec_name_init = Section_small_const; - sec_name_uninit = Section_small_const; + {sec_name_init = Section_small_const true; + sec_name_uninit = Section_small_const false; sec_writable = false; sec_executable = false; sec_access = Access_near}; "STRING", diff --git a/common/Sections.mli b/common/Sections.mli index ff6c8c95..38b99db0 100644 --- a/common/Sections.mli +++ b/common/Sections.mli @@ -20,8 +20,8 @@ type section_name = | Section_text | Section_data of bool (* true = init data, false = uninit data *) | Section_small_data of bool - | Section_const - | Section_small_const + | Section_const of bool + | Section_small_const of bool | Section_string | Section_literal | Section_jumptable |