=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.80 retrieving revision 1.88 diff -u -r1.80 -r1.88 --- src/Makefile.cross 2015/11/14 23:56:48 1.80 +++ src/Makefile.cross 2016/09/23 09:18:05 1.88 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.80 2015/11/14 23:56:48 deraadt Exp $ +# $OpenBSD: Makefile.cross,v 1.88 2016/09/23 09:18:05 sthen 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 @@ -6,18 +6,15 @@ # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving # this variable to work. -.if (${TARGET} == "armish" || ${TARGET} == "armv7" || \ - ${TARGET} == "zaurus") +.if (${TARGET} == "armv7") TARGET_ARCH= arm -.elif (${TARGET} == "aviion" || ${TARGET} == "luna88k") +.elif (${TARGET} == "luna88k") TARGET_ARCH= m88k .elif (${TARGET} == "sgi" || ${TARGET} == "octeon") TARGET_ARCH= mips64 .elif (${TARGET} == "loongson") TARGET_ARCH= mips64el TARGET_CPU= mips64 -.elif (${TARGET} == "solbourne") -TARGET_ARCH= sparc .elif (${TARGET} == "macppc" || ${TARGET} == "socppc") TARGET_ARCH= powerpc .elif (${TARGET} == "landisk") @@ -29,7 +26,7 @@ # List of LP64 archs # XXX move to bsd.*.mk? -LP64_ARCH = amd64 alpha hppa64 ia64 mips64 sparc64 vax64 +LP64_ARCH = amd64 alpha mips64 sparc64 TARGET_IS_LP64 = MACHINE_IS_LP64 = @@ -107,7 +104,6 @@ NO_CROSS+=microcode NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs NO_CROSS+=nsd -NO_CROSS+=sqlite3 NO_CROSS+=bind NO_CROSS+=unbound