maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld-macho][easy] Fix segment max protection 

We should have maxprot == initprot for all non-i386 architectures, which
is what ld64 does.

Reviewed By: #lld-macho, compnerd

Differential Revision: https://reviews.llvm.org/D89420
This commit is contained in:
Jez Ng 2020-10-14 12:46:49 -07:00
parent b86908171e
commit 6cf244327b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/MachO/OutputSegment.cpp
View File

@ -31,9 +31,9 @@ static uint32_t initProt(StringRef name) {
} }
static uint32_t maxProt(StringRef name) { static uint32_t maxProt(StringRef name) {
if (name == segment_names::pageZero) assert(config->arch != AK_i386 &&
return 0; "TODO: i386 has different maxProt requirements");
return VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE; return initProt(name);
} }
size_t OutputSegment::numNonHiddenSections() const { size_t OutputSegment::numNonHiddenSections() const {

4
lld/test/MachO/segments.s
View File

@ -28,7 +28,7 @@
## dyld3 assumes that the __TEXT segment starts from the file header ## dyld3 assumes that the __TEXT segment starts from the file header
# CHECK-NEXT: fileoff: 0 # CHECK-NEXT: fileoff: 0
# CHECK-NEXT: filesize: # CHECK-NEXT: filesize:
# CHECK-NEXT: maxprot: rwx # CHECK-NEXT: maxprot: r-x
# CHECK-NEXT: initprot: r-x # CHECK-NEXT: initprot: r-x
# CHECK-NEXT: nsects: 1 # CHECK-NEXT: nsects: 1
# CHECK-NEXT: flags: 0x0 # CHECK-NEXT: flags: 0x0
@ -46,7 +46,7 @@
# CHECK-NEXT: vmsize: # CHECK-NEXT: vmsize:
# CHECK-NEXT: fileoff: [[#%u, LINKEDIT_OFF:]] # CHECK-NEXT: fileoff: [[#%u, LINKEDIT_OFF:]]
# CHECK-NEXT: filesize: [[#%u, LINKEDIT_SIZE:]] # CHECK-NEXT: filesize: [[#%u, LINKEDIT_SIZE:]]
# CHECK-NEXT: maxprot: rwx # CHECK-NEXT: maxprot: r--
# CHECK-NEXT: initprot: r-- # CHECK-NEXT: initprot: r--
# CHECK-NOT: Cmd: LC_SEGMENT_64 # CHECK-NOT: Cmd: LC_SEGMENT_64