*** empty log message ***

[deliverable/binutils-gdb.git] / bfd / elf32-cris.c

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 4580beabd9024e8fa395aaa070f507aeacf32218..3edabc757945436b4137cd69c54f29e6d36b790f 100644 (file)
--- 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 */
@@ -1764,7 +1769,7 @@ elf_cris_finish_dynamic_symbol (output_bfd, info, h, sym)
 
   /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
   if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+      || h == elf_hash_table (info)->hgot)
     sym->st_shndx = SHN_ABS;
 
   return TRUE;