about summary refs log tree commit diff
path: root/nptl/sysdeps/i386/tls.h
diff options
context:
space:
mode:
Diffstat (limited to 'nptl/sysdeps/i386/tls.h')
-rw-r--r--nptl/sysdeps/i386/tls.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index 4f2e8180d3..7ee2bcac19 100644
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -169,11 +169,11 @@ union user_desc_init
 # define INIT_SYSINFO
 #endif
 
-#ifndef LOCK
+#ifndef LOCK_PREFIX
 # ifdef UP
-#  define LOCK  /* nothing */
+#  define LOCK_PREFIX  /* nothing */
 # else
-#  define LOCK "lock;"
+#  define LOCK_PREFIX "lock;"
 # endif
 #endif
 
@@ -365,7 +365,7 @@ union user_desc_init
   ({ __typeof (descr->member) __ret;					      \
      __typeof (oldval) __old = (oldval);				      \
      if (sizeof (descr->member) == 4)					      \
-       asm volatile (LOCK "cmpxchgl %2, %%gs:%P3"			      \
+       asm volatile (LOCK_PREFIX "cmpxchgl %2, %%gs:%P3"		      \
 		     : "=a" (__ret)					      \
 		     : "0" (__old), "r" (newval),			      \
 		       "i" (offsetof (struct pthread, member)));	      \
@@ -378,7 +378,7 @@ union user_desc_init
 /* Atomic set bit.  */
 #define THREAD_ATOMIC_BIT_SET(descr, member, bit) \
   (void) ({ if (sizeof ((descr)->member) == 4)				      \
-	      asm volatile (LOCK "orl %1, %%gs:%P0"			      \
+	      asm volatile (LOCK_PREFIX "orl %1, %%gs:%P0"		      \
 			    :: "i" (offsetof (struct pthread, member)),	      \
 			       "ir" (1 << (bit)));			      \
 	    else							      \