[llvm-readobj] Include section name of notes.

[rupprecht]

Summary

This changes the output of llvm-readelf -n from:

Displaying notes found at file offset 0x<...> with length 0x<...>:

to:

Displaying notes found in: .note.foo

And similarly, adds a Name: field to the llvm-readobj -n output for notes.

This change not only increases GNU compatibility, it also makes it much easier to read notes. Note that we still fall back to printing the file offset/length in cases where we don't have a section name, such as when printing notes in program headers or printing notes in a partially stripped file (GNU readelf does the same).

Fixes llvm.org/PR41339.

[MaskRay]

llvm/test/tools/llvm-readobj/ELF/gnu-notes.test

66

Worth a comment that it has no name.

79

This will be the remaining test for the Displaying notes found at file offset ... form.

Worth a comment that it has no name.

[rupprecht]

• Update test comments

[rupprecht]

Upload correct patch

[grimar]

llvm/tools/llvm-readobj/ELFDumper.cpp

5134

Probably,

/*SecName=*/None

6278

Should we always print fields? (i.e. print Name=something for !SecName).
Is it the only case for LLVM output where we can omit/print field I guess?
(I remember we had something like this before somewhere and removed it).

[rupprecht]

• Annotate SecName param
• Use <?> for unknown section names

[rupprecht]

llvm/tools/llvm-readobj/ELFDumper.cpp

6278

Yes, we do have a custom of printing <?> for unknown sections/symbols. Updated here, but not for GNU output format, for better compatibility.

lld/test/ELF/partition-notes.s

 // Test that notes (both from object files and synthetic) are duplicated into
 // each partition.
 
 // REQUIRES: x86
 
 // RUN: llvm-mc %s -o %t.o -filetype=obj --triple=x86_64-unknown-linux
 // RUN: ld.lld %t.o -o %t --shared --gc-sections --build-id=sha1
 
 // RUN: llvm-objcopy --extract-main-partition %t %t0
 // RUN: llvm-objcopy --extract-partition=part1 %t %t1
 
-// RUN: llvm-readelf --all %t0 | FileCheck --check-prefixes=CHECK,PART0 %s
-// RUN: llvm-readelf --all %t1 | FileCheck --check-prefixes=CHECK,PART1 %s
+// RUN: llvm-readobj --all %t0 | FileCheck --check-prefixes=CHECK,PART0 %s
+// RUN: llvm-readobj --all %t1 | FileCheck --check-prefixes=CHECK,PART1 %s
 
-// CHECK: Program Headers:
-// CHECK: NOTE 0x{{0*}}[[NOTE_OFFSET:[^ ]*]]
+// CHECK:        Type: PT_NOTE
+// CHECK-NEXT:   Offset: 0x{{0*}}[[NOTE_OFFSET:[^ ]*]]
 
-// CHECK: Displaying notes found at file offset 0x{{0*}}[[NOTE_OFFSET]]
-// CHECK-NEXT: Owner
-// CHECK-NEXT: foo                   0x00000004 NT_VERSION (version)
-// CHECK-NEXT:  description data: 62 61 72 00
-// CHECK-NEXT: Displaying notes
-// CHECK-NEXT: Owner
-// CHECK-NEXT: GNU                   0x00000014 NT_GNU_BUILD_ID (unique build ID bitstring)
-// CHECK-NEXT: Build ID: 08b93eab87177a2356d1b0d1148339463f98dac2
+// CHECK:      Notes [
+// CHECK-NEXT:   NoteSection {
+// CHECK-NEXT:     Name: .note.obj
+// CHECK-NEXT:     Offset: 0x{{0*}}[[NOTE_OFFSET]]
+// CHECK-NEXT:     Size:
+// CHECK-NEXT:     Note {
+// CHECK-NEXT:       Owner: foo
+// CHECK-NEXT:       Data size: 0x4
+// CHECK-NEXT:       Type: NT_VERSION (version)
+// CHECK-NEXT:       Description data (
+// CHECK-NEXT:         0000: 62617200                             |bar.|
+// CHECK-NEXT:       )
+// CHECK-NEXT:     }
+// CHECK-NEXT:   }
+// CHECK-NEXT:   NoteSection {
+// CHECK-NEXT:     Name: .note.gnu.build-id
+// CHECK-NEXT:     Offset:
+// CHECK-NEXT:     Size:
+// CHECK-NEXT:     Note {
+// CHECK-NEXT:       Owner: GNU
+// CHECK-NEXT:       Data size:
+// CHECK-NEXT:       Type: NT_GNU_BUILD_ID (unique build ID bitstring)
+// CHECK-NEXT:       Build ID: 08b93eab87177a2356d1b0d1148339463f98dac2
+// CHECK-NEXT:     }
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
 
 .section .llvm_sympart,"",@llvm_sympart
 .asciz "part1"
 .quad p1
 
 .section .data.p0,"aw",@progbits
 .globl p0
 p0:

llvm/test/CodeGen/AMDGPU/code-object-v3.ll

 ; OSABI-AMDHSA-ELF: 0000000000000050 0000000300000005 R_AMDGPU_REL64 0000000000000100 fsub + 10
 
 ; OSABI-AMDHSA-ELF: Symbol table '.symtab' contains {{[0-9]+}} entries
 ; OSABI-AMDHSA-ELF: {{[0-9]+}}: 0000000000000000 {{[0-9]+}} FUNC   GLOBAL PROTECTED {{[0-9]+}} fadd
 ; OSABI-AMDHSA-ELF: {{[0-9]+}}: 0000000000000000 64         OBJECT GLOBAL DEFAULT   {{[0-9]+}} fadd.kd
 ; OSABI-AMDHSA-ELF: {{[0-9]+}}: 0000000000000100 {{[0-9]+}} FUNC   GLOBAL PROTECTED {{[0-9]+}} fsub
 ; OSABI-AMDHSA-ELF: {{[0-9]+}}: 0000000000000040 64         OBJECT GLOBAL DEFAULT   {{[0-9]+}} fsub.kd
 
-; OSABI-AMDHSA-ELF: Displaying notes found at file offset
+; OSABI-AMDHSA-ELF: Displaying notes found in: .note
 ; OSABI-AMDHSA-ELF: AMDGPU 0x{{[0-9a-f]+}} NT_AMDGPU_METADATA (AMDGPU Metadata)
 
 define amdgpu_kernel void @fadd(
     float addrspace(1)* %r,
     float addrspace(1)* %a,
     float addrspace(1)* %b) {
 entry:
   %a.val = load float, float addrspace(1)* %a

llvm/test/tools/llvm-objcopy/ELF/add-note.test

 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
 
 # CHECK:      Notes [
 # CHECK-NEXT:   NoteSection {
+# CHECK-NEXT:     Name: .note.gnu.build-id
 # CHECK-NEXT:     Offset:
 # CHECK-NEXT:     Size:
 # CHECK-NEXT:     Note {
 # CHECK-NEXT:       Owner: GNU
 # CHECK-NEXT:       Data size: 0x10
 # CHECK-NEXT:       Type: NT_GNU_BUILD_ID
 # CHECK-NEXT:       Build ID: 000102030405060708090a0b0c0d0e0f
 # CHECK-NEXT:     }
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]

llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-note-gnu-property.s

 // RUN: llvm-mc -filetype=obj -triple aarch64-linux-gnu %s -o %t
 // RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
 // RUN: llvm-readobj --notes %t | FileCheck %s --check-prefix=LLVM
 
-// GNU: Displaying notes found at file offset 0x00000040 with length 0x00000020:
+// GNU: Displaying notes found in: .note.gnu.property
 // GNU-NEXT:   Owner                 Data size  Description
 // GNU-NEXT:   GNU                   0x00000010 NT_GNU_PROPERTY_TYPE_0 (property note)
 // GNU-NEXT:     Properties:    aarch64 feature: BTI, PAC
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.gnu.property
 // LLVM-NEXT:     Offset: 0x40
 // LLVM-NEXT:     Size: 0x20
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: GNU
 // LLVM-NEXT:       Data size: 0x10
 // LLVM-NEXT:       Type: NT_GNU_PROPERTY_TYPE_0 (property note)
 // LLVM-NEXT:       Property [
 // LLVM-NEXT:         aarch64 feature: BTI, PAC

llvm/test/tools/llvm-readobj/ELF/all.test

 # GNU-ALL: .eh_frame section at offset {{.*}} address 0x0:
 # GNU-ALL: Dynamic section at offset {{.*}} contains {{.*}} entries:
 # GNU-ALL: Program Headers:
 # GNU-ALL: Version symbols section '.gnu.version' contains {{.*}} entries:
 # GNU-ALL: Version definition section '.gnu.version_d' contains {{.*}} entries:
 # GNU-ALL: Version needs section '.gnu.version_r' contains {{.*}} entries:
 # GNU-ALL: There are no section groups in this file.
 # GNU-ALL: Histogram for bucket list length (total of 1 buckets)
-# GNU-ALL: Displaying notes found at file offset {{.*}} with length {{.*}}:
+# GNU-ALL: Displaying notes found
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS32
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_386
 Sections:

llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
 # RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
 
-# GNU:        Owner                 Data size       Description
+# GNU:      Displaying notes found in: .note.ABI-tag
+# GNU-NEXT:   Owner                 Data size       Description
 # GNU-NEXT:   GNU                   0x00000004      NT_GNU_ABI_TAG (ABI version tag)
 # GNU-NEXT:     <corrupt GNU_ABI_TAG>
 
 # LLVM:      Notes [
 # LLVM-NEXT:   NoteSection {
+# LLVM-NEXT:     Name: .note.ABI-tag
 # LLVM-NEXT:     Offset:
 # LLVM-NEXT:     Size: 0x14
 # LLVM-NEXT:     Note {
 # LLVM-NEXT:       Owner: GNU
 # LLVM-NEXT:       Data size: 0x4
 # LLVM-NEXT:       Type: NT_GNU_ABI_TAG (ABI version tag)
 # LLVM-NEXT:       ABI: <corrupt GNU_ABI_TAG>
 # LLVM-NEXT:     }

llvm/test/tools/llvm-readobj/ELF/gnu-notes.test

 ## Test tools are able to dump different types of notes.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1.so
 # RUN: llvm-readelf --notes %t1.so | FileCheck %s --check-prefix=GNU --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --notes %t1.so | FileCheck %s --check-prefix=LLVM
 # RUN: llvm-objcopy --strip-sections %t1.so %t1.stripped.so
 # RUN: llvm-readelf --notes %t1.stripped.so | FileCheck %s --check-prefix=GNU-STRIPPED --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --notes %t1.stripped.so | FileCheck %s --check-prefix=LLVM-STRIPPED
 
-#      GNU:Displaying notes found at file offset 0x00000078 with length 0x00000020:
+#      GNU:Displaying notes found in: .note.ABI-tag
 # GNU-NEXT:  Owner                Data size   Description
 # GNU-NEXT:  GNU                  0x00000010  NT_GNU_ABI_TAG (ABI version tag)
 # GNU-NEXT:    OS: Linux, ABI: 2.6.32
 
-#      GNU:Displaying notes found at file offset 0x00000098 with length 0x00000020:
+#      GNU:Displaying notes found in: .note.gnu.build-id
 # GNU-NEXT:  Owner                Data size   Description
 # GNU-NEXT:  GNU                  0x00000010  NT_GNU_BUILD_ID (unique build ID bitstring)
 # GNU-NEXT:    Build ID: 4fcb712aa6387724a9f465a32cd8c14b
 
-#      GNU:Displaying notes found at file offset 0x000000b8 with length 0x0000001c:
+#      GNU:Displaying notes found in: .note.gnu.gold-version
 # GNU-NEXT:  Owner                Data size   Description
 # GNU-NEXT:  GNU                  0x00000009  NT_GNU_GOLD_VERSION (gold version)
 # GNU-NEXT:    Version: gold 1.11
 
 # LLVM:      Notes [
 # LLVM-NEXT:   NoteSection {
+# LLVM-NEXT:     Name: .note.ABI-tag
 # LLVM-NEXT:     Offset: 0x78
 # LLVM-NEXT:     Size: 0x20
 # LLVM-NEXT:     Note {
 # LLVM-NEXT:       Owner: GNU
 # LLVM-NEXT:       Data size: 0x10
 # LLVM-NEXT:       Type: NT_GNU_ABI_TAG (ABI version tag)
 # LLVM-NEXT:       OS: Linux
 # LLVM-NEXT:       ABI: 2.6.32
 # LLVM-NEXT:     }
 # LLVM-NEXT:   }
 # LLVM-NEXT:   NoteSection {
+# LLVM-NEXT:     Name: .note.gnu.build-id
 # LLVM-NEXT:     Offset: 0x98
 # LLVM-NEXT:     Size: 0x20
 # LLVM-NEXT:     Note {
 # LLVM-NEXT:       Owner: GNU
 # LLVM-NEXT:       Data size: 0x10
 # LLVM-NEXT:       Type: NT_GNU_BUILD_ID (unique build ID bitstring)
 # LLVM-NEXT:       Build ID: 4fcb712aa6387724a9f465a32cd8c14b
 # LLVM-NEXT:     }
 # LLVM-NEXT:   }
 # LLVM-NEXT:   NoteSection {
+# LLVM-NEXT:     Name: .note.gnu.gold-version
 # LLVM-NEXT:     Offset: 0xB8
 # LLVM-NEXT:     Size: 0x1C
 # LLVM-NEXT:     Note {
 # LLVM-NEXT:       Owner: GNU
 # LLVM-NEXT:       Data size: 0x9
 # LLVM-NEXT:       Type: NT_GNU_GOLD_VERSION (gold version)
 # LLVM-NEXT:       Version: gold 1.11
 # LLVM-NEXT:     }
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 
+## Note: there is no "Name: .note.gnu.build-id" assertion here because the
+## section header table is not present.
 # LLVM-STRIPPED:      Notes [
 # LLVM-STRIPPED-NEXT:   NoteSection {
 # LLVM-STRIPPED-NEXT:     Offset: 0x78
 # LLVM-STRIPPED-NEXT:     Size: 0x20
 # LLVM-STRIPPED-NEXT:     Note {
 # LLVM-STRIPPED-NEXT:       Owner: GNU
 # LLVM-STRIPPED-NEXT:       Data size: 0x10
 # LLVM-STRIPPED-NEXT:       Type: NT_GNU_BUILD_ID (unique build ID bitstring)
 # LLVM-STRIPPED-NEXT:       Build ID: 4fcb712aa6387724a9f465a32cd8c14b
 # LLVM-STRIPPED-NEXT:     }
 # LLVM-STRIPPED-NEXT:   }
 # LLVM-STRIPPED-NEXT: ]
 
+## Note: offset and length printed instead of "found in: .note.gnu.build-id"
+## because the section header table is not present.
 #      GNU-STRIPPED:Displaying notes found at file offset 0x00000078 with length 0x00000020:
 # GNU-STRIPPED-NEXT:  Owner                Data size  Description
 # GNU-STRIPPED-NEXT:  GNU                  0x00000010 NT_GNU_BUILD_ID (unique build ID bitstring)
 # GNU-STRIPPED-NEXT:    Build ID: 4fcb712aa6387724a9f465a32cd8c14b
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB

llvm/test/tools/llvm-readobj/ELF/note-amd.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 
 // RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
 // RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
 
-// GNU:      Displaying notes found
+// GNU:      Displaying notes found in: .note.no.desc
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   AMD                  0x00000000       NT_AMD_AMDGPU_HSA_METADATA (HSA Metadata)
 // GNU-NEXT:     HSA Metadata:
 // GNU-NEXT: {{^ +$}}
 // GNU-NEXT:   AMD                  0x00000000       NT_AMD_AMDGPU_ISA (ISA Version)
 // GNU-NEXT:     ISA Version:
 // GNU-NEXT: {{^ +$}}
-// GNU-NEXT: Displaying notes found
+// GNU-NEXT: Displaying notes found in: .note.desc
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   AMD                  0x0000000a       NT_AMD_AMDGPU_HSA_METADATA (HSA Metadata)
 // GNU-NEXT:     HSA Metadata:
 // GNU-NEXT:     meta_blah
 // GNU-NEXT:   AMD                  0x00000009       NT_AMD_AMDGPU_ISA (ISA Version)
 // GNU-NEXT:     ISA Version:
 // GNU-NEXT:     isa_blah
-// GNU-NEXT: Displaying notes found
+// GNU-NEXT: Displaying notes found in: .note.other
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   AMD                  0x00000000       NT_AMD_AMDGPU_PAL_METADATA (PAL Metadata)
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.no.desc
 // LLVM-NEXT:     Offset:
 // LLVM-NEXT:     Size:
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: AMD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_AMD_AMDGPU_HSA_METADATA (HSA Metadata)
 // LLVM-NEXT:       HSA Metadata:
 // LLVM-NEXT:     }
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: AMD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_AMD_AMDGPU_ISA (ISA Version)
 // LLVM-NEXT:       ISA Version:
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.desc
 // LLVM-NEXT:     Offset:
 // LLVM-NEXT:     Size:
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: AMD
 // LLVM-NEXT:       Data size: 0xA
 // LLVM-NEXT:       Type: NT_AMD_AMDGPU_HSA_METADATA (HSA Metadata)
 // LLVM-NEXT:       HSA Metadata: meta_blah
 // LLVM-NEXT:     }
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: AMD
 // LLVM-NEXT:       Data size: 0x9
 // LLVM-NEXT:       Type: NT_AMD_AMDGPU_ISA (ISA Version)
 // LLVM-NEXT:       ISA Version: isa_blah
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.other
 // LLVM-NEXT:     Offset:
 // LLVM-NEXT:     Size:
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: AMD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_AMD_AMDGPU_PAL_METADATA (PAL Metadata)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }

llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test

 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
 # RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
 
-# GNU:      Displaying notes found
+# GNU:      Displaying notes found in: .note.foo
 # GNU-NEXT:   Owner                Data size        Description
 # GNU-NEXT:   AMDGPU               0x000000e6       NT_AMDGPU_METADATA (AMDGPU Metadata)
 # GNU-NEXT:     AMDGPU Metadata:
 # GNU-NEXT:         ---
 # GNU-NEXT: amdhsa.kernels:
 # GNU-NEXT:   - .group_segment_fixed_size: 2
 # GNU-NEXT:     .kernarg_segment_align: 4
 # GNU-NEXT:     .kernarg_segment_size: 1
 # GNU-NEXT:     .max_flat_workgroup_size: 8
 # GNU-NEXT:     .name:           foo
 # GNU-NEXT:     .private_segment_fixed_size: 3
 # GNU-NEXT:     .sgpr_count:     6
 # GNU-NEXT:     .symbol:         foo
 # GNU-NEXT:     .vgpr_count:     7
 # GNU-NEXT:     .wavefront_size: 5
 # GNU-NEXT: amdhsa.version:
 # GNU-NEXT:   - 1
 # GNU-NEXT:   - 0
 # GNU-NEXT: ...
 
 # LLVM:      Notes [
 # LLVM-NEXT:   NoteSection {
+# LLVM-NEXT:     Name: .note.foo
 # LLVM-NEXT:     Offset:
 # LLVM-NEXT:     Size:
 # LLVM-NEXT:     Note {
 # LLVM-NEXT:       Owner: AMDGPU
 # LLVM-NEXT:       Data size: 0xE6
 # LLVM-NEXT:       Type: NT_AMDGPU_METADATA (AMDGPU Metadata)
 # LLVM-NEXT:       AMDGPU Metadata: ---
 # LLVM-NEXT: amdhsa.kernels:

llvm/test/tools/llvm-readobj/ELF/note-freebsd.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 
 // RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
 // RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
 
-// GNU:      Displaying notes found
+// GNU:      Displaying notes found in: .note.foo
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   FreeBSD              0x00000000       NT_THRMISC (thrmisc structure)
 // GNU-NEXT:   FreeBSD              0x00000000       NT_PROCSTAT_PROC (proc data)
-// GNU-NEXT: Displaying notes found
+// GNU-NEXT: Displaying notes found in: .note.bar
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   FreeBSD              0x00000000       NT_PROCSTAT_FILES (files data)
-// GNU-NEXT: Displaying notes found
+// GNU-NEXT: Displaying notes found in: .note.baz
 // GNU-NEXT:   Owner                Data size        Description
 // GNU-NEXT:   FreeBSD              0x0000001c       Unknown note type (0x00000003)
 // GNU-NEXT:    description data: 4c 6f 72 65 6d 20 69 70 73 75 6d 20 64 6f 6c 6f 72 20 73 69 74 20 61 6d 65 74 00 00
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.foo
 // LLVM-NEXT:     Offset:
 // LLVM-NEXT:     Size:
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: FreeBSD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_THRMISC (thrmisc structure)
 // LLVM-NEXT:     }
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: FreeBSD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_PROCSTAT_PROC (proc data)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.bar
 // LLVM-NEXT:     Offset: 0x68
 // LLVM-NEXT:     Size: 0x14
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: FreeBSD
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_PROCSTAT_FILES (files data)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.baz
 // LLVM-NEXT:     Offset: 0x7C
 // LLVM-NEXT:     Size: 0x30
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: FreeBSD
 // LLVM-NEXT:       Data size: 0x1C
 // LLVM-NEXT:       Type: Unknown note type (0x00000003)
 // LLVM-NEXT:       Description data (
 // LLVM-NEXT:         0000: 4C6F7265 6D206970 73756D20 646F6C6F  |Lorem ipsum dolo|

llvm/test/tools/llvm-readobj/ELF/note-generic.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 
 // RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
 // RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
 
-// GNU:      Displaying notes found at file offset 0x00000040 with length 0x00000010:
+// GNU:      Displaying notes found in: .note.version
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x00000000       NT_VERSION (version)
 
-// GNU:      Displaying notes found at file offset 0x00000050 with length 0x00000010:
+// GNU:      Displaying notes found in: .note.arch
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x00000000       NT_ARCH (architecture)
 
-// GNU:      Displaying notes found at file offset 0x00000060 with length 0x00000010:
+// GNU:      Displaying notes found in: .note.open
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x00000000       OPEN
 
-// GNU:      Displaying notes found at file offset 0x00000070 with length 0x00000010:
+// GNU:      Displaying notes found in: .note.func
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x00000000       func
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.version
 // LLVM-NEXT:     Offset: 0x40
 // LLVM-NEXT:     Size: 0x10
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_VERSION (version)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.arch
 // LLVM-NEXT:     Offset: 0x50
 // LLVM-NEXT:     Size: 0x10
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: NT_ARCH (architecture)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.open
 // LLVM-NEXT:     Offset: 0x60
 // LLVM-NEXT:     Size: 0x10
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: OPEN
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.func
 // LLVM-NEXT:     Offset: 0x70
 // LLVM-NEXT:     Size: 0x10
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: func
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }

llvm/test/tools/llvm-readobj/ELF/note-gnu-property.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
 // RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
 // RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
 
-// GNU:      Displaying notes found at file offset 0x00000040 with length 0x000000f8:
+// GNU:      Displaying notes found in: .note.gnu.property
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   GNU                   0x000000e8      NT_GNU_PROPERTY_TYPE_0 (property note)
 // GNU-NEXT:     Properties:  stack size: 0x100
 // GNU-NEXT:     stack size: 0x100
 // GNU-NEXT:     no copy on protected
 // GNU-NEXT:     x86 feature: SHSTK
 // GNU-NEXT:     x86 feature: IBT, SHSTK
 // GNU-NEXT:     x86 feature: <None>
 // GNU-NEXT:     x86 ISA needed: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD
 // GNU-NEXT:     x86 ISA used: AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI
 // GNU-NEXT:     x86 feature needed: x86, x87, MMX, XMM, YMM
 // GNU-NEXT:     x86 feature used: ZMM, FXSR, XSAVE, XSAVEOPT, XSAVEC
 // GNU-NEXT:     <application-specific type 0xfefefefe>
 // GNU-NEXT:     stack size: <corrupt length: 0x0>
 // GNU-NEXT:     stack size: <corrupt length: 0x4>
 // GNU-NEXT:     no copy on protected <corrupt length: 0x1>
 // GNU-NEXT:     x86 feature: <corrupt length: 0x0>
 // GNU-NEXT:     x86 feature: IBT, <unknown flags: 0xf000f000>
 // GNU-NEXT:     <corrupt type (0x2) datasz: 0x1>
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.gnu.property
 // LLVM-NEXT:     Offset: 0x40
 // LLVM-NEXT:     Size: 0xF8
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: GNU
 // LLVM-NEXT:       Data size: 0xE8
 // LLVM-NEXT:       Type: NT_GNU_PROPERTY_TYPE_0 (property note)
 // LLVM-NEXT:       Property [
 // LLVM-NEXT:         stack size: 0x100

llvm/test/tools/llvm-readobj/ELF/note-gnu-property2.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
 // RUN: llvm-readelf --notes %t | FileCheck %s --check-prefix=GNU
 // RUN: llvm-readobj --elf-output-style LLVM --notes %t | FileCheck %s --check-prefix=LLVM
 
-// GNU:      Displaying notes found at file offset 0x00000040 with length 0x00000014:
+// GNU:      Displaying notes found in: .note.gnu.property
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   GNU                   0x00000004      NT_GNU_PROPERTY_TYPE_0 (property note)
 // GNU-NEXT:     Properties:  <corrupted GNU_PROPERTY_TYPE_0>
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.gnu.property
 // LLVM-NEXT:     Offset: 0x40
 // LLVM-NEXT:     Size: 0x14
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: GNU
 // LLVM-NEXT:       Data size: 0x4
 // LLVM-NEXT:       Type: NT_GNU_PROPERTY_TYPE_0 (property note)
 // LLVM-NEXT:       Property [
 // LLVM-NEXT:         <corrupted GNU_PROPERTY_TYPE_0>

llvm/test/tools/llvm-readobj/ELF/note-unknown.s

 // REQUIRES: x86-registered-target
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
 
 // RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
 // RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
 
-// GNU:      Displaying notes found at file offset 0x00000040 with length 0x00000010:
+// GNU:      Displaying notes found in: .note.foo
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x00000000       Unknown note type: (0x00000003)
-// GNU-NEXT: Displaying notes found at file offset 0x00000050 with length 0x0000002c:
+// GNU-NEXT: Displaying notes found in: .note.bar
 // GNU-NEXT:   Owner                 Data size       Description
 // GNU-NEXT:   XYZ                  0x0000001c       Unknown note type: (0x00000003)
 // GNU-NEXT:     description data: 4c 6f 72 65 6d 20 69 70 73 75 6d 20 64 6f 6c 6f 72 20 73 69 74 20 61 6d 65 74 00 00
 
 // LLVM:      Notes [
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.foo
 // LLVM-NEXT:     Offset: 0x40
 // LLVM-NEXT:     Size: 0x10
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x0
 // LLVM-NEXT:       Type: Unknown (0x00000003)
 // LLVM-NEXT:     }
 // LLVM-NEXT:   }
 // LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Name: .note.bar
 // LLVM-NEXT:     Offset: 0x50
 // LLVM-NEXT:     Size: 0x2C
 // LLVM-NEXT:     Note {
 // LLVM-NEXT:       Owner: XYZ
 // LLVM-NEXT:       Data size: 0x1C
 // LLVM-NEXT:       Type: Unknown (0x00000003)
 // LLVM-NEXT:       Description data (
 // LLVM-NEXT:         0000: 4C6F7265 6D206970 73756D20 646F6C6F  |Lorem ipsum dolo|

llvm/tools/llvm-readobj/ELFDumper.cpp

OS << "    " << format_hex(Mapping.Start, FieldWidth) << "  "
        << format_hex(Mapping.End, FieldWidth) << "  "
        << format_hex(Mapping.Offset, FieldWidth) << "\n        "
        << Mapping.Filename << '\n';
   }
 }
 
 template <class ELFT>
 void GNUStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
-  auto PrintHeader = [&](const typename ELFT::Off Offset,
+  auto PrintHeader = [&](Optional<StringRef> SecName,
+                         const typename ELFT::Off Offset,
                          const typename ELFT::Addr Size) {
-    OS << "Displaying notes found at file offset " << format_hex(Offset, 10)
-       << " with length " << format_hex(Size, 10) << ":\n"
-       << "  Owner                Data size \tDescription\n";
+    OS << "Displaying notes found ";
+
+    if (SecName)
+      OS << "in: " << *SecName << "\n";
+    else
+      OS << "at file offset " << format_hex(Offset, 10) << " with length "
+         << format_hex(Size, 10) << ":\n";
+
+    OS << "  Owner                Data size \tDescription\n";
   };
 
   auto ProcessNote = [&](const Elf_Note &Note) {
     StringRef Name = Note.getName();
     ArrayRef<uint8_t> Descriptor = Note.getDesc();
     Elf_Word Type = Note.getType();
 
     // Print the note owner/type.
auto ProcessNote = [&](const Elf_Note &Note) {
     }
   };
 
   ArrayRef<Elf_Shdr> Sections = unwrapOrError(this->FileName, Obj->sections());
   if (Obj->getHeader()->e_type != ELF::ET_CORE && !Sections.empty()) {
     for (const auto &S : Sections) {
       if (S.sh_type != SHT_NOTE)
         continue;
-      PrintHeader(S.sh_offset, S.sh_size);
+      PrintHeader(expectedToOptional(Obj->getSectionName(&S)), S.sh_offset,
+                  S.sh_size);
       Error Err = Error::success();
       for (auto Note : Obj->notes(S, Err))
         ProcessNote(Note);
       if (Err)
         reportError(std::move(Err), this->FileName);
     }
   } else {
     for (const auto &P :
          unwrapOrError(this->FileName, Obj->program_headers())) {
       if (P.p_type != PT_NOTE)
         continue;
-      PrintHeader(P.p_offset, P.p_filesz);
+      PrintHeader(None, P.p_offset, P.p_filesz);
       Error Err = Error::success();
       for (auto Note : Obj->notes(P, Err))
         ProcessNote(Note);
       if (Err)
         reportError(std::move(Err), this->FileName);
     }
   }
 }
for (const CoreFileMapping &Mapping : Note.Mappings) {
     W.printString("Filename", Mapping.Filename);
   }
 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
   ListScope L(W, "Notes");
 
-  auto PrintHeader = [&](const typename ELFT::Off Offset,
+  auto PrintHeader = [&](Optional<StringRef> SecName,
+                         const typename ELFT::Off Offset,
                          const typename ELFT::Addr Size) {
+    if (SecName)
+      W.printString("Name", *SecName);
     W.printHex("Offset", Offset);
     W.printHex("Size", Size);
   };
 
   auto ProcessNote = [&](const Elf_Note &Note) {
     DictScope D2(W, "Note");
     StringRef Name = Note.getName();
     ArrayRef<uint8_t> Descriptor = Note.getDesc();
void LLVMStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
   };
 
   ArrayRef<Elf_Shdr> Sections = unwrapOrError(this->FileName, Obj->sections());
   if (Obj->getHeader()->e_type != ELF::ET_CORE && !Sections.empty()) {
     for (const auto &S : Sections) {
       if (S.sh_type != SHT_NOTE)
         continue;
       DictScope D(W, "NoteSection");
-      PrintHeader(S.sh_offset, S.sh_size);
+      PrintHeader(expectedToOptional(Obj->getSectionName(&S)), S.sh_offset,
+                  S.sh_size);
       Error Err = Error::success();
       for (auto Note : Obj->notes(S, Err))
         ProcessNote(Note);
       if (Err)
         reportError(std::move(Err), this->FileName);
     }
   } else {
     for (const auto &P :
          unwrapOrError(this->FileName, Obj->program_headers())) {
       if (P.p_type != PT_NOTE)
         continue;
       DictScope D(W, "NoteSection");
-      PrintHeader(P.p_offset, P.p_filesz);
+      PrintHeader(None, P.p_offset, P.p_filesz);
       Error Err = Error::success();
       for (auto Note : Obj->notes(P, Err))
         ProcessNote(Note);
       if (Err)
         reportError(std::move(Err), this->FileName);
     }
   }
 }