diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-15 04:29:36 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-15 04:29:36 +0000 |
commit | 569c4a4767428d7b489db1e634ced5a3b36d8a1d (patch) | |
tree | d3e87822a6956041c94ae3eff09bd1e6042e44b0 | |
parent | 8e3ef115506f40b43f9b2f05755d74eeda67adb2 (diff) | |
download | llvm-569c4a4767428d7b489db1e634ced5a3b36d8a1d.tar.gz llvm-569c4a4767428d7b489db1e634ced5a3b36d8a1d.tar.bz2 llvm-569c4a4767428d7b489db1e634ced5a3b36d8a1d.tar.xz |
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-".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142055 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Support/Windows/Host.inc | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc index 6d4803f3b8..733830e82f 100644 --- a/lib/Support/Windows/Host.inc +++ b/lib/Support/Windows/Host.inc @@ -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; } |