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

[lld/mac] Use libSystem.dylib instead of libSystem.B.dylib in tests 

For -flat_namespace, lld needs to load dylibs in LC_LOAD_DYLIB.
The current setup meant that libSystem.dylib would cause a LC_LOAD_DYLIB
with libSystem.B.dylib, but that didn't exist in our libsysroot for
tests. So just drop the .B.

See https://reviews.llvm.org/D97641#2595237 and
https://reviews.llvm.org/D97641#2595270
This commit is contained in:
Nico Weber 2021-03-01 15:23:25 -05:00
parent 2e803ec746
commit 3e6b6cee00
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/test/MachO/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd
View File

@ -2,7 +2,7 @@
archs: [ x86_64, arm64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000000', 'arm64: 00000000-0000-0000-0000-000000000010' ]
platform: macosx
install-name: '/usr/lib/libSystem.B.dylib'
install-name: '/usr/lib/libSystem.dylib'
current-version: 0001.001.1
exports:
- archs: [ 'x86_64', 'arm64' ]

2
lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
View File

@ -2,7 +2,7 @@
archs: [ i386, x86_64 ]
uuids: [ 'i386: 00000000-0000-0000-0000-000000000000', 'x86_64: 00000000-0000-0000-0000-000000000001' ]
platform: ios
install-name: '/usr/lib/libSystem.B.dylib'
install-name: '/usr/lib/libSystem.dylib'
current-version: 1281
exports:
- archs: [ i386, x86_64 ]

2
lld/test/MachO/implicit-dylibs.s
View File

@ -67,7 +67,7 @@
# LOAD: cmd LC_LOAD_DYLIB
# LOAD-NEXT: cmdsize
# LOAD-NEXT: name /usr/lib/libSystem.B.dylib
# LOAD-NEXT: name /usr/lib/libSystem.dylib
# LOAD: cmd LC_LOAD_DYLIB
# LOAD-NEXT: cmdsize
# LOAD-NEXT: name /System/Library/Frameworks/Foo.framework/Versions/A/Foo

2
lld/test/MachO/lc-linker-option.ll
View File

@ -21,7 +21,7 @@
# RUN: --implicit-check-not LC_LOAD_DYLIB
# LIB: cmd LC_LOAD_DYLIB
# LIB-NEXT: cmdsize
# LIB-NEXT: name /usr/lib/libSystem.B.dylib
# LIB-NEXT: name /usr/lib/libSystem.dylib
# RUN: llvm-as %t/invalid.ll -o %t/invalid.o
# RUN: not %lld %t/invalid.o -o /dev/null 2>&1 | FileCheck --check-prefix=INVALID %s

4
lld/test/MachO/link-search-order.s
View File

@ -48,11 +48,11 @@
# DYLIB: @executable_path/libhello.dylib
# DYLIB: @executable_path/libgoodbye.dylib
# DYLIB: /usr/lib/libSystem.B.dylib
# DYLIB: /usr/lib/libSystem.dylib
# ARCHIVE: @executable_path/libhello.dylib
# ARCHIVE-NOT: @executable_path/libgoodbye.dylib
# ARCHIVE: /usr/lib/libSystem.B.dylib
# ARCHIVE: /usr/lib/libSystem.dylib
.section __TEXT,__text
.global _main

2
lld/test/MachO/stub-link.s
View File

@ -23,7 +23,7 @@
# LOAD: cmd LC_LOAD_DYLIB
# LOAD-NEXT: cmdsize
# LOAD-NEXT: name /usr/lib/libSystem.B.dylib
# LOAD-NEXT: name /usr/lib/libSystem.dylib
# LOAD-NEXT: time stamp
# LOAD-NEXT: current version 1.1.1
# LOAD-NEXT: compatibility version

4
lld/test/MachO/weak-import.s
View File

@ -24,7 +24,7 @@
# WEAK-SYS: cmd LC_LOAD_WEAK_DYLIB
# WEAK-SYS-NEXT: cmdsize
# WEAK-SYS-NEXT: name /usr/lib/libSystem.B.dylib
# WEAK-SYS-NEXT: name /usr/lib/libSystem.dylib
# WEAK-SYS: cmd LC_LOAD_WEAK_DYLIB
# WEAK-SYS-NEXT: cmdsize
@ -32,7 +32,7 @@
# SYS: cmd LC_LOAD_DYLIB
# SYS-NEXT: cmdsize
# SYS-NEXT: name /usr/lib/libSystem.B.dylib
# SYS-NEXT: name /usr/lib/libSystem.dylib
# WEAK-FOO: cmd LC_LOAD_WEAK_DYLIB
# WEAK-FOO-NEXT: cmdsize