diff options
Diffstat (limited to 'lld')
| -rw-r--r-- | lld/ELF/OutputSections.cpp | 2 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/merge-nonalloc.s | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index 8ad01e34654..c1442c07873 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -95,7 +95,7 @@ void OutputSection::addSection(InputSection *IS) { Flags = IS->Flags; } else { // Otherwise, check if new type or flags are compatible with existing ones. - unsigned Mask = SHF_ALLOC | SHF_TLS | SHF_LINK_ORDER; + unsigned Mask = SHF_TLS | SHF_LINK_ORDER; if ((Flags & Mask) != (IS->Flags & Mask)) error("incompatible section flags for " + Name + "\n>>> " + toString(IS) + ": 0x" + utohexstr(IS->Flags) + "\n>>> output section " + Name + diff --git a/lld/test/ELF/linkerscript/merge-nonalloc.s b/lld/test/ELF/linkerscript/merge-nonalloc.s new file mode 100644 index 00000000000..7c48d3bc6cd --- /dev/null +++ b/lld/test/ELF/linkerscript/merge-nonalloc.s @@ -0,0 +1,14 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o +# RUN: echo "SECTIONS { .text : { *(.text) *(.nonalloc) } }" > %t.script +# RUN: ld.lld -shared -o %t.exe %t.script %t.o +# RUN: llvm-objdump -syms %t.exe | FileCheck %s + +# CHECK: .text 00000000 nonalloc_start + +_start: + nop + +.section .nonalloc,"",@progbits +nonalloc_start: + .long 0xcafe |