Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/yamt-uio_vmspace]: src/sys sync with head.
details: https://anonhg.NetBSD.org/src/rev/82434992d22d
branches: yamt-uio_vmspace
changeset: 586699:82434992d22d
user: yamt <yamt%NetBSD.org@localhost>
date: Sun Jan 15 10:02:36 2006 +0000
description:
sync with head.
diffstat:
sys/arch/acorn26/include/intr.h | 5 +-
sys/arch/alpha/alpha/trap.c | 8 +-
sys/arch/amd64/amd64/netbsd32_machdep.c | 8 +-
sys/arch/amd64/conf/GENERIC | 5 +-
sys/arch/amd64/conf/INSTALL | 5 +-
sys/arch/amd64/include/sysarch.h | 36 +-
sys/arch/amd64/include/vmparam.h | 18 +-
sys/arch/amiga/stand/bootblock/boot/Makefile | 11 +-
sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile | 10 +-
sys/arch/arm/footbridge/footbridge_intr.h | 22 +-
sys/arch/arm/sa11x0/sa1111.c | 8 +-
sys/arch/arm/sa11x0/sa11x0.c | 10 +-
sys/arch/cobalt/include/intr.h | 3 +-
sys/arch/evbarm/include/intr.h | 19 +-
sys/arch/evbmips/alchemy/machdep.c | 6 +-
sys/arch/evbppc/explora/machdep.c | 24 +-
sys/arch/ews4800mips/conf/GENERIC | 36 +-
sys/arch/ews4800mips/conf/RAMDISK | 61 +-
sys/arch/ews4800mips/stand/boot/Makefile | 25 +-
sys/arch/hpc/stand/hpcboot/load.cpp | 50 +-
sys/arch/hpc/stand/hpcboot/load_elf.cpp | 12 +-
sys/arch/hpc/stand/include/machine/endian.h | 54 +-
sys/arch/hpc/stand/include/machine/types.h | 37 +-
sys/arch/hpcarm/conf/INSTALL_IPAQ | 4 +-
sys/arch/hpcarm/conf/JORNADA720 | 15 +-
sys/arch/hpcarm/conf/files.hpcarm | 17 +-
sys/arch/hpcsh/conf/GENERIC | 32 +-
sys/arch/hpcsh/conf/files.hpcsh | 33 +-
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c | 8 +-
sys/arch/hpcsh/dev/hd64461/hd64461video.c | 6 +-
sys/arch/hpcsh/hpcsh/autoconf.c | 6 +-
sys/arch/i386/conf/GENERIC | 9 +-
sys/arch/i386/conf/GENERIC.MPACPI | 1254 +-------------------
sys/arch/i386/conf/GENERIC_LAPTOP | 15 +-
sys/arch/i386/conf/INSTALL | 3 +-
sys/arch/i386/conf/INSTALL_LAPTOP | 3 +-
sys/arch/i386/conf/XEN0 | 3 +-
sys/arch/i386/conf/files.i386 | 9 +-
sys/arch/i386/i386/est.c | 20 +-
sys/arch/i386/i386/identcpu.c | 10 +-
sys/arch/i386/i386/powernow_k7.c | 383 ++++++
sys/arch/i386/include/cpu.h | 5 +-
sys/arch/i386/pci/pci_intr_fixup.c | 13 +-
sys/arch/i386/pci/pci_intr_fixup.h | 4 +-
sys/arch/i386/pci/via8231.c | 319 +++++
sys/arch/i386/pci/via8231reg.h | 137 ++
sys/arch/iyonix/include/intr.h | 19 +-
sys/arch/macppc/conf/GENERIC | 5 +-
sys/arch/macppc/conf/INSTALL | 3 +-
sys/arch/mips/mips/locore_mips1.S | 4 +-
sys/arch/mips/sibyte/dev/sbwdog.c | 6 +-
sys/arch/powerpc/include/ibm4xx/ibm4xx_intr.h | 4 +-
sys/arch/sgimips/conf/GENERIC32_IP12 | 7 +-
sys/arch/sh3/include/asm.h | 106 +-
sys/arch/sh3/include/lock.h | 10 +-
sys/arch/sh3/include/setjmp.h | 17 +-
sys/arch/sh3/sh3/cache.c | 42 +-
sys/arch/sh3/sh3/cpu.c | 6 +-
sys/arch/sh3/sh3/mmu.c | 19 +-
sys/arch/sparc/dev/fd.c | 17 +-
sys/arch/sparc/include/param.h | 4 +-
sys/arch/sparc64/conf/GENERIC32 | 18 +-
sys/arch/sparc64/sparc64/locore.s | 6 +-
sys/arch/sparc64/sparc64/pmap.c | 5 +-
sys/arch/x86/x86/bus_dma.c | 6 +-
sys/arch/x86/x86/lapic.c | 18 +-
sys/arch/xen/i386/npx.c | 10 +-
sys/arch/xen/i386/xen_shm_machdep.c | 3 +-
sys/arch/xen/include/if_xennetvar.h | 58 +-
sys/arch/xen/xen/if_xennet.c | 60 +-
sys/arch/xen/xen/privcmd.c | 10 +-
sys/coda/coda_vnops.c | 17 +-
sys/conf/copyright | 2 +-
sys/conf/files | 4 +-
sys/dev/acpi/acpica/Osd/OsdMisc.c | 12 +-
sys/dev/acpi/files.acpi | 5 +-
sys/dev/ata/ata_raid.c | 16 +-
sys/dev/ata/wd.c | 11 +-
sys/dev/cgd.c | 16 +-
sys/dev/dkwedge/dk.c | 8 +-
sys/dev/fss.c | 33 +-
sys/dev/ic/com.c | 6 +-
sys/dev/ic/gem.c | 7 +-
sys/dev/ic/ninjascsi32.c | 27 +-
sys/dev/isa/fd.c | 17 +-
sys/dev/kloader.c | 19 +-
sys/dev/mii/files.mii | 6 +-
sys/dev/mii/miidevs | 5 +-
sys/dev/mii/miidevs.h | 8 +-
sys/dev/mii/miidevs_data.h | 5 +-
sys/dev/mii/rlphy.c | 328 +++++
sys/dev/pci/azalia.c | 70 +-
sys/dev/pci/azalia.h | 3 +-
sys/dev/pci/azalia_codec.c | 63 +-
sys/dev/pci/if_fxp_pci.c | 7 +-
sys/dev/pci/pcidevs | 17 +-
sys/dev/pci/pcidevs.h | 19 +-
sys/dev/pci/pcidevs_data.h | 54 +-
sys/dev/pci/pciide_common.c | 27 +-
sys/dev/pci/viaide.c | 19 +-
sys/dev/pcmcia/wdc_pcmcia.c | 8 +-
sys/dev/raidframe/rf_dagfuncs.c | 37 +-
sys/dev/raidframe/rf_dagfuncs.h | 5 +-
sys/dev/raidframe/rf_dagutils.c | 13 +-
sys/dev/raidframe/rf_diskqueue.c | 20 +-
sys/dev/raidframe/rf_netbsd.h | 3 +-
sys/dev/raidframe/rf_netbsdkintf.c | 147 +-
sys/dev/scsipi/cd.c | 23 +-
sys/dev/vnd.c | 293 +--
sys/fs/msdosfs/msdosfs_vnops.c | 6 +-
sys/fs/smbfs/smbfs_io.c | 16 +-
sys/fs/union/union_vfsops.c | 30 +-
sys/kern/kern_physio.c | 15 +-
sys/kern/vfs_bio.c | 161 ++-
sys/kern/vfs_subr.c | 13 +-
sys/kern/vfs_vnops.c | 8 +-
sys/lib/libsa/cread.c | 4 +-
sys/lib/libsa/stand.h | 4 +-
sys/lib/libsa/write.c | 7 +-
sys/lib/libz/Makefile | 25 +-
sys/lib/libz/crc32.c | 44 -
sys/lib/libz/infblock.c | 383 ------
sys/lib/libz/infblock.h | 33 -
sys/lib/libz/infcodes.c | 253 ----
sys/lib/libz/infcodes.h | 29 -
sys/lib/libz/inffast.c | 185 --
sys/lib/libz/inffast.h | 19 -
sys/lib/libz/inffixed.h | 151 --
sys/lib/libz/inflate.c | 164 --
sys/lib/libz/inftrees.c | 456 -------
sys/lib/libz/inftrees.h | 60 -
sys/lib/libz/infutil.c | 105 -
sys/lib/libz/infutil.h | 98 -
sys/lib/libz/libz.h | 6 +
sys/lib/libz/uncompr.c | 60 -
sys/lib/libz/zconf.h | 281 ----
sys/lib/libz/zlib.h | 861 -------------
sys/lib/libz/zutil.h | 255 ----
sys/lkm/arch/i386/Makefile | 5 +
sys/lkm/arch/i386/Makefile.inc | 5 +
sys/lkm/arch/i386/powernow/Makefile | 20 +
sys/lkm/arch/i386/powernow/lkminit_powernow.c | 120 +
sys/miscfs/genfs/genfs_vnops.c | 96 +-
sys/net/if_bridge.c | 6 +-
sys/net/if_ppp.c | 6 +-
sys/net/pfil.h | 8 +-
sys/net/zlib.c | 18 +-
sys/net/zlib.h | 18 +-
sys/net80211/ieee80211_ioctl.c | 14 +-
sys/net80211/ieee80211_node.c | 6 +-
sys/nfs/Makefile | 4 +-
sys/nfs/nfs.h | 16 +-
sys/nfs/nfs_bio.c | 5 +-
sys/nfs/nfs_export.c | 49 +-
sys/nfs/nfs_node.c | 20 +-
sys/nfs/nfs_serv.c | 8 +-
sys/nfs/nfs_socket.c | 195 ++-
sys/nfs/nfs_syscalls.c | 112 +-
sys/nfs/nfs_var.h | 422 +++---
sys/sys/buf.h | 19 +-
sys/sys/envsys.h | 4 +-
sys/sys/lock.h | 4 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 6 +-
sys/ufs/ffs/ffs_extern.h | 3 +-
sys/ufs/ffs/ffs_snapshot.c | 16 +-
sys/ufs/ffs/ffs_subr.c | 35 +-
sys/ufs/ffs/ffs_vfsops.c | 5 +-
sys/ufs/lfs/lfs_bio.c | 15 +-
sys/ufs/lfs/lfs_extern.h | 4 +-
sys/ufs/lfs/lfs_segment.c | 16 +-
sys/ufs/lfs/lfs_subr.c | 34 +-
sys/ufs/lfs/lfs_vfsops.c | 15 +-
sys/ufs/ufs/ufs_dirhash.c | 16 +-
sys/ufs/ufs/ufs_extern.h | 3 +-
sys/ufs/ufs/ufs_lookup.c | 118 +-
sys/ufs/ufs/ufsmount.h | 5 +-
sys/uvm/uvm_map.c | 116 +-
sys/uvm/uvm_pager.c | 8 +-
sys/uvm/uvm_pdaemon.c | 6 +-
sys/uvm/uvm_swap.c | 11 +-
180 files changed, 3561 insertions(+), 6407 deletions(-)
diffs (truncated from 15384 to 300 lines):
diff -r a36ea28d490b -r 82434992d22d sys/arch/acorn26/include/intr.h
--- a/sys/arch/acorn26/include/intr.h Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/acorn26/include/intr.h Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2005/12/11 12:16:04 christos Exp $ */
+/* $NetBSD: intr.h,v 1.5.2.1 2006/01/15 10:02:36 yamt Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -56,6 +56,7 @@
#define IPL_STATCLOCK 10
#define IPL_SCHED 11
#define IPL_HIGH 12
+#define IPL_LOCK IPL_HIGH
#define NIPL IPL_HIGH + 1
#if defined(_KERNEL) && !defined(_LOCORE)
@@ -78,6 +79,8 @@
/* #define splsched() splhigh() */
#define spllock() splhigh()
+#define splraiseipl(x) (((x) == IPL_HIGH) ? splhigh() : raisespl(x))
+
#define spl0() lowerspl(IPL_NONE)
#define spllowersoftclock() lowerspl(IPL_SOFTCLOCK)
#define splx(s) lowerspl(s)
diff -r a36ea28d490b -r 82434992d22d sys/arch/alpha/alpha/trap.c
--- a/sys/arch/alpha/alpha/trap.c Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/alpha/alpha/trap.c Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.102 2005/12/11 12:16:10 christos Exp $ */
+/* $NetBSD: trap.c,v 1.102.2.1 2006/01/15 10:02:36 yamt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.102 2005/12/11 12:16:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.102.2.1 2006/01/15 10:02:36 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -689,8 +689,8 @@
uvmexp.softs++;
l->l_md.md_tf = framep;
- if (l->l_flag & P_OWEUPC) {
- l->l_flag &= ~P_OWEUPC;
+ if (l->l_proc->p_flag & P_OWEUPC) {
+ l->l_proc->p_flag &= ~P_OWEUPC;
ADDUPROF(l->l_proc);
}
diff -r a36ea28d490b -r 82434992d22d sys/arch/amd64/amd64/netbsd32_machdep.c
--- a/sys/arch/amd64/amd64/netbsd32_machdep.c Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.18 2005/12/11 12:16:21 christos Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.18.2.1 2006/01/15 10:02:36 yamt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.18 2005/12/11 12:16:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.18.2.1 2006/01/15 10:02:36 yamt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_execfmt.h"
@@ -89,7 +89,7 @@
* for i386 a.out emulation (COMPAT_NETBSD32+EXEC_AOUT).
*/
int
-cpu_exec_aout_makecmds(struct proc *p, struct exec_package *e)
+cpu_exec_aout_makecmds(struct lwp *p, struct exec_package *e)
{
return ENOEXEC;
@@ -873,5 +873,5 @@
vaddr_t
netbsd32_vm_default_addr(struct proc *p, vaddr_t base, vsize_t size)
{
- return round_page((vaddr_t)(base) + (vsize_t)MAXDSIZ32);
+ return VM_DEFAULT_ADDRESS32(base, size);
}
diff -r a36ea28d490b -r 82434992d22d sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amd64/conf/GENERIC Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.78 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: GENERIC,v 1.78.2.1 2006/01/15 10:02:36 yamt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.78 $"
+#ident "GENERIC-$Revision: 1.78.2.1 $"
maxusers 32 # estimated number of users
@@ -585,6 +585,7 @@
nsphyter* at mii? phy ? # NS83843 PHYs
pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
+rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
diff -r a36ea28d490b -r 82434992d22d sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amd64/conf/INSTALL Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.44 2005/12/20 05:35:27 thorpej Exp $
+# $NetBSD: INSTALL,v 1.44.2.1 2006/01/15 10:02:36 yamt Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/amd64/conf/std.amd64"
-#ident "INSTALL-$Revision: 1.44 $"
+#ident "INSTALL-$Revision: 1.44.2.1 $"
maxusers 32 # estimated number of users
@@ -482,6 +482,7 @@
nsphyter* at mii? phy ? # NS83843 PHYs
pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
+rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
diff -r a36ea28d490b -r 82434992d22d sys/arch/amd64/include/sysarch.h
--- a/sys/arch/amd64/include/sysarch.h Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amd64/include/sysarch.h Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.4 2005/12/11 12:16:25 christos Exp $ */
+/* $NetBSD: sysarch.h,v 1.4.2.1 2006/01/15 10:02:36 yamt Exp $ */
#ifndef _AMD64_SYSARCH_H_
#define _AMD64_SYSARCH_H_
@@ -79,6 +79,12 @@
u_int64_t time;
};
+#else
+/* Silence the build */
+struct x86_64_pmc_info_args;
+struct x86_64_pmc_startstop_args;
+struct x86_64_pmc_read_args;
+
#endif /* todo */
struct x86_64_get_mtrr_args {
@@ -93,24 +99,24 @@
#ifdef _KERNEL
-int x86_64_iopl __P((struct lwp *, void *, register_t *));
-int x86_64_get_mtrr __P((struct lwp *, void *, register_t *));
-int x86_64_set_mtrr __P((struct lwp *, void *, register_t *));
+int x86_64_iopl(struct lwp *, void *, register_t *);
+int x86_64_get_mtrr(struct lwp *, void *, register_t *);
+int x86_64_set_mtrr(struct lwp *, void *, register_t *);
#else
#include <sys/cdefs.h>
__BEGIN_DECLS
-int x86_64_get_ldt __P((void *, int));
-int x86_64_set_ldt __P((void *, int));
-int x86_64_iopl __P((int));
-int x86_64_get_ioperm __P((u_long *));
-int x86_64_set_ioperm __P((u_long *));
-int x86_64_pmc_info __P((struct x86_64_pmc_info_args *));
-int x86_64_pmc_startstop __P((struct x86_64_pmc_startstop_args *));
-int x86_64_pmc_read __P((struct x86_64_pmc_read_args *));
-int x86_64_set_mtrr __P((struct mtrr *, int *));
-int x86_64_get_mtrr __P((struct mtrr *, int *));
-int sysarch __P((int, void *));
+int x86_64_get_ldt(void *, int);
+int x86_64_set_ldt(void *, int);
+int x86_64_iopl(int);
+int x86_64_get_ioperm(u_long *);
+int x86_64_set_ioperm(u_long *);
+int x86_64_pmc_info(struct x86_64_pmc_info_args *);
+int x86_64_pmc_startstop(struct x86_64_pmc_startstop_args *);
+int x86_64_pmc_read(struct x86_64_pmc_read_args *);
+int x86_64_set_mtrr(struct mtrr *, int *);
+int x86_64_get_mtrr(struct mtrr *, int *);
+int sysarch(int, void *);
__END_DECLS
#endif
diff -r a36ea28d490b -r 82434992d22d sys/arch/amd64/include/vmparam.h
--- a/sys/arch/amd64/include/vmparam.h Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amd64/include/vmparam.h Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.10 2005/12/11 12:16:25 christos Exp $ */
+/* $NetBSD: vmparam.h,v 1.10.2.1 2006/01/15 10:02:36 yamt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -89,13 +89,13 @@
#define DFLDSIZ32 (256*1024*1024) /* initial data size limit */
#endif
#ifndef MAXDSIZ32
-#define MAXDSIZ32 (2L*1024*1024*1024) /* max data size */
+#define MAXDSIZ32 (3U*1024*1024*1024) /* max data size */
#endif
#ifndef DFLSSIZ32
#define DFLSSIZ32 (2*1024*1024) /* initial stack size limit */
#endif
#ifndef MAXSSIZ32
-#define MAXSSIZ32 (32*1024*1024) /* max stack size */
+#define MAXSSIZ32 (64*1024*1024) /* max stack size */
#endif
/*
@@ -124,6 +124,18 @@
#define VM_MAXUSER_ADDRESS32 0xfffff000
/*
+ * The address to which unspecified mapping requests default
+ */
+#ifdef _KERNEL_OPT
+#include "opt_uvm.h"
+#endif
+#define __USE_TOPDOWN_VM
+#define VM_DEFAULT_ADDRESS(da, sz) \
+ trunc_page(USRSTACK - MAXSSIZ - (sz))
+#define VM_DEFAULT_ADDRESS32(da, sz) \
+ trunc_page(USRSTACK32 - MAXSSIZ32 - (sz))
+
+/*
* XXXfvdl we have plenty of KVM now, remove this.
*/
#ifndef VM_MAX_KERNEL_BUF
diff -r a36ea28d490b -r 82434992d22d sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/12/11 12:16:36 christos Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2006/01/15 10:02:36 yamt Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -9,8 +9,13 @@
DIR_LIBZ = ${DIR_TOP}/lib/libz
DIR_KERN= ${DIR_TOP}/lib/libkern
DIR_KERN_MD= ${DIR_TOP}/lib/libkern/arch/$(MACHINE_ARCH)
+DIR_LIBC= ${DIR_TOP}/../common/lib/libc
-.PATH: $(DIR_SA) ${DIR_LIBZ} $(DIR_KERN) $(DIR_KERN_MD)
+.PATH: $(DIR_SA) ${DIR_LIBZ} $(DIR_KERN) $(DIR_KERN_MD) \
+ ${DIR_LIBC}/gen ${DIR_LIBC}/arch/m68k/gen \
+ ${DIR_LIBC}/inet ${DIR_LIBC}/arch/m68k/inet \
+ ${DIR_LIBC}/quad ${DIR_LIBC}/arch/m68k/quad \
+ ${DIR_LIBC}/string ${DIR_LIBC}/arch/m68k/string
# prefer our assembler versions over assembler, and assembler over C:
@@ -26,7 +31,7 @@
COBJS+= divdi3.o moddi3.o qdivrem.o snprintf.o
SOBJS = alloc.o ashrdi3.o ashldi3.o bcopy.o muldi3.o printf.o startit.o
-SOBJS += strlen.o strcmp.o memcmp.o strerror.o sprintf.o subr_prf.o
+SOBJS += strlen.o memcmp.o strerror.o sprintf.o subr_prf.o
SOBJS += libstubs.o memcmp.o memmove.o memset.o strncmp.o
OBJS= $(SOBJS) $(COBJS)
diff -r a36ea28d490b -r 82434992d22d sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Sat Dec 31 16:29:01 2005 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Sun Jan 15 10:02:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/11 12:16:36 christos Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/01/15 10:02:36 yamt Exp $
### what we need:
@@ -6,8 +6,14 @@
DIR_SA = ${DIR_TOP}/lib/libsa
DIR_KERN= ${DIR_TOP}/lib/libkern
DIR_KERN_MD= ${DIR_TOP}/lib/libkern/arch/$(MACHINE_ARCH)
+DIR_LIBC= ${DIR_TOP}/../common/lib/libc
-.PATH: ${.CURDIR}/../boot $(DIR_SA) $(DIR_KERN) $(DIR_KERN_MD)
+.PATH: ${.CURDIR}/../boot $(DIR_SA) $(DIR_KERN) $(DIR_KERN_MD) \
+ ${DIR_LIBC}/gen ${DIR_LIBC}/arch/m68k/gen \
+ ${DIR_LIBC}/inet ${DIR_LIBC}/arch/m68k/inet \
+ ${DIR_LIBC}/quad ${DIR_LIBC}/arch/m68k/quad \
+ ${DIR_LIBC}/string ${DIR_LIBC}/arch/m68k/string
Home |
Main Index |
Thread Index |
Old Index