From a55624165fe38e6d09b6b5cce6e758a394ea1306 Mon Sep 17 00:00:00 2001
From: Ken Smith <kensmith@FreeBSD.org>
Date: Mon, 29 Mar 2004 01:15:39 +0000
Subject: [PATCH] Remove "-frename-registers" option for sparc64 kernel builds.
  That was not present in what I originally tested when checking to see if the
 kernel built/ran with the -O2 change.  Recent instability in sparc64 kernel
 was tracked to this.  A reproducible kernel stack traceback followed by hard
 hang during the call to msleep() at the point the kernel waits 15 seconds for
 the SCSI bus to settle crept in to recent kernel builds and it seems to go
 away with this patch.

Noticed by:	kris
Approved by:	rwatson (mentor)
---
 sys/conf/kern.pre.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 17e96d591019..83afd1ed729e 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -19,10 +19,12 @@ SIZE?=		size
 .if ${CC} == "icc"
 COPTFLAGS?=-O
 .else
-. if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
+. if ${MACHINE_ARCH} == "amd64"
 COPTFLAGS?=-O2 -frename-registers -pipe
 . elif ${MACHINE_ARCH} == "ia64"
 COPTFLAGS?=-O2 -pipe
+. elif ${MACHINE_ARCH} == "sparc64"
+COPTFLAGS?=-O2 -pipe
 . else
 COPTFLAGS?=-O -pipe
 . endif