summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-cris.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a8895921fe4..d1612fab333 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-28 Hans-Peter Nilsson <hp@axis.com>
+
+ PR ld/1567
+ * elf32-cris.c (cris_elf_howto_table) <R_CRIS_32>: Set
+ complain_on_overflow field to complain_overflow_dont.
+
2005-10-27 Alan Modra <amodra@bigpond.net.au>
PR 973
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 4580beabd90..06865dcc2e2 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -156,7 +156,12 @@ static reloc_howto_type cris_elf_howto_table [] =
32, /* bitsize */
FALSE, /* pc_relative */
0, /* bitpos */
- complain_overflow_bitfield, /* complain_on_overflow */
+ /* We don't want overflow complaints for 64-bit vma builds
+ for e.g. sym+0x40000000 (or actually sym-0xc0000000 in
+ 32-bit ELF) where sym=0xc0001234.
+ Don't do this for the PIC relocs, as we don't expect to
+ see them with large offsets. */
+ complain_overflow_dont, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
"R_CRIS_32", /* name */
FALSE, /* partial_inplace */