diff options
author | fredb <fredb> | 2002-04-11 15:43:36 +0000 |
---|---|---|
committer | fredb <fredb> | 2002-04-11 15:43:36 +0000 |
commit | 185548d916b0dae1f8ce7b232a2caac0c2f0e476 (patch) | |
tree | a1bae1552417fc117da6affb1ea3f6aa28d50c55 /devel/mit-pthreads | |
parent | a9ec5d45492eef7a64ccba695400e662db58bfb4 (diff) | |
download | pkgsrc-185548d916b0dae1f8ce7b232a2caac0c2f0e476.tar.gz |
Prefix register names with '%' so this can build on current/m68k
(plus minor clean-ups: a paste-o and whitespace).
Diffstat (limited to 'devel/mit-pthreads')
-rw-r--r-- | devel/mit-pthreads/distinfo | 8 | ||||
-rw-r--r-- | devel/mit-pthreads/patches/patch-bm | 21 | ||||
-rw-r--r-- | devel/mit-pthreads/patches/patch-bn | 52 | ||||
-rw-r--r-- | devel/mit-pthreads/patches/patch-bo | 12 |
4 files changed, 46 insertions, 47 deletions
diff --git a/devel/mit-pthreads/distinfo b/devel/mit-pthreads/distinfo index 5210e6ee878..9b978ccaf72 100644 --- a/devel/mit-pthreads/distinfo +++ b/devel/mit-pthreads/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/03/25 16:08:32 briggs Exp $ +$NetBSD: distinfo,v 1.5 2002/04/11 15:43:36 fredb Exp $ SHA1 (pthreads-1_60_beta6.tar.gz) = 238e410f372dd1615c0e82ec9c6ff47699c558ee Size (pthreads-1_60_beta6.tar.gz) = 382562 bytes @@ -39,9 +39,9 @@ SHA1 (patch-bi) = 740529301c92ae897d23bd951d1a1740bbec315f SHA1 (patch-bj) = 35d6d3559b1349673748e72438e81dbbbbeb4d6f SHA1 (patch-bk) = 6eab75c41290435bd8a50758eb378d0b561535f9 SHA1 (patch-bl) = 3045f6d4f6de2ac6f07c30b28526272fadeb2f01 -SHA1 (patch-bm) = 0382967827bcd9ee556e16290792d9887d6082e5 -SHA1 (patch-bn) = 13804e7b14af52ed316c386798051d3f3263e476 -SHA1 (patch-bo) = 81ca6c42e81226b4e249f732669134d51c35d284 +SHA1 (patch-bm) = ebfefa8f0431f5de9c53bcb26be457628f74fada +SHA1 (patch-bn) = c614d639d50683615e27a8406e6265b4714216fa +SHA1 (patch-bo) = 0f199da4e6f9c2233833b9e4afd5f53d2c4543ca SHA1 (patch-bp) = d1d5ac273e676a2f01392aacbaddc388632f77b6 SHA1 (patch-bq) = 2c371a32d649f0a1e6279bc6d58c5da79d26b36c SHA1 (patch-br) = eb0f281bf24ec9286308e7b4c9741993a3e11289 diff --git a/devel/mit-pthreads/patches/patch-bm b/devel/mit-pthreads/patches/patch-bm index f0cfe3f2fe3..43053463c1f 100644 --- a/devel/mit-pthreads/patches/patch-bm +++ b/devel/mit-pthreads/patches/patch-bm @@ -1,8 +1,8 @@ -$NetBSD: patch-bm,v 1.2 1999/09/10 20:38:23 bad Exp $ +$NetBSD: patch-bm,v 1.3 2002/04/11 15:43:37 fredb Exp $ ---- /dev/null Fri Sep 10 15:38:20 1999 -+++ machdep/engine-m68000-netbsd.c Fri Sep 10 20:57:07 1999 -@@ -0,0 +1,256 @@ +--- machdep/engine-m68000-netbsd.c.orig Thu Apr 11 09:25:42 2002 ++++ machdep/engine-m68000-netbsd.c Thu Apr 11 09:12:40 2002 +@@ -0,0 +1,255 @@ +/* ==== machdep.c ============================================================ + * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu + * @@ -47,7 +47,7 @@ $NetBSD: patch-bm,v 1.2 1999/09/10 20:38:23 bad Exp $ + */ + +#ifndef lint -+static const char rcsid[] = "$Id: patch-bm,v 1.2 1999/09/10 20:38:23 bad Exp $"; ++static const char rcsid[] = "$Id: patch-bm,v 1.3 2002/04/11 15:43:37 fredb Exp $"; +#endif + +#include "pthread.h" @@ -71,14 +71,14 @@ $NetBSD: patch-bm,v 1.2 1999/09/10 20:38:23 bad Exp $ +} + +/* ========================================================================== -+ * machdep_save_state() ++ * machdep_save_float_state() + */ +void machdep_save_float_state(struct pthread * pthread) +{ + char * fdata = pthread->machdep_data.machdep_fstate; + -+ __asm__ ( "fmovem fp0-fp7,%0"::"m" (*fdata) ); -+ __asm__ ( "fmovem fpcr/fpsr/fpi,%0"::"m" (fdata[80]) ); ++ __asm__ ( "fmovem %%fp0-%%fp7,%0"::"m" (*fdata) ); ++ __asm__ ( "fmovem %%fpcr/%%fpsr/%%fpi,%0"::"m" (fdata[80]) ); +} + +/* ========================================================================== @@ -88,9 +88,8 @@ $NetBSD: patch-bm,v 1.2 1999/09/10 20:38:23 bad Exp $ +{ + char * fdata = pthread_run->machdep_data.machdep_fstate; + -+ __asm__ ( "fmovem %0,fp0-fp7"::"m" (*fdata) ); -+ __asm__ ( "fmovem %0,fpcr/fpsr/fpi"::"m" (fdata[80]) ); -+ ++ __asm__ ( "fmovem %0,%%fp0-%%fp7"::"m" (*fdata) ); ++ __asm__ ( "fmovem %0,%%fpcr/%%fpsr/%%fpi"::"m" (fdata[80]) ); +} + +/* ========================================================================== diff --git a/devel/mit-pthreads/patches/patch-bn b/devel/mit-pthreads/patches/patch-bn index 40854f5fa63..8a46a2d0ec1 100644 --- a/devel/mit-pthreads/patches/patch-bn +++ b/devel/mit-pthreads/patches/patch-bn @@ -1,12 +1,12 @@ -$NetBSD: patch-bn,v 1.3 1999/09/10 20:38:23 bad Exp $ +$NetBSD: patch-bn,v 1.4 2002/04/11 15:43:37 fredb Exp $ ---- /dev/null Fri Sep 10 15:38:20 1999 -+++ machdep/syscall-m68000-netbsd.S Fri Sep 10 20:57:21 1999 +--- machdep/syscall-m68000-netbsd.S.orig Thu Apr 11 09:26:02 2002 ++++ machdep/syscall-m68000-netbsd.S Thu Apr 11 09:33:02 2002 @@ -0,0 +1,83 @@ + +#ifndef lint + .text -+ .asciz "$Id: patch-bn,v 1.3 1999/09/10 20:38:23 bad Exp $"; ++ .asciz "$Id: patch-bn,v 1.4 2002/04/11 15:43:37 fredb Exp $"; +#endif + +#include <machine/asm.h> @@ -15,10 +15,10 @@ $NetBSD: patch-bn,v 1.3 1999/09/10 20:38:23 bad Exp $ +#ifdef __STDC__ +#define IMM # +#define SYSCALL(x) .even; ENTRY(machdep_sys_ ## x); \ -+ movl IMM SYS_ ## x,d0; trap IMM 0; jcs err; rts ++ movl IMM SYS_ ## x,%d0; trap IMM 0; jcs err; rts +#else /* !__STDC__ */ +#define SYSCALL(x) .even; ENTRY(machdep_sys_/**/x); \ -+ movl #SYS_/**/x,d0; trap #0; jcs err; rts ++ movl #SYS_/**/x,%d0; trap #0; jcs err; rts +#endif /* !__STDC__ */ + +/* @@ -34,7 +34,7 @@ $NetBSD: patch-bn,v 1.3 1999/09/10 20:38:23 bad Exp $ + */ + +err: -+ negl d0 ++ negl %d0 + rts + +/* ========================================================================== @@ -42,47 +42,47 @@ $NetBSD: patch-bn,v 1.3 1999/09/10 20:38:23 bad Exp $ + */ + .even +ENTRY(machdep_sys_pipe); -+ movl #SYS_pipe,d0 ++ movl #SYS_pipe,%d0 + trap #0 + jcs err -+ movl sp@(4),a0 -+ movl d0,a0@+ -+ movl d1,a0@ -+ clrl d0 ++ movl %sp@(4),%a0 ++ movl %d0,%a0@+ ++ movl %d1,%a0@ ++ clrl %d0 + rts + +#ifndef SYS___sigsuspend14 + .even +ENTRY(machdep_sys_sigsuspend) -+ movl sp@(4),a0 -+ movl a0@,sp@(4) -+ movl #SYS_sigsuspend,d0 ++ movl %sp@(4),%a0 ++ movl %a0@,%sp@(4) ++ movl #SYS_sigsuspend,%d0 + trap #0 + jcs err -+ clrl d0 ++ clrl %d0 + rts +#endif + +#ifndef SYS___sigprocmask14 + .even +ENTRY(machdep_sys_sigprocmask) -+ tstl sp@(8) ++ tstl %sp@(8) + jne gotptr -+/* movl #0,sp@(8) /* null mask pointer; block empty set */ -+ movl #1,sp@(4) ++/* movl #0,%sp@(8) /* null mask pointer; block empty set */ ++ movl #1,%sp@(4) + jra doit +gotptr: -+ movl sp@(8),a0 -+ movl a0@,sp@(8) ++ movl %sp@(8),%a0 ++ movl %a0@,%sp@(8) +doit: -+ movl #SYS_sigprocmask,d0 ++ movl #SYS_sigprocmask,%d0 + trap #0 + jcs err -+ tstl sp@(12) ++ tstl %sp@(12) + jeq out -+ movl sp@(12),a0 -+ movl d0,a0@ ++ movl %sp@(12),%a0 ++ movl %d0,%a0@ +out: -+ clrl d0 ++ clrl %d0 + rts +#endif diff --git a/devel/mit-pthreads/patches/patch-bo b/devel/mit-pthreads/patches/patch-bo index 1fdf39afdf0..35f3c0b3071 100644 --- a/devel/mit-pthreads/patches/patch-bo +++ b/devel/mit-pthreads/patches/patch-bo @@ -1,7 +1,7 @@ -$NetBSD: patch-bo,v 1.1 1999/07/29 16:44:44 bad Exp $ +$NetBSD: patch-bo,v 1.2 2002/04/11 15:43:37 fredb Exp $ ---- /dev/null Tue Jul 27 03:18:59 1999 -+++ machdep/syscall-template-m68000-netbsd.S Wed Jul 7 04:29:09 1999 +--- machdep/syscall-template-m68000-netbsd.S.orig Thu Apr 11 09:26:27 2002 ++++ machdep/syscall-template-m68000-netbsd.S Thu Apr 11 09:12:45 2002 @@ -0,0 +1,43 @@ +#include <machine/asm.h> +#include <sys/syscall.h> @@ -18,13 +18,13 @@ $NetBSD: patch-bo,v 1.1 1999/07/29 16:44:44 bad Exp $ +#define IMM # +#define SYSCALL(x) .even; \ + ENTRY(machdep_sys_ ## x); \ -+ movl IMM SYS_ ## x,d0; \ ++ movl IMM SYS_ ## x,%d0; \ + trap IMM 0; \ + jcs err; \ + rts +#else /* !__STDC__ */ +#define SYSCALL(x) .even; ENTRY(machdep_sys_/**/x); \ -+ movl #SYS_/**/x,d0; trap #0; jcs err; rts ++ movl #SYS_/**/x,%d0; trap #0; jcs err; rts +#endif /* !__STDC__ */ + +/* @@ -40,7 +40,7 @@ $NetBSD: patch-bo,v 1.1 1999/07/29 16:44:44 bad Exp $ + */ + +err: -+ negl d0 ++ negl %d0 + rts + +#define XSYSCALL(NAME) SYSCALL(NAME) |