Browse Source

x86_64: compile pthread it's own version of __syscall_error

also fix up clone.S from sync

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Austin Foxley 14 years ago
parent
commit
510d1ed6df

+ 2 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch

@@ -9,7 +9,7 @@ LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/x86_64
 
 
 libpthread_SSRC = pt-vfork.S clone.S pthread_once.S
-libpthread_CSRC = pthread_spin_init.c
+libpthread_CSRC = pthread_spin_init.c pt-__syscall_error.c
 
 libc_a_CSRC = fork.c
 libc_a_SSRC = clone.S vfork.S
@@ -24,6 +24,7 @@ libc_a_SSRC += 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__

+ 3 - 9
libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/clone.S

@@ -1,9 +1,3 @@
-/* We want an #include_next, but we are the main source file.
-   So, #include ourselves and in that incarnation we can use #include_next.  */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
+#include <tcb-offsets.h>
+#define RESET_PID
+#include <libc/sysdeps/linux/x86_64/clone.S>

+ 1 - 0
libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pt-__syscall_error.c

@@ -0,0 +1 @@
+#include <../../../../../../../libc/sysdeps/linux/x86_64/__syscall_error.c>