commit e7e18200e614a5e619602a088544c85ac8305a1f
author Edward O'Callaghan <eocallaghan@auroraux.org> Wed Oct 28 15:13:08 2009 +0000
committer Edward O'Callaghan <eocallaghan@auroraux.org> Wed Oct 28 15:13:08 2009 +0000
tree 4fa000f4a1e896a15d37e6b556c0234626b6c42e
parent f20288c91601dd3fbab6362a3400a0e6c472795f

Fix for PR4887, Credit to Jonathan Gray.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85392 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Tools.cpp

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 0e7474c..357dcb3 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2345,9 +2345,12 @@
     }
   }
 
+  std::string Triple = getToolChain().getTripleString();
+  if (Triple.substr(0, 6) == "x86_64")
+	Triple.replace(0, 6, "amd64");
   CmdArgs.push_back(MakeFormattedString(Args,
                            llvm::format("-L/usr/lib/gcc-lib/%s/3.3.5",
-                                    getToolChain().getTripleString().c_str())));
+                                    Triple.c_str())));
 
   Args.AddAllArgs(CmdArgs, options::OPT_L);
   Args.AddAllArgs(CmdArgs, options::OPT_T_Group);