[llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Misha Brukman
brukman at cs.uiuc.edu
Sun Nov 23 23:30:02 PST 2003
Changes in directory llvm/tools/gccld:
gccld.cpp updated: 1.64 -> 1.65
---
Log message:
Make sure we ONLY add a `-load' switch to the JIT command line if the file is
verified as having an ELF header. This fixes PR151.
---
Diffs of the changes: (+2 -1)
Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.64 llvm/tools/gccld/gccld.cpp:1.65
--- llvm/tools/gccld/gccld.cpp:1.64 Thu Nov 20 13:08:42 2003
+++ llvm/tools/gccld/gccld.cpp Sun Nov 23 23:29:42 2003
@@ -285,6 +285,7 @@
// gcc accepts -l<lib> and implicitly searches /lib and /usr/lib.
LibPaths.push_back("/lib");
LibPaths.push_back("/usr/lib");
+ LibPaths.push_back("/usr/X11R6/lib/");
// We don't need to link in libc! In fact, /usr/lib/libc.so may not be a
// shared object at all! See RH 8: plain text.
std::vector<std::string>::iterator libc =
@@ -295,7 +296,7 @@
for (std::vector<std::string>::iterator i = Libraries.begin(),
e = Libraries.end(); i != e; ++i) {
std::string FullLibraryPath = FindLib(*i, LibPaths, true);
- if (!FullLibraryPath.empty())
+ if (!FullLibraryPath.empty() && IsSharedObject(FullLibraryPath))
Out2 << " -load=" << FullLibraryPath << " \\\n";
}
Out2 << " $0.bc $*\n";
More information about the llvm-commits
mailing list