PR ld/13991

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

diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 0ceed858a4e0e9928f17bc23a07f02d0712ac49a..942d4e09d0c9187d3f29997a0f313f80e7226ec3 100644 (file)
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -1,5 +1,5 @@
 /* Renesas RX specific support for 32-bit ELF.
-   Copyright (C) 2008, 2009, 2010, 2011
+   Copyright (C) 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -521,7 +521,7 @@ rx_elf_relocate_section
          name = h->root.root.string;
        }
 
-      if (sec != NULL && elf_discarded_section (sec))
+      if (sec != NULL && discarded_section (sec))
        RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
                                         rel, relend, howto, contents);
 
@@ -1653,7 +1653,7 @@ rx_offset_for_reloc (bfd *                    abfd,
          if (ssec)
            {
              if ((ssec->flags & SEC_MERGE)
-                 && ssec->sec_info_type == ELF_INFO_TYPE_MERGE)
+                 && ssec->sec_info_type == SEC_INFO_TYPE_MERGE)
                symval = _bfd_merged_section_offset (abfd, & ssec,
                                                     elf_section_data (ssec)->sec_info,
                                                     symval);
@@ -2115,7 +2115,7 @@ elf32_rx_relax_section (bfd *                  abfd,
                   /* Decodable bits.  */
                   && (insn[0] & 0xcc) == 0xcc
                   /* Width.  */
-                  && (insn[0] & 0x30) != 3
+                  && (insn[0] & 0x30) != 0x30
                   /* Register MSBs.  */
                   && (insn[1] & 0x88)  == 0x00)
            {
@@ -2219,7 +2219,7 @@ elf32_rx_relax_section (bfd *                  abfd,
                   /* Decodable bits.  */
                   && (insn[0] & 0xc3) == 0xc3
                   /* Width.  */
-                  && (insn[0] & 0x30) != 3
+                  && (insn[0] & 0x30) != 0x30
                   /* Register MSBs.  */
                   && (insn[1] & 0x88)  == 0x00)
            {