This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: Ping [Patch v2] bfd elfxx-ia64: share code between elf32 and elf64
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Andreas Schwab <schwab at linux-m68k dot org>
- Cc: Tristan Gingold <gingold at adacore dot com>, Aurelien Jarno <aurelien at aurel32 dot net>, Nick Clifton <nickc at redhat dot com>, binutils Development <binutils at sourceware dot org>
- Date: Mon, 11 Jul 2011 06:55:08 -0700
- Subject: Re: Ping [Patch v2] bfd elfxx-ia64: share code between elf32 and elf64
- References: <EEEC6C47-1379-4F53-B7C9-C1C539E7A2AB@adacore.com> <BANLkTi=Ms6fs_HVZtR5fG4x2e-AKXD5W8g@mail.gmail.com> <1149AB82-D754-4792-98C1-C677ABE5E712@adacore.com> <BANLkTimmLDU-cB30T2+2rprBw6TV2zpXMw@mail.gmail.com> <9F58AE27-C095-4B50-B3D4-1DF60454A382@adacore.com> <6ACB9B6C-7640-473A-9047-7AFB4C789D49@adacore.com> <4DDBB7CD.40902@redhat.com> <9C0F5E39-7514-4996-AA9B-26478EEAAD79@adacore.com> <4DDCADE9.4020405@redhat.com> <049A78A6-0E98-4631-BB9B-27A6B9527D37@adacore.com> <20110705182906.GB19197@volta.aurel32.net> <DBD073AB-4CE9-4EC6-A3F1-CFE5483A6EFD@adacore.com> <m2vcvbs4g5.fsf@igel.home>
On Sat, Jul 9, 2011 at 11:18 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Tristan Gingold <gingold@adacore.com> writes:
>
>> This patch shouldn't have made any functional change, but ...
>
> There is one functional change:
>
> @@ -2648,7 +2135,7 @@ count_dyn_reloc (bfd *abfd, struct elfNN_ia64_dyn_sym_info *dyn_i,
> ? ? ? rent->count = 0;
> ? ? ? dyn_i->reloc_entries = rent;
> ? ? }
> - ?rent->reltext = reltext;
> + ?rent->reltext |= reltext;
> ? rent->count++;
>
> ? return TRUE;
>
>
I am checking this as an obvious fix.
--
H.J.
----
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a1b9197..e469ef2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-11 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/12978
+ * elfnn-ia64.c (count_dyn_reloc): Fix a typo.
+
2011-07-09 Alan Modra <amodra@gmail.com>
PR ld/12942
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index bc31fca..3e2ee0b 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -2129,7 +2129,7 @@ count_dyn_reloc (bfd *abfd, struct
elfNN_ia64_dyn_sym_info *dyn_i,
rent->count = 0;
dyn_i->reloc_entries = rent;
}
- rent->reltext |= reltext;
+ rent->reltext = reltext;
rent->count++;
return TRUE;