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

[ELF] Implement action for OUTPUT linker script command 

Reviewed by:	ruiu, shankarke

llvm-svn: 227787
This commit is contained in:
Davide Italiano 2015-02-02 06:28:12 +00:00
parent 5cbde851ed
commit 104949df73
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/lib/Driver/GnuLdDriver.cpp
View File

@ -280,9 +280,7 @@ GnuLdDriver::evalLinkerScript(ELFLinkingContext &ctx,
if (!script)
return LinkerScriptReaderError::parse_error;
// Evaluate script commands.
// Currently we only recognize this subset of linker script commands:
// - GROUP()
// - SEARCH_DIR()
// Currently we only recognize this subset of linker script commands.
for (const script::Command *c : script->_commands) {
if (auto *group = dyn_cast<script::Group>(c))
if (std::error_code ec = evaluateLinkerScriptGroup(ctx, path, group, diag))
@ -291,6 +289,8 @@ GnuLdDriver::evalLinkerScript(ELFLinkingContext &ctx,
ctx.addSearchPath(searchDir->getSearchPath());
if (auto *entry = dyn_cast<script::Entry>(c))
ctx.setEntrySymbolName(entry->getEntryName());
if (auto *output = dyn_cast<script::Output>(c))
ctx.setOutputPath(output->getOutputFileName());
}
return std::error_code();
}

13
lld/unittests/DriverTests/GnuLdDriverTest.cpp
View File

@ -204,3 +204,16 @@ TEST_F(GnuLdParserTest, LinkerScriptEntry) {
StringRef entrySymbol = _context->entrySymbolName();
EXPECT_EQ("blah", entrySymbol);
}
TEST_F(GnuLdParserTest, LinkerScriptOutput) {
parse("ld", "a.o", nullptr);
std::unique_ptr<MemoryBuffer> mb = MemoryBuffer::getMemBuffer(
"OUTPUT(\"/path/to/output\")", "foo.so");
std::string s;
raw_string_ostream out(s);
std::error_code ec = GnuLdDriver::evalLinkerScript(
*_context, std::move(mb), out);
EXPECT_FALSE(ec);
StringRef output = _context->outputPath();
EXPECT_EQ("/path/to/output", output);
}