[llvm-commits] [llvm] r142055 - /llvm/trunk/lib/Support/Windows/Host.inc

[NAKAMURA Takumi]

Author: chapuni
Date: Fri Oct 14 23:29:36 2011
New Revision: 142055

URL: http://llvm.org/viewvc/llvm-project?rev=142055&view=rev
Log:
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/trunk/lib/Support/Windows/Host.inc

Modified: llvm/trunk/lib/Support/Windows/Host.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Host.inc?rev=142055&r1=142054&r2=142055&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Host.inc (original)
+++ llvm/trunk/lib/Support/Windows/Host.inc Fri Oct 14 23:29:36 2011
@@ -12,44 +12,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "Windows.h"
-#include "llvm/ADT/Twine.h"
+#include <cstdio>
+#include <string>
 
 using namespace llvm;
 
 std::string sys::getHostTriple() {
-  // Get the execution environment, not the native environment.
-  SYSTEM_INFO info;
-  ::GetSystemInfo(&info);
-
-  Twine ret;
-  switch (info.wProcessorArchitecture) {
-  // If we don't know what the processor architecture is, or it is not one
-  // we currently support, then we should fall back on something reasonable.
-  case PROCESSOR_ARCHITECTURE_IA64:
-  default: return LLVM_HOSTTRIPLE;
-
-  case PROCESSOR_ARCHITECTURE_INTEL:
-    // We need to figure out what kind of x86 it is (possible values are
-    // i386 through i986).
-    ret = Twine("i").concat(Twine(info.wProcessorLevel)).concat("86");
-    break;
-  case PROCESSOR_ARCHITECTURE_AMD64:
-    ret = "amd64";
-	break;
-  case PROCESSOR_ARCHITECTURE_MIPS:
-    ret = "mips";
-    break;
-  case PROCESSOR_ARCHITECTURE_ARM:
-    ret = "arm";
-    break;
-  case PROCESSOR_ARCHITECTURE_PPC:
-    ret = "ppc";
-    break;
-  case PROCESSOR_ARCHITECTURE_ALPHA:
-    ret = "alpha";
-    break;
-  }
-
-  // Since we're on Windows, we're always on pc-win32.
-  return ret.concat("-pc-win32").str();
+  // FIXME: Adapt to running version.
+  return LLVM_HOSTTRIPLE;
 }