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

Revert "ELF: Add /lib and /usr/lib as default search paths." 

It was causing errors like

/lib/libc.so.6 is incompatible with elf_x86_64

when linking on Fedora.

Every system has different default paths. It seems better to just trust
the driver to pass the correct -L options.

This reverts commit 262910.

llvm-svn: 262941
This commit is contained in:
Rafael Espindola 2016-03-08 17:13:12 +00:00
parent eaf06851d0
commit 0650192094
6 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lld/ELF/Config.h
View File

@ -67,7 +67,6 @@ struct Configuration {
bool Mips64EL = false;
bool NoUndefined;
bool NoinhibitExec;
bool Nostdlib;
bool PrintGcSections;
bool Relocatable;
bool Shared;

12
lld/ELF/Driver.cpp
View File

@ -207,6 +207,9 @@ void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
// Initializes Config members by the command line options.
void LinkerDriver::readConfigs(opt::InputArgList &Args) {
for (auto *Arg : Args.filtered(OPT_L))
Config->SearchPaths.push_back(Arg->getValue());
std::vector<StringRef> RPaths;
for (auto *Arg : Args.filtered(OPT_rpath))
RPaths.push_back(Arg->getValue());
@ -234,7 +237,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->ICF = Args.hasArg(OPT_icf);
Config->NoUndefined = Args.hasArg(OPT_no_undefined);
Config->NoinhibitExec = Args.hasArg(OPT_noinhibit_exec);
Config->Nostdlib = Args.hasArg(OPT_nostdlib);
Config->PrintGcSections = Args.hasArg(OPT_print_gc_sections);
Config->Relocatable = Args.hasArg(OPT_relocatable);
Config->Shared = Args.hasArg(OPT_shared);
@ -277,14 +279,6 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
for (auto *Arg : Args.filtered(OPT_undefined))
Config->Undefined.push_back(Arg->getValue());
if (!Config->Nostdlib) {
Config->SearchPaths.push_back("=/lib");
Config->SearchPaths.push_back("=/usr/lib");
}
for (auto *Arg : Args.filtered(OPT_L))
Config->SearchPaths.push_back(Arg->getValue());
}
void LinkerDriver::createFiles(opt::InputArgList &Args) {

4
lld/ELF/LinkerScript.cpp
View File

@ -396,9 +396,7 @@ void ScriptParser::readOutputFormat() {
void ScriptParser::readSearchDir() {
expect("(");
StringRef Path = next();
if (!Config->Nostdlib)
Config->SearchPaths.push_back(Path);
Config->SearchPaths.push_back(next());
expect(")");
}

3
lld/ELF/Options.td
View File

@ -91,9 +91,6 @@ def noinhibit_exec : Flag<["--"], "noinhibit-exec">,
def no_undefined : Flag<["--"], "no-undefined">,
HelpText<"Report unresolved symbols even if the linker is creating a shared library">;
def nostdlib: Flag<["-", "--"], "nostdlib">,
HelpText<"Only search directories specified on the command line">;
def o : JoinedOrSeparate<["-"], "o">, MetaVarName<"<path>">,
HelpText<"Path to file to write output">;

3
lld/test/ELF/Inputs/nostdlib.s
View File

@ -1,3 +0,0 @@
.globl foo
foo:
ret

16
lld/test/ELF/nostdlib.s
View File

@ -1,16 +0,0 @@
# REQUIRES: x86
# RUN: mkdir -p %t.dir/lib
# RUN: mkdir -p %t.dir/usr/lib
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/nostdlib.s -o %t2.o
# RUN: ld.lld -shared -o %t.dir/lib/libfoo.so %t2.o
# RUN: ld.lld -shared -o %t.dir/usr/lib/libbar.so %t2.o
# RUN: ld.lld --sysroot=%t.dir -o %t %t1.o -lfoo
# RUN: ld.lld --sysroot=%t.dir -o %t %t1.o -lbar
# RUN: not ld.lld --sysroot=%t.dir -nostdlib -o %t %t1.o -lfoo
# RUN: not ld.lld --sysroot=%t.dir -nostdlib -o %t %t1.o -lbar
.globl _start
_start:
ret