[src/trunk]: src/sys/arch/amiga/stand/bootblock Make the bootblocks compile a...

[is <is%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/300eca405a18
branches:  trunk
changeset: 586801:300eca405a18
user:      is <is%NetBSD.org@localhost>
date:      Mon Jan 02 22:10:31 2006 +0000

description:
Make the bootblocks compile again using the shared libc functions.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/Makefile       |  11 ++++++++---
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile |  10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 5207546acf64 -r 300eca405a18 sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Mon Jan 02 21:53:30 2006 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Mon Jan 02 22:10:31 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2005/12/11 12:16:36 christos Exp $
+#      $NetBSD: Makefile,v 1.36 2006/01/02 22:10:31 is 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 5207546acf64 -r 300eca405a18 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Mon Jan 02 21:53:30 2006 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Mon Jan 02 22:10:31 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2005/12/11 12:16:36 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2006/01/02 22:10:32 is 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
+
 
 # prefer our assembler versions over assembler, and assembler over C: