diff options
| author | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2014-10-22 15:51:54 -0400 |
| commit | fc92f8a400cf3e4d053940e0b86b72d6de27d67a (patch) | |
| tree | ad0b517f2a9cd798c909e59d982b9061f16c0348 /src/cmd/ld/dwarf.c | |
| parent | 48b04a95e5f719cbef174124780dce00bb410c2c (diff) | |
| parent | b8d4cd490ddd8ba298b5347d3e72316df768565c (diff) | |
| download | go-fc92f8a400cf3e4d053940e0b86b72d6de27d67a.tar.gz | |
[dev.power64] all: merge default into dev.power64
This brings dev.power64 up-to-date with the current tip of
default. go_bootstrap is still panicking with a bad defer
when initializing the runtime (even on amd64).
LGTM=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/152570049
Diffstat (limited to 'src/cmd/ld/dwarf.c')
| -rw-r--r-- | src/cmd/ld/dwarf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c index a3ba52325..fbb5699bd 100644 --- a/src/cmd/ld/dwarf.c +++ b/src/cmd/ld/dwarf.c @@ -2189,7 +2189,7 @@ dwarfaddshstrings(LSym *shstrtab) elfstrdbg[ElfStrDebugStr] = addstring(shstrtab, ".debug_str"); elfstrdbg[ElfStrGDBScripts] = addstring(shstrtab, ".debug_gdb_scripts"); if(linkmode == LinkExternal) { - if(thechar == '6') { + if(thechar == '6' || thechar == '9') { elfstrdbg[ElfStrRelDebugInfo] = addstring(shstrtab, ".rela.debug_info"); elfstrdbg[ElfStrRelDebugAranges] = addstring(shstrtab, ".rela.debug_aranges"); elfstrdbg[ElfStrRelDebugLine] = addstring(shstrtab, ".rela.debug_line"); @@ -2244,7 +2244,7 @@ dwarfaddelfrelocheader(int elfstr, ElfShdr *shdata, vlong off, vlong size) ElfShdr *sh; sh = newElfShdr(elfstrdbg[elfstr]); - if(thechar == '6') { + if(thechar == '6' || thechar == '9') { sh->type = SHT_RELA; } else { sh->type = SHT_REL; |