[llvm-commits] [vector_llvm] CVS: llvm/tools/gccld/GenerateCode.cpp

[Robert Bocchino]

Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.54 -> 1.54.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+4 -1)

 GenerateCode.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.54 llvm/tools/gccld/GenerateCode.cpp:1.54.2.1
--- llvm/tools/gccld/GenerateCode.cpp:1.54	Tue Oct 18 01:29:43 2005
+++ llvm/tools/gccld/GenerateCode.cpp	Wed Nov 16 12:33:36 2005
@@ -423,7 +423,10 @@
 
   // Add in the libraries to link.
   for (unsigned index = 0; index < Libraries.size(); index++)
-    if (Libraries[index] != "crtend") {
+    // HACK: If this is libg, discard it.  This gets added by the compiler
+    // driver when doing: 'llvm-gcc main.c -Wl,-native -o a.out -g'. Note that
+    // this should really be fixed by changing the llvm-gcc compiler driver.
+    if (Libraries[index] != "crtend" && Libraries[index] != "g") {
       std::string Tmp = "-l"+Libraries[index];
       StringsToDelete.push_back(strdup(Tmp.c_str()));
       args.push_back(StringsToDelete.back());