aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorCalvin Buckley <[email protected]>2019-01-25 07:56:31 -0500
committerCalvin <[email protected]>2019-05-29 06:21:40 -0400
commitd8b4e8f55c4ada9f2fe1b6088126e8d3e6c7147b (patch)
treef615f4efecddc0dc51056504c078068959657492 /erts/emulator/beam
parentd2ceabf2458688077a3eb97f4aaddfce4a04e5bf (diff)
downloadotp-d8b4e8f55c4ada9f2fe1b6088126e8d3e6c7147b.tar.gz
otp-d8b4e8f55c4ada9f2fe1b6088126e8d3e6c7147b.tar.bz2
otp-d8b4e8f55c4ada9f2fe1b6088126e8d3e6c7147b.zip
Fix AIX weirdness woth section attribute by not using it
I suspect XCOFF shenanigans.
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/sys.h3
1 files changed, 2 insertions, 1 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