From ee7d707911892680b0553affa9fd7ac9f6c50615 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Wed, 15 Mar 2006 23:47:57 +0000 Subject: [PATCH] applied binutils-20050713 patch --- bfd/configure | 2 +- bfd/configure.in | 2 +- bfd/elf32-amigaos.c | 2 +- ld/scripttempl/amigaos.sc | 13 +------------ 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/bfd/configure b/bfd/configure index 894a8b5..15c7fad 100755 --- a/bfd/configure +++ b/bfd/configure @@ -2831,7 +2831,7 @@ bfd_version=`echo "${VERSION}" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\ bfd_version_string="\"${VERSION}\"" if test x${is_release} = x; then bfd_version_date=`sed -n -e 's/.*DATE //p' < ${srcdir}/version.h` - bfd_version_string="\"${VERSION} ${bfd_version_date} (Amiga OS build 20041204)\"" + bfd_version_string="\"${VERSION} ${bfd_version_date} (Amiga OS build 20050713)\"" fi diff --git a/bfd/configure.in b/bfd/configure.in index 18ba446..66dbf3d 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -18,7 +18,7 @@ changequote([,])dnl bfd_version_string="\"${VERSION}\"" if test x${is_release} = x; then bfd_version_date=`sed -n -e 's/.*DATE //p' < ${srcdir}/version.h` - bfd_version_string="\"${VERSION} ${bfd_version_date} (Amiga OS build 20041204)\"" + bfd_version_string="\"${VERSION} ${bfd_version_date} (Amiga OS build 20050713)\"" fi AC_SUBST(bfd_version) AC_SUBST(bfd_version_string) diff --git a/bfd/elf32-amigaos.c b/bfd/elf32-amigaos.c index 3ff25fe..7862ce4 100644 --- a/bfd/elf32-amigaos.c +++ b/bfd/elf32-amigaos.c @@ -5301,7 +5301,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section, addend = addend - data_section->vma; if (r_type == R_PPC_AMIGAOS_BREL_HA) - addend -= ((relocation + addend) & 0x8000) << 1; + addend += ((relocation + addend) & 0x8000) << 1; } break; diff --git a/ld/scripttempl/amigaos.sc b/ld/scripttempl/amigaos.sc index d6b5966..b11e82e 100644 --- a/ld/scripttempl/amigaos.sc +++ b/ld/scripttempl/amigaos.sc @@ -302,12 +302,7 @@ cat <