Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/conf Look at opt_m680x0.h to determine whether...



details:   https://anonhg.NetBSD.org/src/rev/4eb5433f9fa0
branches:  trunk
changeset: 499150:4eb5433f9fa0
user:      minoura <minoura%NetBSD.org@localhost>
date:      Mon Nov 13 14:47:14 2000 +0000

description:
Look at opt_m680x0.h to determine whether to use -m68060 compiler option,
since options M68060 (etc.) is now defopt'ed.
Pointed out by NISHIMURA Takeshi <nsmrtks%comd.nara.sharp.co.jp@localhost>.
Use -m68020-60 instead of -m68060 to ensure not to use new instructions.

diffstat:

 sys/arch/x68k/conf/Makefile.x68k |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r a5c7e2bbb5a6 -r 4eb5433f9fa0 sys/arch/x68k/conf/Makefile.x68k
--- a/sys/arch/x68k/conf/Makefile.x68k  Mon Nov 13 12:16:28 2000 +0000
+++ b/sys/arch/x68k/conf/Makefile.x68k  Mon Nov 13 14:47:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.x68k,v 1.45 2000/05/09 00:56:28 hubertf Exp $
+#      $NetBSD: Makefile.x68k,v 1.46 2000/11/13 14:47:14 minoura Exp $
 
 # Makefile for NetBSD
 #
@@ -47,10 +47,18 @@
 HAVE_EGCS!=    ${CC} --version | egrep "^(2\.8|egcs)" ; echo
 INCLUDES=      -I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dx68k
-.if empty(IDENT:M-DM68060)
+
+M68060!=       ( echo '\#include "opt_m680x0.h"';      \
+                 echo '\#ifdef M68060';                \
+                 echo '1';                             \
+                 echo '\#else';                        \
+                 echo '0';                             \
+                 echo '\#endif' )                      \
+                       | ${CPP} | grep -v '^\#'
+.if ${M68060}
+CMACHFLAGS=    -m68020-60 -Wa,-m68030 -Wa,-m68851
+.else
 CMACHFLAGS=    -m68030
-.else
-CMACHFLAGS=    -m68060 -Wa,-m68030 -Wa,-m68851
 .endif
 CWARNFLAGS?=   -Werror -Wstrict-prototypes -Wmissing-prototypes \
                -Wpointer-arith



Home | Main Index | Thread Index | Old Index