[PATCH] D27041: [ELF] - Disable emiting multiple output sections when merging is disabled.

[George Rimar via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL288151: [ELF] - Disable emiting multiple output sections when merging is disabled. (authored by grimar).

Changed prior to commit:
  https://reviews.llvm.org/D27041?vs=79543&id=79577#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D27041

Files:
  lld/trunk/ELF/InputSection.cpp
  lld/trunk/test/ELF/merge-string.s
  lld/trunk/test/ELF/no-merge.s


Index: lld/trunk/test/ELF/no-merge.s
===================================================================
--- lld/trunk/test/ELF/no-merge.s
+++ lld/trunk/test/ELF/no-merge.s
@@ -0,0 +1,25 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "SECTIONS { .data : {*(.data.*)} }" > %t0.script
+# RUN: ld.lld %t.o -o %t0.out --script %t0.script
+# RUN: llvm-objdump -s %t0.out | FileCheck %s --check-prefix=OPT
+# OPT:      Contents of section .data:
+# OPT-NEXT:   0000 01
+# OPT-NEXT: Contents of section .data:
+# OPT-NEXT:   0001 6100
+# OPT-NEXT: Contents of section .data:
+# OPT-NEXT:   0003 03
+
+# RUN: ld.lld -O0 %t.o -o %t1.out --script %t0.script
+# RUN: llvm-objdump -s %t1.out | FileCheck %s --check-prefix=NOOPT
+# NOOPT:      Contents of section .data:
+# NOOPT-NEXT:   0000 01610003
+
+.section .data.aw,"aw", at progbits
+.byte 1
+
+.section .data.ams,"aMS", at progbits,1
+.asciz "a"
+
+.section .data.am,"aM", at progbits,1
+.byte 3
Index: lld/trunk/test/ELF/merge-string.s
===================================================================
--- lld/trunk/test/ELF/merge-string.s
+++ lld/trunk/test/ELF/merge-string.s
@@ -61,8 +61,6 @@
 // NOMERGE-NEXT: Type:    SHT_PROGBITS
 // NOMERGE-NEXT: Flags [
 // NOMERGE-NEXT:   SHF_ALLOC
-// NOMERGE-NEXT:   SHF_MERGE
-// NOMERGE-NEXT:   SHF_STRINGS
 // NOMERGE-NEXT: ]
 // NOMERGE-NEXT: Address:         0x1C8
 // NOMERGE-NEXT: Offset:  0x1C8
Index: lld/trunk/ELF/InputSection.cpp
===================================================================
--- lld/trunk/ELF/InputSection.cpp
+++ lld/trunk/ELF/InputSection.cpp
@@ -80,6 +80,12 @@
   if (V > UINT32_MAX)
     fatal(toString(File) + ": section sh_addralign is too large");
   Alignment = V;
+
+  // If it is not a mergeable section, overwrite the flag so that the flag
+  // is consistent with the class. This inconsistency could occur when
+  // string merging is disabled using -O0 flag.
+  if (!Config->Relocatable && !isa<MergeInputSection<ELFT>>(this))
+    this->Flags &= ~(SHF_MERGE | SHF_STRINGS);
 }
 
 template <class ELFT>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D27041.79577.patch
Type: text/x-patch
Size: 2091 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161129/07c0bf47/attachment.bin>