[git commit nptl] sparc nptl: make sure correct clone.S and pt-vfork.S get in libpthread

[Austin Foxley]

commit: http://git.uclibc.org/uClibc/commit/?id=51468f1123252fbc9f1cbb244160cf7d95d01334
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/sysdeps/linux/sparc/clone.S                   |    4 ++--
 .../nptl/sysdeps/unix/sysv/linux/Makefile.in       |    1 +
 .../sysdeps/unix/sysv/linux/sparc/Makefile.arch    |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libc/sysdeps/linux/sparc/clone.S b/libc/sysdeps/linux/sparc/clone.S
index b623bfb..2b66095 100644
--- a/libc/sysdeps/linux/sparc/clone.S
+++ b/libc/sysdeps/linux/sparc/clone.S
@@ -73,7 +73,7 @@ ENTRY (__clone)
 .Leinval:
 	mov	EINVAL, %o0
 .Lerror:
-	call	HIDDEN_JUMPTARGET(__errno_location)
+	call	__errno_location
 	 mov	%o0, %i0
 	st	%i0,[%o0]
 	jmpl	%i7 + 8, %g0
@@ -99,7 +99,7 @@ __thread_start:
 	mov	%g0, %fp	/* terminate backtrace */
 	call	%g2
 	 mov	%g3,%o0
-	call	HIDDEN_JUMPTARGET(_exit),0
+	call	exit,0
 	 nop
 
 	.size	__thread_start, .-__thread_start
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
index 5a6d8a2..56c1770 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
@@ -49,6 +49,7 @@ librt_CSRC := mq_notify.c
 endif
 
 ifeq ($(TARGET_ARCH),sparc)
+libpthread_CSRC += __syscall_error.c
 librt_CSRC := mq_notify.c __syscall_error.c
 endif
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch
index a843027..b547310 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch
@@ -31,6 +31,7 @@ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 #Needed to use the correct SYSCALL_ERROR_HANDLER
 ASFLAGS-clone.S += -DUSE___THREAD
 ASFLAGS-vfork.S += -DUSE___THREAD
+ASFLAGS-pt-vfork.S += -DUSE___THREAD
 endif
 
 CFLAGS += $(SSP_ALL_CFLAGS)
@@ -39,7 +40,7 @@ CFLAGS += $(SSP_ALL_CFLAGS)
 LINUX_ARCH_DIR:=$(top_srcdir)libpthread/nptl/sysdeps/unix/sysv/linux/sparc
 LINUX_ARCH_OUT:=$(top_builddir)libpthread/nptl/sysdeps/unix/sysv/linux/sparc
 
-LINUX_ARCH_OBJ:=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC))
+LINUX_ARCH_OBJ:=$(patsubst %.S,$(LINUX_ARCH_OUT)/%.o,$(libpthread_SSRC))
 LINUX_ARCH_OBJ+=$(patsubst %.c,$(LINUX_ARCH_OUT)/%.o,$(libpthread_CSRC))
 
 ifeq ($(DOPIC),y)
-- 
1.6.3.3