X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FSupport%2FHost.h;h=8f4bf3c1ba56d87a0e9d14446411af7108b268c4;hb=e36c14fbedbfccf86f2b9632bbfddf281bb95068;hp=9a4036a8affbccee769195d07d0c559f113df2b1;hpb=c9363ef67a5716a282bd7b4810c61da522bb7fd9;p=oota-llvm.git

diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
index 9a4036a8aff..8f4bf3c1ba5 100644
--- a/include/llvm/Support/Host.h
+++ b/include/llvm/Support/Host.h
@@ -16,10 +16,10 @@
 
 #include "llvm/ADT/StringMap.h"
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
 #include <endian.h>
 #else
-#ifndef LLVM_ON_WIN32
+#if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32)
 #include <machine/endian.h>
 #endif
 #endif
@@ -55,7 +55,7 @@ namespace sys {
   /// target which matches the host.
   ///
   /// \return - The host CPU name, or empty if the CPU could not be determined.
-  std::string getHostCPUName();
+  StringRef getHostCPUName();
 
   /// getHostCPUFeatures - Get the LLVM names for the host CPU features.
   /// The particular format of the names are target dependent, and suitable for