diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:54:38 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:54:38 +0000 |
| commit | e0a7506f8ec11c1c524fe1d6b52781d168e988db (patch) | |
| tree | 2dcf7858f0c7d236efe32db885baa9379358ec8a /libpthread/linuxthreads.old/sysdeps/arm | |
| parent | e772b90e7e8190112a987f7c18c19a33766acfd0 (diff) | |
| download | uClibc-alpine-e0a7506f8ec11c1c524fe1d6b52781d168e988db.tar.bz2 uClibc-alpine-e0a7506f8ec11c1c524fe1d6b52781d168e988db.tar.xz | |
Merge nptl branch tree with trunk.
Step 7: merge linuxthreads and linuxthread.old folders
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads.old/sysdeps/arm')
| -rw-r--r-- | libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h index 284567970..14eb6f6da 100644 --- a/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h @@ -22,13 +22,12 @@ #ifndef _PT_MACHINE_H #define _PT_MACHINE_H 1 +#include <features.h> + #ifndef PT_EI -# define PT_EI extern inline +# define PT_EI __extern_always_inline #endif -extern long int testandset (int *spinlock); -extern int __compare_and_swap (long int *p, long int oldval, long int newval); - /* This will not work on ARM1 or ARM2 because SWP is lacking on those machines. Unfortunately we have no way to detect this at compile time; let's hope nobody tries to use one. */ |