summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/simple-atomic.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6641ed9f5e..b96fc9f090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-09-13 Bruno Haible <bruno@clisp.org>
+
+ simple-atomic: Port to Oracle Studio 12.6.
+ * lib/simple-atomic.c (asm) [0x590 <= __SUNPRO_C && __STDC__]:
+ #define to __asm.
+
2021-09-13 Paul Eggert <eggert@cs.ucla.edu>
asyncsafe-spin: port to Oracle Studio 12.6 sparc
diff --git a/lib/simple-atomic.c b/lib/simple-atomic.c
index da78cd3ec2..b34c5c8e5a 100644
--- a/lib/simple-atomic.c
+++ b/lib/simple-atomic.c
@@ -21,6 +21,10 @@
/* Specification. */
#include "simple-atomic.h"
+#if 0x590 <= __SUNPRO_C && __STDC__
+# define asm __asm
+#endif
+
#if defined _WIN32 && ! defined __CYGWIN__
/* Native Windows. */