replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ld64.lld: Make janky support for tbd files actually work sometimes 

Also fix a bug in the test input that made the test miss this issue.
This commit is contained in:
Nico Weber 2020-07-02 15:30:39 -04:00
parent 7cccd49a55
commit 425fb21e03
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/lib/ReaderWriter/MachO/File.h
View File

@ -450,7 +450,7 @@ private:
MemoryBuffer::getMemBuffer("", _mb->getBufferIdentifier()), _ctx));
reexport.file = _ownedFiles.back().get();
std::error_code err = _ownedFiles.back()->loadFromInterface(*document);
if (!err)
if (err)
return err;
}
}

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

@ -13,7 +13,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000001' ]
platform: macosx
install-name: '/usr/lib/libdyld.dylib'
install-name: '/usr/lib/system/libdyld.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports:
@ -23,7 +23,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000002' ]
platform: macosx
install-name: '/usr/lib/libsystem_c.dylib'
install-name: '/usr/lib/system/libsystem_c.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports:
@ -33,7 +33,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000003' ]
platform: macosx
install-name: '/usr/lib/libsystem_m.dylib'
install-name: '/usr/lib/system/libsystem_m.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports:

6
lld/test/mach-o/Inputs/MacOSX.sdk/usr/lib/libSystem.tbd
View File

@ -13,7 +13,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000001' ]
platform: macosx
install-name: '/usr/lib/libdyld.dylib'
install-name: '/usr/lib/system/libdyld.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports:
@ -23,7 +23,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000002' ]
platform: macosx
install-name: '/usr/lib/libsystem_c.dylib'
install-name: '/usr/lib/system/libsystem_c.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports:
@ -33,7 +33,7 @@ exports:
archs: [ x86_64 ]
uuids: [ 'x86_64: 00000000-0000-0000-0000-000000000003' ]
platform: macosx
install-name: '/usr/lib/libsystem_m.dylib'
install-name: '/usr/lib/system/libsystem_m.dylib'
current-version: 0001.001.1
parent-umbrella: System
exports: