[llvm-branch-commits] [llvm-branch] r142096 - /llvm/branches/release_30/

[Bill Wendling]

Author: void
Date: Sat Oct 15 20:51:52 2011
New Revision: 142096

URL: http://llvm.org/viewvc/llvm-project?rev=142096&view=rev
Log:
Merging r142055:
------------------------------------------------------------------------
r142055 | chapuni | 2011-10-14 21:29:36 -0700 (Fri, 14 Oct 2011) | 5 lines

Revert r142046, "Fix for llvm::sys::getHostTriple on Windows.  Instead of relying on the triple"

It extremely breaks builds when optimization is enabled. Twine should not hold temporary objects.

By the way, I might feel sad if I saw "i786-" "i1586-" or "iF86-".
------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 15 20:51:52 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142058
+/llvm/trunk:142039,142055,142058