summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoît Thébaudeau" <benoit.thebaudeau@advansee.com>2011-12-14 18:57:47 (GMT)
committerBenoît Thébaudeau" <benoit.thebaudeau@advansee.com>2011-12-14 18:57:47 (GMT)
commit25447b10c4bc59c4f875a90990d91914718ea3eb (patch)
tree9802fec0d29fa2b7f1280f1bbd7d6e13b355e13c
parentbcc636057f0b40e55ea61b395241e0bdc892845d (diff)
binutils/binutils: add the patches used by BuildRoot for 2.22
Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
-rw-r--r--patches/binutils/2.22/120-sh-conf.patch31
-rw-r--r--patches/binutils/2.22/300-001_ld_makefile_patch.patch24
-rw-r--r--patches/binutils/2.22/300-012_check_ldrunpath_length.patch21
-rw-r--r--patches/binutils/2.22/999-ppc-textrels.patch72
4 files changed, 148 insertions, 0 deletions
diff --git a/patches/binutils/2.22/120-sh-conf.patch b/patches/binutils/2.22/120-sh-conf.patch
new file mode 100644
index 0000000..d5913e8
--- /dev/null
+++ b/patches/binutils/2.22/120-sh-conf.patch
@@ -0,0 +1,31 @@
+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).
+
+diff -durN binutils-2.22.orig/configure binutils-2.22/configure
+--- binutils-2.22.orig/configure 2011-08-14 14:28:15.000000000 +0200
++++ binutils-2.22/configure 2011-12-14 19:49:40.284777434 +0100
+@@ -3570,7 +3570,7 @@
+ mips*-*-*)
+ noconfigdirs="$noconfigdirs gprof"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${target}" in
+ sh*-*-elf)
+ ;;
+diff -durN binutils-2.22.orig/configure.ac binutils-2.22/configure.ac
+--- binutils-2.22.orig/configure.ac 2011-11-21 12:58:27.000000000 +0100
++++ binutils-2.22/configure.ac 2011-12-14 19:49:40.316777436 +0100
+@@ -1006,7 +1006,7 @@
+ mips*-*-*)
+ noconfigdirs="$noconfigdirs gprof"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${target}" in
+ sh*-*-elf)
+ ;;
diff --git a/patches/binutils/2.22/300-001_ld_makefile_patch.patch b/patches/binutils/2.22/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000..4b5888a
--- /dev/null
+++ b/patches/binutils/2.22/300-001_ld_makefile_patch.patch
@@ -0,0 +1,24 @@
+diff -durN binutils-2.22.orig/ld/Makefile.am binutils-2.22/ld/Makefile.am
+--- binutils-2.22.orig/ld/Makefile.am 2011-07-22 22:22:37.000000000 +0200
++++ binutils-2.22/ld/Makefile.am 2011-12-14 19:50:25.760779164 +0100
+@@ -37,7 +37,7 @@
+ # 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@
+diff -durN binutils-2.22.orig/ld/Makefile.in binutils-2.22/ld/Makefile.in
+--- binutils-2.22.orig/ld/Makefile.in 2011-07-22 22:22:37.000000000 +0200
++++ binutils-2.22/ld/Makefile.in 2011-12-14 19:50:25.784779163 +0100
+@@ -366,7 +366,7 @@
+ # 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/patches/binutils/2.22/300-012_check_ldrunpath_length.patch b/patches/binutils/2.22/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000..b49cc04
--- /dev/null
+++ b/patches/binutils/2.22/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,21 @@
+diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em
+--- binutils-2.22.orig/ld/emultempl/elf32.em 2011-11-21 10:29:39.000000000 +0100
++++ binutils-2.22/ld/emultempl/elf32.em 2011-12-14 19:52:12.880783238 +0100
+@@ -1273,6 +1273,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;
+@@ -1500,6 +1502,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)
diff --git a/patches/binutils/2.22/999-ppc-textrels.patch b/patches/binutils/2.22/999-ppc-textrels.patch
new file mode 100644
index 0000000..ff0c031
--- /dev/null
+++ b/patches/binutils/2.22/999-ppc-textrels.patch
@@ -0,0 +1,72 @@
+http://bugs.gentoo.org/392645
+http://sourceware.org/bugzilla/show_bug.cgi?id=13470
+
+2011-12-03 Alan Modra <amodra@gmail.com>
+
+ PR ld/13470
+ * elf32-ppc.c (ppc_elf_copy_indirect_symbol): Revert substantive
+ change in 2011-07-01 commit. Comment.
+ * elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+
+diff -durN binutils-2.22.orig/bfd/elf32-ppc.c binutils-2.22/bfd/elf32-ppc.c
+--- binutils-2.22.orig/bfd/elf32-ppc.c 2011-11-21 10:29:21.000000000 +0100
++++ binutils-2.22/bfd/elf32-ppc.c 2011-12-14 19:52:43.308784395 +0100
+@@ -2987,10 +2987,6 @@
+ edir->elf.needs_plt |= eind->elf.needs_plt;
+ edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
+
+- /* If we were called to copy over info for a weak sym, that's all. */
+- if (eind->elf.root.type != bfd_link_hash_indirect)
+- return;
+-
+ if (eind->dyn_relocs != NULL)
+ {
+ if (edir->dyn_relocs != NULL)
+@@ -3022,6 +3018,16 @@
+ eind->dyn_relocs = NULL;
+ }
+
++ /* If we were called to copy over info for a weak sym, that's all.
++ You might think dyn_relocs need not be copied over; After all,
++ both syms will be dynamic or both non-dynamic so we're just
++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS
++ code in ppc_elf_adjust_dynamic_symbol needs to check for
++ dyn_relocs in read-only sections, and it does so on what is the
++ DIR sym here. */
++ if (eind->elf.root.type != bfd_link_hash_indirect)
++ return;
++
+ /* Copy over the GOT refcount entries that we may have already seen to
+ the symbol which just became indirect. */
+ edir->elf.got.refcount += eind->elf.got.refcount;
+diff -durN binutils-2.22.orig/bfd/elf64-ppc.c binutils-2.22/bfd/elf64-ppc.c
+--- binutils-2.22.orig/bfd/elf64-ppc.c 2011-11-21 10:29:24.000000000 +0100
++++ binutils-2.22/bfd/elf64-ppc.c 2011-12-14 19:52:43.336784395 +0100
+@@ -4435,10 +4435,6 @@
+ edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
+ edir->elf.needs_plt |= eind->elf.needs_plt;
+
+- /* If we were called to copy over info for a weak sym, that's all. */
+- if (eind->elf.root.type != bfd_link_hash_indirect)
+- return;
+-
+ /* Copy over any dynamic relocs we may have on the indirect sym. */
+ if (eind->dyn_relocs != NULL)
+ {
+@@ -4471,6 +4467,16 @@
+ eind->dyn_relocs = NULL;
+ }
+
++ /* If we were called to copy over info for a weak sym, that's all.
++ You might think dyn_relocs need not be copied over; After all,
++ both syms will be dynamic or both non-dynamic so we're just
++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS
++ code in ppc64_elf_adjust_dynamic_symbol needs to check for
++ dyn_relocs in read-only sections, and it does so on what is the
++ DIR sym here. */
++ if (eind->elf.root.type != bfd_link_hash_indirect)
++ return;
++
+ /* Copy over got entries that we may have already seen to the
+ symbol which just became indirect. */
+ if (eind->elf.got.glist != NULL)