Revert 332750, llvm part (see comment on D46910).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@332823 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cmake
index 7b84245..019188a 100644 (file)
--- a/cmake/modules/GetHostTriple.cmake
+++ b/cmake/modules/GetHostTriple.cmake
@@ -4,15 +4,15 @@
 function( get_host_triple var )
   if( MSVC )
     if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-      set( value "x86_64-pc-windows-msvc" )
+      set( value "x86_64-pc-win32" )
     else()
-      set( value "i686-pc-windows-msvc" )
+      set( value "i686-pc-win32" )
     endif()
   elseif( MINGW AND NOT MSYS )
     if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-      set( value "x86_64-w64-windows-gnu" )
+      set( value "x86_64-w64-mingw32" )
     else()
-      set( value "i686-pc-windows-gnu" )
+      set( value "i686-pc-mingw32" )
     endif()
   else( MSVC )
     set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)

diff --git a/lib/Support/Unix/Host.inc b/lib/Support/Unix/Host.inc
index b65f84b..5580e63 100644 (file)
--- a/lib/Support/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -64,5 +64,5 @@ std::string sys::getDefaultTargetTriple() {
     TargetTripleString = EnvTriple;
 #endif
 
-  return TargetTripleString;
+  return Triple::normalize(TargetTripleString);
 }

diff --git a/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc
index 58c4dc5..90a6fb3 100644 (file)
--- a/lib/Support/Windows/Host.inc
+++ b/lib/Support/Windows/Host.inc
@@ -30,5 +30,5 @@ std::string sys::getDefaultTargetTriple() {
     Triple = EnvTriple;
 #endif
 
-  return Triple;
+  return Triple::normalize(Triple);
 }