Merge 83391 from mainline.

tlattner · tlattner · commit aee09631c1d9 · 2009-10-12T16:45:48.000Z
Fix PR5112, a miscompilation on gcc-4.0.3.

llvm-svn: 83858
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
@@ -326,7 +326,10 @@ void Triple::setOS(OSType Kind) {
 }
 
 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) {

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,10 @@ void Triple::setOS(OSType Kind) {`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`void Triple::setArchName(const StringRef &Str) {`
`329`		`- setTriple(Str + "-" + getVendorName() + "-" + getOSAndEnvironmentName());`
	`329`	`+ // Work around a miscompilation bug in gcc 4.0.3.`
	`330`	`+ Twine a = getVendorName() + "-" + getOSAndEnvironmentName();`
	`331`	`+ Twine b = Str + "-" + a;`
	`332`	`+ setTriple(b);`
`330`	`333`	`}`
`331`	`334`
`332`	`335`	`void Triple::setVendorName(const StringRef &Str) {`