* elflink.c (_bfd_elf_merge_symbol): Don't discard TLS symbols here.

[binutils-gdb.git] / bfd / elf32-rl78.c

diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 62b1371dc08888fde9f641c822d8598d4b57dafb..ea9a0760d58ca570687fc7b10a2397689244ae0b 100644 (file)
--- a/bfd/elf32-rl78.c
+++ b/bfd/elf32-rl78.c
@@ -778,6 +778,8 @@ rl78_elf_relocate_section
                               + sec->output_section->vma
                               + sec->output_offset
                               + rel->r_addend);
+             else if (h->root.type == bfd_link_hash_undefweak)
+               RL78_STACK_PUSH (0);
              else
                _bfd_error_handler (_("Warning: RL78_SYM reloc with an unknown symbol"));
            }
@@ -1155,7 +1157,7 @@ rl78_get_reloc (long reloc)
 
 /* We support 16-bit pointers to code above 64k by generating a thunk
    below 64k containing a JMP instruction to the final address.  */
- 
+
 static bfd_boolean
 rl78_elf_check_relocs
     (bfd *                     abfd,
@@ -1173,7 +1175,7 @@ rl78_elf_check_relocs
 
   if (info->relocatable)
     return TRUE;
- 
+
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
   local_plt_offsets = elf_local_got_offsets (abfd);
@@ -1186,7 +1188,7 @@ rl78_elf_check_relocs
       struct elf_link_hash_entry *h;
       unsigned long r_symndx;
       bfd_vma *offset;
- 
+
       r_symndx = ELF32_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
         h = NULL;
@@ -1197,7 +1199,7 @@ rl78_elf_check_relocs
                 || h->root.type == bfd_link_hash_warning)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
        }
- 
+
       switch (ELF32_R_TYPE (rel->r_info))
         {
          /* This relocation describes a 16-bit pointer to a function.
@@ -1251,7 +1253,7 @@ rl78_elf_check_relocs
          break;
         }
     }
- 
+
   return TRUE;
 }
 
@@ -1326,8 +1328,7 @@ struct relax_plt_data
 };
 
 static bfd_boolean
-rl78_relax_plt_check (struct elf_link_hash_entry *h,
-                      PTR xdata)
+rl78_relax_plt_check (struct elf_link_hash_entry *h, void * xdata)
 {
   struct relax_plt_data *data = (struct relax_plt_data *) xdata;
 
@@ -1358,8 +1359,7 @@ rl78_relax_plt_check (struct elf_link_hash_entry *h,
    previously had a plt entry, give it a new entry offset.  */
 
 static bfd_boolean
-rl78_relax_plt_realloc (struct elf_link_hash_entry *h,
-                        PTR xdata)
+rl78_relax_plt_realloc (struct elf_link_hash_entry *h, void * xdata)
 {
   bfd_vma *entry = (bfd_vma *) xdata;
 
@@ -1973,7 +1973,7 @@ struct {
   { 0x71, 0x58, 0x53, 0x5b },  /* CLR1 !addr16.0 */
   { 0x71, 0x68, 0x63, 0x6b },  /* CLR1 !addr16.0 */
   { 0x71, 0x78, 0x73, 0x7b },  /* CLR1 !addr16.0 */
-  
+
   { -1, -1, -1, -1 }
 };
 
@@ -2056,14 +2056,14 @@ rl78_elf_relax_section
       if (shndx_buf == NULL)
        goto error_return;
       if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
-         || bfd_bread ((PTR) shndx_buf, amt, abfd) != amt)
+         || bfd_bread (shndx_buf, amt, abfd) != amt)
        goto error_return;
       shndx_hdr->contents = (bfd_byte *) shndx_buf;
     }
 
   /* Get a copy of the native relocations.  */
   internal_relocs = (_bfd_elf_link_read_relocs
-                    (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+                    (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
                      link_info->keep_memory));
   if (internal_relocs == NULL)
     goto error_return;
@@ -2350,7 +2350,7 @@ rl78_elf_relax_section
                }
              break;
            }
-         
+
        }
 
       if (irel->r_addend & RL78_RELAXA_ADDR16)
@@ -2416,7 +2416,7 @@ rl78_elf_relax_section
                      insn[poff] = relax_addr16[idx].insn_for_saddr;
                      SNIP (poff+2, 1, R_RL78_RH_SADDR);
                    }
-               
+
                }
            }
        }