* elfxx-mips.c (MICROMIPS_P): New macro.

	(_bfd_mips_elf_symbol_processing): Use it.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b3ad685520a0ad767bc106d06a299d63dbeb72af..0ac30d807311426bd9b1854b0d883d8903365a9a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-18  Paul Brook  <paul@codesourcery.com>
+
+       * elfxx-mips.c (MICROMIPS_P): New macro.
+       (_bfd_mips_elf_symbol_processing): Use it.
+
 2013-02-18  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * elfxx-mips.c (_bfd_mips_elf_create_dynamic_sections): Clarify

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 5a4e237380d61f73b59a479fef5c95d01c3f5961..74a9a51f5e65ae91ddd80cc9cb3174f5ff96aae9 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -737,6 +737,10 @@ static bfd *reldyn_sorting_bfd;
 /* Nonzero if ABFD is using NewABI conventions.  */
 #define NEWABI_P(abfd) (ABI_N32_P (abfd) || ABI_64_P (abfd))
 
+/* Nonzero if ABFD has microMIPS code.  */
+#define MICROMIPS_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_MICROMIPS) != 0)
+
 /* The IRIX compatibility level we are striving for.  */
 #define IRIX_COMPAT(abfd) \
   (get_elf_backend_data (abfd)->elf_backend_mips_irix_compat (abfd))
@@ -6423,7 +6427,7 @@ _bfd_mips_elf_symbol_processing (bfd *abfd, asymbol *asym)
       && (asym->value & 1) != 0)
     {
       asym->value--;
-      if (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_MICROMIPS)
+      if (MICROMIPS_P (abfd))
        elfsym->internal_elf_sym.st_other
          = ELF_ST_SET_MICROMIPS (elfsym->internal_elf_sym.st_other);
       else