diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-02-20 15:34:09 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-02-20 15:34:09 +0000 |
| commit | f17556d13bd4a06d65712d7669d7519329a545f2 (patch) | |
| tree | 0941454edd28ee67fd817a099d8da57c069bb2c9 | |
| parent | f81f45231aa9d070340f9af9d6c598dc2e8f7cb6 (diff) | |
Do not pass 68060-specific compiler flags anymore.
| -rw-r--r-- | sys/arch/mvme68k/conf/Makefile.mvme68k | 10 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/libsa/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/netboot/Makefile | 4 |
3 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index f9615dad660..ea9176f8e79 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.25 2004/10/08 07:11:04 grange Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.26 2005/02/20 15:34:03 miod Exp $ # This makefile is constructed from a machine description: # config machineid @@ -38,16 +38,10 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -.if empty(IDENT:M-DM68060) -CMACHFLAGS= -m68020 -.else -CMACHFLAGS= -m68060 -Wa,-m68030 -.endif -CMACHFLAGS+= -msoft-float +CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log .if ${IDENT:M-DNO_PROPOLICE} CMACHFLAGS+= -fno-stack-protector .endif -CMACHFLAGS+= -fno-builtin-printf -fno-builtin-log COPTS?= -O2 CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile index 4bacff90fb1..a06e496d90a 100644 --- a/sys/arch/mvme68k/stand/libsa/Makefile +++ b/sys/arch/mvme68k/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/06/02 09:10:34 miod Exp $ +# $OpenBSD: Makefile,v 1.17 2005/02/20 15:34:06 miod Exp $ LIB=sa @@ -36,7 +36,6 @@ SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern} #DEFS= -DCOMPAT_UFS DEFS= -D__INTERNAL_LIBSA_CREAD INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S} -COPTS= -m68060 -Wa,-m68030 CFLAGS+= ${XCFLAGS} -O2 ${COPTS} ${DEFS} ${DBG} ${INCL} .PATH: ${DIR_SA} ${DIR_KERN} diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile index 5982ab54a29..c4350a29a9c 100644 --- a/sys/arch/mvme68k/stand/netboot/Makefile +++ b/sys/arch/mvme68k/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2002/04/16 15:37:04 miod Exp $ +# $OpenBSD: Makefile,v 1.12 2005/02/20 15:34:08 miod Exp $ RELOC=0x6F0000 SIZE?= size @@ -7,7 +7,7 @@ S= ${.CURDIR}/../../../.. DEFS= -DSUN_BOOTPARAMS -DRELOC=${RELOC} INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ -I${S} -I${S}/lib/libsa -CFLAGS= -O2 ${DEFS} ${INCPATH} ${COPTS} -m68060 +CFLAGS= -O2 ${DEFS} ${INCPATH} ${COPTS} CLEANFILES+=netboot netboot.bin .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc" |