Module Name: src
Committed By: christos
Date: Thu Nov 7 00:43:16 UTC 2013
Modified Files:
src/sys/arch/sun68k/stand: Makefile.inc
src/sys/arch/sun68k/stand/libsa: Makefile
Log Message:
avoid confusion with 68010 and 68020. The sun3 always was a 68020, and
the code assumes that.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun68k/stand/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sun68k/stand/libsa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun68k/stand/Makefile.inc
diff -u src/sys/arch/sun68k/stand/Makefile.inc:1.19 src/sys/arch/sun68k/stand/Makefile.inc:1.20
--- src/sys/arch/sun68k/stand/Makefile.inc:1.19 Mon Aug 12 12:34:05 2013
+++ src/sys/arch/sun68k/stand/Makefile.inc Wed Nov 6 19:43:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.20 2013/11/07 00:43:15 christos Exp $
# Must have S=/usr/src/sys (or equivalent)
# But note: this is w.r.t. a subdirectory
@@ -18,7 +18,7 @@ RELOC?= 240000
DEFS?= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
INCL?= -I. -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
-CPUFLAGS= -mc68000 -Wa,-mc68010
+CPUFLAGS= -m68020 -Wa,-mc68020
COPTS= -Os -fno-defer-pop -ffreestanding -fno-unwind-tables
CFLAGS= -msoft-float
CPPFLAGS= ${DEFS} ${DEBUG} ${INCL}
Index: src/sys/arch/sun68k/stand/libsa/Makefile
diff -u src/sys/arch/sun68k/stand/libsa/Makefile:1.29 src/sys/arch/sun68k/stand/libsa/Makefile:1.30
--- src/sys/arch/sun68k/stand/libsa/Makefile:1.29 Mon Aug 12 12:34:05 2013
+++ src/sys/arch/sun68k/stand/libsa/Makefile Wed Nov 6 19:43:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2013/11/07 00:43:15 christos Exp $
# Logically src/sys
S!= cd ${.CURDIR}/../../../..; pwd
@@ -12,8 +12,8 @@ DIR_LIBC=${S}/../common/lib/libc
CPUFLAGS= # ignore settings in /etc/mk.conf
DEFS= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
INCL= -I. -I${.CURDIR} -I${S}/lib/libsa -I${S} -I${S}/arch
-AFLAGS= -Wa,-mc68020 -Wa,-mc68851
-CFLAGS= -mc68000 -Wa,-mc68010 -Wa,-m68851 -msoft-float
+AFLAGS= -Wa,-m68020 -Wa,-m68851
+CFLAGS= -m68020 ${AFLAGS} -msoft-float
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
COPTS= -Os -fno-defer-pop -ffreestanding -fno-unwind-tables
CPPFLAGS= ${DEFS} ${DEBUG} ${INCL}
