summaryrefslogtreecommitdiffstats
path: root/lld/tools
diff options
context:
space:
mode:
authorShankar Easwaran <shankare@codeaurora.org>2013-02-13 06:12:52 +0000
committerShankar Easwaran <shankare@codeaurora.org>2013-02-13 06:12:52 +0000
commit96d594b14e6892d28e2700730a6cf31db6028c81 (patch)
tree95ab65ac26d9ce0eebb5c80200e613e50b406396 /lld/tools
parent4681fbf00257abb34b5f1e64ed12ffc1fa843313 (diff)
downloadbcm5719-llvm-96d594b14e6892d28e2700730a6cf31db6028c81.tar.gz
bcm5719-llvm-96d594b14e6892d28e2700730a6cf31db6028c81.zip
add merge strings option, this temporarily fixes the problem bringing up helloworld with glibc on x86_64
llvm-svn: 175038
Diffstat (limited to 'lld/tools')
-rw-r--r--lld/tools/lld-core/lld-core.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/lld/tools/lld-core/lld-core.cpp b/lld/tools/lld-core/lld-core.cpp
index 74f6df5a720..bbaedcb3056 100644
--- a/lld/tools/lld-core/lld-core.cpp
+++ b/lld/tools/lld-core/lld-core.cpp
@@ -70,6 +70,11 @@ cmdLineDoGotPass("got-pass", llvm::cl::desc("Run pass to create GOT atoms"));
llvm::cl::opt<bool>
cmdLineDoLayoutPass("layout-pass", llvm::cl::desc("Run pass to layout atoms"));
+llvm::cl::opt<bool>
+cmdLineDoMergeStrings(
+ "merge-strings",
+ llvm::cl::desc("make common strings merge possible"));
+
llvm::cl::opt<bool> cmdLineUndefinesIsError(
"undefines-are-errors",
llvm::cl::desc("Any undefined symbols at end is an error"));
@@ -230,6 +235,7 @@ int main(int argc, char *argv[]) {
lo._forceLoadArchives = cmdLineForceLoad;
lo._outputKind = OutputKind::Executable;
lo._entrySymbol = cmdLineEntryPoint;
+ lo._mergeCommonStrings = cmdLineDoMergeStrings;
switch (archSelected) {
case i386:
OpenPOWER on IntegriCloud