[COFF] Strip section name suffix from mingw comdats
This is the second part of the fix for PR42217.
Differential Revision: https://reviews.llvm.org/D63352
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@363457 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/COFF/Writer.cpp b/COFF/Writer.cpp
index 89dd0a8..a406c53 100644
--- a/COFF/Writer.cpp
+++ b/COFF/Writer.cpp
@@ -797,7 +797,13 @@
SC->printDiscardedMessage();
continue;
}
- PartialSection *PSec = createPartialSection(C->getSectionName(),
+ StringRef Name = C->getSectionName();
+ // On MinGW, comdat groups are formed by putting the comdat group name
+ // after the '$' in the section name. Such a section name suffix shouldn't
+ // imply separate alphabetical sorting of those section chunks though.
+ if (Config->MinGW && SC && SC->isCOMDAT())
+ Name = Name.split('$').first;
+ PartialSection *PSec = createPartialSection(Name,
C->getOutputCharacteristics());
PSec->Chunks.push_back(C);
}
diff --git a/test/COFF/eh_frame_suffix_sorting.s b/test/COFF/eh_frame_suffix_sorting.s
new file mode 100644
index 0000000..f920751
--- /dev/null
+++ b/test/COFF/eh_frame_suffix_sorting.s
@@ -0,0 +1,39 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.main.o
+# RUN: llvm-mc -filetype=obj -triple=i686-windows-gnu \
+# RUN: %p/Inputs/eh_frame_terminator-crtend.s -o %t.crtend.o
+
+# RUN: lld-link -lldmingw -entry:main %t.main.o %t.crtend.o -out:%t.exe
+# RUN: llvm-objdump -s %t.exe | FileCheck %s
+
+# Check that the contents of .eh_frame$foo was placed before .eh_frame from
+# crtend.o, even if the former had a section name suffix.
+
+# CHECK: Contents of section .eh_fram:
+# CHECK: 403000 4203
+
+ .text
+ .def _main;
+ .scl 2;
+ .type 32;
+ .endef
+ .globl _main
+ .p2align 4, 0x90
+_main:
+ call _foo
+ ret
+
+ .section .eh_frame$foo,"dr"
+ .linkonce discard
+ .byte 0x42
+
+ .def _foo;
+ .scl 2;
+ .type 32;
+ .endef
+ .section .text$foo,"xr",discard,foo
+ .globl _foo
+ .p2align 4
+_foo:
+ ret
