diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 292d58a570b8e94e5666c67609bcf4c8ec79d7ad..efd0c04c71b86ba7a1ed6f1a0cdabbd2fc4c8d5e 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/linux/x86/futex.h: Check __x86_64__ instead of
+	__LP64__.
+
 2011-07-29  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/49897
diff --git a/libgomp/config/linux/x86/futex.h b/libgomp/config/linux/x86/futex.h
index cb7461d89e67e053a3a2952a2ef8fee3cb961201..419f4d981c661080b943f7e42dcd206f9f7db2cf 100644
--- a/libgomp/config/linux/x86/futex.h
+++ b/libgomp/config/linux/x86/futex.h
@@ -24,7 +24,7 @@
 
 /* Provide target-specific access to the futex system call.  */
 
-#ifdef __LP64__
+#ifdef __x86_64__
 # ifndef SYS_futex
 #  define SYS_futex	202
 # endif
@@ -138,7 +138,7 @@ futex_wake (int *addr, int count)
     }
 }
 
-#endif /* __LP64__ */
+#endif /* __x86_64__ */
 
 static inline void
 cpu_relax (void)