diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 13:39:22 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-29 13:39:22 +0000 |
commit | f13f814a01526fe9097e9ed0e4b6fc6d359bd710 (patch) | |
tree | c80611829ebc8ac0239b33fd7a99044e861e0bcf /openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch | |
parent | 46c806b11f5d2045017ecb95ce9e32e963feaf73 (diff) |
add binutils 2.16.90.0.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@758 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch')
-rw-r--r-- | openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch b/openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch new file mode 100644 index 000000000..036712eac --- /dev/null +++ b/openwrt/toolchain/binutils/2.16.90.0.1/300-120_mips_xgot_multigot_workaround.patch @@ -0,0 +1,41 @@ +#! /bin/sh -e +## 120_mips_xgot_multigot_workaround.dpatch +## +## DP: Description: Make multigot/xgot handling mutually exclusive. +## DP: Author: Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> +## DP: Upstream status: Not submitted +## DP: Date: 2004-09-17 + +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 -urNad /home/james/debian/packages/binutils/binutils-2.15/bfd/elfxx-mips.c binutils-2.15/bfd/elfxx-mips.c +--- /home/james/debian/packages/binutils/binutils-2.15/bfd/elfxx-mips.c 2004-09-23 22:41:37.156466673 +0100 ++++ binutils-2.15/bfd/elfxx-mips.c 2004-09-23 22:42:15.998362861 +0100 +@@ -6594,7 +6594,9 @@ + + mips_elf_resolve_final_got_entries (g); + +- if (s->size > MIPS_ELF_GOT_MAX_SIZE (output_bfd)) ++ if (s->size > MIPS_ELF_GOT_MAX_SIZE (output_bfd) ++ && g->global_gotno <= (MIPS_ELF_GOT_MAX_SIZE (output_bfd) ++ / MIPS_ELF_GOT_SIZE (output_bfd))) + { + if (! mips_elf_multi_got (output_bfd, info, g, s, local_gotno)) + return FALSE; |