From: Felix Fietkau Date: Sun, 10 May 2015 13:54:20 +0000 (+0000) Subject: toolchain: change default emulation for mips64 (octeon) to n64 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c5f965c741a10ad44aa4dcc32fa67868c673940;p=openwrt%2Fstaging%2Fjow.git toolchain: change default emulation for mips64 (octeon) to n64 fixes several ld errors reported by buildbot: http://buildbot.openwrt.org:8010/broken_packages/octeon/mdnsresponder/compile.txt http://buildbot.openwrt.org:8010/broken_packages/octeon/luasocket/compile.txt http://buildbot.openwrt.org:8010/broken_packages/octeon/luasec/compile.txt http://buildbot.openwrt.org:8010/broken_packages/octeon/openvswitch/compile.txt http://buildbot.openwrt.org:8010/broken_packages/octeon/prosody/compile.txt link error: ABI is incompatible with that of the selected emulation found at OE toolchain for bintils 2.22: http://patchwork.openembedded.org/patch/28033/ Signed-off-by: Dirk Neukirchen SVN-Revision: 45666 --- diff --git a/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch new file mode 100644 index 0000000000..cd036beca9 --- /dev/null +++ b/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch @@ -0,0 +1,37 @@ +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1053,12 +1053,12 @@ case "${targ}" in + targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" + ;; + mips64*el-*-linux*) +- targ_defvec=bfd_elf32_ntradlittlemips_vec +- targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec" ++ targ_defvec=bfd_elf64_tradlittlemips_vec ++ targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec" + ;; + mips64*-*-linux*) +- targ_defvec=bfd_elf32_ntradbigmips_vec +- targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec" ++ targ_defvec=bfd_elf64_tradbigmips_vec ++ targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradlittlemips_vec" + ;; + mips*el-*-linux*) + targ_defvec=bfd_elf32_tradlittlemips_vec +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -472,11 +472,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip + mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + targ_extra_emuls="elf32elmipvxworks" ;; + mips*-*-windiss) targ_emul=elf32mipswindiss ;; +-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 +- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" ++mips64*el-*-linux-*) targ_emul=elf64ltsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" + targ_extra_libpath=$targ_extra_emuls ;; +-mips64*-*-linux-*) targ_emul=elf32btsmipn32 +- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" ++mips64*-*-linux-*) targ_emul=elf64btsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" + targ_extra_libpath=$targ_extra_emuls ;; + mips*el-*-linux-*) targ_emul=elf32ltsmip + targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"