From 1d68e44fcf1f9e3ad4d717b0e01ca4d6cdc54e31 Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Wed, 1 Nov 2006 17:10:36 +0000
Subject: [PATCH] Remove the hack that compiles dfa.c with -O1 on hppa. -O2
 works fine.

---
 doc/HACKS                      | 13 +------------
 gnu/usr.bin/grep/grep/Makefile |  7 +------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/doc/HACKS b/doc/HACKS
index 226e07fff136..b0917a783669 100644
--- a/doc/HACKS
+++ b/doc/HACKS
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.89 2006/10/30 16:46:42 skrll Exp $
+# $NetBSD: HACKS,v 1.90 2006/11/01 17:10:36 skrll Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -667,17 +667,6 @@ port	macppc
 		This is reportedly fixed in gcc-3.4
 	kcah
 
-port	hppa
-
-	hack	hppa-gcc-3.3.3/grep/dfa.c
-	cdate	Sun Aug  8 08:34:32 PDT 2004
-	who	chs
-	file	gnu/usr.bin/grep/grep/Makefile : 1.4
-	descr
-		gcc 3.3.3 generates bad code for dfa.c with -O2,
-		reduce optimization to -O1 to avoid the bug.
-	kcah
-
 port	mips
 
 	hack	mips-shared-linker-load-address
diff --git a/gnu/usr.bin/grep/grep/Makefile b/gnu/usr.bin/grep/grep/Makefile
index 6a90871d75a7..41dd3f199369 100644
--- a/gnu/usr.bin/grep/grep/Makefile
+++ b/gnu/usr.bin/grep/grep/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2005/05/11 13:10:21 chs Exp $
+#	$NetBSD: Makefile,v 1.5 2006/11/01 17:10:36 skrll Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -29,10 +29,5 @@ FILESNAME_${F}=	grep.mo
 .endfor
 .endif
 
-# XXX
-.if ${MACHINE_ARCH} == "hppa"
-COPTS.dfa.c=	-O1
-.endif
-
 .include <bsd.info.mk>
 .include <bsd.prog.mk>