switch alpha to gcc3; joint work with drahn@ and brad@

ok drahn@ brad@ mickey@ deraadt@

5 files changed, 23 insertions, 57 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 535bb68b419..41c778829f6 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -41,6 +41,7 @@
 ./sbin/iopctl
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/gccbug
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
@@ -62,12 +63,11 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/alpha-unknown-openbsd4.0
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cpp0
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/specs
 ./usr/lib/libasn1.so.16.0
 ./usr/lib/libc.so.39.3
 ./usr/lib/libcom_err.so.16.0
@@ -77,7 +77,7 @@
 ./usr/lib/libedit.so.3.0
 ./usr/lib/libevent.so.1.3
 ./usr/lib/libform.so.3.0
-./usr/lib/libg2c.so.8.0
+./usr/lib/libg2c.so.8.1
 ./usr/lib/libgssapi.so.5.0
 ./usr/lib/libiberty.so.8.0
 ./usr/lib/libkafs.so.16.0
@@ -100,7 +100,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.11.0
-./usr/lib/libstdc++.so.41.0
+./usr/lib/libstdc++.so.42.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 06594f52fc0..47fc7240cab 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -170,47 +170,12 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/ieee
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/ieee/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/README
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/exception
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/fixed
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/float.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/iso646.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/limits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/new
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/new.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/proto.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stdarg.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stdbool.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stddef.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-alpha.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-arc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-c4x.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-clipper.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-h8300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-i860.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-i960.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-m32r.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-m88k.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mips.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mn10200.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mn10300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-pa.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-ppc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-pyr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-sh.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-sparc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-spur.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-v850.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/varargs.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/3.3.5/libgcc.a
 ./usr/lib/libalpha.a
 ./usr/lib/libalpha_p.a
 ./usr/lib/libasn1_pic.a
diff --git a/libexec/ld.so/alpha/Makefile.inc b/libexec/ld.so/alpha/Makefile.inc
index 7115f746acb..375ba49a56e 100644
--- a/libexec/ld.so/alpha/Makefile.inc
+++ b/libexec/ld.so/alpha/Makefile.inc
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/08/21 15:40:30 art Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2006/09/26 23:14:52 martin Exp $
 
-CFLAGS += -fpic -mno-fp-regs
+CFLAGS += -fPIC -mno-fp-regs
 LIBCSRCDIR=${.CURDIR}/../../lib/libc
 .include "${LIBCSRCDIR}/arch/alpha/Makefile.inc"
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index bf49c844c3d..cf9fb2b68c6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.95 2006/06/26 03:12:37 brad Exp $
+#	$OpenBSD: bsd.own.mk,v 1.96 2006/09/26 23:14:52 martin Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -32,8 +32,7 @@ ELF_TOOLCHAIN?=	yes
 .endif
 
 # gcc3
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
     ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "vax"
 USE_GCC3?=no
 .else
@@ -122,7 +121,7 @@ NOPIC=
 .endif
 
 # pic relocation flags.
-.if ${MACHINE_ARCH} == "sparc64"
+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64")
 PICFLAG=-fPIC
 .else
 PICFLAG=-fpic
diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc
index 39bcbf06eab..dd81a0c79b3 100644
--- a/sys/arch/alpha/stand/Makefile.inc
+++ b/sys/arch/alpha/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2005/12/30 02:03:48 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2006/09/26 23:14:52 martin Exp $
 #	$NetBSD: Makefile.inc,v 1.8 1997/04/06 08:39:38 cgd Exp $
 
 .include <bsd.own.mk>			# for ELF_TOOLCHAIN definition
@@ -20,4 +20,6 @@ CPPFLAGS+=		-D_STANDALONE
 
 XCPPFLAGS+=		-DHEAP_LIMIT="0x${HEAP_LIMIT}"
 
-CFLAGS+=		-fno-stack-protector
+CFLAGS+=		-fno-stack-protector -fno-builtin-printf \
+			-fno-builtin-vprintf -fno-builtin-putchar \
+			-fno-builtin-puts