STEP 11: synch linuxthreads.old directory

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

7 files changed, 38 insertions, 38 deletions

diff --git a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
index c9669f2d3..cd45d5faf 100644
--- a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h
@@ -18,16 +18,16 @@
 static inline int
 _test_and_set (int *p, int v)
 {
-       int result;
+	int result;
 
-       __asm__ __volatile__(
-               "/* Inline test and set */\n"
-               "       xchg    %[old], %[mem], %[new]"
-               : [old] "=&r"(result)
-               : [mem] "r"(p), [new] "r"(v)
-               : "memory");
+	__asm__ __volatile__(
+		"/* Inline test and set */\n"
+		"	xchg	%[old], %[mem], %[new]"
+		: [old] "=&r"(result)
+		: [mem] "r"(p), [new] "r"(v)
+		: "memory");
 
-       return result;
+	return result;
 }
 
 extern long int testandset (int *spinlock);
@@ -37,7 +37,7 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval);
 PT_EI long int
 testandset (int *spinlock)
 {
-       return _test_and_set(spinlock, 1);
+	return _test_and_set(spinlock, 1);
 }
 
 
@@ -52,22 +52,22 @@ register char * stack_pointer __asm__ ("sp");
 PT_EI int
 __compare_and_swap(long int *p, long int oldval, long int newval)
 {
-       long int result;
+	long int result;
 
-       __asm__ __volatile__(
-               "/* Inline compare and swap */\n"
-               "1:     ssrf    5\n"
-               "       ld.w    %[result], %[mem]\n"
-               "       eor     %[result], %[old]\n"
-               "       brne    2f\n"
-               "       stcond  %[mem], %[new]\n"
-               "       brne    1b\n"
-               "2:"
-               : [result] "=&r"(result), [mem] "=m"(*p)
-               : "m"(*p), [new] "r"(newval), [old] "r"(oldval)
-               : "cc", "memory");
+	__asm__ __volatile__(
+		"/* Inline compare and swap */\n"
+		"1:	ssrf	5\n"
+		"	ld.w	%[result], %[mem]\n"
+		"	eor	%[result], %[old]\n"
+		"	brne	2f\n"
+		"	stcond	%[mem], %[new]\n"
+		"	brne	1b\n"
+		"2:"
+		: [result] "=&r"(result), [mem] "=m"(*p)
+		: "m"(*p), [new] "r"(newval), [old] "r"(oldval)
+		: "cc", "memory");
 
-       return result == 0;
+	return result == 0;
 }
 
 #endif /* pt-machine.h */
diff --git a/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
index 9f5cb5c1f..e81ecffbe 100644
--- a/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
@@ -70,7 +70,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
 #ifdef SHARED
 # define PTHREAD_STATIC_FN_REQUIRE(name)
 #else
-# define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " "_"#name);
+# define PTHREAD_STATIC_FN_REQUIRE(name) __asm__ (".globl " "_"#name);
 #endif
 
 #endif /* pt-machine.h */
diff --git a/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
index 2317b65a0..9c9d0d76a 100644
--- a/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
@@ -35,7 +35,7 @@ PT_EI long int
 testandset (int *spinlock)
 {
   int i = 1;
-  asm ("swap%I0 %M0, %1" : "+m"(*(volatile int *)spinlock), "+r"(i));
+  __asm__ ("swap%I0 %M0, %1" : "+m"(*(volatile int *)spinlock), "+r"(i));
   return i;
 }
 
@@ -53,7 +53,7 @@ extern char __stacksize;
 #define WRITE_MEMORY_BARRIER() __asm__ __volatile__("membar" : : : "memory")
 
 /* Return the thread descriptor for the current thread.  */
-register struct _pthread_descr_struct *THREAD_SELF asm ("gr29");
+register struct _pthread_descr_struct *THREAD_SELF __asm__ ("gr29");
 #define THREAD_SELF THREAD_SELF
 
 /* Initialize the thread-unique value.  */
diff --git a/libpthread/linuxthreads.old/sysdeps/i386/tls.h b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
index e4f007ee3..8534cab80 100644
--- a/libpthread/linuxthreads.old/sysdeps/i386/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
@@ -104,7 +104,7 @@ typedef struct
     { nr, (unsigned long int) (descr), 0xfffff /* 4GB in pages */,	      \
       1, 0, 0, 1, 0, 1, 0 };						      \
   int result;								      \
-  asm volatile (TLS_LOAD_EBX						      \
+  __asm__ __volatile__ (TLS_LOAD_EBX						      \
 		"int $0x80\n\t"						      \
 		TLS_LOAD_EBX						      \
 		: "=a" (result)						      \
@@ -125,9 +125,9 @@ typedef struct
   int result;								      \
   if (secondcall)							      \
     ldt_entry.entry_number = ({ int _gs;				      \
-				asm ("movw %%gs, %w0" : "=q" (_gs));	      \
+				__asm__ ("movw %%gs, %w0" : "=q" (_gs));	      \
 				(_gs & 0xffff) >> 3; });		      \
-  asm volatile (TLS_LOAD_EBX						      \
+  __asm__ __volatile__ (TLS_LOAD_EBX						      \
 		"int $0x80\n\t"						      \
 		TLS_LOAD_EBX						      \
 		: "=a" (result), "=m" (ldt_entry.entry_number)		      \
@@ -167,7 +167,7 @@ typedef struct
     __gs = TLS_SETUP_GS_SEGMENT (_descr, secondcall);			      \
     if (__builtin_expect (__gs, 7) != -1)				      \
       {									      \
-	asm ("movw %w0, %%gs" : : "q" (__gs));				      \
+	__asm__ ("movw %w0, %%gs" : : "q" (__gs));				      \
 	__gs = 0;							      \
       }									      \
     __gs;								      \
diff --git a/libpthread/linuxthreads.old/sysdeps/i386/useldt.h b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
index 16aee9989..ca5677cc9 100644
--- a/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
@@ -71,7 +71,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
       1, 0, 0, 1, 0, 1, 0 };						      \
   if (__modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0)		      \
     abort ();								      \
-  asm ("movw %w0, %%gs" : : "q" (nr * 8 + 7));				      \
+  __asm__ ("movw %w0, %%gs" : : "q" (nr * 8 + 7));				      \
 })
 
 #ifdef __PIC__
@@ -97,21 +97,21 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
   int __gs;								      \
   if (DO_SET_THREAD_AREA_REUSE (nr))					      \
     {									      \
-      asm ("movw %%gs, %w0" : "=q" (__gs));				      \
+      __asm__ ("movw %%gs, %w0" : "=q" (__gs));				      \
       struct modify_ldt_ldt_s ldt_entry =				      \
 	{ (__gs & 0xffff) >> 3,						      \
 	  (unsigned long int) (descr), 0xfffff /* 4GB in pages */,	      \
 	  1, 0, 0, 1, 0, 1, 0 };					      \
 									      \
       int __result;							      \
-      __asm (USETLS_LOAD_EBX						      \
+      __asm__ (USETLS_LOAD_EBX						      \
 	     "movl %2, %%eax\n\t"					      \
 	     "int $0x80\n\t"						      \
 	     USETLS_LOAD_EBX						      \
 	     : "&a" (__result)						      \
 	     : USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area));      \
       if (__result == 0)						      \
-	asm ("movw %w0, %%gs" :: "q" (__gs));				      \
+	__asm__ ("movw %w0, %%gs" :: "q" (__gs));				      \
       else								      \
 	__gs = -1;							      \
     }									      \
@@ -122,7 +122,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
 	  (unsigned long int) (descr), 0xfffff /* 4GB in pages */,	      \
 	  1, 0, 0, 1, 0, 1, 0 };					      \
       int __result;							      \
-      __asm (USETLS_LOAD_EBX						      \
+      __asm__ (USETLS_LOAD_EBX						      \
 	     "movl %2, %%eax\n\t"					      \
 	     "int $0x80\n\t"						      \
 	     USETLS_LOAD_EBX						      \
@@ -131,7 +131,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
       if (__result == 0)						      \
 	{								      \
 	  __gs = (ldt_entry.entry_number << 3) + 3;			      \
-	  asm ("movw %w0, %%gs" : : "q" (__gs));			      \
+	  __asm__ ("movw %w0, %%gs" : : "q" (__gs));			      \
 	}								      \
       else								      \
 	__gs = -1;							      \
diff --git a/libpthread/linuxthreads.old/sysdeps/sh/tls.h b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
index 75326d8e1..7bc29800a 100644
--- a/libpthread/linuxthreads.old/sysdeps/sh/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
@@ -100,7 +100,7 @@ typedef struct
     /* For now the thread descriptor is at the same address.  */	      \
     head->self = _descr;						      \
 									      \
-    asm ("ldc %0,gbr" : : "r" (_descr));				      \
+    __asm__ ("ldc %0,gbr" : : "r" (_descr));				      \
 									      \
     0;									      \
   })
diff --git a/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
index d67275c10..5e7239d17 100644
--- a/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
@@ -108,7 +108,7 @@ typedef struct
     /* For now the thread descriptor is at the same address.  */	      \
     head->self = _descr;						      \
 									      \
-    asm volatile ("syscall"						      \
+    __asm__ __volatile__ ("syscall"						      \
 		  : "=a" (_result)					      \
 		  : "0" ((unsigned long int) __NR_arch_prctl),		      \
 		    "D" ((unsigned long int) ARCH_SET_FS),		      \