summaryrefslogtreecommitdiffstats
path: root/libpthread/linuxthreads
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2008-04-25 17:26:54 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2008-04-25 17:26:54 +0000
commit72fef32aa0821a1851d7a99f443bb33d1bf76e3d (patch)
tree378fea8735359556aacd5f36b695d5067764f0fe /libpthread/linuxthreads
parentf28adc8110ff9a24d653f5cc0441898b8e61aa33 (diff)
downloaduClibc-alpine-72fef32aa0821a1851d7a99f443bb33d1bf76e3d.tar.bz2
uClibc-alpine-72fef32aa0821a1851d7a99f443bb33d1bf76e3d.tar.xz
STEP 10: synch linuxthreads directory
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads')
-rw-r--r--libpthread/linuxthreads/Makefile.in2
-rw-r--r--libpthread/linuxthreads/sysdeps/avr32/pt-machine.h46
2 files changed, 24 insertions, 24 deletions
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index 37ed96365..459be19c5 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -77,7 +77,7 @@ libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os)
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
diff --git a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
index 903a7ed54..b93bc47f0 100644
--- a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
+++ b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h
@@ -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 @@ 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)
{
- 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 */