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 /powerpc | |
| parent | e86596ae60132b0821cb8b15409074e4cd76243a (diff) | |
| parent | c1daedb244d1f7586c12749642b0d78ae910e60a (diff) | |
| download | compcert-kvx-a80705575b12c9813d6a7ecf92bb33aedd10b09e.tar.gz compcert-kvx-a80705575b12c9813d6a7ecf92bb33aedd10b09e.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'powerpc')
| -rw-r--r-- | powerpc/PrintDiab.ml | 8 | ||||
| -rw-r--r-- | powerpc/PrintLinux.ml | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/powerpc/PrintDiab.ml b/powerpc/PrintDiab.ml index 0d9f74e6..1aa27405 100644 --- a/powerpc/PrintDiab.ml +++ b/powerpc/PrintDiab.ml @@ -54,16 +54,16 @@ module Diab_System = let name_of_section = function | Section_text -> ".text" - | Section_data i -> if i then ".data" else ".bss" + | Section_data i -> if i then ".data" else "COMM" | Section_small_data i -> if i then ".sdata" else ".sbss" - | Section_const -> ".text" - | Section_small_const -> ".sdata2" + | Section_const _ -> ".text" + | Section_small_const _ -> ".sdata2" | Section_string -> ".text" | Section_literal -> ".text" | Section_jumptable -> ".text" | Section_user(s, wr, ex) -> sprintf ".section \"%s\",,%c" - s + s (match wr, ex with | true, true -> 'm' (* text+data *) | true, false -> 'd' (* data *) diff --git a/powerpc/PrintLinux.ml b/powerpc/PrintLinux.ml index ed4ef19b..4e90308c 100644 --- a/powerpc/PrintLinux.ml +++ b/powerpc/PrintLinux.ml @@ -53,13 +53,14 @@ module Linux_System = let name_of_section = function | Section_text -> ".text" - | Section_data i -> if i then ".data" else "COMM" + | Section_data i -> + if i then ".data" else "COMM" | Section_small_data i -> - if i - then ".section .sdata,\"aw\",@progbits" - else ".section .sbss,\"aw\",@progbits" - | Section_const -> ".rodata" - | Section_small_const -> ".section .sdata2,\"a\",@progbits" + if i then ".section .sdata,\"aw\",@progbits" else "COMM" + | Section_const i -> + if i then ".rodata" else "COMM" + | Section_small_const i -> + if i then ".section .sdata2,\"a\",@progbits" else "COMM" | Section_string -> ".rodata" | Section_literal -> ".section .rodata.cst8,\"aM\",@progbits,8" | Section_jumptable -> ".text" |