include/elf/

	* ppc.h (R_PPC_RELAX*): Define as enum.
bfd/
	* elf32-ppc.c (ppc_elf_check_relocs): Handle R_PPC_RELAX* in switch.
	* elf32-v850.c (v850_elf_relocate_section): Warning fix.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 52f3ca5..11bfbfc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-22  Alan Modra  <amodra@bigpond.net.au>
 
+       * elf32-ppc.c (ppc_elf_check_relocs): Handle R_PPC_RELAX* in switch.
+       * elf32-v850.c (v850_elf_relocate_section): Warning fix.
+
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
        * elf64-ppc.c (ppc64_elf_edit_opd): Avoid gcc warning.
 
 2009-06-19  H.J. Lu  <hongjiu.lu@intel.com>

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 7aafbeb..0a27ffd 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -3643,6 +3643,10 @@ ppc_elf_check_relocs (bfd *abfd,
        case R_PPC_EMB_MRKREF:
        case R_PPC_NONE:
        case R_PPC_max:
+       case R_PPC_RELAX32:
+       case R_PPC_RELAX32PC:
+       case R_PPC_RELAX32_PLT:
+       case R_PPC_RELAX32PC_PLT:
          break;
 
          /* These should only appear in dynamic objects.  */

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 5ecfa69..fa9dedf 100644 (file)
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -1680,7 +1680,7 @@ v850_elf_relocate_section (bfd *output_bfd,
                name = bfd_section_name (input_bfd, sec);
            }
 
-         switch (r)
+         switch ((int) r)
            {
            case bfd_reloc_overflow:
              if (! ((*info->callbacks->reloc_overflow)

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index a8821a2..99805f1 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+       * ppc.h (R_PPC_RELAX*): Define as enum.
+
 2009-06-11  Anthony Green  <green@moxielogic.org>
 
        * moxie.h (R_MOXIE_PCREL10): New.

diff --git a/include/elf/ppc.h b/include/elf/ppc.h
index 06df630..8f4ed9e 100644 (file)
--- a/include/elf/ppc.h
+++ b/include/elf/ppc.h
@@ -122,11 +122,13 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type)
   RELOC_NUMBER (R_PPC_EMB_BIT_FLD,     115)
   RELOC_NUMBER (R_PPC_EMB_RELSDA,      116)
 
+#ifndef RELOC_MACROS_GEN_FUNC
 /* Fake relocations for branch stubs, only used internally by ld.  */
-#define R_PPC_RELAX32 245
-#define R_PPC_RELAX32PC 246
-#define R_PPC_RELAX32_PLT 247
-#define R_PPC_RELAX32PC_PLT 248
+  RELOC_NUMBER (R_PPC_RELAX32,         245)
+  RELOC_NUMBER (R_PPC_RELAX32PC,       246)
+  RELOC_NUMBER (R_PPC_RELAX32_PLT,     247)
+  RELOC_NUMBER (R_PPC_RELAX32PC_PLT,   248)
+#endif
 
 /* These are GNU extensions used in PIC code sequences.  */
   RELOC_NUMBER (R_PPC_REL16,           249)