[lld] r227610 - ELF: Fix a bug in -l.

Rui Ueyama ruiu at google.com
Fri Jan 30 13:03:20 PST 2015


Author: ruiu
Date: Fri Jan 30 15:03:19 2015
New Revision: 227610

URL: http://llvm.org/viewvc/llvm-project?rev=227610&view=rev
Log:
ELF: Fix a bug in -l.

If a linker script is given with -l, LLD failed to read the file.
The bug was introduced in 227341.

Modified:
    lld/trunk/lib/Driver/GnuLdDriver.cpp
    lld/trunk/test/elf/group-cmd-search.test

Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=227610&r1=227609&r2=227610&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Fri Jan 30 15:03:19 2015
@@ -623,7 +623,7 @@ bool GnuLdDriver::parse(int argc, const
         if (ctx->logInputFiles())
           diag << path << "\n";
         ErrorOr<std::unique_ptr<MemoryBuffer>> mb =
-          MemoryBuffer::getFileOrSTDIN(path);
+          MemoryBuffer::getFileOrSTDIN(realpath);
         if (std::error_code ec = mb.getError()) {
           diag << "Cannot open " << path << ": " << ec.message() << "\n";
           return false;

Modified: lld/trunk/test/elf/group-cmd-search.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/group-cmd-search.test?rev=227610&r1=227609&r2=227610&view=diff
==============================================================================
--- lld/trunk/test/elf/group-cmd-search.test (original)
+++ lld/trunk/test/elf/group-cmd-search.test Fri Jan 30 15:03:19 2015
@@ -124,4 +124,11 @@ RUN: lld -flavor gnu -target x86_64 -sha
 RUN:     -L%p/Inputs %p/Inputs/use-shared.x86-64 \
 RUN:     %s -o %t7
 */
+
+/*
+RUN: lld -flavor gnu -target x86_64 -shared \
+RUN:     -L%p/Inputs %p/Inputs/use-shared.x86-64 \
+RUN:     -l:group-cmd-search-1.ls -o %t9
+*/
+
 GROUP ( /shared.so-x86-64 )





More information about the llvm-commits mailing list