diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:06:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 20:31:42 +0100 |
| commit | 1aae667817ddbe7b35bc2be4cc81c991eeda2e0e (patch) | |
| tree | 0e1be32d99d699484006c2b4b5c465ce1c13c842 /sal/rtl/source | |
| parent | aa5755e6dc03258c53a626aa74566d1307bf6136 (diff) | |
AIX port
Diffstat (limited to 'sal/rtl/source')
| -rw-r--r-- | sal/rtl/source/alloc.c | 4 | ||||
| -rw-r--r-- | sal/rtl/source/alloc_global.c | 2 | ||||
| -rw-r--r-- | sal/rtl/source/macro.hxx | 2 | ||||
| -rw-r--r-- | sal/rtl/source/makefile.mk | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/sal/rtl/source/alloc.c b/sal/rtl/source/alloc.c index 67828bb6adb1..79e909ab52ce 100644 --- a/sal/rtl/source/alloc.c +++ b/sal/rtl/source/alloc.c @@ -75,7 +75,7 @@ static sal_Size __rtl_memory_vmpagesize (void) /* xBSD */ return (sal_Size)(getpagesize()); } -#elif defined(LINUX) || defined(SOLARIS) +#elif defined(LINUX) || defined(SOLARIS) || defined(AIX) static sal_Size __rtl_memory_vmpagesize (void) { /* POSIX */ @@ -87,7 +87,7 @@ static sal_Size __rtl_memory_vmpagesize (void) /* other */ return (sal_Size)(0x2000); } -#endif /* FREEBSD || NETBSD || MACOSX || LINUX || SOLARIS */ +#endif /* FREEBSD || NETBSD || MACOSX || LINUX || SOLARIS || AIX */ #ifndef PROT_HEAP #define PROT_HEAP (PROT_READ | PROT_WRITE | PROT_EXEC) diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c index 5137f868127d..0e8be8683491 100644 --- a/sal/rtl/source/alloc_global.c +++ b/sal/rtl/source/alloc_global.c @@ -157,7 +157,7 @@ rtl_memory_init (void) Delegated the call to "rtl_memory_fini" into a dummy C++ object, see memory_fini.cxx . */ -#if defined(__GNUC__) && !defined(MACOSX) +#if defined(__GNUC__) && !defined(MACOSX) && !defined(AIX) static void rtl_memory_fini (void) __attribute__((destructor)); #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) #pragma fini(rtl_memory_fini) diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx index 3fa0fbe58f42..f704422c05c7 100644 --- a/sal/rtl/source/macro.hxx +++ b/sal/rtl/source/macro.hxx @@ -50,6 +50,8 @@ #define THIS_OS "NetBSD" #elif defined FREEBSD #define THIS_OS "FreeBSD" +#elif defined AIX +#define THIS_OS "AIX" #endif #if ! defined THIS_OS diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index 517d2c2df2a3..b8f40170693b 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -61,7 +61,9 @@ UWINAPILIB:= .IF "$(header)" == "" +.IF "$(OS)" != "AIX" ALWAYSDBGFILES=$(SLO)$/debugprint.obj +.ENDIF .IF "$(ALWAYSDBGFILES)" != "" ALWAYSDBGTARGET=do_it_alwaysdebug @@ -95,7 +97,7 @@ SLOFILES= \ $(SLO)$/alloc_cache.obj \ $(SLO)$/alloc_arena.obj -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="AIX" SLOFILES+=$(SLO)$/memory_fini.obj .ENDIF @@ -128,7 +130,7 @@ OBJFILES= \ $(OBJ)$/alloc_cache.obj \ $(OBJ)$/alloc_arena.obj -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="AIX" OBJFILES+=$(OBJ)$/memory_fini.obj .ENDIF |