diff options
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 11 | ||||
| -rw-r--r-- | test/MC/ELF/comdat-reloc.s | 29 | ||||
| -rw-r--r-- | test/MC/ELF/comdat.s | 2 |
3 files changed, 39 insertions, 3 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 4f66156f6d..2db59acd50 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -1002,11 +1002,18 @@ void ELFObjectWriter::CreateRelocationSections(MCAssembler &Asm, else EntrySize = is64Bit() ? sizeof(ELF::Elf64_Rel) : sizeof(ELF::Elf32_Rel); + unsigned Flags = 0; + StringRef Group = ""; + if (Section.getFlags() & ELF::SHF_GROUP) { + Flags = ELF::SHF_GROUP; + Group = Section.getGroup()->getName(); + } + const MCSectionELF *RelaSection = Ctx.getELFSection(RelaSectionName, hasRelocationAddend() ? - ELF::SHT_RELA : ELF::SHT_REL, 0, + ELF::SHT_RELA : ELF::SHT_REL, Flags, SectionKind::getReadOnly(), - EntrySize, ""); + EntrySize, Group); RelMap[&Section] = RelaSection; Asm.getOrCreateSectionData(*RelaSection); } diff --git a/test/MC/ELF/comdat-reloc.s b/test/MC/ELF/comdat-reloc.s new file mode 100644 index 0000000000..d893a7b149 --- /dev/null +++ b/test/MC/ELF/comdat-reloc.s @@ -0,0 +1,29 @@ +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -sd | FileCheck %s + + .text + .globl hello + .type hello,@function +hello: + call world + ret + + .section .text.world,"axG",@progbits,world,comdat + .type world,@function +world: + call doctor + ret + +// CHECK: Name: .group +// CHECK-NOT: SectionData +// CHECK: SectionData +// CHECK-NEXT: 0000: 01000000 06000000 07000000 + +// CHECK: Index: 6 +// CHECK-NEXT: Name: .text.world +// CHECK-NOT: Section { +// CHECK: SHF_GROUP + +// CHECK: Index: 7 +// CHECK-NEXT: Name: .rela.text.world +// CHECK-NOT: Section { +// CHECK: SHF_GROUP diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s index f9469dfae2..6dbe583df0 100644 --- a/test/MC/ELF/comdat.s +++ b/test/MC/ELF/comdat.s @@ -39,7 +39,7 @@ // CHECK-NEXT: ] // CHECK-NEXT: Address: 0x0 // CHECK-NEXT: Offset: 0x54 -// CHECK-NEXT: Size: 8 +// CHECK-NEXT: Size: 12 // CHECK-NEXT: Link: 13 // CHECK-NEXT: Info: 13 // CHECK-NEXT: AddressAlignment: 4 |