[git commit nptl] i386/arm nptl warning fixes
Austin Foxley
austinf at cetoncorp.com
Wed Sep 23 14:24:33 UTC 2009
commit: http://git.uclibc.org/uClibc/commit/?id=d10ba0ae91ba9ad57b3cbb13d5e1122d943464aa
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl
* fix some "USE___THREAD not defined" warnings
* get rid of remnant glibc versioned symbols
* fix RTLD_PRIVATE_ERRNO define usage
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
.../nptl/sysdeps/unix/sysv/linux/arm/sysdep.h | 2 +-
.../sysv/linux/i386/i486/pthread_cond_broadcast.S | 3 +--
.../sysv/linux/i386/i486/pthread_cond_timedwait.S | 3 +--
.../unix/sysv/linux/i386/i486/pthread_cond_wait.S | 3 +--
.../sysdeps/unix/sysv/linux/i386/i486/sem_post.S | 3 ++-
.../unix/sysv/linux/i386/i486/sem_trywait.S | 3 ++-
.../sysdeps/unix/sysv/linux/i386/i486/sem_wait.S | 3 ++-
.../nptl/sysdeps/unix/sysv/linux/i386/sysdep.h | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
index d62c385..0883ac6 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -99,7 +99,7 @@
#if NOT_IN_libc
# define SYSCALL_ERROR __local_syscall_error
-# if RTLD_PRIVATE_ERRNO
+# ifdef RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
__local_syscall_error: \
ldr r1, 1f; \
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
index 16b019c..6e8ffe6 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
@@ -158,5 +158,4 @@ __pthread_cond_broadcast:
ENTER_KERNEL
jmp 10b
.size __pthread_cond_broadcast, .-__pthread_cond_broadcast
-versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast,
- GLIBC_2_3_2)
+weak_alias(__pthread_cond_broadcast, pthread_cond_broadcast)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index e1f4c6d..fc4f21b 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -368,8 +368,7 @@ __pthread_cond_timedwait:
jmp 21b
#endif
.size __pthread_cond_timedwait, .-__pthread_cond_timedwait
-versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
- GLIBC_2_3_2)
+weak_alias(__pthread_cond_timedwait, pthread_cond_timedwait)
.type __condvar_tw_cleanup2, @function
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
index 4cb0073..bf852b5 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
@@ -260,8 +260,7 @@ __pthread_cond_wait:
movl %esi, %eax
jmp 14b
.size __pthread_cond_wait, .-__pthread_cond_wait
-versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
+weak_alias(__pthread_cond_wait, pthread_cond_wait)
.type __condvar_w_cleanup2, @function
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
index 85bccd7..82f24c2 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
#include <pthread-errnos.h>
+#include <tls.h>
#ifndef UP
# define LOCK lock
@@ -80,7 +81,7 @@ __new_sem_post:
popl %ebx
ret
.size __new_sem_post,.-__new_sem_post
- versioned_symbol(libpthread, __new_sem_post, sem_post, GLIBC_2_1)
+weak_alias(__new_sem_post, sem_post)
#ifdef PIC
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index b5e3df6..1fd5186 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
@@ -19,6 +19,7 @@
#include <sysdep.h>
#include <pthread-errnos.h>
+#include <tls.h>
#ifndef UP
# define LOCK lock
@@ -69,7 +70,7 @@ __new_sem_trywait:
orl $-1, %eax
ret
.size __new_sem_trywait,.-__new_sem_trywait
- versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1)
+weak_alias(__new_sem_trywait, sem_trywait)
#ifdef PIC
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index 56c4cae..baae429 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -20,6 +20,7 @@
#include <sysdep.h>
#include <pthread-errnos.h>
#include <tcb-offsets.h>
+#include <tls.h>
#ifndef UP
# define LOCK lock
@@ -130,4 +131,4 @@ __new_sem_wait:
jmp HIDDEN_JUMPTARGET (__pthread_unwind)
cfi_endproc
.size __new_sem_wait,.-__new_sem_wait
- versioned_symbol(libpthread, __new_sem_wait, sem_wait, GLIBC_2_1)
+weak_alias(__new_sem_wait, sem_wait)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h
index 6ab0560..03916b3 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -107,7 +107,7 @@
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
#else
-# if RTLD_PRIVATE_ERRNO
+# ifdef RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
0:SETUP_PIC_REG(cx); \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
--
1.6.3.3
More information about the uClibc-cvs
mailing list