From 5968b7e4de1fe31f1d3e6704503b0b2a2edf3eeb Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 2 Mar 2005 11:17:51 +0000 Subject: bother. Fix the filename --- .../2.15.94.0.2.2/117_mips_symbolic_link.dpatch | 44 ---------------------- .../2.15.94.0.2.2/117_mips_symbolic_link.patch | 44 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.dpatch create mode 100644 toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.patch (limited to 'toolchain/binutils') diff --git a/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.dpatch b/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.dpatch deleted file mode 100644 index 45d1dd5ca..000000000 --- a/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.dpatch +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -e -## 117_mips_symbolic_link.dpatch -## -## DP: Description: Handle symbolic multigot links. (#270619) -## DP: Author: Thiemo Seufer -## DP: Upstream status: Not submitted -## DP: Date: 2004-09-08 - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urpN binutils-2.15.orig/bfd/elfxx-mips.c binutils-2.15/bfd/elfxx-mips.c ---- binutils-2.15.orig/bfd/elfxx-mips.c 2004-05-17 21:36:03.000000000 +0200 -+++ binutils-2.15/bfd/elfxx-mips.c 2004-08-29 08:48:22.000000000 +0200 -@@ -3909,11 +3910,8 @@ mips_elf_create_dynamic_relocation (bfd - /* We must now calculate the dynamic symbol table index to use - in the relocation. */ - if (h != NULL -- && (! info->symbolic || (h->root.elf_link_hash_flags -- & ELF_LINK_HASH_DEF_REGULAR) == 0) -- /* h->root.dynindx may be -1 if this symbol was marked to -- become local. */ -- && h->root.dynindx != -1) -+ && ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0 -+ || (h->root.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)) - { - indx = h->root.dynindx; - if (SGI_COMPAT (output_bfd)) diff --git a/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.patch b/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.patch new file mode 100644 index 000000000..45d1dd5ca --- /dev/null +++ b/toolchain/binutils/2.15.94.0.2.2/117_mips_symbolic_link.patch @@ -0,0 +1,44 @@ +#! /bin/sh -e +## 117_mips_symbolic_link.dpatch +## +## DP: Description: Handle symbolic multigot links. (#270619) +## DP: Author: Thiemo Seufer +## DP: Upstream status: Not submitted +## DP: Date: 2004-09-08 + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urpN binutils-2.15.orig/bfd/elfxx-mips.c binutils-2.15/bfd/elfxx-mips.c +--- binutils-2.15.orig/bfd/elfxx-mips.c 2004-05-17 21:36:03.000000000 +0200 ++++ binutils-2.15/bfd/elfxx-mips.c 2004-08-29 08:48:22.000000000 +0200 +@@ -3909,11 +3910,8 @@ mips_elf_create_dynamic_relocation (bfd + /* We must now calculate the dynamic symbol table index to use + in the relocation. */ + if (h != NULL +- && (! info->symbolic || (h->root.elf_link_hash_flags +- & ELF_LINK_HASH_DEF_REGULAR) == 0) +- /* h->root.dynindx may be -1 if this symbol was marked to +- become local. */ +- && h->root.dynindx != -1) ++ && ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0 ++ || (h->root.elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)) + { + indx = h->root.dynindx; + if (SGI_COMPAT (output_bfd)) -- cgit v1.2.3