Version bump to version from Developer Tools 3.2.2
authorFabian Groffen <grobian@gentoo.org>
Tue, 18 May 2010 10:42:10 +0000 (10:42 +0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 18 May 2010 10:42:10 +0000 (10:42 +0000)
Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

sys-devel/binutils-apple/ChangeLog
sys-devel/binutils-apple/Manifest
sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild [new file with mode: 0644]
sys-devel/binutils-apple/files/binutils-apple-3.2.2-as.patch [new file with mode: 0644]

index 5ff66abbbb0759bf4f79806c006e92071e066f4c..1a4e3e417408a121efe3694ef98a45db94a09951 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.11 2010/05/02 14:37:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.12 2010/05/18 10:42:10 grobian Exp $
+
+*binutils-apple-3.2.2 (18 May 2010)
+
+  18 May 2010; Fabian Groffen <grobian@gentoo.org>
+  +binutils-apple-3.2.2.ebuild, +files/binutils-apple-3.2.2-as.patch:
+  Version bump to version from Developer Tools 3.2.2
 
   02 May 2010; Fabian Groffen <grobian@gentoo.org>
   binutils-apple-3.2-r1.ebuild:
index 2805bb3b3b81df39a8fc59277fb36524d41329d2..7a3dd137f2f949d5a9bbccf05346c36b597208a3 100644 (file)
@@ -11,19 +11,24 @@ AUX binutils-apple-3.1.1-testsuite.patch 3951 RMD160 60763dc51f0bc28b8df43ae8b79
 AUX binutils-apple-3.1.2-as-Makefile.patch 308 RMD160 043f9f5fc0eeedd7c1f61520ba39d943b827e573 SHA1 dfe1c9d8078aeb28f20737610fc71487fb4f23ae SHA256 032256cbc31d7097f1af351b5ec6aebc7663c715bbc44efa131e54081ec28d8b
 AUX binutils-apple-3.2-armv7-defines.patch 321 RMD160 f6aa6230d53de02c1c60e127bec188e748502157 SHA1 4f83bf45ee90d727e83a326d1218786bff4b80a8 SHA256 1c7fb1938bc8d906af861ff4cc430ebee860162d0de28ca4ebb57d67ff62074f
 AUX binutils-apple-3.2-ld64-Makefile 760 RMD160 da9f2930915d75d51bab3a58417a3ddc59a24bc4 SHA1 f4e0735ed11f3b277d88cf5300efab9e4ac03dda SHA256 990d24770f2e9ef985ad0f8d9f56c0fb1a0798b102418d29810918447a5ec92e
+AUX binutils-apple-3.2.2-as.patch 2777 RMD160 b94adf36e78c3b43998a063c035979195296ac86 SHA1 eb1be8fbaee452aaa97dd78d2ef7b6eb46eb1274 SHA256 99692bb424bd21d6772c5a81239ecb5babc3b6d6f18a8c7a43e424acb92676d4
 AUX ld64-95.2.12-Makefile 728 RMD160 56104bcb07a3845b11cf9034f1051c0ceebf681d SHA1 7549a604ea69ad1ad93b92511a70634033cdbab8 SHA256 3e1181c3dc7aaa8cb5d02cc00fc0f760d052bb2714883833a5aaa2fa3105f88d
 AUX ld64-95.2.12-darwin8-no-mlong-branch-warning.patch 620 RMD160 cf17f65dda73393a921896b8844493b237dc3307 SHA1 b834e98d61a9ecd70aa99b89b5575a8e32b5b2f7 SHA256 ca0455c78e77f84e7d15e6edf19085b0729a12baf29a89455af84e947f201b1d
 DIST binutils-apple-3.2-unwind-patches-2.tar.xz 23888 RMD160 2d677f7a3f74aaec20f1e999283dd023d1873b54 SHA1 e1b74657fa3f3a0cf479bf7e03d8aceb2295a985 SHA256 2859c3545c467f516bac0704ff97a8d18766d91faa28dfad1dcc07bfbd03919d
+DIST binutils-apple-3.2-unwind-patches-3.tar.xz 23908 RMD160 087a2fdb12b6e4bc23379ebee6f5c6ddc1aabc04 SHA1 9fb923c01056e3ce48b8a85799555335993871b3 SHA256 b3082b464cf8fdc4b1f8fd2a73b5b7580c524cdde09869b82b770e62168b6939
 DIST binutils-apple-LP64-patches-1.tar.bz2 10235 RMD160 754e956a9b8b9ecdf1bde5115bad0eb85545292e SHA1 e863f222e2f3eb5134de661987c7e5b58abaa710 SHA256 a107459f3914d57524e51ec4cb5e800f6715d40003514c79add0b5b4521cf809
 DIST cctools-698.1.tar.gz 2318018 RMD160 898c7b46869d4989c115420912fdd8d96ae923d3 SHA1 11cb788151365fb365f7bf4a9083c3fcc6fa88f7 SHA256 383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
 DIST cctools-698.tar.gz 2318613 RMD160 6e044c684936172d048e0790d087bb96e47ecb20 SHA1 9016e64d064b99e16ad71c79f2337dd0fc281b1b SHA256 c7a02ebab31fb3ecc18299e85620913ea3729750114d01a50f6e404ff405dc71
 DIST cctools-750.tar.gz 1947953 RMD160 4b4074a93d071fc56f5b9ebd972c6a175bb9904e SHA1 20dd28b6e41e6ca367a6f457f6b465a0e4fbae3c SHA256 188855640da114e37e4ddd4824ff6cdc1ea89dfb6c90a23905c9ca315342f356
+DIST cctools-773.tar.gz 1962238 RMD160 3ea1b348c878efebc1d1ba9d50a89840c272aafd SHA1 762318baef6f4efca75a066d8265e0cddee267e1 SHA256 293729884921bc9c05fcbe8ef9c2b1166a7ff92cfd5bdb30349b483e78464f98
 DIST ld64-85.2.1.tar.gz 598524 RMD160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 SHA1 31a7debf4c407c32b8bd1a51a4b4a7ae68dc8b85 SHA256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
 DIST ld64-85.2.2.tar.gz 298144 RMD160 f7f897666a072e07f1888beca5b22fdd75fa1b61 SHA1 33c655bd7cbfecd70807dbde428615fb0947f31b SHA256 01ab6f6f1ce91203722c5cd56666ffa81da0eafe8beee1490a383811d56d86aa
 DIST ld64-95.2.12.tar.gz 401104 RMD160 35de89aa1d31d100bd952829df4316e640c03cb4 SHA1 eea384a5ed3b5a994cc24e076c74ad20e6f8b68a SHA256 5a5ea02bd81d74f4f773403bebe34950acf4830fb7fee0d466305276f869097c
+DIST ld64-97.2.tar.gz 415630 RMD160 e5557db2809627a9a0771c949b42e15c23eb65ba SHA1 3db816678f96db0dc1936af0ceb5c58b049648d6 SHA256 3a94376586656192e16a09c7b82e2a70f0a441fc8cb2ccf8a835a050e82866da
 EBUILD binutils-apple-3.1.1.ebuild 5157 RMD160 692fc010932d7ddbf51b3fd63f1f79742cdfcff3 SHA1 5c82eb1ce460f94cc4328327ad5c141463a3953a SHA256 c8f9904789faea57409863af02683e6eae36377925fcf4e7a9dd44dab9c7e6ac
 EBUILD binutils-apple-3.1.2.ebuild 5288 RMD160 bbe9a2371e5e1e66b0c9fa2f4ca600bb2474d234 SHA1 5d21c2ac4c555ec8d997efe9d5ae0233b2fa17cb SHA256 0818f10ee517368085e4bacfd53f25ab81115f05b480fb716c6b70b7ebc59bdd
 EBUILD binutils-apple-3.2-r1.ebuild 6228 RMD160 fdd810e43d987bebc9c938beb12ac204667f0cbe SHA1 489c9b0f50541e29f6dc60de68aa3ee21c1c538b SHA256 26c29b4bf9584053e42a6a3d197afc0a21f95413bf6bccf86cb21f4e08c3bcaa
+EBUILD binutils-apple-3.2.2.ebuild 6202 RMD160 73621094f924415c7669361fde13cc9911ccd56c SHA1 fade93e2da454f2c1f5f9166fbdfbd186efee932 SHA256 c26d98fd40daf363671147acfa554992310b3cda657242a880f2c026f05dac5f
 EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-MISC ChangeLog 5635 RMD160 183e34dd9b458da7c89cd179dbd12ef0c4d141bb SHA1 feba34222be63d2a7bc0e2df09de6a0912f04770 SHA256 d88ed0ace68a78d182cbfc0acda47e3e0a2ed50b92072b0b07544485dc0d622a
+MISC ChangeLog 5847 RMD160 e1bc051d1ce35d8b352f36c9b19836d56880b625 SHA1 7aa5dc5a055970911277777bdabde7468c3c43b8 SHA256 50ba6e34c1aeb169fc5b634c6e39b2614975241b915f36acaa170bafc618e76b
 MISC metadata.xml 158 RMD160 61ad495b84df949a636009d30b8c3af6d267e469 SHA1 cacd49ab85e7648a81e5dd4791ef9598090ee63d SHA256 6a21555efc71392966785841abafc9b2984d97d75ad574d654db6adc8674b1bd
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..d564ff1
--- /dev/null
@@ -0,0 +1,236 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild,v 1.1 2010/05/18 10:42:10 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="test" # the test suite will test what's installed.
+
+LD64=ld64-97.2
+CCTOOLS=cctools-773
+# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
+UNWIND=binutils-apple-3.2-unwind-patches-3
+
+DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2"
+HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
+SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
+       http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
+       http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
+
+LICENSE="APSL-2"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+SLOT="0"
+
+RDEPEND="sys-devel/binutils-config
+       test? ( >=dev-lang/perl-5.8.8 )"
+DEPEND="${RDEPEND}
+       >=sys-devel/gcc-apple-4.2.1"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+               export CTARGET=${CATEGORY/cross-}
+       fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+if is_cross ; then
+       SLOT="${CTARGET}"
+else
+       SLOT="0"
+fi
+
+LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+INCPATH=${LIBPATH}/include
+DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+if is_cross ; then
+       BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+else
+       BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+fi
+
+S=${WORKDIR}
+
+src_prepare() {
+       cd "${S}"/${CCTOOLS}
+       epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
+       epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
+
+       cd "${S}"/${LD64}/src
+       cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
+
+       ln -s ../../${CCTOOLS}/include
+       cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
+
+       local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
+       echo '#undef LTO_SUPPORT' > configure.h
+       echo '' > linker_opts
+       echo "char ldVersionString[] = ${VER_STR};" > version.cpp
+
+       epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
+       [[ ${CHOST} == *-darwin10 ]] && \
+               epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch
+       [[ ${CHOST} == powerpc*-darwin* ]] && \
+               epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
+
+       # clean up test suite
+       cd "${S}"/${LD64}
+       epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
+
+       cd "${S}"/${LD64}/unit-tests/test-cases
+       local c
+
+       # we don't have llvm
+       ((++c)); rm -rf llvm-integration;
+
+       # we don't have dtrace
+       ((++c)); rm -rf dtrace-static-probes-coalescing;
+       ((++c)); rm -rf dtrace-static-probes;
+
+       # a file is missing
+       ((++c)); rm -rf eh-coalescing-r
+
+       # we don't do universal binaries
+       ((++c)); rm -rf blank-stubs;
+
+       # looks like a problem with apple's result-filter.pl
+       ((++c)); rm -rf implicit-common3;
+       ((++c)); rm -rf order_file-ans;
+
+       # TODO no idea what goes wrong here
+       ((++c)); rm -rf dwarf-debug-notes;
+
+       einfo "Deleted $c tests that were bound to fail"
+
+       cd "${S}"
+       ebegin "cleaning Makefiles from unwanted CFLAGS"
+       find . -name "Makefile" -print0 | xargs -0 sed \
+               -i \
+               -e 's/ -g / /g' \
+               -e 's/^OFLAG =.*$/OFLAG =/' \
+               -e 's/install -c -s/install/g'
+       eend $?
+
+       # -pg is used and the two are incompatible
+       filter-flags -fomit-frame-pointer
+}
+
+compile_ld64() {
+       cd "${S}"/${LD64}/src
+       # remove antiquated copy that's available on any OSX system and
+       # breaks ld64 compilation
+       mv include/mach-o/dyld.h{,.disable}
+       emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+               || die "emake failed for ld64"
+       use test && emake build_test
+       # restore, it's necessary for cctools' install
+       mv include/mach-o/dyld.h{.disable,}
+}
+
+compile_cctools() {
+       cd "${S}"/${CCTOOLS}
+       emake \
+               LTO= \
+               TRIE= \
+               EFITOOLS= \
+               COMMON_SUBDIRS='libstuff ar misc otool' \
+               SUBDIRS_32= \
+               RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+               || die "emake failed for the cctools"
+       cd "${S}"/${CCTOOLS}/as
+       emake \
+               BUILD_OBSOLETE_ARCH= \
+               RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
+               || die "emake failed for as"
+}
+
+src_compile() {
+       tc-export CC CXX AR
+       compile_cctools
+       compile_ld64
+}
+
+install_ld64() {
+       exeinto ${BINPATH}
+       doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
+       dosym ld64 ${BINPATH}/ld
+       insinto ${DATAPATH}/man/man1
+       doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
+}
+
+install_cctools() {
+       cd "${S}"/${CCTOOLS}
+       emake install_all_but_headers \
+               EFITOOLS= \
+               COMMON_SUBDIRS='ar misc otool' \
+               SUBDIRS_32= \
+               RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+               DSTROOT=\"${D}\" \
+               BINDIR=\"${EPREFIX}\"${BINPATH} \
+               LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
+               USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+               LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
+               MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
+       cd "${S}"/${CCTOOLS}/as
+       emake install \
+               BUILD_OBSOLETE_ARCH= \
+               DSTROOT=\"${D}\" \
+               USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+               LIBDIR=\"${EPREFIX}\"${LIBPATH}
+
+       cd "${ED}"${BINPATH}
+       insinto ${DATAPATH}/man/man1
+       local skips manpage
+       # ar brings an up-to-date manpage with it
+       skips=( ar )
+       for bin in *; do
+               for skip in ${skips[@]}; do
+                       if [[ ${bin} == ${skip} ]]; then
+                               continue 2;
+                       fi
+               done
+               manpage=${S}/${CCTOOLS}/man/${bin}.1
+               if [[ -f "${manpage}" ]]; then
+                       doins "${manpage}"
+               fi
+       done
+       insinto ${DATAPATH}/man/man5
+       doins "${S}"/${CCTOOLS}/man/*.5
+}
+
+src_test() {
+       einfo "Running unit tests"
+       cd "${S}"/${LD64}/unit-tests/test-cases
+       # need host arch, since GNU arch doesn't do what Apple's does
+       tc-export CC CXX
+       perl ../bin/make-recursive.pl \
+               ARCH="$(/usr/bin/arch)" \
+               RELEASEDIR="${S}"/${LD64}/src \
+               | perl ../bin/result-filter.pl
+}
+
+src_install() {
+       install_ld64
+       install_cctools
+
+       cd "${S}"
+       insinto /etc/env.d/binutils
+       cat <<-EOF > env.d
+               TARGET="${CHOST}"
+               VER="${PV}"
+               FAKE_TARGETS="${CHOST}"
+       EOF
+       newins env.d ${CHOST}-${PV}
+}
+
+pkg_postinst() {
+       binutils-config ${CHOST}-${PV}
+}
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2.2-as.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.2-as.patch
new file mode 100644 (file)
index 0000000..f032e1b
--- /dev/null
@@ -0,0 +1,101 @@
+make building for obsolete architectures optional.
+
+--- as/Makefile
++++ as/Makefile
+@@ -1,3 +1,4 @@
++BUILD_OBSOLETE_ARCH = yes
+ RC_OS = macos
+ export USE_APPLE_PB_SUPPORT = all
+ OFLAG =
+@@ -32,28 +33,36 @@
+ SYMROOT = .
+ OBJROOT = .
+ SYM_DIRS = $(SYMROOT)/driver_dir \
+-         $(SYMROOT)/a68_dir \
+-         $(SYMROOT)/a88_dir \
+          $(SYMROOT)/a386_dir \
+          $(SYMROOT)/ax86_64_dir \
+          $(SYMROOT)/appc_dir \
+          $(SYMROOT)/appc64_dir \
++         $(SYMROOT)/aarm_dir 
++
++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
++SYM_DIRS += \
++         $(SYMROOT)/a68_dir \
++         $(SYMROOT)/a88_dir \
+          $(SYMROOT)/a860_dir \
+          $(SYMROOT)/ahppa_dir \
+-         $(SYMROOT)/asparc_dir \
+-         $(SYMROOT)/aarm_dir 
++         $(SYMROOT)/asparc_dir
++endif
+ 
+ OFILE_DIRS = $(OBJROOT)/driver_dir \
+-           $(OBJROOT)/a68_dir \
+-           $(OBJROOT)/a88_dir \
+            $(OBJROOT)/a386_dir \
+            $(OBJROOT)/ax86_64_dir \
+            $(OBJROOT)/appc_dir \
+            $(OBJROOT)/appc64_dir \
++           $(OBJROOT)/aarm_dir
++
++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
++OFILE_DIRS += \
++           $(OBJROOT)/a68_dir \
++           $(OBJROOT)/a88_dir \
+            $(OBJROOT)/a860_dir \
+            $(OBJROOT)/ahppa_dir \
+-           $(OBJROOT)/asparc_dir \
+-           $(OBJROOT)/aarm_dir
++           $(OBJROOT)/asparc_dir
++endif
+ 
+ BINDIR = /bin
+ USRBINDIR = /usr/bin
+@@ -115,9 +124,12 @@
+ OBJS_sparc = $(CFILES_sparc:.c=.o)
+ OBJS_arm = $(CFILES_arm:.c=.o)
+ 
+-all:  $(OFILE_DIRS) $(SYM_DIRS) driver_build a68_build a88_build a386_build \
+-      ax86_64_build a860_build appc_build appc64_build ahppa_build \
+-      aarm_build asparc_build
++all:  $(OFILE_DIRS) $(SYM_DIRS) driver_build a386_build \
++      ax86_64_build appc_build appc64_build aarm_build
++
++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
++all:  a68_build a88_build a860_build ahppa_build asparc_build
++endif
+ 
+ all_test:     a68_test a88_test a860_test a386_test appc_test ahppa_test
+ 
+@@ -429,12 +441,14 @@
+       $(MKDIRS) $(DSTROOT)$(LIBDIR)/ppc64
+       install -c -s -m 555 $(SYMROOT)/appc64_dir/as \
+               $(DSTROOT)$(LIBDIR)/ppc64/as
++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
+       $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m68k
+       install -c -s -m 555 $(SYMROOT)/a68_dir/as \
+               $(DSTROOT)$(LOCLIBDIR)/m68k/as
+       $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/sparc 
+       install -c -s -m 555 $(SYMROOT)/asparc_dir/as \
+               $(DSTROOT)$(LOCLIBDIR)/sparc/as
++endif
+       $(MKDIRS) $(DSTROOT)$(LIBDIR)/arm
+       install -c -s -m 555 $(SYMROOT)/aarm_dir/as \
+               $(DSTROOT)$(LIBDIR)/arm/as
+@@ -457,6 +471,7 @@
+               $(DSTROOT)$(LOCLIBDIR)/ppc/as
+ 
+ common_install:
++ifeq "yes" "$(BUILD_OBSOLETE_ARCH)"
+       $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/m88k
+       install -s -m 555 $(SYMROOT)/a88_dir/as \
+               $(DSTROOT)$(LOCLIBDIR)/m88k/as
+@@ -466,6 +481,7 @@
+       $(MKDIRS) $(DSTROOT)$(LOCLIBDIR)/i860
+       install -s -m 555 $(SYMROOT)/a860_dir/as \
+               $(DSTROOT)$(LOCLIBDIR)/i860/as
++endif
+ 
+ $(OFILE_DIRS) $(SYM_DIRS):
+       $(MKDIRS) $@