merging...

58 files changed, 554 insertions, 490 deletions

diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index 5f322af4f..e1a8985f3 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -3,92 +3,129 @@
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
-#+-------------------+-----------------------+-------------+------------------------------+
-#| _CARCH            | _os (GNU/Linux-libre) | _os (GNU)   | _os (GNU/Linux-libre uClibc) |
-#+-------------------+-----------------------+-------------+------------------------------+
-#| mips64el          | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
-#| x86_64            | unknown-linux-gnu     | unknown-gnu | unknown-uclinux-gnu          |
-#| i[65]86           | pc-linux-gnu          | pc-gnu      | unknown-uclinux-gnu          |
-#| aarch64{,_be}     | unknown-linux-gnu     | -           | unknown-uclinux-gnu          |
-#| arm{,v[765]}{,eb} | unknown-linux-gnueabi | -           | unknown-uclinux-gnueabi      |
-#| sparc64           | unknown-linux-gnu     | -           | -                            |
-#| ia64              | unknown-linux-gnu     | -           | -                            |
-#+-------------------+-----------------------+-------------+------------------------------+
-
-#+----------------+--------------------+
-#| _CARCH         | _os (ELF/EABI)     |
-#+----------------+--------------------+
-#| xtensa         | unknown-elf        |
-#| mips64{,el}    | unknown-elf        |
-#| mips32{,el}    | unknown-elf        |
-#| x86_64         | unknown-elf        |
-#| i[653]86       | unknown-elf        |
-#| aarch64{,_be}  | unknown-elf        |
-#| arm{,eb}       | unknown-eabi       |
-#| powerpc64{,le} | unknown-{elf,eabi} |
-#| powerpc32{,le} | unknown-{elf,eabi} |
-#| sh64{,l}       | unknown-elf        |
-#| sh{,l}         | unknown-elf        |
-#| m68k           | unknown-elf        |
-#+----------------+--------------------+
+# +-------------+-------------+-----------------------------------------------------------+-----------+---------+
+# | -march      | CARCH       | CHOST (_target)                                           | Multilib  | QEMU    |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | _arch       | _CARCH      | _host       | _machine | _system (GNU/*)                  | _multilib | -       |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | mips64el    | mips64el    | mips64el    | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | mips64      | mips64      | mips64      | unknown  | linux-gnu|elf                    | yes       | sys     |
+# | *           | mipsel      | mipsel      | unknown  | elf                              | no        | bin/sys |
+# | *           | mips        | mips        | unknown  | elf                              | no        | bin/sys |
+# | x86_64      | x86_64      | x86_64      | unknown  | linux-gnu|gnu<|elf               | yes       | bin/sys |
+# | i[5-7]86    | i[5-7]86    | i[5-7]86    | pc       | linux-gnu|gnu|                   | no        | bin/sys |
+# | *           | i386        | i386        | unknown  | elf                              | no        | bin/sys |
+# | armv8-a     | aarch64     | aarch64     | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv8-a     | aarch64_be  | aarch64_be  | unknown  | linux-gnu|elf                    | yes       | -       |
+# | armv7-a     | armv7h      | armv7l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv6       | armv6h      | armv6l      | unknown  | linux-gnueabihf                  | no        | bin/sys |
+# | armv5te     | arm         | armv5tel    | unknown  | linux-gnueabi                    | no        | bin/sys |
+# | *           | arm         | arm         | unknown  | eabi                             | no        | bin/sys |
+# | arm         | armeb       | armeb       | unknown  | linux-gnueabi|eabi               | no        | bin     |
+# | sparc64     | sparc64     | sparc64     | unknown  | linux-gnu                        | yes       | bin/sys |
+# | sparc       | sparc       | sparc       | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | ia64        | ia64        | unknown  | linux-gnu                        | yes       | -       |
+# | -           | s390        | s390        | unknown  | linux-gnu                        | no        | -       |
+# | -           | s390x       | s390x       | unknown  | linux-gnu                        | no        | bin/sys |
+# | powerpc64   | powerpc64   | powerpc64   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | bin/sys |
+# | powerpc64le | powerpc64le | powerpc64le | unknown  | linux-gnu|linux-gnueabi|elf|eabi | yes       | -       |
+# | powerpc     | powerpc     | powerpc     | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | bin/sys |
+# | powerpcle   | powerpcle   | powerpcle   | unknown  | linux-gnu|linux-gnueabi|elf|eabi | no        | -       |
+# | -           | spu         | spu         | unknown  | elf                              | no        | -       |
+# | -           | sh64        | sh64        | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh64l       | sh64l       | unknown  | linux-gnu|elf                    | yes       | -       |
+# | -           | sh4         | sh4         | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh4l        | sh4l        | unknown  | linux-gnu                        | no        | bin/sys |
+# | -           | sh          | sh          | unknown  | elf                              | no        | - @     |
+# | -           | shl         | shl         | unknown  | elf                              | no        | - @     |
+# | -           | xtensa      | xtensa      | unknown  | elf                              | no        | sys     |
+# | *           | m68k        | m68k        | unknown  | elf                              | no        | bin/sys |
+# | -           | lm32        | lm32        | unknown  | linux-gnu|elf                    | no        | sys     |
+# | -           | or32        | or32        | unknown  | linux-gnu<|elf<                  | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# For "DOSBox"
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | *           | i386        | i386        | pc       | msdosdjgpp                       | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# For "Wine"
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+# | *           | x86_64      | x86_64      | unknown  | mingw64                          | yes       | bin/sys |
+# | *           | i386        | i386        | unknown  | mingw32                          | no        | bin/sys |
+# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+
+
+# * : Any supported by architecture.
+# - : None.
+# @ : bin/sys (Only sh4 and sh4l support)
+# < : I will support it. (future)
+
+_carch_list=('mips64el' 'mips64' 'x86_64' 'i786' 'i686' 'i586' 'i486' 'i386' 'aarch64' 'aarch64_be'
+             'armv7l' 'armv6l' 'armv5tel' 'armeb' 'sparc64' 'sparc' 'ia64' 's390' 's390x'
+             'powerpc64' 'powerpc64le' 'powerpc' 'powerpcle' 'sh64' 'sh64l' 'sh4' 'sh4l' 'lm32' 'or32')
+_multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'ia64' 'powerpc64' 'powerpc64le''sh64' 'sh64l')
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-_pkgname="binutils"
-
 ### Base FLAGS: ###
-_CARCH="x86_64"
-_os="unknown-linux-gnu"
-_target="${_CARCH}-${_os}"
-_multilib="no"
+# For custom name.
+_pkgname="binutils"
+_pkgver="2.23.2"
+_pkgrel="2"
+# For binutils-common ("${_pkgname}-common${_pkgflag}${_verflag}") release.
+_pkgrelb="2"
+# For _target-binutils ("${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}") release.
+_pkgrelc="2"
+# For older version.
+_add_version_name="no"
+# For custom pkg.
+_pkgflag=""
+
+### Architecture FLAGS: ###
+# CARCH flag 
+_CARCH="mips64"
+# CHOST flags
+_host="${_CARCH}"
+_machine="unknown"
+_system="linux-gnu"
+# Multilib flag
+_multilib="yes"
 
 ### Patch FLAGS: ###
 _patch_ath9k_htc_fw="no"
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-# For "_multilib"
-[[ ${_multilib} == "yes" ]] && {
-  _multilib_name="-multilib"
-  _multilib_desc=" for multilib"
-}
-[[ ${_CARCH} == i686 ||
-   ${_CARCH} == i586 ||
-   ${_CARCH} == i386 ||
-   ${_CARCH} == xtensa ||
-   ${_CARCH} == mips32 ||
-   ${_CARCH} == mips32el ||
-   ${_CARCH} == arm ||
-   ${_CARCH} == armeb ||
-   ${_CARCH} == armv7 ||
-   ${_CARCH} == armv7eb ||
-   ${_CARCH} == armv6 ||
-   ${_CARCH} == armv6eb ||
-   ${_CARCH} == armv5 ||
-   ${_CARCH} == armv5eb ||
-   ${_CARCH} == powerpc32 ||
-   ${_CARCH} == powerpc32le ||
-   ${_CARCH} == sh ||
-   ${_CARCH} == shl ||
-   ${_CARCH} == m68k ]] && _multilib="no"
+# For older version.
+[[ ${_add_version_name} == yes ]] && _verflag="-v${_pkgver}"
+
+# For Architecture.
+_target="${_host}-${_machine}-${_system}"
 
 # For "_patch_ath9k_htc_fw"
+[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
 [[ ${_patch_ath9k_htc_fw} == "yes" ]] && {
   _ath9k_htc_name="-ath9k-htc"
   _ath9k_htc_desc=" adapted for ath9k-htc firmware"
   _multilib="no"
 }
-[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no"
+
+# For "_multilib"
+[[ ${_CARCH} != $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]] && _multilib="no"
+[[ ${_multilib} == "yes" ]] && {
+  _multilib_name="-multilib"
+  _multilib_desc=" for multilib"
+}
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 pkgname=(
-  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}"
-  "${_pkgname}-common"
+  "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}"
+  "${_pkgname}-common${_pkgflag}${_verflag}"
 )
-pkgver=2.23.2
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=${_pkgver}
+pkgrel=${_pkgrel}
+arch=("${_carch_list[@]}")
 url="http://www.gnu.org/software/${_pkgname}/"
 license=('GPL2')
 groups=('cross-devel')
@@ -132,12 +169,7 @@ build() {
   cd ${srcdir}/${_pkgname}-build
 
   [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}"
-  if [[ $CARCH == x86_64 ||
-        $CARCH == mips64el ||
-        $CARCH == aarch64 ||
-        $CARCH == aarch64_be ||
-        $CARCH == sparc64 ||
-        $CARCH == ia64 ]]; then
+  if [[ ${_CARCH} == $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]]; then
     _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32"
   else
     _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib"
@@ -149,7 +181,7 @@ build() {
     _MULTILIB='--disable-multilib'
   fi
 
-  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]}/${pkgver} \
+  ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]/${_verflag}/}/${pkgver} \
     $_TARGET $_LIB_PATH \
     --program-prefix=${_target}- \
     --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \
@@ -164,7 +196,7 @@ build() {
   msg "Check the host environment and makes sure all the necessary tools are available"
   make configure-host
 
-  make tooldir=/opt/${pkgname[0]}/${pkgver}
+  make tooldir=/opt/${pkgname[0]/${_verflag}/}/${pkgver}
 }
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
@@ -180,7 +212,7 @@ check() {
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 _target-binutils() {
-  pkgrel=$pkgrel
+  pkgrel=${_pkgrelc}
   pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)"
   depends=('glibc>=2.17' 'zlib' "${_pkgname}-common")
   [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}")
@@ -193,7 +225,7 @@ _target-binutils() {
   install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install"
 
   cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
 
   # temp #
   msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!"
@@ -208,8 +240,8 @@ _target-binutils() {
 
   [[ $CARCH != ${_CARCH} ]] && {
     msg "Move 'lib' files and directories, and remove architecture directories"
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
-    rmdir -v ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST/{${_target}/{lib,},}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/lib/*,lib}
+    rmdir -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST/{${_target}/{lib,},}
   }
 
   msg "Change lib-path on ldscripts files"
@@ -217,7 +249,7 @@ _target-binutils() {
           /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g;
           /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g;
-         " ${pkgdir}/opt/${pkgname}/${pkgver}/lib/ldscripts/*
+         " ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib/ldscripts/*
 
   _removebin=(ar as nm objcopy objdump ranlib strip)
   for _rbin in ${_removebin[@]}; do
@@ -228,10 +260,10 @@ _target-binutils() {
   msg "Create links for libraries"
   install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d}
   ln -vs ../lib ${pkgdir}/usr/${_target}/lib
-  echo /opt/${pkgname}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
+  echo /opt/${pkgname/${_verflag}/}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf
 
   msg "Install PIC libiberty.a"
-  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname[0]}/${pkgver}/lib
+  install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib
 
   msg "Remove unnecessaries manuals and create links for manuals"
   _man=$(ls -1A ${pkgdir}/usr/share/man/man1)
@@ -248,69 +280,64 @@ _target-binutils() {
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
-# GNU/Linux-libre with GNU C Library (glibc)
+# GNU/Linux-libre
 package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; }
 package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_mips64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_mips64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
 package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; }
 package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_i786-pc-linux-gnu-binutils() { _target-binutils; }
 package_i686-pc-linux-gnu-binutils() { _target-binutils; }
 package_i586-pc-linux-gnu-binutils() { _target-binutils; }
 package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; }
 package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
 package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; }
 package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
-package_arm-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm7l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm6l-unknown-linux-gnueabi-binutils() { _target-binutils; }
+package_arm5tel-unknown-linux-gnueabi-binutils() { _target-binutils; }
 package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv7-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv7eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv6-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv6eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv5-unknown-linux-gnueabi-binutils() { _target-binutils; }
-package_armv5eb-unknown-linux-gnueabi-binutils() { _target-binutils; }
 package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
 package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sparc-unknown-linux-gnu-binutils() { _target-binutils; }
 package_ia64-unknown-linux-gnu-binutils() { _target-binutils; }
 package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_s390-unknown-linux-gnu-binutils() { _target-binutils; }
+package_s390x-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpc64le-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_powerpc-unknown-linux-gnu-binutils() { _target-binutils; }
+package_powerpcle-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh64l-unknown-linux-gnu-binutils-multilib() { _target-binutils; }
+package_sh4-unknown-linux-gnu-binutils() { _target-binutils; }
+package_sh4l-unknown-linux-gnu-binutils() { _target-binutils; }
+package_lm32-unknown-linux-gnu-binutils() { _target-binutils; }
+package_or32-unknown-linux-gnu-binutils() { _target-binutils; }
 
 # GNU
 package_x86_64-unknown-gnu-binutils() { _target-binutils; }
 package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; }
+package_i786-pc-gnu-binutils() { _target-binutils; }
 package_i686-pc-gnu-binutils() { _target-binutils; }
 package_i586-pc-gnu-binutils() { _target-binutils; }
 
-# GNU/Linux-libre with uClibc
-package_mips64el-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_mips64el-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
-package_x86_64-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_x86_64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
-package_i686-pc-uclinux-gnu-binutils() { _target-binutils; }
-package_i586-pc-uclinux-gnu-binutils() { _target-binutils; }
-package_aarch64-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_aarch64-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
-package_aarch64_be-unknown-uclinux-gnu-binutils() { _target-binutils; }
-package_aarch64_be-unknown-uclinux-gnu-binutils-multilib() { _target-binutils; }
-package_arm-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armeb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv7-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv7eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv6-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv6eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv5-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-package_armv5eb-unknown-uclinux-gnueabi-binutils() { _target-binutils; }
-
 # ELF or EABI only
-package_xtensa-unknown-elf-binutils() { _target-binutils; }
-package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
 package_mips64el-unknown-elf-binutils() { _target-binutils; }
 package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; }
 package_mips64-unknown-elf-binutils() { _target-binutils; }
 package_mips64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_mips32el-unknown-elf-binutils() { _target-binutils; }
-package_mips32-unknown-elf-binutils() { _target-binutils; }
+package_mipsel-unknown-elf-binutils() { _target-binutils; }
+package_mips-unknown-elf-binutils() { _target-binutils; }
 package_x86_64-unknown-elf-binutils() { _target-binutils; }
 package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_i686-unknown-elf-binutils() { _target-binutils; }
-package_i586-unknown-elf-binutils() { _target-binutils; }
 package_i386-unknown-elf-binutils() { _target-binutils; }
 package_aarch64-unknown-elf-binutils() { _target-binutils; }
 package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; }
@@ -320,55 +347,60 @@ package_arm-unknown-eabi-binutils() { _target-binutils; }
 package_armeb-unknown-eabi-binutils() { _target-binutils; }
 package_powerpc64-unknown-elf-binutils() { _target-binutils; }
 package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; }
-package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
-package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; }
-package_powerpc32-unknown-elf-binutils() { _target-binutils; }
-package_powerpc32le-unknown-elf-binutils() { _target-binutils; }
 package_powerpc64-unknown-eabi-binutils() { _target-binutils; }
 package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils() { _target-binutils; }
+package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; }
 package_powerpc64le-unknown-eabi-binutils() { _target-binutils; }
 package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; }
-package_powerpc32-unknown-eabi-binutils() { _target-binutils; }
-package_powerpc32le-unknown-eabi-binutils() { _target-binutils; }
+package_powerpc-unknown-elf-binutils() { _target-binutils; }
+package_powerpc-unknown-eabi-binutils() { _target-binutils; }
+package_powerpcle-unknown-elf-binutils() { _target-binutils; }
+package_powerpcle-unknown-eabi-binutils() { _target-binutils; }
+package_spu-unknown-elf-binutils() { _target-binutils; }
 package_sh64-unknown-elf-binutils() { _target-binutils; }
 package_sh64-unknown-elf-binutils-multilib() { _target-binutils; }
 package_sh64l-unknown-elf-binutils() { _target-binutils; }
 package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; }
 package_sh-unknown-elf-binutils() { _target-binutils; }
 package_shl-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils() { _target-binutils; }
+package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; }
 package_m68k-unknown-elf-binutils() { _target-binutils; }
+package_lm32-unknown-elf-binutils() { _target-binutils; }
+package_or32-unknown-elf-binutils() { _target-binutils; }
 
 #---------------------------------------------------------------------------------------------------------------------------------------------
 
 package_binutils-common() {
-  pkgrel=$pkgrel
+  pkgrel=${_pkgrelb}
   pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)"
   arch=('any')
   depends=('linktools')
   install="${_pkgname}.install"
 
   cd ${srcdir}/${_pkgname}-build
-  make prefix=${pkgdir}/opt/${pkgname}/${pkgver} tooldir=${pkgdir}/opt/${pkgname}/${pkgver} install
+  make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install
 
   [[ $CARCH != ${_CARCH} ]] && {
     msg "Move 'include' files and directories"
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/{$CHOST/${_target}/include,}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/include,}
   }
 
   msg "Add some useful headers"
-  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname}/${pkgver}/include
+  install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/include
 
   msg "Remove unnecessaries files and directories"
-  rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/{bin,lib}
+  rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{bin,lib}
   [[ $CARCH != ${_CARCH} ]] && {
-    rm -vr ${pkgdir}/opt/${pkgname}/${pkgver}/$CHOST
+    rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST
   }
 
   msg "Rename manuals"
-  _man=$(ls -1A ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1)
+  _man=$(ls -1A ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1)
   for _man_stage1 in ${_man[@]}; do
     _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/}
     _manuals=${_man_stage2/${_target}-/}
-    mv -v ${pkgdir}/opt/${pkgname}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
+    mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}}
   done
 }
diff --git a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 0420b342a..000000000
--- a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64-unknown-uclinux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 8ecd22ed1..000000000
--- a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=aarch64_be-unknown-uclinux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
index b44e358f1..f1053cd1e 100644
--- a/~coadde/cross-binutils/armeb-unknown-uclinux-gnueabi.install
+++ b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=armeb-unknown-uclinux-gnueabi-binutils
+_pkgname=arm5tel-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
index e7cee926c..fa11d3f92 100644
--- a/~coadde/cross-binutils/arm-unknown-uclinux-gnueabi.install
+++ b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=arm-unknown-uclinux-gnueabi-binutils
+_pkgname=arm6l-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
index fa1e49875..4e9ca080f 100644
--- a/~coadde/cross-binutils/aarch64-unknown-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
@@ -1,4 +1,4 @@
-_pkgname=aarch64-unknown-uclinux-gnu-binutils
+_pkgname=arm7l-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
deleted file mode 100644
index 69faa8902..000000000
--- a/~coadde/cross-binutils/armv5-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv5-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install
deleted file mode 100644
index 1b92d60a0..000000000
--- a/~coadde/cross-binutils/armv5eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv5eb-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install
deleted file mode 100644
index 3370ab5b5..000000000
--- a/~coadde/cross-binutils/armv5eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv5eb-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install
deleted file mode 100644
index b5dcd7d38..000000000
--- a/~coadde/cross-binutils/armv6-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv6-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install
deleted file mode 100644
index 63169847e..000000000
--- a/~coadde/cross-binutils/armv6-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv6-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install
deleted file mode 100644
index 72ea5a267..000000000
--- a/~coadde/cross-binutils/armv6eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv6eb-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install
deleted file mode 100644
index ba95c1b5d..000000000
--- a/~coadde/cross-binutils/armv6eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv6eb-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install
deleted file mode 100644
index b0cadf5af..000000000
--- a/~coadde/cross-binutils/armv7-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv7-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install
deleted file mode 100644
index 42f2d1cea..000000000
--- a/~coadde/cross-binutils/armv7-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv7-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install
deleted file mode 100644
index b4510863d..000000000
--- a/~coadde/cross-binutils/armv7eb-unknown-linux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv7eb-unknown-linux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install b/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install
deleted file mode 100644
index faa3e3b77..000000000
--- a/~coadde/cross-binutils/armv7eb-unknown-uclinux-gnueabi.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=armv7eb-unknown-uclinux-gnueabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/i586-unknown-elf-binutils.install b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
index 4c55c2c6e..f77927c8d 100644
--- a/~coadde/cross-binutils/i586-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i586-unknown-elf-binutils
+_pkgname=i786-pc-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/mips32-unknown-elf-binutils.install b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
index c16855af8..b6422d2ce 100644
--- a/~coadde/cross-binutils/mips32-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=mips32-unknown-elf-binutils
+_pkgname=i786-pc-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/i686-unknown-elf-binutils.install b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
index f92849138..c2481ba1f 100644
--- a/~coadde/cross-binutils/i686-unknown-elf-binutils.install
+++ b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i686-unknown-elf-binutils
+_pkgname=lm32-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..e59746dd4
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=lm32-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
index 04ece7396..f8dd9a4ad 100644
--- a/~coadde/cross-binutils/i686-pc-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i686-pc-uclinux-gnu-binutils
+_pkgname=mips-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
deleted file mode 100644
index 83ef0456f..000000000
--- a/~coadde/cross-binutils/mips32el-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips32el-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..7ae20c93c
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..3da7b37e3
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mips64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index b633641d5..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-uclinux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install
deleted file mode 100644
index 29094da95..000000000
--- a/~coadde/cross-binutils/mips64el-unknown-uclinux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=mips64el-unknown-uclinux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
new file mode 100644
index 000000000..87c99efcf
--- /dev/null
+++ b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=mipsel-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/or32-unknown-elf-binutils.install b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
new file mode 100644
index 000000000..92833bd5d
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..8427c5c91
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=or32-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
new file mode 100644
index 000000000..eed9a2c98
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
index 2729ec574..fbd5f0556 100644
--- a/~coadde/cross-binutils/i586-pc-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=i586-pc-uclinux-gnu-binutils
+_pkgname=powerpc-unknown-elf-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
index 011cd2ae3..b7e544e48 100644
--- a/~coadde/cross-binutils/arm-unknown-linux-gnueabi.install
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=arm-unknown-linux-gnueabi-binutils
+_pkgname=powerpc-unknown-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..5667c84e2
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
deleted file mode 100644
index 6db625881..000000000
--- a/~coadde/cross-binutils/powerpc32-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc32-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install
deleted file mode 100644
index dcc691e53..000000000
--- a/~coadde/cross-binutils/powerpc32-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc32-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install
deleted file mode 100644
index dd55db2d7..000000000
--- a/~coadde/cross-binutils/powerpc32le-unknown-eabi-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc32le-unknown-eabi-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install
deleted file mode 100644
index d304b6799..000000000
--- a/~coadde/cross-binutils/powerpc32le-unknown-elf-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=powerpc32le-unknown-elf-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
index afdc1ebc8..15a8c37c5 100644
--- a/~coadde/cross-binutils/armv5-unknown-linux-gnueabi.install
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=armv5-unknown-linux-gnueabi-binutils
+_pkgname=powerpc64-unknown-linux-gnu-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
index 017efb727..28e4914c6 100644
--- a/~coadde/cross-binutils/aarch64_be-unknown-uclinux-gnu-binutils.install
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
@@ -1,4 +1,4 @@
-_pkgname=aarch64_be-unknown-uclinux-gnu-binutils
+_pkgname=powerpc64-unknown-linux-gnueabi-binutils
 
 post_install() {
   linktools set $_pkgname
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f8872d8e1
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..ae20ca33c
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpc64le-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
new file mode 100644
index 000000000..850610fc6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-eabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
new file mode 100644
index 000000000..24e07a7ec
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..b681acc4b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
new file mode 100644
index 000000000..6559cdd29
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=powerpcle-unknown-linux-gnueabi-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..0a583f543
--- /dev/null
+++ b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..dc576d75e
--- /dev/null
+++ b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=s390x-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..5843ac274
--- /dev/null
+++ b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f97168df0
--- /dev/null
+++ b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh4l-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..451eedb44
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..2af6a7268
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
new file mode 100644
index 000000000..71c191e1c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-linux-gnu-binutils-multilib
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..cbe5c788a
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sh64l-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
new file mode 100644
index 000000000..f3dfca2d3
--- /dev/null
+++ b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=sparc-unknown-linux-gnu-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/spu-unknown-elf-binutils.install b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
new file mode 100644
index 000000000..204d4bfb2
--- /dev/null
+++ b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_pkgname=spu-unknown-elf-binutils
+
+post_install() {
+  linktools set $_pkgname
+  linktools update binutils
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  [[ $_pkgname == $(linktools check) ]] && {
+    linktools unset
+  }
+}
diff --git a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
deleted file mode 100644
index 69bbb9180..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils-multilib.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-uclinux-gnu-binutils-multilib
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}
diff --git a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install
deleted file mode 100644
index 0a16733a9..000000000
--- a/~coadde/cross-binutils/x86_64-unknown-uclinux-gnu-binutils.install
+++ /dev/null
@@ -1,16 +0,0 @@
-_pkgname=x86_64-unknown-uclinux-gnu-binutils
-
-post_install() {
-  linktools set $_pkgname
-  linktools update binutils
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  [[ $_pkgname == $(linktools check) ]] && {
-    linktools unset
-  }
-}