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

ELF: Correctly handle --whole-archive for thin archives. 

Differential Revision: http://reviews.llvm.org/D18669

llvm-svn: 265073
This commit is contained in:
Peter Collingbourne 2016-03-31 23:12:18 +00:00
parent ba539dbad2
commit d418b1da38
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lld/ELF/Driver.cpp
View File

@ -71,7 +71,8 @@ static std::pair<ELFKind, uint16_t> parseEmulation(StringRef S) {
// Returns slices of MB by parsing MB as an archive file.
// Each slice consists of a member file in the archive.
static std::vector<MemoryBufferRef> getArchiveMembers(MemoryBufferRef MB) {
std::vector<MemoryBufferRef>
LinkerDriver::getArchiveMembers(MemoryBufferRef MB) {
std::unique_ptr<Archive> File =
check(Archive::create(MB), "failed to parse archive");
@ -85,6 +86,11 @@ static std::vector<MemoryBufferRef> getArchiveMembers(MemoryBufferRef MB) {
File->getFileName());
V.push_back(Mb);
}
// Take ownership of memory buffers created for members of thin archives.
for (std::unique_ptr<MemoryBuffer> &MB : File->takeThinBuffers())
OwningMBs.push_back(std::move(MB));
return V;
}

1
lld/ELF/Driver.h
View File

@ -28,6 +28,7 @@ public:
void addLibrary(StringRef Name);
private:
std::vector<MemoryBufferRef> getArchiveMembers(MemoryBufferRef MB);
void readConfigs(llvm::opt::InputArgList &Args);
void createFiles(llvm::opt::InputArgList &Args);
template <class ELFT> void link(llvm::opt::InputArgList &Args);

4
lld/test/ELF/archive.s
View File

@ -6,6 +6,10 @@
# RUN: llvm-ar rcs %tar %t2 %t3 %t4
# RUN: ld.lld %t %tar %t5 -o %tout
# RUN: llvm-nm %tout | FileCheck %s
# RUN: rm -f %tarthin
# RUN: llvm-ar --format=gnu rcsT %tarthin %t2 %t3 %t4
# RUN: ld.lld %t %tarthin %t5 -o %tout
# RUN: llvm-nm %tout | FileCheck %s
# REQUIRES: x86
# Nothing here. Just needed for the linker to create a undefined _start symbol.

6
lld/test/ELF/whole-archive.s
View File

@ -30,5 +30,11 @@
// RUN: ld.lld -o %t3 %t.o --whole-archive %t.a --no-whole-archive
// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
// --whole-archive should also work with thin archives
// RUN: rm -f %tthin.a
// RUN: llvm-ar --format=gnu rcsT %tthin.a %ta.o
// RUN: ld.lld -o %t3 %t.o --whole-archive %tthin.a
// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
.globl _start;
_start: