[llvm-branch-commits] [llvm-branch] r83858 - /llvm/branches/release_26/lib/Support/Triple.cpp

[Tanya Lattner]

Author: tbrethou
Date: Mon Oct 12 11:45:48 2009
New Revision: 83858

URL: http://llvm.org/viewvc/llvm-project?rev=83858&view=rev
Log:
Merge 83391 from mainline.
Fix PR5112, a miscompilation on gcc-4.0.3.

Modified:
    llvm/branches/release_26/lib/Support/Triple.cpp

Modified: llvm/branches/release_26/lib/Support/Triple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/lib/Support/Triple.cpp?rev=83858&r1=83857&r2=83858&view=diff

==============================================================================
--- llvm/branches/release_26/lib/Support/Triple.cpp (original)
+++ llvm/branches/release_26/lib/Support/Triple.cpp Mon Oct 12 11:45:48 2009
@@ -326,7 +326,10 @@
 }
 
 void Triple::setArchName(const StringRef &Str) {
-  setTriple(Str + "-" + getVendorName() + "-" + getOSAndEnvironmentName());
+  // Work around a miscompilation bug in gcc 4.0.3.
+  Twine a = getVendorName() + "-" + getOSAndEnvironmentName();
+  Twine b = Str + "-" + a;
+  setTriple(b);
 }
 
 void Triple::setVendorName(const StringRef &Str) {