svn commit: branches/uClibc-nptl/libpthread/linuxthreads: sysdeps/avr32

[carmelo at uclibc.org]

Author: carmelo
Date: 2008-04-25 10:26:54 -0700 (Fri, 25 Apr 2008)
New Revision: 21866

Log:
STEP 10: synch linuxthreads directory

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


Modified:
   branches/uClibc-nptl/libpthread/linuxthreads/Makefile.in
   branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h


Changeset:
Modified: branches/uClibc-nptl/libpthread/linuxthreads/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/Makefile.in	2008-04-25 17:23:47 UTC (rev 21865)
+++ branches/uClibc-nptl/libpthread/linuxthreads/Makefile.in	2008-04-25 17:26:54 UTC (rev 21866)
@@ -77,7 +77,7 @@
 else
 libpthread-a-y  += $(libpthread_OBJ) $(libpthread-static-y)
 endif
-libpthread-so-y += $(libpthread_OBJ:.o=.os)
+libpthread-so-y += $(libpthread_OBJ:.o=.oS)
 
 lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
 lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so

Modified: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
===================================================================
--- branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h	2008-04-25 17:23:47 UTC (rev 21865)
+++ branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h	2008-04-25 17:26:54 UTC (rev 21866)
@@ -18,16 +18,16 @@
 static inline int
 _test_and_set (int *p, int v) __THROW
 {
-       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 @@
 PT_EI long int
 testandset (int *spinlock)
 {
-       return _test_and_set(spinlock, 1);
+	return _test_and_set(spinlock, 1);
 }
 
 
@@ -52,22 +52,22 @@
 PT_EI int
 __compare_and_swap(long int *p, long int oldval, long int newval)
 {
-       int result;
+	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 */