summaryrefslogtreecommitdiffstats
path: root/lld
diff options
context:
space:
mode:
Diffstat (limited to 'lld')
-rw-r--r--lld/lib/ReaderWriter/ELF/Atoms.cpp7
-rw-r--r--lld/test/elf/note.test6
2 files changed, 10 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Atoms.cpp b/lld/lib/ReaderWriter/ELF/Atoms.cpp
index 45a82d1392c..63963339316 100644
--- a/lld/lib/ReaderWriter/ELF/Atoms.cpp
+++ b/lld/lib/ReaderWriter/ELF/Atoms.cpp
@@ -71,8 +71,13 @@ DefinedAtom::ContentType ELFDefinedAtom<ELFT>::doContentType() const {
return typeGnuLinkOnce;
uint64_t flags = _section->sh_flags;
- if (!(flags & SHF_ALLOC))
+
+ if (!(flags & SHF_ALLOC)) {
+ if (_section->sh_type == SHT_NOTE)
+ return (flags == SHF_WRITE) ? typeRWNote : typeRONote;
return _contentType = typeNoAlloc;
+ }
+
if (_section->sh_flags == (SHF_ALLOC | SHF_WRITE | SHF_TLS))
return _section->sh_type == SHT_NOBITS ? typeThreadZeroFill
: typeThreadData;
diff --git a/lld/test/elf/note.test b/lld/test/elf/note.test
index 01329e9c8f6..e7544c1f126 100644
--- a/lld/test/elf/note.test
+++ b/lld/test/elf/note.test
@@ -1,9 +1,11 @@
# Check that the linker is not ignoring input sections.
# RUN: yaml2obj -format=elf %s > %t.obj
# RUN: lld -flavor gnu -target x86_64 %t.obj -o %t.exe --noinhibit-exec
-# RUN: llvm-objdump -h %t.exe | FileCheck %s
+# RUN: llvm-readobj -s %t.exe | FileCheck %s
-# CHECK: {{[0-9]+}} .note
+# CHECK: Section {
+# CHECK: Name: .note
+# CHECK-NEXT: Type: SHT_NOTE
---
FileHeader:
OpenPOWER on IntegriCloud