From 35d891d7e78495c6c638070e71755ce2add8e3e6 Mon Sep 17 00:00:00 2001 From: skrll Date: Thu, 12 Apr 2001 07:14:58 +0000 Subject: Add _C_LABEL to the sparc assembler files. Fixes pkg/11360. --- devel/mit-pthreads/files/patch-sum | 6 ++--- devel/mit-pthreads/patches/patch-au | 49 ++++++++++++++++++------------------- devel/mit-pthreads/patches/patch-av | 13 +++++----- 3 files changed, 33 insertions(+), 35 deletions(-) (limited to 'devel/mit-pthreads') diff --git a/devel/mit-pthreads/files/patch-sum b/devel/mit-pthreads/files/patch-sum index 07d86c421ed..24ac2541db3 100644 --- a/devel/mit-pthreads/files/patch-sum +++ b/devel/mit-pthreads/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.21 2001/04/12 07:11:37 skrll Exp $ +$NetBSD: patch-sum,v 1.22 2001/04/12 07:14:58 skrll Exp $ SHA1 (patch-aa) = a42d26c40aa404c2658ad782ddf624d684aa5a6c SHA1 (patch-ab) = 1585e8418b02bd4f50fce7335ddb3f7ee489f69c @@ -19,8 +19,8 @@ SHA1 (patch-aq) = c1e78959d933a5e2fbf92954ea1fa3347481ce7c SHA1 (patch-ar) = e58e84e7c1ec41fd42bcb29596fd4f1ee5122d57 SHA1 (patch-as) = 7fcadec7050085119a673c0f8f6b0332087902a2 SHA1 (patch-at) = a2c7af77a6509b2d10e96eefc318c3410e8b4a9d -SHA1 (patch-au) = 4728b68d55558a4db399e811a7c8d39e7ca31f67 -SHA1 (patch-av) = 8495c511411c11ccd21ece5e796167b30aef1db0 +SHA1 (patch-au) = 24220bf3b592b9b328d9bab0934d4edef6a8dbc2 +SHA1 (patch-av) = a4540066b35026c3bdb741e00d63b4c1883747f8 SHA1 (patch-aw) = cb1ed9e8f5d0089716200c650b52f88092014b0f SHA1 (patch-ax) = 83944d22da291b61f033ce41ce34c0b12d274c85 SHA1 (patch-ay) = 1e2a1d0ffe257e3cd13a3f1fce6e7faf48b01e8d diff --git a/devel/mit-pthreads/patches/patch-au b/devel/mit-pthreads/patches/patch-au index 5394a41eb5e..acbe395c16e 100644 --- a/devel/mit-pthreads/patches/patch-au +++ b/devel/mit-pthreads/patches/patch-au @@ -1,8 +1,6 @@ -$NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ - ---- /dev/null Sun Oct 25 03:17:31 1998 -+++ machdep/syscall-sparc-netbsd-1.3.S Sat Oct 24 21:39:15 1998 -@@ -0,0 +1,171 @@ +--- machdep/syscall-sparc-netbsd-1.3.S.orig Thu Apr 12 06:57:19 2001 ++++ machdep/syscall-sparc-netbsd-1.3.S Thu Apr 12 07:15:26 2001 +@@ -0,0 +1,172 @@ +/* ==== syscall.S ============================================================ + * Copyright (c) 1994 Chris Provenzano, proven@mit.edu + * All rights reserved. @@ -11,15 +9,16 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ + +#ifndef lint + .text -+ .asciz "$Id: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $"; ++ .asciz "$Id: patch-au,v 1.2 2001/04/12 07:14:58 skrll Exp $"; +#endif + ++#include +#include + +#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; \ @@ -48,9 +47,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * 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 + ta 0 @@ -64,9 +63,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * 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; + ta 0; @@ -80,9 +79,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * machdep_sys_sigprocmask() + */ -+ .globl _machdep_sys_sigprocmask; ++ .globl _C_LABEL(machdep_sys_sigprocmask); + -+_machdep_sys_sigprocmask:; ++_C_LABEL(machdep_sys_sigprocmask):; + + ld [%o1], %o1; + mov SYS_sigprocmask, %g1; @@ -97,9 +96,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * machdep_sys_sigsuspend() + */ -+ .globl _machdep_sys_sigsuspend; ++ .globl _C_LABEL(machdep_sys_sigsuspend); + -+_machdep_sys_sigsuspend:; ++_C_LABEL(machdep_sys_sigsuspend):; + + ld [%o0], %o0; + mov SYS_sigsuspend, %g1; @@ -113,9 +112,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * 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; + ta 0; @@ -127,7 +126,7 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * machdep_sys___syscall() + */ -+_machdep_sys___syscall:; ++_C_LABEL(machdep_sys___syscall):; + + mov SYS___syscall, %g1; + ta 0; @@ -139,9 +138,9 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * 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 + mov %i2,%o5 @@ -149,7 +148,7 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ + mov 0,%o0 + 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 + mov %o1,%i1 @@ -159,16 +158,16 @@ $NetBSD: patch-au,v 1.1 1998/12/28 22:22:02 bad Exp $ +/* ========================================================================== + * 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 + mov %i2,%o5 + mov 0,%o0 + 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 + sra %o0,31,%o0 diff --git a/devel/mit-pthreads/patches/patch-av b/devel/mit-pthreads/patches/patch-av index 26cc6475b55..b4e8a238bae 100644 --- a/devel/mit-pthreads/patches/patch-av +++ b/devel/mit-pthreads/patches/patch-av @@ -1,14 +1,13 @@ -$NetBSD: patch-av,v 1.1 1998/12/28 22:22:02 bad Exp $ - ---- /dev/null Mon Oct 19 22:21:39 1998 -+++ machdep/syscall-template-sparc-netbsd-1.3.S Mon Oct 19 22:36:44 1998 -@@ -0,0 +1,47 @@ +--- machdep/syscall-template-sparc-netbsd-1.3.S.orig Thu Apr 12 06:57:20 2001 ++++ machdep/syscall-template-sparc-netbsd-1.3.S Thu Apr 12 07:20:31 2001 +@@ -0,0 +1,48 @@ +/* ==== syscall.S ============================================================ + * Copyright (c) 1994 Chris Provenzano, proven@mit.edu + * All rights reserved. + * + */ + ++#include +#include + +#ifdef SYS___sigsuspend14 @@ -19,9 +18,9 @@ $NetBSD: patch-av,v 1.1 1998/12/28 22:22:02 bad Exp $ +#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; \ -- cgit v1.2.3