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 <rth@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..ca644f4 100644
--- a/libitm/config/x86/tls.h
+++ b/libitm/config/x86/tls.h
@@ -37,7 +37,7 @@
 #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
 namespace GTM HIDDEN {
 
-#ifdef __LP64__
+#ifdef __x86_64__
 # define SEG_READ(OFS)		"movq\t%%fs:(" #OFS "*8),%0"
 # define SEG_WRITE(OFS)		"movq\t%0,%%fs:(" #OFS "*8)"
 # define SEG_DECODE_READ(OFS)	SEG_READ(OFS) "\n\t" \