This is an archive of the discontinued LLVM Phabricator instance.

Differential D67146

[yaml2obj] Support PT_GNU_STACK and PT_GNU_RELRO
ClosedPublic

Authored by MaskRay on Sep 4 2019, 12:27 AM.

Details

Reviewers
grimar
jhenderson
alexander-shaposhnikov
• espindola
rupprecht
Commits
rG441d450115f5: [yaml2obj] Support PT_GNU_STACK and PT_GNU_RELRO
rL370857: [yaml2obj] Support PT_GNU_STACK and PT_GNU_RELRO
Summary

PT_GNU_STACK is used in an llvm-objcopy test.

I plan to use PT_GNU_RELRO in a patch to improve nested segment
processing in llvm-objcopy (PR42963).

Diff Detail

Repository
rL LLVM

Event Timeline

MaskRay created this revision.Sep 4 2019, 12:27 AM
Herald added a reviewer: alexander-shaposhnikov. · View Herald TranscriptSep 4 2019, 12:27 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B37694: Diff 218600.Sep 4 2019, 12:28 AM
grimar accepted this revision.Sep 4 2019, 2:05 AM

LGTM

This revision is now accepted and ready to land.Sep 4 2019, 2:05 AM
MaskRay updated this revision to Diff 218617.Sep 4 2019, 2:16 AM
MaskRay edited the summary of this revision. (Show Details)

Update a test test/tools/llvm-objcopy/ELF/marker-segment.test to use PT_GNU_STACK
Add numbers beside Type: PT_*

Herald added a reviewer: • espindola. · View Herald TranscriptSep 4 2019, 2:16 AM
Herald added a reviewer: rupprecht. · View Herald Transcript
Herald added subscribers: seiya, jakehehrlich, arichardson, emaste. · View Herald Transcript
Harbormaster completed remote builds in B37701: Diff 218617.Sep 4 2019, 2:16 AM
Closed by commit rL370857: [yaml2obj] Support PT_GNU_STACK and PT_GNU_RELRO (authored by MaskRay). · Explain WhySep 4 2019, 2:19 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
ObjectYAML/
2 lines
test/
tools/
llvm-objcopy/
ELF/
2 lines
yaml2obj/
12 lines

Diff 218619

llvm/trunk/lib/ObjectYAML/ELFYAML.cpp

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines#define ECase(X) IO.enumCase(Value, #X, ELF::X)
ECase(PT_LOAD); ECase(PT_LOAD);
ECase(PT_DYNAMIC); ECase(PT_DYNAMIC);
ECase(PT_INTERP); ECase(PT_INTERP);
ECase(PT_NOTE); ECase(PT_NOTE);
ECase(PT_SHLIB); ECase(PT_SHLIB);
ECase(PT_PHDR); ECase(PT_PHDR);
ECase(PT_TLS); ECase(PT_TLS);
ECase(PT_GNU_EH_FRAME); ECase(PT_GNU_EH_FRAME);
ECase(PT_GNU_STACK);
ECase(PT_GNU_RELRO);
#undef ECase #undef ECase
IO.enumFallback<Hex32>(Value); IO.enumFallback<Hex32>(Value);
} }
void ScalarEnumerationTraits<ELFYAML::ELF_EM>::enumeration( void ScalarEnumerationTraits<ELFYAML::ELF_EM>::enumeration(
IO &IO, ELFYAML::ELF_EM &Value) { IO &IO, ELFYAML::ELF_EM &Value) {
#define ECase(X) IO.enumCase(Value, #X, ELF::X) #define ECase(X) IO.enumCase(Value, #X, ELF::X)
ECase(EM_NONE); ECase(EM_NONE);
▲ Show 20 Lines • Show All 1,196 Lines • Show Last 20 Lines

llvm/trunk/test/tools/llvm-objcopy/ELF/marker-segment.test

Show All 37 Lines Sections:
- Section: .text - Section: .text
- Type: PT_LOAD - Type: PT_LOAD
Flags: [ PF_R, PF_W ] Flags: [ PF_R, PF_W ]
VAddr: 0x2000 VAddr: 0x2000
PAddr: 0x2000 PAddr: 0x2000
Align: 0x1000 Align: 0x1000
Sections: Sections:
- Section: .data - Section: .data
- Type: 0x6474e551 # GNU_STACK - Type: PT_GNU_STACK
Flags: [ PF_R, PF_W ] Flags: [ PF_R, PF_W ]
VAddr: 0x0000 VAddr: 0x0000
PAddr: 0x0000 PAddr: 0x0000
Align: 0x0000 Align: 0x0000
- Type: PT_LOAD - Type: PT_LOAD
Flags: [ PF_R ] Flags: [ PF_R ]
VAddr: 0x2010 VAddr: 0x2010
PAddr: 0x2010 PAddr: 0x2010
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines

llvm/trunk/test/tools/yaml2obj/program-header.yaml

Show All 31 Lines Sections:
- Section: .text - Section: .text
- Section: .init - Section: .init
- Type: PT_LOAD - Type: PT_LOAD
Flags: [ PF_R ] Flags: [ PF_R ]
VAddr: 0xAAAA2000 VAddr: 0xAAAA2000
PAddr: 0xFFFF2000 PAddr: 0xFFFF2000
Sections: Sections:
- Section: .data - Section: .data
- Type: PT_GNU_EH_FRAME
- Type: PT_GNU_STACK
- Type: PT_GNU_RELRO
#CHECK: ProgramHeaders [ #CHECK: ProgramHeaders [
#CHECK-NEXT: ProgramHeader { #CHECK-NEXT: ProgramHeader {
#CHECK-NEXT: Type: PT_LOAD #CHECK-NEXT: Type: PT_LOAD
#CHECK-NEXT: Offset: 0x1000 #CHECK-NEXT: Offset: 0x1000
#CHECK-NEXT: VirtualAddress: 0xAAAA1000 #CHECK-NEXT: VirtualAddress: 0xAAAA1000
#CHECK-NEXT: PhysicalAddress: 0xFFFF1000 #CHECK-NEXT: PhysicalAddress: 0xFFFF1000
#CHECK-NEXT: FileSize: 20 #CHECK-NEXT: FileSize: 20
Show All 11 Lines
#CHECK-NEXT: PhysicalAddress: 0xFFFF2000 #CHECK-NEXT: PhysicalAddress: 0xFFFF2000
#CHECK-NEXT: FileSize: 4 #CHECK-NEXT: FileSize: 4
#CHECK-NEXT: MemSize: 4 #CHECK-NEXT: MemSize: 4
#CHECK-NEXT: Flags [ #CHECK-NEXT: Flags [
#CHECK-NEXT: PF_R #CHECK-NEXT: PF_R
#CHECK-NEXT: ] #CHECK-NEXT: ]
#CHECK-NEXT: Alignment: 4096 #CHECK-NEXT: Alignment: 4096
#CHECK-NEXT: } #CHECK-NEXT: }
#CHECK-NEXT: ProgramHeader {
#CHECK-NEXT: Type: PT_GNU_EH_FRAME (0x6474E550)
#CHECK: }
#CHECK-NEXT: ProgramHeader {
#CHECK-NEXT: Type: PT_GNU_STACK (0x6474E551)
#CHECK: }
#CHECK-NEXT: ProgramHeader {
#CHECK-NEXT: Type: PT_GNU_RELRO (0x6474E552)
#CHECK: }
#CHECK-NEXT:] #CHECK-NEXT:]
## Check we do not allow referencing sections that do not exist. ## Check we do not allow referencing sections that do not exist.
# RUN: not yaml2obj --docnum=2 %s -o %t 2>&1 | FileCheck %s --check-prefix=ERR # RUN: not yaml2obj --docnum=2 %s -o %t 2>&1 | FileCheck %s --check-prefix=ERR
# ERR: error: Unknown section referenced: '.foo' by program header. # ERR: error: Unknown section referenced: '.foo' by program header.
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_EXEC Type: ET_EXEC
Machine: EM_X86_64 Machine: EM_X86_64
ProgramHeaders: ProgramHeaders:
- Type: PT_LOAD - Type: PT_LOAD
Sections: Sections:
- Section: .foo - Section: .foo