Author: hauke
Date: 2015-09-11 19:58:39 +0200 (Fri, 11 Sep 2015)
New Revision: 46874

Added:
   trunk/toolchain/binutils/patches/2.25.1/
Modified:
   trunk/toolchain/binutils/Config.in
   trunk/toolchain/binutils/Makefile
   trunk/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch
   trunk/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch
   trunk/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch
   
trunk/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch
Log:
binutils: add binutils 2.25.1

This adds binutils 2.25.1 as an option to OpenWrt.

Signed-off-by: Hauke Mehrtens <[email protected]>


Modified: trunk/toolchain/binutils/Config.in
===================================================================
--- trunk/toolchain/binutils/Config.in  2015-09-11 17:57:39 UTC (rev 46873)
+++ trunk/toolchain/binutils/Config.in  2015-09-11 17:58:39 UTC (rev 46874)
@@ -9,6 +9,9 @@
        config BINUTILS_VERSION_LINARO
                bool "Linaro binutils 2.24"
 
+       config BINUTILS_VERSION_2_25_1
+               bool "Linaro binutils 2.25.1"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -22,4 +25,5 @@
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
        default "linaro"          if BINUTILS_VERSION_LINARO
+       default "2.25.1"          if BINUTILS_VERSION_2_25_1
        default "linaro"

Modified: trunk/toolchain/binutils/Makefile
===================================================================
--- trunk/toolchain/binutils/Makefile   2015-09-11 17:57:39 UTC (rev 46873)
+++ trunk/toolchain/binutils/Makefile   2015-09-11 17:58:39 UTC (rev 46874)
@@ -10,13 +10,22 @@
 PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))
 BIN_VERSION:=$(PKG_VERSION)
 
-PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/
-PKG_REV:=2.24.0-2014.09
-PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz
-PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353
-BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV)
-HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR)
+ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro)
+  
PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/
+  PKG_REV:=2.24.0-2014.09
+  PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz
+  PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353
+  BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV)
+  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR)
+else
+  PKG_SOURCE_URL:=@GNU/binutils/
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
+  ifeq ($(PKG_VERSION),2.25.1)
+    PKG_MD5SUM:=ac493a78de4fee895961d025b7905be4
+  endif
+endif
+
 HOST_BUILD_PARALLEL:=1
 
 PATCH_DIR:=./patches/$(PKG_VERSION)

Modified: 
trunk/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch
===================================================================
--- trunk/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch     
2015-09-11 17:55:28 UTC (rev 46872)
+++ trunk/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch     
2015-09-11 17:58:39 UTC (rev 46874)
@@ -11,7 +11,7 @@
  EMULATION_OFILES = @EMULATION_OFILES@
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -386,7 +386,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -388,7 +388,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.

Modified: 
trunk/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch
===================================================================
--- 
trunk/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch    
    2015-09-11 17:55:28 UTC (rev 46872)
+++ 
trunk/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch    
    2015-09-11 17:58:39 UTC (rev 46874)
@@ -1,6 +1,6 @@
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1267,6 +1267,8 @@ fragment <<EOF
+@@ -1198,6 +1198,8 @@ fragment <<EOF
              && command_line.rpath == NULL)
            {
              lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -9,12 +9,12 @@
              if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
                                                      force))
                break;
-@@ -1518,6 +1520,8 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1461,6 +1463,8 @@ gld${EMULATION_NAME}_before_allocation (
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
 +  if ((rpath) && (strlen (rpath) == 0))
 +      rpath = NULL;
  
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)

Modified: 
trunk/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch
===================================================================
--- 
trunk/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch   
    2015-09-11 17:55:28 UTC (rev 46872)
+++ 
trunk/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch   
    2015-09-11 17:58:39 UTC (rev 46874)
@@ -1,6 +1,6 @@
 --- a/bfd/elfxx-mips.c
 +++ b/bfd/elfxx-mips.c
-@@ -7450,6 +7450,7 @@ _bfd_mips_elf_create_dynamic_sections (b
+@@ -7689,6 +7689,7 @@ _bfd_mips_elf_create_dynamic_sections (b
  
        name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING";
        bh = NULL;
@@ -8,7 +8,7 @@
        if (!(_bfd_generic_link_add_one_symbol
            (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0,
             NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
-@@ -7462,6 +7463,7 @@ _bfd_mips_elf_create_dynamic_sections (b
+@@ -7701,6 +7702,7 @@ _bfd_mips_elf_create_dynamic_sections (b
  
        if (! bfd_elf_link_record_dynamic_symbol (info, h))
        return FALSE;

Modified: 
trunk/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch
===================================================================
--- 
trunk/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch
 2015-09-11 17:55:28 UTC (rev 46872)
+++ 
trunk/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch
 2015-09-11 17:58:39 UTC (rev 46874)
@@ -1,25 +1,25 @@
 --- 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"
+@@ -1062,12 +1062,12 @@ case "${targ}" in
+     targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec 
mips_ecoff_be_vec mips_ecoff_le_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"
+-    targ_defvec=mips_elf32_ntrad_le_vec
+-    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec 
mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
++    targ_defvec=mips_elf64_trad_le_vec
++    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec 
mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_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"
+-    targ_defvec=mips_elf32_ntrad_be_vec
+-    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec 
mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
++    targ_defvec=mips_elf64_trad_be_vec
++    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec 
mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
      ;;
    mips*el-*-linux*)
-     targ_defvec=bfd_elf32_tradlittlemips_vec
+     targ_defvec=mips_elf32_trad_le_vec
 --- a/ld/configure.tgt
 +++ b/ld/configure.tgt
-@@ -472,11 +472,11 @@ mips*el-*-vxworks*)      targ_emul=elf32elmip
+@@ -476,11 +476,11 @@ mips*el-*-vxworks*)      targ_emul=elf32elmip
  mips*-*-vxworks*)     targ_emul=elf32ebmipvxworks
                        targ_extra_emuls="elf32elmipvxworks" ;;
  mips*-*-windiss)      targ_emul=elf32mipswindiss ;;
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to