summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-02-19 00:34:29 -0800
committerKhem Raj <raj.khem@gmail.com>2010-02-19 00:34:29 -0800
commit323bc3be3b3144932bbb5ee2a586e9ab4074239e (patch)
tree06aa7dff415d6c3f74e599fcc6e5188552a1bcf7
parent00f5c08d216581e02a1e5cc8a8076ae3779ea6ca (diff)
Fixes to get nptl compiling for x86
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--libpthread/nptl/pthread_atfork.c4
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch1
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S2
3 files changed, 4 insertions, 3 deletions
diff --git a/libpthread/nptl/pthread_atfork.c b/libpthread/nptl/pthread_atfork.c
index a11d568c3..e607d496e 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 9bb19381c..b36c04206 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 7ab222e1b..aff926a8f 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)