Skip to contentSkip to conversation

binutils: add 2.23.2 and remove deprecated 2.20

PATCH New Gustavo Zacarias 2 participants 2 messages Mar 26, 2013 – Mar 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 binutils: add 2.23.2 and remove deprecated 2.20

---
 package/binutils/Config.in.host                    |  10 +-
 .../binutils/binutils-2.20/110-arm-eabi-conf.patch |  24 ---
 package/binutils/binutils-2.20/120-sh-conf.patch   |  42 -----
 .../300-012_check_ldrunpath_length.patch           |  21 ---
 .../binutils-2.20/400-arm_link_speed.patch         | 183 ---------------------
 package/binutils/binutils-2.23.2/120-sh-conf.patch |  29 ++++
 .../300-001_ld_makefile_patch.patch                |   0
 .../300-012_check_ldrunpath_length.patch           |  21 +++
 .../500-sysroot.patch                              |  21 +--
 9 files changed, 66 insertions(+), 285 deletions(-)
 delete mode 100644 package/binutils/binutils-2.20/110-arm-eabi-conf.patch
 delete mode 100644 package/binutils/binutils-2.20/120-sh-conf.patch
 delete mode 100644 package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch
 delete mode 100644 package/binutils/binutils-2.20/400-arm_link_speed.patch
 create mode 100644 package/binutils/binutils-2.23.2/120-sh-conf.patch
 rename package/binutils/{binutils-2.20 => binutils-2.23.2}/300-001_ld_makefile_patch.patch (100%)
 create mode 100644 package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch
 rename package/binutils/{binutils-2.20 => binutils-2.23.2}/500-sysroot.patch (62%)
package/binutils/Config.in.host +5 -5
index 81a4cf7..a61a503 100644
@@ -12,10 +12,6 @@ choice
 	       depends on BR2_avr32
 	       bool "binutils 2.18-avr32-1.0.1"
 
-	config BR2_BINUTILS_VERSION_2_20
-		depends on !BR2_avr32 && BR2_DEPRECATED
-		bool "binutils 2.20"
-
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32
 		bool "binutils 2.20.1"
@@ -36,17 +32,21 @@ choice
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.23.1"
 
+	config BR2_BINUTILS_VERSION_2_23_2
+		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31)
+		bool "binutils 2.23.2"
+
 endchoice
 
 config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.20"		if BR2_BINUTILS_VERSION_2_20
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 	default "2.22"		if BR2_BINUTILS_VERSION_2_22
 	default "2.23.1"	if BR2_BINUTILS_VERSION_2_23_1
+	default "2.23.2"	if BR2_BINUTILS_VERSION_2_23_2
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
package/binutils/binutils-2.20/110-arm-eabi-conf.patch deleted +0 -24
deleted file mode 100644
index af26329..0000000
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
package/binutils/binutils-2.20/120-sh-conf.patch deleted +0 -42

42 lines not on this page · raw message

package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch deleted +0 -21
deleted file mode 100644
index 6e80921..0000000
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
package/binutils/binutils-2.20/400-arm_link_speed.patch deleted +0 -183

183 lines not on this page · raw message

package/binutils/binutils-2.23.2/120-sh-conf.patch new file +29 -0
new file mode 100644
index 0000000..ea3d1b6
@@ -0,0 +1,29 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+--- a/configure
++++ b/configure
+@@ -1495,7 +1495,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,7 +712,7 @@
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch renamed from package/binutils/binutils-2.20/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.23.2/300-001_ld_makefile_patch.patch
package/binutils/binutils-2.23.2/300-012_check_ldrunpath_length.patch new file +21 -0
new file mode 100644
index 0000000..df78310
@@ -0,0 +1,21 @@
+diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
+--- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
++++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
+@@ -1270,6 +1270,8 @@
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1497,6 +1499,8 @@
+   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)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
package/binutils/binutils-2.23.2/500-sysroot.patch renamed from package/binutils/binutils-2.20/500-sysroot.patch +11 -10
similarity index 62%
rename from package/binutils/binutils-2.20/500-sysroot.patch
rename to package/binutils/binutils-2.23.2/500-sysroot.patch
index d21e4cb..e49c795 100644
@@ -7,23 +7,24 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -308,18 +308,24 @@
+@@ -308,18 +308,25 @@
       directory first.  */
-   if (! entry->is_archive)
+   if (! entry->flags.maybe_archive)
      {
--      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
 +      /* For absolute pathnames, try to always open the file in the
 +	 sysroot first. If this fails, try to open the file at the
-+	 given location. */
-+      entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
-+      if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
++	 given location.  */
++      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++	  && ld_sysroot)
  	{
  	  char *name = concat (ld_sysroot, entry->filename,
  			       (const char *) NULL);
  	  if (ldfile_try_open_bfd (name, entry))
  	    {
  	      entry->filename = name;
-+	      entry->sysrooted = TRUE;
++	      entry->flags.sysrooted = TRUE;
  	      return TRUE;
  	    }
  	  free (name);
@@ -31,6 +32,6 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 -      else if (ldfile_try_open_bfd (entry->filename, entry))
 +
 +      if (ldfile_try_open_bfd (entry->filename, entry))
- 	{
- 	  entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
- 	    && is_sysrooted_pathname (entry->filename, TRUE);
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 binutils: add 2.23.2 and remove deprecated 2.20

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard