Tue Jun 7 20:05:46 2011 UTC ()
Catch up with addition of putstr32.S.


(joerg)
diff -r1.33 -r1.34 src/sys/arch/i386/stand/lib/Makefile
cvs diff -r1.33 -r1.34 src/sys/arch/i386/stand/lib/Makefile (switch to unified diff)

--- src/sys/arch/i386/stand/lib/Makefile 2011/06/02 18:53:00 1.33
+++ src/sys/arch/i386/stand/lib/Makefile 2011/06/07 20:05:46 1.34
@@ -1,74 +1,75 @@ @@ -1,74 +1,75 @@
1# $NetBSD: Makefile,v 1.33 2011/06/02 18:53:00 dsl Exp $ 1# $NetBSD: Makefile,v 1.34 2011/06/07 20:05:46 joerg Exp $
2 2
3S?= ${.CURDIR}/../../../.. 3S?= ${.CURDIR}/../../../..
4 4
5LIB= i386 5LIB= i386
6NOPIC=# defined 6NOPIC=# defined
7NOPROFILE=# defined 7NOPROFILE=# defined
8 8
9I386_INCLUDE_DISK?= yes 9I386_INCLUDE_DISK?= yes
10I386_INCLUDE_DOS?= no 10I386_INCLUDE_DOS?= no
11I386_INCLUDE_BUS?= no 11I386_INCLUDE_BUS?= no
12I386_INCLUDE_PS2?= yes 12I386_INCLUDE_PS2?= yes
13 13
14AFLAGS.biosdelay.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 14AFLAGS.biosdelay.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
15AFLAGS.biosgetrtc.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 15AFLAGS.biosgetrtc.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
16AFLAGS.biosgetsystime.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 16AFLAGS.biosgetsystime.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
17AFLAGS.biosmca.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 17AFLAGS.biosmca.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
18AFLAGS.biosmemps2.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 18AFLAGS.biosmemps2.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
19AFLAGS.biosmem.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 19AFLAGS.biosmem.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
20AFLAGS.biosmemx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 20AFLAGS.biosmemx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
21AFLAGS.biosreboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 21AFLAGS.biosreboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
22AFLAGS.biosvbe.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 22AFLAGS.biosvbe.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
23AFLAGS.biosvideomode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 23AFLAGS.biosvideomode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
24AFLAGS.bios_disk.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 24AFLAGS.bios_disk.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
25AFLAGS.bios_pci.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 25AFLAGS.bios_pci.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
26AFLAGS.comio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 26AFLAGS.comio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
27AFLAGS.conio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 27AFLAGS.conio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
28AFLAGS.dos_file.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 28AFLAGS.dos_file.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
29AFLAGS.dump_eax.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 29AFLAGS.dump_eax.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
30AFLAGS.message.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 30AFLAGS.message.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
31AFLAGS.message32.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 31AFLAGS.message32.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
32AFLAGS.pvcopy.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 32AFLAGS.pvcopy.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
33AFLAGS.putstr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 33AFLAGS.putstr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 34AFLAGS.putstr32.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
34AFLAGS.realprot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 35AFLAGS.realprot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
35 36
36CPPFLAGS= -I$S/lib/libsa ${I386CPPFLAGS} ${I386MISCCPPFLAGS} 37CPPFLAGS= -I$S/lib/libsa ${I386CPPFLAGS} ${I386MISCCPPFLAGS}
37#CPPFLAGS+= -DDISK_DEBUG 38#CPPFLAGS+= -DDISK_DEBUG
38#CPPFLAGS+= -DNO_DISKLABEL 39#CPPFLAGS+= -DNO_DISKLABEL
39#CPPFLAGS+= -DNO_GPT 40#CPPFLAGS+= -DNO_GPT
40#CPPFLAGS+= -DSAVE_MEMORY 41#CPPFLAGS+= -DSAVE_MEMORY
41 42
42SRCS= pcio.c conio.S comio.S comio_direct.c biosvideomode.S 43SRCS= pcio.c conio.S comio.S comio_direct.c biosvideomode.S
43SRCS+= getsecs.c biosgetrtc.S biosdelay.S biosreboot.S gatea20.c 44SRCS+= getsecs.c biosgetrtc.S biosdelay.S biosreboot.S gatea20.c
44SRCS+= biosmem.S getextmemx.c biosmemx.S printmemlist.c 45SRCS+= biosmem.S getextmemx.c biosmemx.S printmemlist.c
45SRCS+= pread.c menuutils.c parseutils.c 46SRCS+= pread.c menuutils.c parseutils.c
46SRCS+= bootinfo.c bootinfo_biosgeom.c bootinfo_memmap.c 47SRCS+= bootinfo.c bootinfo_biosgeom.c bootinfo_memmap.c
47SRCS+= startprog.S multiboot.S 48SRCS+= startprog.S multiboot.S
48SRCS+= biosgetsystime.S cpufunc.S bootmenu.c 49SRCS+= biosgetsystime.S cpufunc.S bootmenu.c
49SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S putstr32.S 50SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S putstr32.S
50SRCS+= rasops.c vbe.c biosvbe.S 51SRCS+= rasops.c vbe.c biosvbe.S
51.if (${I386_INCLUDE_DISK} == "yes") 52.if (${I386_INCLUDE_DISK} == "yes")
52SRCS+= biosdisk.c biosdisk_ll.c bios_disk.S 53SRCS+= biosdisk.c biosdisk_ll.c bios_disk.S
53.endif 54.endif
54.if (${I386_INCLUDE_DOS} == "yes") 55.if (${I386_INCLUDE_DOS} == "yes")
55SRCS+= dosfile.c dos_file.S 56SRCS+= dosfile.c dos_file.S
56.endif 57.endif
57.if (${I386_INCLUDE_DISK} == "yes") || (${I386_INCLUDE_DOS} == "yes") 58.if (${I386_INCLUDE_DISK} == "yes") || (${I386_INCLUDE_DOS} == "yes")
58SRCS+= diskbuf.c 59SRCS+= diskbuf.c
59.endif 60.endif
60.if (${I386_INCLUDE_BUS} == "yes") 61.if (${I386_INCLUDE_BUS} == "yes")
61SRCS+= biospci.c bios_pci.S isapnp.c isadma.c 62SRCS+= biospci.c bios_pci.S isapnp.c isadma.c
62.endif 63.endif
63.if (${I386_INCLUDE_PS2} == "yes") 64.if (${I386_INCLUDE_PS2} == "yes")
64SRCS+= biosmca.S biosmemps2.S 65SRCS+= biosmca.S biosmemps2.S
65.endif 66.endif
66 67
67.include <bsd.own.mk> 68.include <bsd.own.mk>
68.undef DESTDIR 69.undef DESTDIR
69.include <bsd.lib.mk> 70.include <bsd.lib.mk>
70 71
71lib${LIB}.o:: ${OBJS} 72lib${LIB}.o:: ${OBJS}
72 @echo building standard ${LIB} library 73 @echo building standard ${LIB} library
73 @rm -f lib${LIB}.o 74 @rm -f lib${LIB}.o
74 @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort` 75 @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`