Prefix register names with '%' in included mit-pthreads to let this build
on current/m68k (plus minor clean-ups: a paste-o and whitespace).
This commit is contained in:
fredb
parent
58dba79df2
commit
c1136110cc
4 changed files with 160 additions and 1 deletions
|
|
@ -1,8 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.12 2002/03/25 15:19:30 briggs Exp $
|
||||
$NetBSD: distinfo,v 1.13 2002/04/11 13:45:24 fredb Exp $
|
||||
|
||||
SHA1 (mysql-3.23.49.tar.gz) = 0256331c7aa9388955148f80cdca382f467ad1be
|
||||
Size (mysql-3.23.49.tar.gz) = 11844905 bytes
|
||||
SHA1 (patch-aa) = d40a52dd115b3fd4236d66c2c5946fddc04f13cb
|
||||
SHA1 (patch-ab) = 8e80dc2b0def56f3453395f8310e71f8113c7ccd
|
||||
SHA1 (patch-ac) = 29fbb5bac3a81c3f9197c2d9ff84b795cdfbcaed
|
||||
SHA1 (patch-ad) = 7127dd00a6067aa06a563c13dde1ea25e70fa7bf
|
||||
SHA1 (patch-ae) = 81fa0273261ea44c599cf44f5a3a56935c3a62bd
|
||||
SHA1 (patch-af) = 78acdcd5a0f65ecaf545561eb3d450fa43746d1a
|
||||
SHA1 (patch-ah) = 7cd4278c9bdc5220de04f7e6b62bb8d11c892ffb
|
||||
|
|
|
|||
34
databases/mysql-server/patches/patch-ab
Normal file
34
databases/mysql-server/patches/patch-ab
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
$NetBSD: patch-ab,v 1.6 2002/04/11 13:45:24 fredb Exp $
|
||||
|
||||
--- mit-pthreads/machdep/engine-m68000-netbsd.c.orig Thu Feb 14 11:30:25 2002
|
||||
+++ mit-pthreads/machdep/engine-m68000-netbsd.c
|
||||
@@ -66,14 +66,14 @@
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
- * 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]) );
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
@@ -83,9 +83,8 @@
|
||||
{
|
||||
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]) );
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
93
databases/mysql-server/patches/patch-ac
Normal file
93
databases/mysql-server/patches/patch-ac
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
$NetBSD: patch-ac,v 1.6 2002/04/11 13:45:25 fredb Exp $
|
||||
|
||||
--- mit-pthreads/machdep/syscall-m68000-netbsd.S.orig Thu Feb 14 11:30:15 2002
|
||||
+++ mit-pthreads/machdep/syscall-m68000-netbsd.S
|
||||
@@ -10,10 +10,10 @@
|
||||
#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__ */
|
||||
|
||||
/*
|
||||
@@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
err:
|
||||
- negl d0
|
||||
+ negl %d0
|
||||
rts
|
||||
|
||||
/* ==========================================================================
|
||||
@@ -37,47 +37,47 @@
|
||||
*/
|
||||
.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_compat_13_sigsuspend13,d0
|
||||
+ movl %sp@(4),%a0
|
||||
+ movl %a0@,%sp@(4)
|
||||
+ movl #SYS_compat_13_sigsuspend13,%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_compat_13_sigprocmask13,d0
|
||||
+ movl #SYS_compat_13_sigprocmask13,%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
|
||||
29
databases/mysql-server/patches/patch-ad
Normal file
29
databases/mysql-server/patches/patch-ad
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
$NetBSD: patch-ad,v 1.4 2002/04/11 13:45:25 fredb Exp $
|
||||
|
||||
--- mit-pthreads/machdep/syscall-template-m68000-netbsd.S.orig Thu Feb 14 11:30:13 2002
|
||||
+++ mit-pthreads/machdep/syscall-template-m68000-netbsd.S
|
||||
@@ -13,13 +13,13 @@
|
||||
#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__ */
|
||||
|
||||
/*
|
||||
@@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
err:
|
||||
- negl d0
|
||||
+ negl %d0
|
||||
rts
|
||||
|
||||
#define XSYSCALL(NAME) SYSCALL(NAME)
|
||||
Loading…
Reference in a new issue