Git sucks!

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

diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 5000eb7be0cf1d54688708187807b1d493057a95..2045cb76bad96aa8304ac97dedcdf409621f921f 100644 (file)
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -1,6 +1,5 @@
 /* Renesas RX specific support for 32-bit ELF.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,8 +30,8 @@
 /* This is a meta-target that's used only with objcopy, to avoid the
    endian-swap we would otherwise get.  We check for this in
    rx_elf_object_p().  */
-const bfd_target bfd_elf32_rx_be_ns_vec;
-const bfd_target bfd_elf32_rx_be_vec;
+const bfd_target rx_elf32_be_ns_vec;
+const bfd_target rx_elf32_be_vec;
 
 #ifdef DEBUG
 char * rx_get_reloc (long);
@@ -511,12 +510,12 @@ rx_elf_relocate_section
        }
       else
        {
-         bfd_boolean warned;
+         bfd_boolean warned, ignored;
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes, h,
                                   sec, relocation, unresolved_reloc,
-                                  warned);
+                                  warned, ignored);
 
          name = h->root.root.string;
        }
@@ -1163,6 +1162,7 @@ rx_elf_relocate_section
          {
            int32_t tmp;
 
+           saw_subtract = TRUE;
            RX_STACK_POP (tmp);
            tmp = - tmp;
            RX_STACK_PUSH (tmp);
@@ -1207,7 +1207,6 @@ rx_elf_relocate_section
          {
            int32_t tmp1, tmp2;
 
-           saw_subtract = TRUE;
            RX_STACK_POP (tmp1);
            RX_STACK_POP (tmp2);
            tmp1 /= tmp2;
@@ -3072,17 +3071,17 @@ rx_elf_object_p (bfd * abfd)
   /* We never want to automatically choose the non-swapping big-endian
      target.  The user can only get that explicitly, such as with -I
      and objcopy.  */
-  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
+  if (abfd->xvec == &rx_elf32_be_ns_vec
       && abfd->target_defaulted)
     return FALSE;
 
   /* BFD->target_defaulted is not set to TRUE when a target is chosen
      as a fallback, so we check for "scanning" to know when to stop
      using the non-swapping target.  */
-  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
+  if (abfd->xvec == &rx_elf32_be_ns_vec
       && saw_be)
     return FALSE;
-  if (abfd->xvec == &bfd_elf32_rx_be_vec)
+  if (abfd->xvec == &rx_elf32_be_vec)
     saw_be = TRUE;
 
   bfd_default_set_arch_mach (abfd, bfd_arch_rx,
@@ -3177,31 +3176,31 @@ rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
     {
       switch (ELF_ST_TYPE (isym->st_info))
        {
-       case STT_FUNC: st_info_str = "STT_FUNC";
-       case STT_SECTION: st_info_str = "STT_SECTION";
-       case STT_FILE: st_info_str = "STT_FILE";
-       case STT_OBJECT: st_info_str = "STT_OBJECT";
-       case STT_TLS: st_info_str = "STT_TLS";
+       case STT_FUNC: st_info_str = "STT_FUNC"; break;
+       case STT_SECTION: st_info_str = "STT_SECTION"; break;
+       case STT_FILE: st_info_str = "STT_FILE"; break;
+       case STT_OBJECT: st_info_str = "STT_OBJECT"; break;
+       case STT_TLS: st_info_str = "STT_TLS"; break;
        default: st_info_str = "";
        }
       switch (ELF_ST_BIND (isym->st_info))
        {
-       case STB_LOCAL: st_info_stb_str = "STB_LOCAL";
-       case STB_GLOBAL: st_info_stb_str = "STB_GLOBAL";
+       case STB_LOCAL: st_info_stb_str = "STB_LOCAL"; break;
+       case STB_GLOBAL: st_info_stb_str = "STB_GLOBAL"; break;
        default: st_info_stb_str = "";
        }
       switch (ELF_ST_VISIBILITY (isym->st_other))
        {
-       case STV_DEFAULT: st_other_str = "STV_DEFAULT";
-       case STV_INTERNAL: st_other_str = "STV_INTERNAL";
-       case STV_PROTECTED: st_other_str = "STV_PROTECTED";
+       case STV_DEFAULT: st_other_str = "STV_DEFAULT"; break;
+       case STV_INTERNAL: st_other_str = "STV_INTERNAL"; break;
+       case STV_PROTECTED: st_other_str = "STV_PROTECTED"; break;
        default: st_other_str = "";
        }
       switch (isym->st_shndx)
        {
-       case SHN_ABS: st_shndx_str = "SHN_ABS";
-       case SHN_COMMON: st_shndx_str = "SHN_COMMON";
-       case SHN_UNDEF: st_shndx_str = "SHN_UNDEF";
+       case SHN_ABS: st_shndx_str = "SHN_ABS"; break;
+       case SHN_COMMON: st_shndx_str = "SHN_COMMON"; break;
+       case SHN_UNDEF: st_shndx_str = "SHN_UNDEF"; break;
        default: st_shndx_str = "";
        }
 
@@ -3510,7 +3509,7 @@ elf32_rx_modify_program_headers (bfd * abfd ATTRIBUTE_UNUSED,
   bed = get_elf_backend_data (abfd);
   tdata = elf_tdata (abfd);
   phdr = tdata->phdr;
-  count = tdata->program_header_size / bed->s->sizeof_phdr;
+  count = elf_program_header_size (abfd) / bed->s->sizeof_phdr;
 
   if (ignore_lma)
     for (i = count; i-- != 0;)
@@ -3549,10 +3548,10 @@ static const struct bfd_elf_special_section elf32_rx_special_sections[] =
 #define ELF_MACHINE_CODE       EM_RX
 #define ELF_MAXPAGESIZE                0x1000
 
-#define TARGET_BIG_SYM         bfd_elf32_rx_be_vec
+#define TARGET_BIG_SYM         rx_elf32_be_vec
 #define TARGET_BIG_NAME                "elf32-rx-be"
 
-#define TARGET_LITTLE_SYM      bfd_elf32_rx_le_vec
+#define TARGET_LITTLE_SYM      rx_elf32_le_vec
 #define TARGET_LITTLE_NAME     "elf32-rx-le"
 
 #define elf_info_to_howto_rel                  NULL
@@ -3581,7 +3580,7 @@ static const struct bfd_elf_special_section elf32_rx_special_sections[] =
    pre-swapped .text sections (like objcopy).  */
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM         bfd_elf32_rx_be_ns_vec
+#define TARGET_BIG_SYM         rx_elf32_be_ns_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME                "elf32-rx-be-ns"
 #undef  TARGET_LITTLE_SYM