From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32591 invoked by alias); 2 May 2011 12:35:35 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 32407 invoked by uid 9674); 2 May 2011 12:35:34 -0000 Date: Mon, 02 May 2011 12:35:00 -0000 Message-ID: <20110502123534.32359.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-readline62: Merge remote-tracking branch 'origin/master' into archer-jankratochvil-readline62 X-Git-Refname: refs/heads/archer-jankratochvil-readline62 X-Git-Reftype: branch X-Git-Oldrev: ccec88bb2f4506a2d8104775855e96d0388544ea X-Git-Newrev: b13706abbee9646f4de522c0552ddd68d1a4f43a X-SW-Source: 2011-q2/txt/msg00030.txt.bz2 List-Id: The branch, archer-jankratochvil-readline62 has been updated via b13706abbee9646f4de522c0552ddd68d1a4f43a (commit) via da90f7a7481c546ed7f6bf3ff4481e1302c8bfc3 (commit) via 9197bcacc6fa176aacaa09582207ecb3171dbd61 (commit) via 37c169a23a1ba1baf2e628d048152b163e92fa21 (commit) via c3770ab55b2752a60451b2bc593371ae7d424d1f (commit) via c2c5d4451c0d78b2516b45ba190d5bbc6352205d (commit) from ccec88bb2f4506a2d8104775855e96d0388544ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit b13706abbee9646f4de522c0552ddd68d1a4f43a Merge: ccec88b da90f7a Author: Jan Kratochvil Date: Mon May 2 14:35:28 2011 +0200 Merge remote-tracking branch 'origin/master' into archer-jankratochvil-readline62 ----------------------------------------------------------------------- Summary of changes: bfd/ChangeLog | 12 ++++++++++++ bfd/elf32-i386.c | 4 +++- bfd/elf64-x86-64.c | 16 +++++++++------- bfd/version.h | 2 +- gdb/version.in | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) First 500 lines of diff: diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8216abd..4d155cd 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2011-05-01 Alan Modra + + PR ld/12718 + * elf32-i386.c (elf_i386_check_relocs): Ensure dynobj set before + creating ifunc sections. + * elf64-x86-64.c (elf_x86_64_check_relocs): Likewise. + +2011-04-30 H.J. Lu + + * elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter + names. + 2011-04-28 Tom Tromey * bfdio.c (memory_bstat): Pass correct size to memset. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e32ec83..ee1511f 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1376,7 +1376,9 @@ elf_i386_check_relocs (bfd *abfd, case R_386_PLT32: case R_386_GOT32: case R_386_GOTOFF: - if (!_bfd_elf_create_ifunc_sections (abfd, info)) + if (htab->elf.dynobj == NULL) + htab->elf.dynobj = abfd; + if (!_bfd_elf_create_ifunc_sections (htab->elf.dynobj, info)) return FALSE; break; } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index a02b3e8..ae175e1 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -1261,7 +1261,9 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_X86_64_PLT32: case R_X86_64_GOTPCREL: case R_X86_64_GOTPCREL64: - if (!_bfd_elf_create_ifunc_sections (abfd, info)) + if (htab->elf.dynobj == NULL) + htab->elf.dynobj = abfd; + if (!_bfd_elf_create_ifunc_sections (htab->elf.dynobj, info)) return FALSE; break; } @@ -4551,14 +4553,14 @@ elf_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED, bfd_boolean *override ATTRIBUTE_UNUSED, bfd_boolean *type_change_ok ATTRIBUTE_UNUSED, bfd_boolean *size_change_ok ATTRIBUTE_UNUSED, - bfd_boolean *newdef ATTRIBUTE_UNUSED, - bfd_boolean *newdyn, + bfd_boolean *newdyn ATTRIBUTE_UNUSED, + bfd_boolean *newdef, bfd_boolean *newdyncommon ATTRIBUTE_UNUSED, bfd_boolean *newweak ATTRIBUTE_UNUSED, bfd *abfd ATTRIBUTE_UNUSED, asection **sec, - bfd_boolean *olddef ATTRIBUTE_UNUSED, - bfd_boolean *olddyn, + bfd_boolean *olddyn ATTRIBUTE_UNUSED, + bfd_boolean *olddef, bfd_boolean *olddyncommon ATTRIBUTE_UNUSED, bfd_boolean *oldweak ATTRIBUTE_UNUSED, bfd *oldbfd, @@ -4567,9 +4569,9 @@ elf_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED, /* A normal common symbol and a large common symbol result in a normal common symbol. We turn the large common symbol into a normal one. */ - if (!*olddyn + if (!*olddef && h->root.type == bfd_link_hash_common - && !*newdyn + && !*newdef && bfd_is_com_section (*sec) && *oldsec != *sec) { diff --git a/bfd/version.h b/bfd/version.h index ffa33ff..23b2798 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20110430 +#define BFD_VERSION_DATE 20110501 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ diff --git a/gdb/version.in b/gdb/version.in index 68a820e..f566d6e 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -7.3.50.20110430-cvs +7.3.50.20110501-cvs hooks/post-receive -- Repository for Project Archer.