summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2016-03-24 20:35:42 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2016-03-24 20:43:59 +0100
commit343349df1f19f21899818d647bf570e489d0cf8f (patch)
tree28e2c1b134cc2c9e3519d55be9966166e9eae45d /includes
parentcb08f8da37ff5fb99e1d02b8afdcb802d23e9a8d (diff)
downloadhaskell-343349df1f19f21899818d647bf570e489d0cf8f.tar.gz
Avoid local label syntax for assembler on AIX
Unfortunately (for inline `__asm__()` uses), IBM's `as` doesn't seem to support local labels[1] like GNU `as` does so we need to workaround this when on AIX. [1]: https://sourceware.org/binutils/docs/as/Symbol-Names.html#Symbol-Names Turns out this also addresses the long-standing bug #485 Reviewed By: bgamari, trommler Differential Revision: https://phabricator.haskell.org/D2029
Diffstat (limited to 'includes')
-rw-r--r--includes/stg/SMP.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h
index 756f0401ab..21f05edad3 100644
--- a/includes/stg/SMP.h
+++ b/includes/stg/SMP.h
@@ -121,9 +121,18 @@ xchg(StgPtr p, StgWord w)
);
#elif powerpc_HOST_ARCH
__asm__ __volatile__ (
+# if aix_HOST_OS
+ /* IBM's assembler doesn't seem to support local labels so we use
+ * explicit relative numeric offsets to workaround this limitation
+ */
+ " lwarx %0, 0, %2\n"
+ " stwcx. %1, 0, %2\n"
+ " bne- $-8"
+# else // aix_HOST_OS
"1: lwarx %0, 0, %2\n"
" stwcx. %1, 0, %2\n"
" bne- 1b"
+# endif
:"=&r" (result)
:"r" (w), "r" (p)
);
@@ -205,12 +214,23 @@ cas(StgVolatilePtr p, StgWord o, StgWord n)
#elif powerpc_HOST_ARCH
StgWord result;
__asm__ __volatile__ (
+# if aix_HOST_OS
+ /* IBM's assembler doesn't seem to support local labels so we use
+ * explicit relative numeric offsets to workaround this limitation
+ */
+ " lwarx %0, 0, %3\n"
+ " cmpw %0, %1\n"
+ " bne $+12\n"
+ " stwcx. %2, 0, %3\n"
+ " bne- $-16\n"
+# else // aix_HOST_OS
"1: lwarx %0, 0, %3\n"
" cmpw %0, %1\n"
" bne 2f\n"
" stwcx. %2, 0, %3\n"
" bne- 1b\n"
"2:"
+# endif // !aix_HOST_OS
:"=&r" (result)
:"r" (o), "r" (n), "r" (p)
:"cc", "memory"