diff options
author | Felix Fietkau <nbd@openwrt.org> | 2005-03-07 12:41:16 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2005-03-07 12:41:16 +0000 |
commit | 41f65be77df7e337ee7a4b9e4d2faf8a27fc6ed9 (patch) | |
tree | e1a463f67f836d9daaa71e8317104156b9ccac32 /toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch | |
parent | 42ba5c898eabc9602ced05f941aa1d5e9c38a38e (diff) | |
download | master-187ad058-41f65be77df7e337ee7a4b9e4d2faf8a27fc6ed9.tar.gz master-187ad058-41f65be77df7e337ee7a4b9e4d2faf8a27fc6ed9.tar.bz2 master-187ad058-41f65be77df7e337ee7a4b9e4d2faf8a27fc6ed9.zip |
binutils & gcc patches from uclibc buildroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@331 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch')
-rw-r--r-- | toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch b/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch new file mode 100644 index 0000000000..ae2033d069 --- /dev/null +++ b/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch @@ -0,0 +1,39 @@ +#! /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 +@@ -5883,6 +5883,8 @@ + s->size += i * MIPS_ELF_GOT_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)) + && ! mips_elf_multi_got (output_bfd, info, g, s, local_gotno)) + return FALSE; + |