Sun Apr 9 18:46:55 2017 UTC ()
no need fo clean vers.c
fix typo


(christos)
diff -r1.31 -r1.32 src/sys/arch/sun68k/stand/libsa/Makefile
diff -r1.4 -r1.5 src/sys/arch/sun68k/stand/libsa/Makefile.inc
cvs diff -r1.31 -r1.32 src/sys/arch/sun68k/stand/libsa/Makefile (expand / switch to unified diff)

--- src/sys/arch/sun68k/stand/libsa/Makefile 2013/11/07 19:52:56 1.31
+++ src/sys/arch/sun68k/stand/libsa/Makefile 2017/04/09 18:46:55 1.32
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.31 2013/11/07 19:52:56 christos Exp $ 1# $NetBSD: Makefile,v 1.32 2017/04/09 18:46:55 christos Exp $
2 2
3# Logically src/sys 3# Logically src/sys
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5S!= cd ${.CURDIR}/../../../..; pwd 5S!= cd ${.CURDIR}/../../../..; pwd
6DIR_SA=${S}/lib/libsa 6DIR_SA=${S}/lib/libsa
7DIR_KERN=${S}/lib/libkern ${S}/lib/libkern/arch/m68k 7DIR_KERN=${S}/lib/libkern ${S}/lib/libkern/arch/m68k
8DIR_LIBC=${S}/../common/lib/libc 8DIR_LIBC=${S}/../common/lib/libc
9 9
10# DEBUG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \ 10# DEBUG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
11# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG -DDEBUG_PROM 11# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG -DDEBUG_PROM
12 12
13CPUFLAGS= # ignore settings in /etc/mk.conf 13CPUFLAGS= # ignore settings in /etc/mk.conf
14DEFS= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t 14DEFS= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
15INCL= -I. -I${.CURDIR} -I${S}/lib/libsa -I${S} -I${S}/arch 15INCL= -I. -I${.CURDIR} -I${S}/lib/libsa -I${S} -I${S}/arch
16AFLAGS= -Wa,-mc68020 -Wa,-mc68851 16AFLAGS= -Wa,-mc68020 -Wa,-mc68851
17.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48 17.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
18# gcc 4.8 convers -mc68000 to -mcpu=68000 and that breaks gas 18# gcc 4.8 convers -mc68000 to -mcpu=68000 and that breaks gas
19# which works for -march=68010 but breaks for -mcpu=68010 19# which works for -march=68010 but breaks for -mcpu=68010
20CFLAGS= -march=68010 20CFLAGS= -march=68010
21.else 21.else
22CFLAGS= -mc68000 -Wa,-mc68010 22CFLAGS= -mc68000 -Wa,-mc68010
23.endif 23.endif
24CFLAGS+= -Wa,-m68851 -msoft-float 24CFLAGS+= -Wa,-m68851 -msoft-float
25CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith 25CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
26COPTS= -Os -fno-defer-pop -ffreestanding -fno-unwind-tables 26COPTS= -Os -fno-defer-pop -ffreestanding -fno-unwind-tables
27CPPFLAGS= ${DEFS} ${DEBUG} ${INCL} 27CPPFLAGS= ${DEFS} ${DEBUG} ${INCL}
28CLEANFILES= SRT0.o SRT1.o vers.c 28CLEANFILES= SRT0.o SRT1.o
29 29
30SRCS= SRT0.S SRT1.c 30SRCS= SRT0.S SRT1.c
31OBJS= SRT0.o SRT1.o 31OBJS= SRT0.o SRT1.o
32 32
33realall: ${OBJS} 33realall: ${OBJS}
34 34
35.include <bsd.prog.mk> 35.include <bsd.prog.mk>
36 36
37### find out what to use for libkern 37### find out what to use for libkern
38KERN_AS= library 38KERN_AS= library
39.include "${S}/lib/libkern/Makefile.inc" 39.include "${S}/lib/libkern/Makefile.inc"
40LIBKERN= ${KERNLIB} 40LIBKERN= ${KERNLIB}
41 41
cvs diff -r1.4 -r1.5 src/sys/arch/sun68k/stand/libsa/Makefile.inc (expand / switch to unified diff)

--- src/sys/arch/sun68k/stand/libsa/Makefile.inc 2017/04/08 19:53:23 1.4
+++ src/sys/arch/sun68k/stand/libsa/Makefile.inc 2017/04/09 18:46:55 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.inc,v 1.4 2017/04/08 19:53:23 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.5 2017/04/09 18:46:55 christos Exp $
2 2
3S!= cd ${SA_EXTRADIR}/../../../..; pwd 3S!= cd ${SA_EXTRADIR}/../../../..; pwd
4 4
5.PATH.c: ${SA_EXTRADIR} 5.PATH.c: ${SA_EXTRADIR}
6 6
7# prefered local sources: gets.c panic.c 7# prefered local sources: gets.c panic.c
8 8
9SRCS+= clock.c dev_disk.c devopen.c \ 9SRCS+= clock.c dev_disk.c devopen.c \
10 idprom.c netif_sun.c \ 10 idprom.c netif_sun.c \
11 promboot.c promcons.c promdev.c putstr.c \ 11 promboot.c promcons.c promdev.c putstr.c \
12 sun2.c sun3.c sun3x.c xxboot.c 12 sun2.c sun3.c sun3x.c xxboot.c
13 13
14.PATH.S: ${S}/arch/sun68k/sun68k 14.PATH.S: ${S}/arch/sun68k/sun68k
15SRCS+= ctrlsp.S 15SRCS+= ctrlsp.S
16 16
17# XXX libkern builds these only on m68000 17# XXX libkern builds these only on m68000
18.PATH.S: ${S}/../common/lib/libc/arch/m68k/gen 18.PATH.S: ${S}/../common/lib/libc/arch/m68k/gen
19SRCS+= mulsi3.S divsi3.S udivsi3.S modsi3.S umodsi3.S 19SRCS+= mulsi3.S divsi3.S udivsi3.S modsi3.S umodsi3.S
20 20
21VERSIONFILE=${SA_EXTRADIR}/vers 21VERSIONFILE=${SA_EXTRADIR}/version
22.include "${S}/conf/newvers_stand.mk" 22.include "${S}/conf/newvers_stand.mk"