diff options
| -rw-r--r-- | include/llvm/ADT/Triple.h | 3 | ||||
| -rw-r--r-- | lib/Support/Triple.cpp | 5 | ||||
| -rw-r--r-- | lib/Support/raw_ostream.cpp | 2 | ||||
| -rw-r--r-- | lib/System/Unix/Program.inc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h index be31ea0128..c6f4165489 100644 --- a/include/llvm/ADT/Triple.h +++ b/include/llvm/ADT/Triple.h @@ -100,7 +100,8 @@ public: Psp, Solaris, Win32, - Haiku + Haiku, + Minix }; private: diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp index 9796ca56f4..6a70449b56 100644 --- a/lib/Support/Triple.cpp +++ b/lib/Support/Triple.cpp @@ -104,6 +104,7 @@ const char *Triple::getOSTypeName(OSType Kind) { case Solaris: return "solaris"; case Win32: return "win32"; case Haiku: return "haiku"; + case Minix: return "minix"; } return "<invalid>"; @@ -326,7 +327,9 @@ void Triple::Parse() const { else if (OSName.startswith("win32")) OS = Win32; else if (OSName.startswith("haiku")) - OS = Haiku; + OS = Haiku; + else if (OSName.startswith("minix")) + OS = Minix; else OS = UnknownOS; diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index bb72dfbecf..8054ae6368 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -481,7 +481,7 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { } size_t raw_fd_ostream::preferred_buffer_size() const { -#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_MINIX) +#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__minix) // Windows and Minix have no st_blksize. assert(FD >= 0 && "File not yet open!"); struct stat statbuf; diff --git a/lib/System/Unix/Program.inc b/lib/System/Unix/Program.inc index 358415f526..67018de812 100644 --- a/lib/System/Unix/Program.inc +++ b/lib/System/Unix/Program.inc @@ -310,7 +310,7 @@ Program::Wait(unsigned secondsToWait, // fact of having a handler at all causes the wait below to return with EINTR, // unlike if we used SIG_IGN. if (secondsToWait) { -#ifndef __HAIKU__ +#if !defined(__HAIKU__) && !defined(__minix) Act.sa_sigaction = 0; #endif Act.sa_handler = TimeOutHandler; |