diff options
| author | Lukas Larsson <[email protected]> | 2019-06-19 10:26:00 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-06-19 10:26:00 +0200 |
| commit | 8c1d7e7c1e8d5cc207d80074b14dcbc2b3a32ba8 (patch) | |
| tree | 718d423ddd3607e7f944171c6439218f78420445 /erts/emulator/beam | |
| parent | 5da818c743e619a74eb70073d4d092374fbe79a4 (diff) | |
| parent | e414c818360911ab759cef6a08b3ed133f3208ae (diff) | |
| download | otp-8c1d7e7c1e8d5cc207d80074b14dcbc2b3a32ba8.tar.gz otp-8c1d7e7c1e8d5cc207d80074b14dcbc2b3a32ba8.tar.bz2 otp-8c1d7e7c1e8d5cc207d80074b14dcbc2b3a32ba8.zip | |
Merge pull request #2110 from NattyNarwhal/aix-fixes/OTP-15866
Wake AIX up from coma
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/sys.h | 3 | ||||
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index acc321aa51..db07512cf7 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -178,7 +178,8 @@ typedef ERTS_SYS_FD_TYPE ErtsSysFdType; # define ERTS_UNLIKELY(BOOL) (BOOL) #endif -#if ERTS_AT_LEAST_GCC_VSN__(2, 96, 0) +/* AIX doesn't like this and claims section conflicts */ +#if ERTS_AT_LEAST_GCC_VSN__(2, 96, 0) && !defined(_AIX) #if (defined(__APPLE__) && defined(__MACH__)) || defined(__DARWIN__) # define ERTS_WRITE_UNLIKELY(X) X __attribute__ ((section ("__DATA,ERTS_LOW_WRITE") )) #else diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index ad71828d72..fb06d60768 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -66,7 +66,7 @@ #undef M_MMAP_THRESHOLD #undef M_MMAP_MAX -#if defined(__GLIBC__) && defined(HAVE_MALLOC_H) +#if (defined(__GLIBC__) || defined(_AIX)) && defined(HAVE_MALLOC_H) #include <malloc.h> #endif |