summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-05-26 14:39:39 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-05-26 14:39:39 +0000
commitbe63cb8dec704c552c0d5e3ea65cc23f471822b0 (patch)
tree4cca05ca99f4dd7237c083776126a04668c6f822
parent4b9cf3ab192c7e5b1ee8b915d25de6b18cbd1f7e (diff)
Switch amd64 and sparc64 over to gcc4; bump libc major to deal with the ABI
corner cases that were fixed in gcc4, and changes in libgcc that we may have missed. ok kettenis@
-rw-r--r--lib/libc/shlib_version4
-rw-r--r--share/mk/bsd.own.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version
index 81a5aca30f3..edb06f55ccd 100644
--- a/lib/libc/shlib_version
+++ b/lib/libc/shlib_version
@@ -1,4 +1,4 @@
-major=53
-minor=2
+major=54
+minor=0
# note: If changes were made to include/thread_private.h or if system
# calls were added/changed then libpthread must also be updated.
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1d680eaff2a..af17d94af95 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.101 2010/05/09 12:31:41 espie Exp $
+# $OpenBSD: bsd.own.mk,v 1.102 2010/05/26 14:39:38 kettenis Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -36,7 +36,7 @@ ELF_TOOLCHAIN?= yes
${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "vax"
USE_GCC3?=no
COMPILER_VERSION?=gcc2
-.elif ${MACHINE_ARCH} == "GCC4_ARCH_GOES_HERE_eg_powerpc"
+.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
COMPILER_VERSION?=gcc4
.else
USE_GCC3?=yes