On Mon, 2011-08-22 at 14:42 -0700, Richard Henderson wrote:
> On 08/22/2011 02:42 AM, Torvald Riegel wrote:
> > Use __x86_64__ instead of __LP64__ in setjmp/longjmp and TLS
> > definitions.
> >
> > H.J.: Is that sufficient for x32, or do we need entirely different code?
> > If so, can you please provide the required changes?
>
> The SJLJ part should be ok for x32.
>
> The TLS part needs to use a 32-bit load and "*4".
Hmm, like in the attached patch? (I'm just guessing here ...!)
commit 3f10f6882e8dd19ca0f11a0f9d953aebe6027ead
Author: Torvald Riegel <trie...@redhat.com>
Date: Mon Aug 22 11:21:03 2011 +0200
Use __x86_64__ instead of __LP64__.
* config/x86/tls.h: Use __x86_64__ instead of __LP64__.
Add X32 support.
* config/x86/sjlj.S: Same.
diff --git a/libitm/config/x86/sjlj.S b/libitm/config/x86/sjlj.S
index 0e9c246..725ffec 100644
--- a/libitm/config/x86/sjlj.S
+++ b/libitm/config/x86/sjlj.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
Contributed by Richard Henderson <r...@redhat.com>.
This file is part of the GNU Transactional Memory Library (libitm).
@@ -29,7 +29,7 @@
_ITM_beginTransaction:
.cfi_startproc
-#ifdef __LP64__
+#ifdef __x86_64__
leaq 8(%rsp), %rax
movq (%rsp), %r8
subq $72, %rsp
@@ -72,7 +72,7 @@ _ITM_beginTransaction:
GTM_longjmp:
.cfi_startproc
-#ifdef __LP64__
+#ifdef __x86_64__
movq (%rdi), %rcx
movq 8(%rdi), %rdx
movq 16(%rdi), %rbx
diff --git a/libitm/config/x86/tls.h b/libitm/config/x86/tls.h
index 03fdab2..3d247e3 100644
--- a/libitm/config/x86/tls.h
+++ b/libitm/config/x86/tls.h
@@ -37,6 +37,7 @@
#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
namespace GTM HIDDEN {
+#ifdef __x86_64__
#ifdef __LP64__
# define SEG_READ(OFS) "movq\t%%fs:(" #OFS "*8),%0"
# define SEG_WRITE(OFS) "movq\t%0,%%fs:(" #OFS "*8)"
@@ -47,6 +48,17 @@ namespace GTM HIDDEN {
"rolq\t$17,%0\n\t" \
SEG_WRITE(OFS)
#else
+// For X32.
+# define SEG_READ(OFS) "movl\t%%fs:(" #OFS "*4),%0"
+# define SEG_WRITE(OFS) "movl\t%0,%%fs:(" #OFS "*4)"
+# define SEG_DECODE_READ(OFS) SEG_READ(OFS) "\n\t" \
+ "rorl\t$9,%0\n\t" \
+ "xorl\t%%fs:24,%0"
+# define SEG_ENCODE_WRITE(OFS) "xorl\t%%fs:24,%0\n\t" \
+ "roll\t$9,%0\n\t" \
+ SEG_WRITE(OFS)
+#endif
+#else
# define SEG_READ(OFS) "movl\t%%gs:(" #OFS "*4),%0"
# define SEG_WRITE(OFS) "movl\t%0,%%gs:(" #OFS "*4)"
# define SEG_DECODE_READ(OFS) SEG_READ(OFS) "\n\t" \
