For PR780:
1. Add #includes to LinkAllVMCore.h to get Mangler.o and InlineAsm.o
2. Make Mangler.h and InlineAsm.h use the macros to ensure linkage
3. Make each of the tools with --load options include LinkAllVMCore.h
This should be the last set of changes for this bug and 800.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28719 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 1900cc9..b93d511 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -20,6 +20,7 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/LinkAllVMCore.h"
#include "llvm/Linker.h"
#include "llvm/System/Program.h"
#include "llvm/Module.h"
@@ -77,9 +78,12 @@
cl::desc("Disable writing of compressed bytecode files"));
static cl::list<std::string> PostLinkOpts("post-link-opts",
- cl::value_desc("path to post-link optimization programs"),
+ cl::value_desc("path"),
cl::desc("Run one or more optimization programs after linking"));
+static cl::list<std::string> XLinker("Xlinker", cl::value_desc("option"),
+ cl::desc("Pass options to the system linker"));
+
// Compatibility options that are ignored but supported by LD
static cl::opt<std::string> CO3("soname", cl::Hidden,
cl::desc("Compatibility option: ignored"));
@@ -93,6 +97,7 @@
static cl::opt<std::string> CO6("h", cl::Hidden,
cl::desc("Compatibility option: ignored"));
+
/// This is just for convenience so it doesn't have to be passed around
/// everywhere.
static std::string progname;
@@ -303,12 +308,25 @@
args.push_back(OutputFilename.c_str());
args.push_back(InputFilename.c_str());
+ // Add in the library paths
+ for (unsigned index = 0; index < LibPaths.size(); index++) {
+ args.push_back("-L");
+ args.push_back(LibPaths[index].c_str());
+ }
+
+ // Add the requested options
+ for (unsigned index = 0; index < XLinker.size(); index++) {
+ args.push_back(XLinker[index].c_str());
+ args.push_back(Libraries[index].c_str());
+ }
+
// Add in the libraries to link.
for (unsigned index = 0; index < Libraries.size(); index++)
if (Libraries[index] != "crtend") {
args.push_back("-l");
args.push_back(Libraries[index].c_str());
}
+
args.push_back(0);
// Run the compiler to assembly and link together the program.