Merging r258729:

[oota-llvm.git] / lib / Support / Windows / Host.inc

diff --git a/lib/Support/Windows/Host.inc b/lib/Support/Windows/Host.inc
index cce82349cd6131c4dca5f52c37bb5e374e051359..fe89fe0aad8c475d85d859de47928cf41b80bc0d 100644 (file)
--- a/lib/Support/Windows/Host.inc
+++ b/lib/Support/Windows/Host.inc
@@ -1,4 +1,4 @@
-//===- llvm/Support/Win32/Host.inc -------------------------------*- C++ -*-===//
+//===- llvm/Support/Win32/Host.inc ------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,16 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Windows.h"
+#include "WindowsSupport.h"
 #include <cstdio>
 #include <string>
 
 using namespace llvm;
 
 std::string sys::getDefaultTargetTriple() {
-  return LLVM_DEFAULT_TARGET_TRIPLE;
-}
-
-std::string sys::getHostTriple() {
-  return LLVM_HOST_TRIPLE;
+  return Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE);
 }