[git commit nptl_glibc_sync] Fixes to get nptl compiling for x86

Khem Raj raj.khem at gmail.com
Wed Feb 10 14:24:03 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=323bc3be3b3144932bbb5ee2a586e9ab4074239e
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl_glibc_sync

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 libpthread/nptl/pthread_atfork.c                   |    4 ++--
 .../sysdeps/unix/sysv/linux/i386/Makefile.arch     |    1 +
 .../nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S   |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libpthread/nptl/pthread_atfork.c b/libpthread/nptl/pthread_atfork.c
index a11d568..e607d49 100644
--- a/libpthread/nptl/pthread_atfork.c
+++ b/libpthread/nptl/pthread_atfork.c
@@ -38,8 +38,8 @@
 #include <fork.h>
 
 /* This is defined by newer gcc version unique for each module.  */
-extern void *__dso_handle __attribute__ ((__weak__,
-					  __visibility__ ("hidden")));
+extern void *__dso_handle __attribute__ ((__weak__));
+					  //,__visibility__ ("hidden")));
 
 
 /* Hide the symbol so that no definition but the one locally in the
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch
index 9bb1938..b36c042 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch
@@ -24,6 +24,7 @@ libc_a_SSRC += i486/libc-lowlevellock.S
 
 
 CFLAGS-OMIT-fork.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
+CFLAGS-pt-__syscall_error.c =  -DNOT_IN_libc=1 -DIS_IN_libpthread=1
 
 ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
 CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
index 7ab222e..aff926a 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
@@ -61,7 +61,7 @@ ENTRY (__vfork)
 
 	cmpl	$-4095, %eax
 	jae	SYSCALL_ERROR_LABEL	/* Branch forward if it failed.  */
-.Lpseudo_end:
+L(pseudo_end):
 	ret
 PSEUDO_END (__vfork)
 
-- 
1.6.3.3



More information about the uClibc-cvs mailing list