summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-11-12 18:32:36 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-11-12 18:32:36 +0000
commit13b88b5160d708b4b16a0d72b7061ab7c76550dc (patch)
treec9b19d5172229319512aebb19f17a5fb3e27566c
parent7968043e9f742576cdcdecb7cacee324e60f012e (diff)
- add avr32 which'll use gcc4/binutils-2.17
- remove BINUTILS217_ARCH from Makefile.cross as bsd.own.mk is included there (requested by drahn@) ok drahn@ deraadt@
-rw-r--r--Makefile.cross3
-rw-r--r--share/mk/bsd.own.mk6
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.cross b/Makefile.cross
index 32afb7273e1..b605ebd0183 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.49 2011/11/11 12:26:54 drahn Exp $
+# $OpenBSD: Makefile.cross,v 1.50 2011/11/12 18:32:35 jasper Exp $
cross-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -89,7 +89,6 @@ CROSSGCC= ${CROSSDIR}/.gcc_done
.include <bsd.own.mk>
-BINUTILS217_ARCH=hppa64 ia64
OLD_BINUTILS_ARCH=m68k m88k vax
.for _arch in ${TARGET_ARCH}
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 72897c1e097..ad49faaec22 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.112 2011/11/11 13:04:54 jsing Exp $
+# $OpenBSD: bsd.own.mk,v 1.113 2011/11/12 18:32:35 jasper Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -33,8 +33,8 @@ ELF_TOOLCHAIN?= yes
GCC2_ARCH=m68k m88k vax
#GCC3_ARCH=alpha sh
-GCC4_ARCH=amd64 arm hppa hppa64 i386 ia64 mips64 mips64el powerpc sparc sparc64
-BINUTILS217_ARCH=hppa64 ia64
+GCC4_ARCH=amd64 arm avr32 hppa hppa64 i386 ia64 mips64 mips64el powerpc sparc sparc64
+BINUTILS217_ARCH=avr32 hppa64 ia64
.for _arch in ${MACHINE_ARCH}
.if !empty(GCC2_ARCH:M${_arch})