hppa no longer needs -O0 to build toke.c; from miod@ and OK mickey@

2 files changed, 5 insertions, 35 deletions

diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper
index 62135abc0d0..bfa8a2e9a01 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.55 2003/03/30 17:55:14 millert Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.56 2003/07/30 22:59:31 millert Exp $
 #
 # Build wrapper for Perl 5.8.0
 #
@@ -542,34 +542,6 @@ x2p/cflags:
 perly.c perly.h: perly.y
 	-@true
 
-# these dump the core on toke
-.if ${MACHINE} == "hppa"
-
-toke.o: toke.c
-	@echo "${COMPILE.c} ${.IMPSRC} -O0 -o ${.TARGET}"
-	@${COMPILE.c} ${.IMPSRC} -O0 -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-toke.go: toke.c
-	@echo "${COMPILE.c} -g ${.IMPSRC} -O0 -o ${.TARGET}"
-	@${COMPILE.c} -g ${.IMPSRC} -O0 -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-toke.po: toke.c
-	@echo "${COMPILE.c} -p ${.IMPSRC} -O0 -o ${.TARGET}"
-	@${COMPILE.c} -p ${.IMPSRC} -O0 -o ${.TARGET}.o
-	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-toke.so: toke.c
-	@echo "${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -O0 -o ${.TARGET}"
-	@${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -O0 -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-.endif
-
 .ifdef NOMAN
 maninstall:
 	@echo NOMAN is set
diff --git a/gnu/usr.bin/perl/hints/openbsd.sh b/gnu/usr.bin/perl/hints/openbsd.sh
index 0032a183395..af7352709cc 100644
--- a/gnu/usr.bin/perl/hints/openbsd.sh
+++ b/gnu/usr.bin/perl/hints/openbsd.sh
@@ -87,12 +87,9 @@ d_suidsafe=$define
 
 # cc is gcc so we can do better than -O
 # Allow a command-line override, such as -Doptimize=-g
-case ${ARCH} in
-m88k)
-   optimize='-O0'
-   ;;
-hppa)
-   optimize='-O0'
+case "${ARCH}-${osvers}" in
+hppa-3.3|m88k-*)
+   test "$optimize" || optimize='-O0'
    ;;
 *)
    test "$optimize" || optimize='-O2'
@@ -132,6 +129,7 @@ case "$openbsd_distribution" in
 		useshrplib=true
 		libperl=`. ./shlib_version; echo libperl.so.${major}.${minor}`
 	fi
+	usethreads=$define
 	;;
 esac