Add options to switch the linker on the fly between gold and bfd, and clean up the...
authorMike Frysinger <vapier@gentoo.org>
Fri, 12 Aug 2011 20:26:09 +0000 (20:26 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 12 Aug 2011 20:26:09 +0000 (20:26 +0000)
Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

sys-devel/binutils-config/ChangeLog
sys-devel/binutils-config/Manifest
sys-devel/binutils-config/binutils-config-3.ebuild [new file with mode: 0644]
sys-devel/binutils-config/files/binutils-config-3 [new file with mode: 0755]
sys-devel/binutils-config/files/binutils-config.8

index c4f0b93834be9c9c5f4b6b060d88ec5ba216d327..3eade60c272b1232683679eec34c51cd79ed3ea9 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.44 2011/07/10 23:39:04 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.45 2011/08/12 20:26:09 vapier Exp $
+
+*binutils-config-3 (12 Aug 2011)
+
+  12 Aug 2011; Mike Frysinger <vapier@gentoo.org> +files/binutils-config-3,
+  +binutils-config-3.ebuild, files/binutils-config.8:
+  Add options to switch the linker on the fly between gold and bfd, and clean
+  up the tangled profile/target logic.
 
   10 Jul 2011; Mark Loeser <halcy0n@gentoo.org> binutils-config-2-r1.ebuild:
   Stable for ppc64; bug #361849
index 1630e4ca9ea2075b8f0d4fd68a584e9961037d90..a0c94e72cccb91d2fc25d69fe48281662fbcef4a 100644 (file)
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX binutils-config-1.9 11043 RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d SHA1 2f801cb2f4bf167207407d0a3e6481e01a1317b8 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373
 AUX binutils-config-2 11440 RMD160 fdb4906f1a9d0fc3f18d450583ce7a5bd72f6068 SHA1 38d11d772da3aeef242d3c67d8b41e2e71d8544b SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192
-AUX binutils-config.8 3250 RMD160 901307542b481e9d4ffdca4dd4893a7eefe027fb SHA1 5ed2e6cd13b5b6a83fd26eec570fd02399495a2a SHA256 8e6dd458d03413ca7907db03413cb7002397ed3a853d1728713eebe5b126ea13
+AUX binutils-config-3 12789 RMD160 f8985fea59332d698a57a4d1c3fc11788823ef75 SHA1 6ecba494122aa2dcfe465a07e4daa8d3bfdc9cbe SHA256 6973dc67f6b6c9bb8702b456e33c20c161a657bf85967735dbbb6977904a9a5d
+AUX binutils-config.8 4042 RMD160 45423a37c82cb0cd89e581931ce085f80c3c631a SHA1 b080eff9bf82ce5f7145a5881bce0c3f9ea1c1ec SHA256 30e3c818c3a618d5ad2fa309607ce5fec081d24591d8e31da50b1767b69d5763
 EBUILD binutils-config-1.9-r4.ebuild 626 RMD160 e3018b7b6f690abddde9e2a25ce8a727dfcf14d0 SHA1 dd3547d1bbe52d600e3f59b9a45e806a327ea070 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d
 EBUILD binutils-config-2-r1.ebuild 627 RMD160 aa041873d7910e368022522fe1281af8cc16d2ad SHA1 2469140bb41e5ba03e85d4326194587e83701644 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f
-MISC ChangeLog 7410 RMD160 c91359a02a697b3b9d54a899f8025e4a85293fd9 SHA1 7a0776b1e0be9b7a8fc54f28c6a6fc3996bc6ef5 SHA256 971e5b1ef9e8339ff92ae17bb905746b998a3d9a5344936c7703f56264db3c03
+EBUILD binutils-config-3.ebuild 636 RMD160 9c8011de431f2b997aa1d4e181d4232b09c1c860 SHA1 bf31e1b75bad413cba7957324d44fab2a22ea157 SHA256 e6b4c164d4b751353321ca257a13017d538bb14c4031e9dc82db4ac87b1f3317
+MISC ChangeLog 7691 RMD160 9d6a9deaae046adf3db27938de1b496c9d67eb2f SHA1 0d54840995ca82790d6ba72a9a9c896a9a60300e SHA256 3219bce43f6f1ede25788876a8182702aa1effc3ba6f05bb18d33a8f19dfaee7
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4aOBwACgkQCRZPokWLroRJRACeIGbm2oKjiWCbbw8zaWKUyZKq
-+2sAnRRvRYlpeLySONZP7qz4YO2iMDf5
-=sf4S
+iF4EAREIAAYFAk5FjGcACgkQaC/OocHi7JbmnAD/TSY8029Dn6PwqsUQbBFykPCk
+iFIPONTsNv4Qtj3cgs4A/0kJxdctKR/9lzkql3BjzjnvcWfxFsrfGHraP5ZVZmYY
+=k+rH
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/binutils-config-3.ebuild b/sys-devel/binutils-config/binutils-config-3.ebuild
new file mode 100644 (file)
index 0000000..6ebaa6d
--- /dev/null
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3.ebuild,v 1.1 2011/08/12 20:26:09 vapier Exp $
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="userland_GNU? ( >=sys-apps/findutils-4.2 )"
+
+src_install() {
+       newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+       doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
new file mode 100755 (executable)
index 0000000..9674927
--- /dev/null
@@ -0,0 +1,474 @@
+#!/bin/bash
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $
+
+# Format of /etc/env.d/binutils/:
+#  config-TARGET:      CURRENT=version for TARGET
+#  TARGET-VER:         has a TARGET and VER variable
+
+: ${ROOT:=/}
+[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
+[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
+
+cd /
+
+trap ":" INT QUIT TSTP
+
+argv0=${0##*/}
+source /etc/init.d/functions.sh || {
+       echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
+       exit 1
+}
+esyslog() { :; }
+umask 022
+
+usage() {
+cat << USAGE_END
+Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
+
+${HILITE}General Options:${NORMAL}
+  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
+  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
+  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
+  ${GOOD}-d, --debug${NORMAL}                Execute with debug output
+
+${HILITE}General Cruft:${NORMAL}
+  ${GOOD}--gold${NORMAL}                     Switch linker to gold (if supported)
+  ${GOOD}--bfd${NORMAL}                      Switch linker to [older] bfd (if supported)
+
+${HILITE}Arch Specific Cruft:${NORMAL}
+  ${GOOD}--amd64${NORMAL}                    Install extra amd64 links (x86_64)
+  ${GOOD}--arm${NORMAL}                      Install extra arm links (arm/armeb)
+  ${GOOD}--mips${NORMAL}                     Install extra mips links (mips/mipsel)
+  ${GOOD}--x86${NORMAL}                      Install extra x86 links (i[3-6]86)
+
+Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
+For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
+
+For more info, please see ${HILITE}binutils-config${NORMAL}(8).
+USAGE_END
+
+       exit ${1:-1}
+}
+
+mv_if_diff() {
+       if cmp -s "$1" "$2" ; then
+               rm -f "$1"
+       else
+               mv -f "$1" "$2"
+       fi
+}
+
+setup_env() {
+       unset TARGET VER LIBPATH FAKE_TARGETS
+       source "${ENV_D}/${PROFILE}"
+       if [[ -z ${TARGET} ]] ; then
+               eerror "${PROFILE} is invalid (no \$TARGET defined) :("
+               return 1
+       fi
+       if [[ -z ${VER} ]] ; then
+               eerror "${PROFILE} is invalid (no \$VER defined) :("
+               return 1
+       fi
+
+       #
+       # Older installs don't have 'FAKE_TARGETS' defined, so lets
+       # update these env.d entries so that we don't force the poor
+       # user to re-emerge their binutils just for 1 envvar :/
+       #
+       if [[ ${FAKE_TARGETS-poor user} == "poor user" ]] ; then
+               local targ=${TARGET/-*}
+               local FAKE_TARGETS=${TARGET}
+               case ${targ} in
+                       mips|powerpc|sparc)
+                               FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/-/64-}";;
+                       mips64|powerpc64|sparc64)
+                               FAKE_TARGETS="${FAKE_TARGETS} ${TARGET/64-/-}";;
+               esac
+               echo "FAKE_TARGETS=\"${FAKE_TARGETS}\"" >> "${ENV_D}/${PROFILE}"
+       fi
+       local fake_targ_append="${TARGET#*-}"
+       FAKE_TARGETS="${FAKE_TARGETS} ${FAKE_TARGETS_USER// /-${fake_targ_append} }"
+
+       #
+       # Generate binary symlinks
+       # On systems that do 32bit/64bit, we need to fake an
+       # extra set of binary names (${FAKE_TARGETS})
+       #
+       BINPATH=""
+       BINPATH_LINKS=""
+       if [[ ${TARGET} != ${HOST} ]] ; then
+               #
+               # Newer paths: /usr/${HOST}/${TARGET}/...
+               # Older paths: /usr/${TARGET}/...
+               #
+               if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
+                       BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
+                       BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
+               fi
+       fi
+       if [[ -z ${BINPATH} ]] ; then
+               BINPATH=/usr/${TARGET}/binutils-bin/${VER}
+               BINPATH_LINKS=/usr/${TARGET}/bin
+       fi
+}
+
+switch_profile() {
+       ebegin "Switching to ${PROFILE}"
+
+       setup_env || return 1
+
+       cd "${ROOT}/${BINPATH}" || exit 1
+       mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
+       for x in * ; do
+               ln -sf "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}/${x}"
+               ln -sf "${BINPATH_LINKS}/${x}" "${ROOT}"/usr/bin/${TARGET}-${x}
+               for fake in ${FAKE_TARGETS} ; do
+                       [[ -f ${ENV_D}/config-${fake} ]] && continue
+                       ln -sf "${BINPATH_LINKS}/${x}" "${ROOT}"/usr/bin/${fake}-${x}
+               done
+               if [[ ${TARGET} == ${HOST} ]] ; then
+                       ln -sf ${TARGET}-${x} "${ROOT}"/usr/bin/${x}
+               fi
+       done
+
+       #
+       # Generate library / ldscripts symlinks
+       #
+       : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
+       cd "${ROOT}/${LIBPATH}" || exit 1
+       if [[ ${TARGET} == ${HOST} ]] ; then
+               dstlib=${ROOT}/usr/${HOST}/lib
+       else
+               dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
+               # Clean out old path
+               rm -rf "${ROOT}"/usr/${TARGET}/lib/ldscripts
+               rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
+       fi
+       # When upgrading, we need to clean up ldscripts and libs
+       rm -rf "${dstlib}/ldscripts" "${ROOT}/${BINPATH_LINKS}"/ldscripts
+       mkdir -p "${dstlib}"
+       ln -sf "${LIBPATH}/ldscripts" "${dstlib}"/ldscripts
+       find -L "${dstlib}" -type l -exec rm {} +
+       for x in lib* ; do
+               ln -sf "${LIBPATH}/${x}" "${dstlib}/${x}"
+       done
+
+       #
+       # Generate include symlinks
+       #
+       INCPATH=${LIBPATH}/include
+       if [[ -d ${ROOT}/${INCPATH} ]] ; then
+               cd "${ROOT}/${INCPATH}" || exit 1
+               if [[ ${HOST} == ${TARGET} ]] ; then
+                       mkdir -p "${ROOT}/usr/include"
+                       for x in * ; do
+                               ln -sf "${INCPATH}/${x}" "${ROOT}/usr/include/${x}"
+                       done
+               else
+                       # Clean out old path -- cannot use '-exec {} +' syntax here
+                       find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \;
+                       rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
+                       rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
+                       rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
+               fi
+       fi
+
+       #
+       # Make sure proper paths get updated
+       #
+       if [[ ${TARGET} == ${HOST} ]] ; then
+               DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
+               local e="${ROOT}"/etc/env.d/05binutils
+               local ee="${e}.tmp"
+               rm -f "${ee}"
+               [[ -d ${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
+               [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
+               # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
+               if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
+                       local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
+                       local ll="${l}.tmp"
+                       echo "/usr/${TARGET}/lib" > "${ll}"
+                       mv_if_diff "${ll}" "${l}"
+               else
+                       echo "LDPATH=/usr/${TARGET}/lib" >> "${ee}"
+               fi
+               mv_if_diff "${ee}" "${e}"
+       fi
+
+       local c="${ENV_D}/config-${TARGET}"
+       local cc="${c}.tmp"
+       echo "CURRENT=${VER}" > "${cc}"
+       mv_if_diff "${cc}" "${c}"
+
+       eend 0
+
+       #
+       # Regen env.d if need/can be
+       #
+       if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
+               env-update
+               echo
+               ewarn "Please remember to run:"
+               echo
+               ewarn "  # . /etc/profile"
+               echo
+       fi
+
+       return 0
+}
+
+uninstall_target() {
+       if [[ ${TARGET} == ${HOST} ]] ; then
+               eerror "${argv0}: Refusing to uninstall native binutils"
+               exit 1
+       fi
+
+       shopt -s nullglob
+       PROFILE=""
+
+       for PROFILE in "${ENV_D}"/${TARGET}-* ; do
+               ewarn "Removing all signs of ${PROFILE##*/}"
+               rm -f "${ENV_D}"/${PROFILE}
+       done
+       if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
+               eerror "${argv0}: No profiles exist for '${TARGET}'"
+               exit 1
+       fi
+
+       rm -f "${ENV_D}"/config-${TARGET} "${ROOT}"/etc/ld.so.conf.d/05binutils.conf
+
+       # XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
+       for x in addr2line ar as c++filt elf2flt flthdr gprof ld ld.real \
+                nm objcopy objdump ranlib readelf size strings strip ; do
+               rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
+               rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
+               rm -f "${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
+       done
+       for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
+               rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
+       done
+       for x in bfd iberty opcodes ; do
+               rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
+       done
+       # Delete broken symlinks
+       local destdir="${ROOT}/usr/${HOST}/${TARGET}"
+       rm -f "${destdir}"/lib/ldscripts
+       find -L "${destdir}"/lib -type l -exec rm {} +
+       rmdir \
+               "${destdir}"/{bin,include,lib,usr} \
+               "${destdir}" \
+               "${ROOT}"/var/db/pkg/cross-${TARGET} \
+               2>/dev/null
+
+       rm -f "${ENV_D}"/${TARGET}-*
+}
+
+set_current_profile() {
+       if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
+               eerror "${argv0}: unable to locate a profile for target: ${TARGET}"
+               return 1
+       fi
+
+       source "${ENV_D}/config-${TARGET}"
+
+       if [[ -z ${CURRENT} ]] ; then
+               eerror "${argv0}: no binutils profile is active!"
+               return 1
+       fi
+
+       echo "${TARGET}-${CURRENT}"
+
+       return 0
+}
+get_current_profile() { echo "${PROFILE}" ; }
+
+list_profiles() {
+       local x i target
+
+       if [[ ${ROOT} != / ]] ; then
+               echo "Using binutils-config info in ${ROOT}"
+       fi
+
+       set -- "${ENV_D}"/*
+       target=
+       i=1
+
+       for x ; do
+               # skip broken links and config files
+               [[ -f ${x} ]] || continue
+               [[ ${x} == */config-* ]] && continue
+
+               source "${x}"
+               if [[ ${target} != ${TARGET} ]] ; then
+                       [[ -n ${target} ]] && echo
+                       target=${TARGET}
+               fi
+
+               x=${x##*/}
+               if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
+                       source "${ENV_D}/config-${TARGET}"
+                       if [[ ${VER} == ${CURRENT} ]] ; then
+                               [[ ${TARGET} == ${HOST} ]] \
+                                       && x="${x} ${GOOD}*${NORMAL}" \
+                                       || x="${x} ${HILITE}*${NORMAL}"
+                       fi
+               fi
+
+               # We would align the [...] field like so:
+               #printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
+               # but this breaks simple scripting: `binutils -l | awk '{print $2}'`
+
+               # Or we could align the target col like so:
+               #printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
+               # but i'm not sold that it looks better
+
+               # So keep it simple ... only makes a diff anyways for crazy people
+               # like me which have 100+ binutils packages installed ...
+               echo " [$i] ${x}"
+               ((++i))
+       done
+}
+
+switch_linker() {
+       local ld=$1
+
+       setup_env || return 1
+
+       # does this binutils even support the requested linker ?
+       if [[ ! -e ${BINPATH}/ld.${ld} ]] ; then
+               eerror "${argv0}: sorry, but ${PROFILE} doesn't support the ${ld} linker"
+               exit 1
+       fi
+
+       # switch it up
+       ln -sf ld.${ld} "${BINPATH}"/ld
+}
+switch_linker_gold() { switch_linker gold ; }
+switch_linker_bfd() { switch_linker bfd ; }
+
+set_HOST() {
+       # Set HOST to CHOST if it isn't already set
+       : ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
+}
+
+ENV_D="${ROOT}etc/env.d/binutils"
+
+DEBUG="no"
+NEED_ACTION="yes"
+DOIT="switch_profile"
+PROFILE="current"
+FAKE_TARGETS_USER=""
+HOST=""
+TARGET=""
+unset UARG
+
+select_action() {
+       if [[ ${NEED_ACTION} != "no" ]] ; then
+               NEED_ACTION="no"
+               DOIT=$1
+       else
+               eerror "${argv0}: one action at a time!"
+               exit 1
+       fi
+}
+
+while [[ $# -gt 0 ]] ; do
+       x=$1
+       shift
+       case ${x} in
+               -c|--get-current-profile)  select_action get_current_profile ;;
+               -l|--list-profiles)        select_action list_profiles ;;
+               -u|--uninstall)            select_action uninstall_target ;;
+               --gold)                    select_action switch_linker_gold ;;
+               --bfd)                     select_action switch_linker_bfd ;;
+               -d|--debug)                DEBUG="yes" ;;
+               -h|--help)                 usage 0 ;;
+               -V|--version)
+                       unset Header
+                       cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $"
+                       cvsver=${cvsver##*binutils-config-}
+                       bver=${cvsver%%,v *}
+                       cvsver=${cvsver#* }
+                       echo "binutils-config-${bver} (r${cvsver%% *})"
+                       exit 0
+                       ;;
+               --amd64|--arm|--mips|--x86)
+                       if [[ ${NEED_ACTION} == "yes" ]] ; then
+                               # Make sure we have a space after each target
+                               NEED_ACTION="no"
+                               case ${x} in
+                                       --amd64) FAKE_TARGETS_USER="x86_64 ";;
+                                       --arm)   FAKE_TARGETS_USER="arm armeb ";;
+                                       --x86)   FAKE_TARGETS_USER="i386 i486 i586 i686 ";;
+                                       --mips)  FAKE_TARGETS_USER="mips mips64 mipsel mipsel64 ";;
+                               esac
+                       fi
+                       ;;
+               -*)
+                       eerror "${0##*/}: Invalid switch!  Try '--help'."
+                       exit 1
+                       ;;
+               *)
+                       if [[ ${UARG+set} == "set" ]] ; then
+                               eerror "${argv0}: only one profile/target at a time please"
+                               exit 1
+                       fi
+                       NEED_ACTION="maybe"
+                       UARG=${x}
+                       ;;
+       esac
+done
+
+[[ ${NEED_ACTION} == "yes" ]] && usage 1
+[[ ${DEBUG} == "yes" ]] && set -x
+
+# All operations need to know the current HOST to figure out
+# what is a native target and what is a cross target
+set_HOST
+
+# All operations need to know the profile the user wants
+case ${DOIT} in
+switch_profile|switch_linker_*)
+       # decode user's profile choice
+       x=${UARG}
+       PROFILE=""
+       if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
+               # User gave us a # representing the profile
+               i=1
+               for y in "${ENV_D}"/* ; do
+                       [[ ${y/config-} != ${y} ]] && continue
+
+                       if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
+                               PROFILE=${y##*/}
+                               break
+                       fi
+                       ((++i))
+               done
+       fi
+
+       if [[ -z ${PROFILE} ]] ; then
+               # User gave us a full HOST-ver
+               x=${x##*/}
+               if [[ ! -f ${ENV_D}/${x} ]] && [[ ! -f ${ENV_D}/config-${x} ]] ; then
+                       # Maybe they just gave us a ver ...
+                       if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
+                               x=${HOST}-${x}
+                       else
+                               eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
+                               exit 1
+                       fi
+               fi
+               PROFILE=${x}
+       fi
+       ;;
+*)
+       # lookup current profile as the user gave us a target
+       PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
+       ;;
+esac
+
+eval ${DOIT}
+
+# vim:ts=4
index a265cf909268238d535bea7eb11fb688e9739adf..9c83ee7adfb86dd64109029f3329cb0000d2898e 100644 (file)
@@ -3,28 +3,38 @@
 binutils-config \- manage active versions of the binutils programs
 .SH "DESCRIPTION"
 The \fBbinutils-config\fR script allows you to switch between different 
-versions of binutils when you have installed multiple copies via portage.  
-It also allows you to manage multiple cross-compiling targets.
+versions of binutils when you have installed multiple copies (see
+USE=multislot).  It also allows you to manage multiple cross-compiling
+targets simultaneously.
 
-Remember, you may have one version of binutils active per \fBCTARGET\fR.
+Remember, you may have one version of binutils active per \fICTARGET\fR,
+and changing the version for one target has no bearing on any other.  So
+changing an active cross-compiler will not break your native compiler
+(i.e. \fICHOST\fR).
 .SH "SYNOPSIS"
-\fBbinutils-config\fR \fI--get-current-profile\fR \fI[TARGET]\fR
+\fBbinutils-config\fR [\fIcrufty options\fR] \fIPROFILE\fR
 
-\fBbinutils-config\fR \fI--list-profiles\fR
+\fBbinutils-config\fR \fB--get-current-profile\fR \fI[TARGET]\fR
 
-\fBbinutils-config\fR \fI--uninstall\fR \fI<TARGET>\fR
+\fBbinutils-config\fR \fB--list-profiles\fR
+
+\fBbinutils-config\fR \fB--uninstall\fR \fITARGET\fR
 .SH "GENERIC OPTIONS"
 .TP
-\fBTARGET\fR
+\fBPROFILE\fR
 Change the system to use the specified binutils version.  This may take the
-form of the list index number (the number shown in the
-\fI\-\-list\-profiles\fR output), a full \fBCTARGET-VERSION\fR (useful when
-working with cross-compilers), or just a binutils \fBVERSION\fR where the
-\fBCTARGET\fR is assumed to be the native \fBCHOST\fR value.
+form of the list index number (the number shown on the left in the
+\fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when
+working with cross-compilers), or just a binutils \fIVERSION\fR where the
+\fITARGET\fR is assumed to be the native \fIHOST\fR value.
+.TP
+\fBTARGET\fR
+Similiar to \fBPROFILE\fR, but this is only the target and no version info
+(i.e. \fICTARGET\fR or \fICHOST\fR).
 .TP
 \fB\-c\fR, \fB\-\-get\-current\-profile\fR \fI[TARGET]\fR
 Display the active profile for \fITARGET\fR.  If none is specified, the 
-host system's \fITARGET\fR will be shown.
+host system's \fITARGET\fR will be shown (i.e. \fICHOST\fR).
 .TP
 \fB\-l\fR, \fB\-\-list\-profiles\fR
 Show all the profiles that your system currently has installed and what
@@ -32,10 +42,19 @@ versions are active.  The active native version is noted with a bright green
 asterisk while the active cross-compiler versions are noted with a light blue
 asterisk.
 .TP
-\fB-u\fR, \fB\-\-uninstall\fR <\fBTARGET\fR>
+\fB-u\fR, \fB\-\-uninstall\fR \fITARGET\fR
 This is really for internal use only.  Used to remove all traces of the 
-\fBTARGET\fR binutils from your system.
-.SH "SPECIFIC OPTIONS"
+\fITARGET\fR binutils from your system.
+.SH "CRUFTY OPTIONS"
+.TP
+\fB\-\-gold\fR
+Change the default linker for the specified \fIPROFILE\fR to the [newer] gold
+linker.  This only works if the binutils actually supports gold.  Note that
+not all options supported by the bfd linker are supportd by the gold linker.
+.TP
+\fB\-\-bfd\fR
+Change the default linker for the specified \fIPROFILE\fR to the [older but
+stable] bfd linker.  If unsure, stick to this one.
 .TP
 \fB\-\-amd64\fR
 A nice feature of the amd64/x86 toolchain is that each can produce code for