From 53e9e3b501363650717371eae74fd06351edec44 Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Sun, 30 Dec 2007 08:56:59 +0000
Subject: [PATCH] G/C all the cpu options it doesn't work and it's not the
 supported way.

Don't add options to COPTS - it loses the default optimisation level.

Kernels are now compiled with -O2.
---
 sys/arch/hp700/conf/Makefile.hp700 | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/sys/arch/hp700/conf/Makefile.hp700 b/sys/arch/hp700/conf/Makefile.hp700
index 512f81d42890..dd722d2a3f0b 100644
--- a/sys/arch/hp700/conf/Makefile.hp700
+++ b/sys/arch/hp700/conf/Makefile.hp700
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp700,v 1.11 2007/10/17 19:54:25 garbled Exp $
+# $NetBSD: Makefile.hp700,v 1.12 2007/12/30 08:56:59 skrll Exp $
 
 # Makefile for NetBSD
 #
@@ -32,30 +32,17 @@ GENASSYM_CONF=	${HP700}/hp700/genassym.cf
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dhppa -Dhp700
-.if ${IDENT:M-DDDB} != ""
-COPTS+=		-fno-omit-frame-pointer
-.endif
-.if ${IDENT:M-DHP7000_CPU} != ""
-COPTS+=		-mpa-risc-1-0 -mschedule=700
-.elif ${IDENT:M-DHP8*_CPU} != ""
-COPTS+=		-mpa-risc-2-0
-.else
-COPTS+=		-mpa-risc-1-1
-.endif
-.if ${IDENT:M-DHP*_CPU} == ${IDENT:M-DHP7100LC_CPU}
-# XXX they said gcc has bugs in 7100lc scheduling
-#COPTS+=	-mschedule=7100LC
-.endif
-.if ${IDENT:M-DFPEMUL} != ""
-COPTS+=	-msoft-float -mdisable-fpregs
+CFLAGS+=	-mpa-risc-1-1 -msoft-float -mdisable-fpregs
+
 .include "${HPPA}/spmath/Makefile.inc"
+
 .ifndef PROF
 LIBSPMATH=	${SPMATH}
 .else
 LIBSPMATH=	${SPMATH_PROF}
 .endif
-.endif
-COPTS+=		-mno-space-regs -mfast-indirect-calls -mportable-runtime
+
+CFLAGS+=	-mno-space-regs -mfast-indirect-calls -mportable-runtime
 APPFLAGS=	-x assembler-with-cpp -P -traditional ${CPPFLAGS} -D_LOCORE
 
 # Do NOT assume the compiler does "-x funny_format" (gcc-specific)