From b55c648ad3b92fbacef10661f8a6725e37d790a9 Mon Sep 17 00:00:00 2001
From: "jk7744.park" <jk7744.park@samsung.com>
Date: Sun, 1 Feb 2015 13:09:13 +0900
Subject: [PATCH] tizen 2.3 release

---
 packaging/baselibs.conf                      | 152 +++++++------
 packaging/baselibs.conf.old                  | 307 ---------------------------
 packaging/binutils.spec                      |  18 +-
 packaging/cross-armv5tel-binutils-accel.spec |  19 +-
 packaging/cross-armv5tel-binutils.spec       |  17 +-
 packaging/cross-armv6l-binutils-accel.spec   |  19 +-
 packaging/cross-armv6l-binutils.spec         |  17 +-
 packaging/cross-armv7hl-binutils-accel.spec  |  19 +-
 packaging/cross-armv7hl-binutils.spec        |  17 +-
 packaging/cross-armv7l-binutils-accel.spec   |  19 +-
 packaging/cross-armv7l-binutils.spec         |  17 +-
 packaging/cross-armv7nhl-binutils-accel.spec |  19 +-
 packaging/cross-armv7nhl-binutils.spec       |  17 +-
 packaging/cross-mipsel-binutils-accel.spec   |  19 +-
 packaging/cross-mipsel-binutils.spec         |  17 +-
 packaging/precheckin.sh                      |  30 +--
 16 files changed, 279 insertions(+), 444 deletions(-)
 delete mode 100644 packaging/baselibs.conf.old

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index 69e3f7d..7e5b1a3 100644
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1,6 +1,8 @@
 arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel 
+arch x86_64 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel 
 
-cross-armv5tel-binutils-accel
+
+cross-armv5tel-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv6l block!
@@ -11,9 +13,10 @@ cross-armv5tel-binutils-accel
 
   targettype armv5tel autoreqprov off
   targettype armv5tel provides "cross-arm-binutils-accel"
+  targettype armv5tel provides "cross-armv5tel-binutils-accel-armv5tel"
   targettype armv5tel requires "cross-arm-gcc-accel"
-  targettype armv5tel requires "glibc-x86-arm"
-  targettype armv5tel requires "zlib-x86-arm"
+  targettype armv5tel requires "eglibc-@X86@-arm"
+  targettype armv5tel requires "zlib-@X86@-arm"
   targettype armv5tel requires "binutils"
   targettype armv5tel prefix /emul/ia32-linux
   targettype armv5tel extension -arm
@@ -24,34 +27,36 @@ cross-armv5tel-binutils-accel
 
   targettype armv5tel post "#set -x"
   targettype armv5tel post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv5tel post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv5tel post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv5tel post "   binary="/usr/bin/${bin}" "
   targettype armv5tel post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype armv5tel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype armv5tel post "   else "
   targettype armv5tel post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv5tel post "     ln -s ${binary} /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv5tel post "     ln -s ${binary} /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv5tel post "   fi "
   targettype armv5tel post " done "
-  targettype armv5tel post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv5tel post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv5tel post " ln -sf /usr/bin/ld /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv5tel post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv5tel post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype armv5tel preun " set -x"
   targettype armv5tel preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv5tel preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv5tel preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv5tel preun "   binary="/usr/bin/${bin}" "
   targettype armv5tel preun "   if test -e ${binary}.orig-arm ; then"
   targettype armv5tel preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv5tel preun "     rm /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv5tel preun "     rm /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv5tel preun "   else "
   targettype armv5tel preun "     echo "${binary}.orig-arm not present !" "
   targettype armv5tel preun "   fi "
   targettype armv5tel preun " done "
-  targettype armv5tel preun " rm -f /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv5tel preun " rm -f /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv5tel preun " rm -f /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv5tel preun " rm -f /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv5tel preun " rm -f /usr/lib/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
 
-cross-armv6l-binutils-accel
+cross-armv6l-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv5tel block!
@@ -62,9 +67,10 @@ cross-armv6l-binutils-accel
 
   targettype armv6l autoreqprov off
   targettype armv6l provides "cross-arm-binutils-accel"
+  targettype armv6l provides "cross-armv6l-binutils-accel-armv6l"
   targettype armv6l requires "cross-arm-gcc-accel"
-  targettype armv6l requires "glibc-x86-arm"
-  targettype armv6l requires "zlib-x86-arm"
+  targettype armv6l requires "eglibc-@X86@-arm"
+  targettype armv6l requires "zlib-@X86@-arm"
   targettype armv6l requires "binutils"
   targettype armv6l prefix /emul/ia32-linux
   targettype armv6l extension -arm
@@ -75,34 +81,36 @@ cross-armv6l-binutils-accel
 
   targettype armv6l post "#set -x"
   targettype armv6l post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv6l post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv6l post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv6l post "   binary="/usr/bin/${bin}" "
   targettype armv6l post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype armv6l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype armv6l post "   else "
   targettype armv6l post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv6l post "     ln -s ${binary} /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv6l post "     ln -s ${binary} /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv6l post "   fi "
   targettype armv6l post " done "
-  targettype armv6l post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv6l post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv6l post " ln -sf /usr/bin/ld /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv6l post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv6l post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype armv6l preun " set -x"
   targettype armv6l preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv6l preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv6l preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv6l preun "   binary="/usr/bin/${bin}" "
   targettype armv6l preun "   if test -e ${binary}.orig-arm ; then"
   targettype armv6l preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv6l preun "     rm /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv6l preun "     rm /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv6l preun "   else "
   targettype armv6l preun "     echo "${binary}.orig-arm not present !" "
   targettype armv6l preun "   fi "
   targettype armv6l preun " done "
-  targettype armv6l preun " rm -f /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv6l preun " rm -f /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv6l preun " rm -f /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv6l preun " rm -f /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv6l preun " rm -f /usr/lib/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
 
-cross-armv7l-binutils-accel
+cross-armv7l-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv5tel block!
@@ -113,9 +121,10 @@ cross-armv7l-binutils-accel
 
   targettype armv7l autoreqprov off
   targettype armv7l provides "cross-arm-binutils-accel"
+  targettype armv7l provides "cross-armv7l-binutils-accel-armv7l"
   targettype armv7l requires "cross-arm-gcc-accel"
-  targettype armv7l requires "glibc-x86-arm"
-  targettype armv7l requires "zlib-x86-arm"
+  targettype armv7l requires "eglibc-@X86@-arm"
+  targettype armv7l requires "zlib-@X86@-arm"
   targettype armv7l requires "binutils"
   targettype armv7l prefix /emul/ia32-linux
   targettype armv7l extension -arm
@@ -126,34 +135,36 @@ cross-armv7l-binutils-accel
 
   targettype armv7l post "#set -x"
   targettype armv7l post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7l post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7l post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7l post "   binary="/usr/bin/${bin}" "
   targettype armv7l post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype armv7l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype armv7l post "   else "
   targettype armv7l post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7l post "     ln -s ${binary} /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7l post "     ln -s ${binary} /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7l post "   fi "
   targettype armv7l post " done "
-  targettype armv7l post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7l post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7l post " ln -sf /usr/bin/ld /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7l post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7l post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype armv7l preun " set -x"
   targettype armv7l preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7l preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7l preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7l preun "   binary="/usr/bin/${bin}" "
   targettype armv7l preun "   if test -e ${binary}.orig-arm ; then"
   targettype armv7l preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7l preun "     rm /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7l preun "     rm /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7l preun "   else "
   targettype armv7l preun "     echo "${binary}.orig-arm not present !" "
   targettype armv7l preun "   fi "
   targettype armv7l preun " done "
-  targettype armv7l preun " rm -f /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7l preun " rm -f /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7l preun " rm -f /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7l preun " rm -f /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7l preun " rm -f /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
 
-cross-armv7hl-binutils-accel
+cross-armv7hl-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv5tel block!
@@ -164,9 +175,10 @@ cross-armv7hl-binutils-accel
 
   targettype armv7hl autoreqprov off
   targettype armv7hl provides "cross-arm-binutils-accel"
+  targettype armv7hl provides "cross-armv7hl-binutils-accel-armv7hl"
   targettype armv7hl requires "cross-arm-gcc-accel"
-  targettype armv7hl requires "glibc-x86-arm"
-  targettype armv7hl requires "zlib-x86-arm"
+  targettype armv7hl requires "eglibc-@X86@-arm"
+  targettype armv7hl requires "zlib-@X86@-arm"
   targettype armv7hl requires "binutils"
   targettype armv7hl prefix /emul/ia32-linux
   targettype armv7hl extension -arm
@@ -177,34 +189,36 @@ cross-armv7hl-binutils-accel
 
   targettype armv7hl post "#set -x"
   targettype armv7hl post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7hl post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7hl post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7hl post "   binary="/usr/bin/${bin}" "
   targettype armv7hl post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype armv7hl post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype armv7hl post "   else "
   targettype armv7hl post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7hl post "     ln -s ${binary} /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7hl post "     ln -s ${binary} /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7hl post "   fi "
   targettype armv7hl post " done "
-  targettype armv7hl post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7hl post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7hl post " ln -sf /usr/bin/ld /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7hl post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7hl post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype armv7hl preun " set -x"
   targettype armv7hl preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7hl preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7hl preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7hl preun "   binary="/usr/bin/${bin}" "
   targettype armv7hl preun "   if test -e ${binary}.orig-arm ; then"
   targettype armv7hl preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7hl preun "     rm /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7hl preun "     rm /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7hl preun "   else "
   targettype armv7hl preun "     echo "${binary}.orig-arm not present !" "
   targettype armv7hl preun "   fi "
   targettype armv7hl preun " done "
-  targettype armv7hl preun " rm -f /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7hl preun " rm -f /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7hl preun " rm -f /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7hl preun " rm -f /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7hl preun " rm -f /usr/lib/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
 
-cross-armv7nhl-binutils-accel
+cross-armv7nhl-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv5tel block!
@@ -215,9 +229,10 @@ cross-armv7nhl-binutils-accel
 
   targettype armv7nhl autoreqprov off
   targettype armv7nhl provides "cross-arm-binutils-accel"
+  targettype armv7nhl provides "cross-armv7nhl-binutils-accel-armv7nhl"
   targettype armv7nhl requires "cross-arm-gcc-accel"
-  targettype armv7nhl requires "glibc-x86-arm"
-  targettype armv7nhl requires "zlib-x86-arm"
+  targettype armv7nhl requires "eglibc-@X86@-arm"
+  targettype armv7nhl requires "zlib-@X86@-arm"
   targettype armv7nhl requires "binutils"
   targettype armv7nhl prefix /emul/ia32-linux
   targettype armv7nhl extension -arm
@@ -228,34 +243,36 @@ cross-armv7nhl-binutils-accel
 
   targettype armv7nhl post "#set -x"
   targettype armv7nhl post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7nhl post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7nhl post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7nhl post "   binary="/usr/bin/${bin}" "
   targettype armv7nhl post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype armv7nhl post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype armv7nhl post "   else "
   targettype armv7nhl post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7nhl post "     ln -s ${binary} /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7nhl post "     ln -s ${binary} /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7nhl post "   fi "
   targettype armv7nhl post " done "
-  targettype armv7nhl post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7nhl post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7nhl post " ln -sf /usr/bin/ld /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7nhl post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7nhl post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype armv7nhl preun " set -x"
   targettype armv7nhl preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7nhl preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype armv7nhl preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype armv7nhl preun "   binary="/usr/bin/${bin}" "
   targettype armv7nhl preun "   if test -e ${binary}.orig-arm ; then"
   targettype armv7nhl preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7nhl preun "     rm /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype armv7nhl preun "     rm /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype armv7nhl preun "   else "
   targettype armv7nhl preun "     echo "${binary}.orig-arm not present !" "
   targettype armv7nhl preun "   fi "
   targettype armv7nhl preun " done "
-  targettype armv7nhl preun " rm -f /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7nhl preun " rm -f /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7nhl preun " rm -f /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype armv7nhl preun " rm -f /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype armv7nhl preun " rm -f /usr/lib/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
 
-cross-mipsel-binutils-accel
+cross-mipsel-binutils-accel-@X86@
   targettype x86 block!
   targettype 32bit block!
   targettype armv5tel block!
@@ -266,9 +283,10 @@ cross-mipsel-binutils-accel
 
   targettype mipsel autoreqprov off
   targettype mipsel provides "cross-arm-binutils-accel"
+  targettype mipsel provides "cross-mipsel-binutils-accel-mipsel"
   targettype mipsel requires "cross-arm-gcc-accel"
-  targettype mipsel requires "glibc-x86-arm"
-  targettype mipsel requires "zlib-x86-arm"
+  targettype mipsel requires "eglibc-@X86@-arm"
+  targettype mipsel requires "zlib-@X86@-arm"
   targettype mipsel requires "binutils"
   targettype mipsel prefix /emul/ia32-linux
   targettype mipsel extension -arm
@@ -279,29 +297,31 @@ cross-mipsel-binutils-accel
 
   targettype mipsel post "#set -x"
   targettype mipsel post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype mipsel post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype mipsel post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype mipsel post "   binary="/usr/bin/${bin}" "
   targettype mipsel post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
   targettype mipsel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
   targettype mipsel post "   else "
   targettype mipsel post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype mipsel post "     ln -s ${binary} /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype mipsel post "     ln -s ${binary} /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype mipsel post "   fi "
   targettype mipsel post " done "
-  targettype mipsel post " ln -sf /usr/bin/ld /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype mipsel post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype mipsel post " ln -sf /usr/bin/ld /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype mipsel post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype mipsel post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
   targettype mipsel preun " set -x"
   targettype mipsel preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype mipsel preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype mipsel preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype mipsel preun "   binary="/usr/bin/${bin}" "
   targettype mipsel preun "   if test -e ${binary}.orig-arm ; then"
   targettype mipsel preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype mipsel preun "     rm /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
+  targettype mipsel preun "     rm /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
   targettype mipsel preun "   else "
   targettype mipsel preun "     echo "${binary}.orig-arm not present !" "
   targettype mipsel preun "   fi "
   targettype mipsel preun " done "
-  targettype mipsel preun " rm -f /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype mipsel preun " rm -f /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype mipsel preun " rm -f /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
+  targettype mipsel preun " rm -f /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
+  targettype mipsel preun " rm -f /usr/lib/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.gold"
 
diff --git a/packaging/baselibs.conf.old b/packaging/baselibs.conf.old
deleted file mode 100644
index 69e3f7d..0000000
--- a/packaging/baselibs.conf.old
+++ /dev/null
@@ -1,307 +0,0 @@
-arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel 
-
-cross-armv5tel-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv6l block!
-  targettype armv7l block!
-  targettype armv7hl block!
-  targettype armv7nhl block!
-  targettype mipsel block!
-
-  targettype armv5tel autoreqprov off
-  targettype armv5tel provides "cross-arm-binutils-accel"
-  targettype armv5tel requires "cross-arm-gcc-accel"
-  targettype armv5tel requires "glibc-x86-arm"
-  targettype armv5tel requires "zlib-x86-arm"
-  targettype armv5tel requires "binutils"
-  targettype armv5tel prefix /emul/ia32-linux
-  targettype armv5tel extension -arm
-  targettype armv5tel +/
-  targettype armv5tel -/usr/share/man
-  targettype armv5tel -/usr/share/doc
-  targettype armv5tel requires "tizen-accelerator"
-
-  targettype armv5tel post "#set -x"
-  targettype armv5tel post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv5tel post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv5tel post "   binary="/usr/bin/${bin}" "
-  targettype armv5tel post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype armv5tel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype armv5tel post "   else "
-  targettype armv5tel post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv5tel post "     ln -s ${binary} /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv5tel post "   fi "
-  targettype armv5tel post " done "
-  targettype armv5tel post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv5tel post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype armv5tel preun " set -x"
-  targettype armv5tel preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv5tel preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv5tel preun "   binary="/usr/bin/${bin}" "
-  targettype armv5tel preun "   if test -e ${binary}.orig-arm ; then"
-  targettype armv5tel preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv5tel preun "     rm /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv5tel preun "   else "
-  targettype armv5tel preun "     echo "${binary}.orig-arm not present !" "
-  targettype armv5tel preun "   fi "
-  targettype armv5tel preun " done "
-  targettype armv5tel preun " rm -f /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv5tel preun " rm -f /usr/libexec/gcc/armv5tel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-
-cross-armv6l-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv7l block!
-  targettype armv7hl block!
-  targettype armv7nhl block!
-  targettype mipsel block!
-
-  targettype armv6l autoreqprov off
-  targettype armv6l provides "cross-arm-binutils-accel"
-  targettype armv6l requires "cross-arm-gcc-accel"
-  targettype armv6l requires "glibc-x86-arm"
-  targettype armv6l requires "zlib-x86-arm"
-  targettype armv6l requires "binutils"
-  targettype armv6l prefix /emul/ia32-linux
-  targettype armv6l extension -arm
-  targettype armv6l +/
-  targettype armv6l -/usr/share/man
-  targettype armv6l -/usr/share/doc
-  targettype armv6l requires "tizen-accelerator"
-
-  targettype armv6l post "#set -x"
-  targettype armv6l post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv6l post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv6l post "   binary="/usr/bin/${bin}" "
-  targettype armv6l post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype armv6l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype armv6l post "   else "
-  targettype armv6l post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv6l post "     ln -s ${binary} /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv6l post "   fi "
-  targettype armv6l post " done "
-  targettype armv6l post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv6l post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype armv6l preun " set -x"
-  targettype armv6l preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv6l preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv6l preun "   binary="/usr/bin/${bin}" "
-  targettype armv6l preun "   if test -e ${binary}.orig-arm ; then"
-  targettype armv6l preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv6l preun "     rm /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv6l preun "   else "
-  targettype armv6l preun "     echo "${binary}.orig-arm not present !" "
-  targettype armv6l preun "   fi "
-  targettype armv6l preun " done "
-  targettype armv6l preun " rm -f /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv6l preun " rm -f /usr/libexec/gcc/armv6l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-
-cross-armv7l-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv6l block!
-  targettype armv7hl block!
-  targettype armv7nhl block!
-  targettype mipsel block!
-
-  targettype armv7l autoreqprov off
-  targettype armv7l provides "cross-arm-binutils-accel"
-  targettype armv7l requires "cross-arm-gcc-accel"
-  targettype armv7l requires "glibc-x86-arm"
-  targettype armv7l requires "zlib-x86-arm"
-  targettype armv7l requires "binutils"
-  targettype armv7l prefix /emul/ia32-linux
-  targettype armv7l extension -arm
-  targettype armv7l +/
-  targettype armv7l -/usr/share/man
-  targettype armv7l -/usr/share/doc
-  targettype armv7l requires "tizen-accelerator"
-
-  targettype armv7l post "#set -x"
-  targettype armv7l post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7l post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7l post "   binary="/usr/bin/${bin}" "
-  targettype armv7l post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype armv7l post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype armv7l post "   else "
-  targettype armv7l post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7l post "     ln -s ${binary} /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7l post "   fi "
-  targettype armv7l post " done "
-  targettype armv7l post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7l post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype armv7l preun " set -x"
-  targettype armv7l preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7l preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7l preun "   binary="/usr/bin/${bin}" "
-  targettype armv7l preun "   if test -e ${binary}.orig-arm ; then"
-  targettype armv7l preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7l preun "     rm /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7l preun "   else "
-  targettype armv7l preun "     echo "${binary}.orig-arm not present !" "
-  targettype armv7l preun "   fi "
-  targettype armv7l preun " done "
-  targettype armv7l preun " rm -f /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7l preun " rm -f /usr/libexec/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-
-cross-armv7hl-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv6l block!
-  targettype armv7l block!
-  targettype armv7nhl block!
-  targettype mipsel block!
-
-  targettype armv7hl autoreqprov off
-  targettype armv7hl provides "cross-arm-binutils-accel"
-  targettype armv7hl requires "cross-arm-gcc-accel"
-  targettype armv7hl requires "glibc-x86-arm"
-  targettype armv7hl requires "zlib-x86-arm"
-  targettype armv7hl requires "binutils"
-  targettype armv7hl prefix /emul/ia32-linux
-  targettype armv7hl extension -arm
-  targettype armv7hl +/
-  targettype armv7hl -/usr/share/man
-  targettype armv7hl -/usr/share/doc
-  targettype armv7hl requires "tizen-accelerator"
-
-  targettype armv7hl post "#set -x"
-  targettype armv7hl post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7hl post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7hl post "   binary="/usr/bin/${bin}" "
-  targettype armv7hl post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype armv7hl post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype armv7hl post "   else "
-  targettype armv7hl post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7hl post "     ln -s ${binary} /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7hl post "   fi "
-  targettype armv7hl post " done "
-  targettype armv7hl post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7hl post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype armv7hl preun " set -x"
-  targettype armv7hl preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7hl preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7hl preun "   binary="/usr/bin/${bin}" "
-  targettype armv7hl preun "   if test -e ${binary}.orig-arm ; then"
-  targettype armv7hl preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7hl preun "     rm /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7hl preun "   else "
-  targettype armv7hl preun "     echo "${binary}.orig-arm not present !" "
-  targettype armv7hl preun "   fi "
-  targettype armv7hl preun " done "
-  targettype armv7hl preun " rm -f /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7hl preun " rm -f /usr/libexec/gcc/armv7hl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-
-cross-armv7nhl-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv6l block!
-  targettype armv7l block!
-  targettype armv7hl block!
-  targettype mipsel block!
-
-  targettype armv7nhl autoreqprov off
-  targettype armv7nhl provides "cross-arm-binutils-accel"
-  targettype armv7nhl requires "cross-arm-gcc-accel"
-  targettype armv7nhl requires "glibc-x86-arm"
-  targettype armv7nhl requires "zlib-x86-arm"
-  targettype armv7nhl requires "binutils"
-  targettype armv7nhl prefix /emul/ia32-linux
-  targettype armv7nhl extension -arm
-  targettype armv7nhl +/
-  targettype armv7nhl -/usr/share/man
-  targettype armv7nhl -/usr/share/doc
-  targettype armv7nhl requires "tizen-accelerator"
-
-  targettype armv7nhl post "#set -x"
-  targettype armv7nhl post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7nhl post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7nhl post "   binary="/usr/bin/${bin}" "
-  targettype armv7nhl post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype armv7nhl post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype armv7nhl post "   else "
-  targettype armv7nhl post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype armv7nhl post "     ln -s ${binary} /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7nhl post "   fi "
-  targettype armv7nhl post " done "
-  targettype armv7nhl post " ln -sf /usr/bin/ld /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7nhl post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype armv7nhl preun " set -x"
-  targettype armv7nhl preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype armv7nhl preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype armv7nhl preun "   binary="/usr/bin/${bin}" "
-  targettype armv7nhl preun "   if test -e ${binary}.orig-arm ; then"
-  targettype armv7nhl preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype armv7nhl preun "     rm /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype armv7nhl preun "   else "
-  targettype armv7nhl preun "     echo "${binary}.orig-arm not present !" "
-  targettype armv7nhl preun "   fi "
-  targettype armv7nhl preun " done "
-  targettype armv7nhl preun " rm -f /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype armv7nhl preun " rm -f /usr/libexec/gcc/armv7nhl-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-
-cross-mipsel-binutils-accel
-  targettype x86 block!
-  targettype 32bit block!
-  targettype armv5tel block!
-  targettype armv6l block!
-  targettype armv7l block!
-  targettype armv7hl block!
-  targettype armv7nhl block!
-
-  targettype mipsel autoreqprov off
-  targettype mipsel provides "cross-arm-binutils-accel"
-  targettype mipsel requires "cross-arm-gcc-accel"
-  targettype mipsel requires "glibc-x86-arm"
-  targettype mipsel requires "zlib-x86-arm"
-  targettype mipsel requires "binutils"
-  targettype mipsel prefix /emul/ia32-linux
-  targettype mipsel extension -arm
-  targettype mipsel +/
-  targettype mipsel -/usr/share/man
-  targettype mipsel -/usr/share/doc
-  targettype mipsel requires "tizen-accelerator"
-
-  targettype mipsel post "#set -x"
-  targettype mipsel post " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype mipsel post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype mipsel post "   binary="/usr/bin/${bin}" "
-  targettype mipsel post "   if test -L ${binary} -a -e ${binary}.orig-arm ; then"
-  targettype mipsel post "     echo "${binary} not installed or ${binary}.orig-arm already present !" "
-  targettype mipsel post "   else "
-  targettype mipsel post "     mv ${binary} ${binary}.orig-arm && ln -s <prefix>${binary} ${binary}"
-  targettype mipsel post "     ln -s ${binary} /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype mipsel post "   fi "
-  targettype mipsel post " done "
-  targettype mipsel post " ln -sf /usr/bin/ld /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype mipsel post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
-  targettype mipsel preun " set -x"
-  targettype mipsel preun " export GCCVER=$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype mipsel preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
-  targettype mipsel preun "   binary="/usr/bin/${bin}" "
-  targettype mipsel preun "   if test -e ${binary}.orig-arm ; then"
-  targettype mipsel preun "     rm ${binary} && mv ${binary}.orig-arm ${binary}"
-  targettype mipsel preun "     rm /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/${bin}"
-  targettype mipsel preun "   else "
-  targettype mipsel preun "     echo "${binary}.orig-arm not present !" "
-  targettype mipsel preun "   fi "
-  targettype mipsel preun " done "
-  targettype mipsel preun " rm -f /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld"
-  targettype mipsel preun " rm -f /usr/libexec/gcc/mipsel-tizen-linux-gnueabi/${GCCVER}/ld.bfd"
-
diff --git a/packaging/binutils.spec b/packaging/binutils.spec
index c157b42..96a0644 100644
--- a/packaging/binutils.spec
+++ b/packaging/binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -380,7 +389,6 @@ fi
 %{_infodir}/bfd*info*
 %endif # %{isnative}
 
-
 %changelog
 * Tue Feb  7 2012 Carsten Munk <carsten.munk@gmail.com> - 2.22
 - Pull some patches relevant to MIPS from branch update, and
diff --git a/packaging/cross-armv5tel-binutils-accel.spec b/packaging/cross-armv5tel-binutils-accel.spec
index d8293f3..1f2921e 100644
--- a/packaging/cross-armv5tel-binutils-accel.spec
+++ b/packaging/cross-armv5tel-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv5tel-binutils-accel
+Name: cross-armv5tel-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv5tel-binutils.spec b/packaging/cross-armv5tel-binutils.spec
index de2dbcb..54de277 100644
--- a/packaging/cross-armv5tel-binutils.spec
+++ b/packaging/cross-armv5tel-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-armv5tel-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv6l-binutils-accel.spec b/packaging/cross-armv6l-binutils-accel.spec
index 4172329..f709dba 100644
--- a/packaging/cross-armv6l-binutils-accel.spec
+++ b/packaging/cross-armv6l-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv6l-binutils-accel
+Name: cross-armv6l-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv6l-binutils.spec b/packaging/cross-armv6l-binutils.spec
index 0f2223b..85740a1 100644
--- a/packaging/cross-armv6l-binutils.spec
+++ b/packaging/cross-armv6l-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-armv6l-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7hl-binutils-accel.spec b/packaging/cross-armv7hl-binutils-accel.spec
index db61ac8..1ed52c8 100644
--- a/packaging/cross-armv7hl-binutils-accel.spec
+++ b/packaging/cross-armv7hl-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv7hl-binutils-accel
+Name: cross-armv7hl-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7hl-binutils.spec b/packaging/cross-armv7hl-binutils.spec
index 0d97d57..b49af18 100644
--- a/packaging/cross-armv7hl-binutils.spec
+++ b/packaging/cross-armv7hl-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-armv7hl-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7l-binutils-accel.spec b/packaging/cross-armv7l-binutils-accel.spec
index e6f6324..190067e 100644
--- a/packaging/cross-armv7l-binutils-accel.spec
+++ b/packaging/cross-armv7l-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv7l-binutils-accel
+Name: cross-armv7l-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7l-binutils.spec b/packaging/cross-armv7l-binutils.spec
index e8fbdc1..4b23869 100644
--- a/packaging/cross-armv7l-binutils.spec
+++ b/packaging/cross-armv7l-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-armv7l-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7nhl-binutils-accel.spec b/packaging/cross-armv7nhl-binutils-accel.spec
index e2a873d..b75bab8 100644
--- a/packaging/cross-armv7nhl-binutils-accel.spec
+++ b/packaging/cross-armv7nhl-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv7nhl-binutils-accel
+Name: cross-armv7nhl-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-armv7nhl-binutils.spec b/packaging/cross-armv7nhl-binutils.spec
index bdffa80..af73e99 100644
--- a/packaging/cross-armv7nhl-binutils.spec
+++ b/packaging/cross-armv7nhl-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-armv7nhl-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-mipsel-binutils-accel.spec b/packaging/cross-mipsel-binutils-accel.spec
index 48cd317..543bdcc 100644
--- a/packaging/cross-mipsel-binutils-accel.spec
+++ b/packaging/cross-mipsel-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-mipsel-binutils-accel
+Name: cross-mipsel-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/cross-mipsel-binutils.spec b/packaging/cross-mipsel-binutils.spec
index 459ad4d..43213c66 100644
--- a/packaging/cross-mipsel-binutils.spec
+++ b/packaging/cross-mipsel-binutils.spec
@@ -5,6 +5,10 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
 Name: cross-mipsel-binutils
 Version: 2.22
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
diff --git a/packaging/precheckin.sh b/packaging/precheckin.sh
index 9fd24bc..74c1717 100644
--- a/packaging/precheckin.sh
+++ b/packaging/precheckin.sh
@@ -15,16 +15,19 @@ echo -n "arch i586 targets " > baselibs.conf
 for i in ${ARCHES} ; do
 # cross spec files
     cat ./${SPECNAME} | sed -e "s#Name: .*#Name: cross-${i}-${NAME}#" > ./cross-${i}-${NAME}.spec
-    cat ./${SPECNAME} | sed -e "s#Name: .*#Name: cross-${i}-${NAME}-accel#" > ./cross-${i}-${NAME}-accel.spec
+    cat ./${SPECNAME} | sed -e "s#Name: .*#Name: cross-${i}-${NAME}-accel-%{!?x64:x86}%{?x64}#" > ./cross-${i}-${NAME}-accel.spec
 # baselibs.conf - part 2
     test ! x"$i" = x"" && echo -n "${i}:${i} " >> baselibs.conf
 done
 
+echo "" >> baselibs.conf
+cat baselibs.conf | sed -e "s/i586/x86_64/" >> baselibs.conf
+
 # baselibs.conf - part 3
 echo "" >> baselibs.conf
 for i in ${ARCHES} ; do
 echo "" >> baselibs.conf
-echo "cross-${i}-${NAME}-accel
+echo "cross-${i}-${NAME}-accel-@X86@
   targettype x86 block!
   targettype 32bit block!" >> baselibs.conf
 for j in ${ARCHES//${i}} ; do
@@ -34,9 +37,10 @@ cat >> baselibs.conf << EOF
 
   targettype ${i} autoreqprov off
   targettype ${i} provides "cross-arm-binutils-accel"
+  targettype ${i} provides "cross-${i}-binutils-accel-${i}"
   targettype ${i} requires "cross-arm-gcc-accel"
-  targettype ${i} requires "glibc-x86-arm"
-  targettype ${i} requires "zlib-x86-arm"
+  targettype ${i} requires "eglibc-@X86@-arm"
+  targettype ${i} requires "zlib-@X86@-arm"
   targettype ${i} requires "binutils"
   targettype ${i} prefix /emul/ia32-linux
   targettype ${i} extension -arm
@@ -47,31 +51,33 @@ cat >> baselibs.conf << EOF
 
   targettype ${i} post "#set -x"
   targettype ${i} post " export GCCVER=\$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype ${i} post " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype ${i} post " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype ${i} post "   binary="/usr/bin/\${bin}" "
   targettype ${i} post "   if test -L \${binary} -a -e \${binary}.orig-arm ; then"
   targettype ${i} post "     echo "\${binary} not installed or \${binary}.orig-arm already present !" "
   targettype ${i} post "   else "
   targettype ${i} post "     mv \${binary} \${binary}.orig-arm && ln -s <prefix>\${binary} \${binary}"
-  targettype ${i} post "     ln -s \${binary} /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/\${bin}"
+  targettype ${i} post "     ln -s \${binary} /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/\${bin}"
   targettype ${i} post "   fi "
   targettype ${i} post " done "
-  targettype ${i} post " ln -sf /usr/bin/ld /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld"
-  targettype ${i} post " ln -sf /usr/bin/ld.bfd /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.bfd"
+  targettype ${i} post " ln -sf /usr/bin/ld /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld"
+  targettype ${i} post " ln -sf /usr/bin/ld.bfd /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.bfd"
+  targettype ${i} post " ln -sf /usr/bin/ld.gold /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.gold"
 
   targettype ${i} preun " set -x"
   targettype ${i} preun " export GCCVER=\$(LANG=C gcc --version | head -1 | cut -d" " -f5) "
-  targettype ${i} preun " for bin in addr2line ar as c++filt gprov ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do"
+  targettype ${i} preun " for bin in addr2line ar as c++filt elfedit gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip ; do"
   targettype ${i} preun "   binary="/usr/bin/\${bin}" "
   targettype ${i} preun "   if test -e \${binary}.orig-arm ; then"
   targettype ${i} preun "     rm \${binary} && mv \${binary}.orig-arm \${binary}"
-  targettype ${i} preun "     rm /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/\${bin}"
+  targettype ${i} preun "     rm /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/\${bin}"
   targettype ${i} preun "   else "
   targettype ${i} preun "     echo "\${binary}.orig-arm not present !" "
   targettype ${i} preun "   fi "
   targettype ${i} preun " done "
-  targettype ${i} preun " rm -f /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld"
-  targettype ${i} preun " rm -f /usr/libexec/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.bfd"
+  targettype ${i} preun " rm -f /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld"
+  targettype ${i} preun " rm -f /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.bfd"
+  targettype ${i} preun " rm -f /usr/lib/gcc/${i}-tizen-linux-gnueabi/\${GCCVER}/ld.gold"
 
 EOF
 
-- 
2.7.4