diff options
| author | Eric Christopher <echristo@apple.com> | 2012-08-06 20:52:18 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2012-08-06 20:52:18 +0000 |
| commit | 22738d00a30670d5227b47fe2b34d044cebd481c (patch) | |
| tree | a9e31e9aa0be3f16ab53b67cbf51103467478870 /llvm/lib/Support/Unix | |
| parent | b9ddbd3daa318f38266ea8c4b0786073911615ed (diff) | |
| download | bcm5719-llvm-22738d00a30670d5227b47fe2b34d044cebd481c.tar.gz bcm5719-llvm-22738d00a30670d5227b47fe2b34d044cebd481c.zip | |
Add support for the OpenBSD for Bitrig.
Patch by David Hill.
llvm-svn: 161344
Diffstat (limited to 'llvm/lib/Support/Unix')
| -rw-r--r-- | llvm/lib/Support/Unix/Path.inc | 4 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Process.inc | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc index b41390adefd..6bddbdf7bdb 100644 --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -260,7 +260,7 @@ Path::GetCurrentDirectory() { return Path(pathname); } -#if defined(__FreeBSD__) || defined (__NetBSD__) || \ +#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) static int test_dir(char buf[PATH_MAX], char ret[PATH_MAX], @@ -329,7 +329,7 @@ Path Path::GetMainExecutable(const char *argv0, void *MainAddr) { if (realpath(exe_path, link_path)) return Path(link_path); } -#elif defined(__FreeBSD__) || defined (__NetBSD__) || \ +#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) char exe_path[PATH_MAX]; diff --git a/llvm/lib/Support/Unix/Process.inc b/llvm/lib/Support/Unix/Process.inc index 174112e8c2a..5204147ce31 100644 --- a/llvm/lib/Support/Unix/Process.inc +++ b/llvm/lib/Support/Unix/Process.inc @@ -20,9 +20,10 @@ #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif -// DragonFly BSD has deprecated <malloc.h> for <stdlib.h> instead, -// Unix.h includes this for us already. -#if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) +// DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for +// <stdlib.h> instead. Unix.h includes this for us already. +#if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ + !defined(__OpenBSD__) && !defined(__Bitrig__) #include <malloc.h> #endif #ifdef HAVE_MALLOC_MALLOC_H |
