From 274c21cd8ec73c3818ee548cdb8ca60e49f905a2 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 19 Nov 2012 19:37:28 +0000 Subject: [PATCH] binutils: add support for 2.23.1 Signed-off-by: Florian Fainelli SVN-Revision: 34262 --- toolchain/binutils/Config.in | 6 ++++ toolchain/binutils/Makefile | 3 ++ .../112-arm-uclibc-gas-needs-libm.patch | 35 +++++++++++++++++++ .../binutils/patches/2.23.1/120-sh-conf.patch | 22 ++++++++++++ .../2.23.1/300-001_ld_makefile_patch.patch | 22 ++++++++++++ .../300-012_check_ldrunpath_length.patch | 20 +++++++++++ 6 files changed, 108 insertions(+) create mode 100644 toolchain/binutils/patches/2.23.1/112-arm-uclibc-gas-needs-libm.patch create mode 100644 toolchain/binutils/patches/2.23.1/120-sh-conf.patch create mode 100644 toolchain/binutils/patches/2.23.1/300-001_ld_makefile_patch.patch create mode 100644 toolchain/binutils/patches/2.23.1/300-012_check_ldrunpath_length.patch diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 23f7de7f83..0ec15fd38e 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -31,6 +31,11 @@ choice depends !avr32 || (avr32 && BROKEN) bool "binutils 2.22" + config BINUTILS_VERSION_2_23_1 + depends !ubicom32 || (ubicom32 && BROKEN) + depends !avr32 || (avr32 && BROKEN) + bool "binutils 2.23.1" + endchoice config EXTRA_BINUTILS_CONFIG_OPTIONS @@ -48,6 +53,7 @@ config BINUTILS_VERSION default "2.21" if BINUTILS_VERSION_2_21 default "2.21.1" if BINUTILS_VERSION_2_21_1 default "2.22" if BINUTILS_VERSION_2_22 + default "2.23.1" if BINUTILS_VERSION_2_23_1 default "2.19.1" if ubicom32 default "2.20.1" if avr32 default "2.22" diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 4a1140aae2..fd01dc21bb 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -28,6 +28,9 @@ endif ifeq ($(PKG_VERSION),2.22) PKG_MD5SUM:=ee0f10756c84979622b992a4a61ea3f5 endif +ifeq ($(PKG_VERSION),2.23.1) + PKG_MD5SUM:=33adb18c3048d057ac58d07a3f1adb38 +endif HOST_BUILD_PARALLEL:=1 diff --git a/toolchain/binutils/patches/2.23.1/112-arm-uclibc-gas-needs-libm.patch b/toolchain/binutils/patches/2.23.1/112-arm-uclibc-gas-needs-libm.patch new file mode 100644 index 0000000000..a9e435701e --- /dev/null +++ b/toolchain/binutils/patches/2.23.1/112-arm-uclibc-gas-needs-libm.patch @@ -0,0 +1,35 @@ +Source: Khem Raj +Disposition: submit upstream. + +Description: + +We do not need to have the libtool patch anymore for binutils after +libtool has been updated upstream it include support for it. However +for building gas natively on uclibc systems we have to link it with +-lm so that it picks up missing symbols. + +/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_from_double': +floatformat.c:(.text+0x1ec): undefined reference to `frexp' +floatformat.c:(.text+0x2f8): undefined reference to `ldexp' +/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o): In function `floatformat_to_double': +floatformat.c:(.text+0x38a): undefined reference to `ldexp' +floatformat.c:(.text+0x3d2): undefined reference to `ldexp' +floatformat.c:(.text+0x43e): undefined reference to `ldexp' floatformat.c:(.text+0x4e2): undefined reference to `ldexp' +collect2: ld returned 1 exit status +make[4]: *** [as-new] Error 1 + +--- a/gas/configure.tgt ++++ b/gas/configure.tgt +@@ -428,6 +428,12 @@ case ${generic_target} in + *-*-netware) fmt=elf em=netware ;; + esac + ++case ${generic_target} in ++ arm-*-*uclibc*) ++ need_libm=yes ++ ;; ++esac ++ + case ${cpu_type} in + alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k) + bfd_gas=yes diff --git a/toolchain/binutils/patches/2.23.1/120-sh-conf.patch b/toolchain/binutils/patches/2.23.1/120-sh-conf.patch new file mode 100644 index 0000000000..d92ceb52cf --- /dev/null +++ b/toolchain/binutils/patches/2.23.1/120-sh-conf.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -3570,7 +3570,7 @@ case "${target}" in + mips*-*-*) + noconfigdirs="$noconfigdirs gprof" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +--- a/configure.ac ++++ b/configure.ac +@@ -1006,7 +1006,7 @@ case "${target}" in + mips*-*-*) + noconfigdirs="$noconfigdirs gprof" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; diff --git a/toolchain/binutils/patches/2.23.1/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.23.1/300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..aa853ff542 --- /dev/null +++ b/toolchain/binutils/patches/2.23.1/300-001_ld_makefile_patch.patch @@ -0,0 +1,22 @@ +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -37,7 +37,7 @@ endif + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS) + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/toolchain/binutils/patches/2.23.1/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.23.1/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..1e04000340 --- /dev/null +++ b/toolchain/binutils/patches/2.23.1/300-012_check_ldrunpath_length.patch @@ -0,0 +1,20 @@ +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1273,6 +1273,8 @@ fragment <link_next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)