Do the _C_LABEL thing for sparc here as well.

Hopefully fixes pkg/10785

3 files changed, 136 insertions, 1 deletions

diff --git a/devel/unproven-pthreads/files/patch-sum b/devel/unproven-pthreads/files/patch-sum
index ba7db53d263..9167a618bd0 100644
--- a/devel/unproven-pthreads/files/patch-sum
+++ b/devel/unproven-pthreads/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2001/03/23 15:57:45 agc Exp $
+$NetBSD: patch-sum,v 1.9 2001/04/12 07:53:17 skrll Exp $
 
 SHA1 (patch-aa) = 21955c9af0fd80b6bd939631d79db7225a392ea1
 SHA1 (patch-ab) = 870977a372b34eecc44f8e32449e8a2e008b35a1
@@ -18,3 +18,5 @@ SHA1 (patch-ao) = bcb19cf571bfdf7b3c7e8eaa128bb0cf79254c04
 SHA1 (patch-ap) = 9a1292ec8301fc38384198b3dc626f8faf85fd41
 SHA1 (patch-aq) = 1f3b6745ca3ac6b13e3575c230f0f7e5f7b9ec2f
 SHA1 (patch-ar) = 52b983df27904a21fcac75646aeddebe446c7a8c
+SHA1 (patch-as) = e016c3028b44d4ee80b4696bb738b5c6c751cf5b
+SHA1 (patch-at) = 0697a2f8adb4226a74bafc0c6a6ec5b6559db466
diff --git a/devel/unproven-pthreads/patches/patch-as b/devel/unproven-pthreads/patches/patch-as
new file mode 100644
index 00000000000..26c1e4b8a80
--- /dev/null
+++ b/devel/unproven-pthreads/patches/patch-as
@@ -0,0 +1,109 @@
+$NetBSD: patch-as,v 1.1 2001/04/12 07:53:18 skrll Exp $
+
+--- machdep/syscall-sparc-netbsd-1.3.S.orig	Thu Apr 12 08:33:16 2001
++++ machdep/syscall-sparc-netbsd-1.3.S
+@@ -10,10 +10,11 @@
+ #endif
+  
++#include <machine/asm.h>
+ #include <sys/syscall.h>
+ 
+ #define	SYSCALL(x)					\
+-	.globl _machdep_sys_##x;		\
++	.globl _C_LABEL(machdep_sys_##x);		\
+ 									\
+-_machdep_sys_##x:;					\
++_C_LABEL(machdep_sys_##x):;					\
+ 									\
+ 	mov SYS_##x, %g1;   			\
+@@ -44,7 +45,7 @@
+  * machdep_sys_pipe()
+  */
+-    .globl _machdep_sys_pipe
++    .globl _C_LABEL(machdep_sys_pipe)
+ 
+-_machdep_sys_pipe:
++_C_LABEL(machdep_sys_pipe):
+     mov  %o0, %o2
+     mov  SYS_pipe, %g1
+@@ -60,7 +61,7 @@
+  * machdep_sys_fork()
+  */
+-    .globl _machdep_sys_fork;
++    .globl _C_LABEL(machdep_sys_fork);
+ 
+-_machdep_sys_fork:;
++_C_LABEL(machdep_sys_fork):;
+ 
+     mov SYS_fork, %g1;
+@@ -76,7 +77,7 @@
+  * machdep_sys_sigprocmask()
+  */
+-    .globl _machdep_sys_sigprocmask;
++    .globl _C_LABEL(machdep_sys_sigprocmask);
+ 
+-_machdep_sys_sigprocmask:;
++_C_LABEL(machdep_sys_sigprocmask):;
+ 
+ 	ld [%o1], %o1; 
+@@ -93,7 +94,7 @@
+  * machdep_sys_sigsuspend()
+  */
+-    .globl _machdep_sys_sigsuspend;
++    .globl _C_LABEL(machdep_sys_sigsuspend);
+ 
+-_machdep_sys_sigsuspend:;
++_C_LABEL(machdep_sys_sigsuspend):;
+ 
+ 	ld [%o0], %o0; 
+@@ -109,7 +110,7 @@
+  * machdep_sys_fstat()
+  */
+-    .globl _machdep_sys_fstat;
++    .globl _C_LABEL(machdep_sys_fstat);
+ 
+-_machdep_sys_fstat:;
++_C_LABEL(machdep_sys_fstat):;
+ 
+     mov SYS___fstat13, %g1;
+@@ -123,5 +124,5 @@
+  * machdep_sys___syscall()
+  */
+-_machdep_sys___syscall:;
++_C_LABEL(machdep_sys___syscall):;
+ 
+     mov SYS___syscall, %g1;
+@@ -135,7 +136,7 @@
+  * machdep_sys_lseek()
+  */
+-	.global _machdep_sys_lseek
++	.global _C_LABEL(machdep_sys_lseek)
+ 
+-_machdep_sys_lseek:
++_C_LABEL(machdep_sys_lseek):
+ 	save %sp,-112,%sp
+ 	mov %i1,%o4
+@@ -145,5 +146,5 @@
+ 	mov SYS_lseek,%o1
+ 	mov %i0,%o2
+-	call _machdep_sys___syscall,0
++	call _C_LABEL(machdep_sys___syscall),0
+ 	mov 0,%o3
+ 	mov %o0,%i0
+@@ -155,7 +156,7 @@
+  * machdep_sys_ftruncate()
+  */
+-	.global _machdep_sys_ftruncate
++	.global _C_LABEL(machdep_sys_ftruncate)
+ 
+-_machdep_sys_ftruncate:
++_C_LABEL(machdep_sys_ftruncate):
+ 	save %sp,-104,%sp
+ 	mov %i1,%o4
+@@ -164,5 +165,5 @@
+ 	mov SYS_ftruncate,%o1
+ 	mov %i0,%o2
+-	call _machdep_sys___syscall,0
++	call _C_LABEL(machdep_sys___syscall),0
+ 	mov 0,%o3
+ 	mov %o0,%o1
diff --git a/devel/unproven-pthreads/patches/patch-at b/devel/unproven-pthreads/patches/patch-at
new file mode 100644
index 00000000000..18c90238c0a
--- /dev/null
+++ b/devel/unproven-pthreads/patches/patch-at
@@ -0,0 +1,24 @@
+$NetBSD: patch-at,v 1.1 2001/04/12 07:53:18 skrll Exp $
+
+--- machdep/syscall-template-sparc-netbsd-1.3.S.orig	Thu Apr 12 08:33:16 2001
++++ machdep/syscall-template-sparc-netbsd-1.3.S
+@@ -4,6 +4,7 @@
+  *
+  */
+ 
++#include <machine/asm.h>
+ #include <sys/syscall.h>
+ 
+ #ifdef SYS___sigsuspend14
+@@ -14,9 +15,9 @@
+ #endif
+ 
+ #define	SYSCALL(x)						\
+-	.globl _machdep_sys_##x;			\
++	.globl _C_LABEL(machdep_sys_##x);			\
+ 										\
+-_machdep_sys_##x:;						\
++_C_LABEL(machdep_sys_##x):;						\
+ 										\
+ 	mov SYS_##x, %g1;   				\
+ 	ta 0;								\