tfile_target::close: trace_fd can't be -1

[deliverable/binutils-gdb.git] / bfd / cpu-arm.c

diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 3f56e8f9a62f64ba589048561c83185bc6078cd9..a9a8965d959b4a6ae4d42c1f5642d4885d4930a0 100644 (file)
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -1,13 +1,12 @@
 /* BFD support for the ARM processor
 /* BFD support for the ARM processor

-   Copyright 1994, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2020 Free Software Foundation, Inc.

    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,12 +16,14 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "libiberty.h"
 #include "libbfd.h"
 #include "libiberty.h"

+#include "cpu-arm.h"

 
 /* This routine is provided two arch_infos and works out which ARM
    machine which would be compatible with both and returns a pointer
 
 /* This routine is provided two arch_infos and works out which ARM
    machine which would be compatible with both and returns a pointer


@@ -65,34 +66,132 @@ static struct
 }
 processors[] =
 {
 }
 processors[] =
 {

-  { bfd_mach_arm_2,  "arm2"     },
-  { bfd_mach_arm_2a, "arm250"   },
-  { bfd_mach_arm_2a, "arm3"     },
-  { bfd_mach_arm_3,  "arm6"     },
-  { bfd_mach_arm_3,  "arm60"    },
-  { bfd_mach_arm_3,  "arm600"   },
-  { bfd_mach_arm_3,  "arm610"   },
-  { bfd_mach_arm_3,  "arm7"     },
-  { bfd_mach_arm_3,  "arm710"   },
-  { bfd_mach_arm_3,  "arm7500"  },
-  { bfd_mach_arm_3,  "arm7d"    },
-  { bfd_mach_arm_3,  "arm7di"   },
-  { bfd_mach_arm_3M, "arm7dm"   },
-  { bfd_mach_arm_3M, "arm7dmi"  },
-  { bfd_mach_arm_4T, "arm7tdmi" },
-  { bfd_mach_arm_4,  "arm8"     },
-  { bfd_mach_arm_4,  "arm810"   },
-  { bfd_mach_arm_4,  "arm9"     },
-  { bfd_mach_arm_4,  "arm920"   },
-  { bfd_mach_arm_4T, "arm920t"  },
-  { bfd_mach_arm_4T, "arm9tdmi" },
-  { bfd_mach_arm_4,  "sa1"      },
-  { bfd_mach_arm_4,  "strongarm"},
-  { bfd_mach_arm_4,  "strongarm110" },
-  { bfd_mach_arm_4,  "strongarm1100" },
-  { bfd_mach_arm_XScale, "xscale" },
-  { bfd_mach_arm_ep9312, "ep9312" },
-  { bfd_mach_arm_iWMMXt, "iwmmxt" }
+  { bfd_mach_arm_2,      "arm2"            },
+  { bfd_mach_arm_2a,     "arm250"          },
+  { bfd_mach_arm_2a,     "arm3"            },
+  { bfd_mach_arm_3,      "arm6"            },
+  { bfd_mach_arm_3,      "arm60"           },
+  { bfd_mach_arm_3,      "arm600"          },
+  { bfd_mach_arm_3,      "arm610"          },
+  { bfd_mach_arm_3,      "arm620"          },
+  { bfd_mach_arm_3,      "arm7"            },
+  { bfd_mach_arm_3,      "arm70"           },
+  { bfd_mach_arm_3,      "arm700"          },
+  { bfd_mach_arm_3,      "arm700i"         },
+  { bfd_mach_arm_3,      "arm710"          },
+  { bfd_mach_arm_3,      "arm7100"         },
+  { bfd_mach_arm_3,      "arm710c"         },
+  { bfd_mach_arm_4T,     "arm710t"         },
+  { bfd_mach_arm_3,      "arm720"          },
+  { bfd_mach_arm_4T,     "arm720t"         },
+  { bfd_mach_arm_4T,     "arm740t"         },
+  { bfd_mach_arm_3,      "arm7500"         },
+  { bfd_mach_arm_3,      "arm7500fe"       },
+  { bfd_mach_arm_3,      "arm7d"           },
+  { bfd_mach_arm_3,      "arm7di"          },
+  { bfd_mach_arm_3M,     "arm7dm"          },
+  { bfd_mach_arm_3M,     "arm7dmi"         },
+  { bfd_mach_arm_4T,     "arm7t"           },
+  { bfd_mach_arm_4T,     "arm7tdmi"        },
+  { bfd_mach_arm_4T,     "arm7tdmi-s"      },
+  { bfd_mach_arm_3M,     "arm7m"           },
+  { bfd_mach_arm_4,      "arm8"            },
+  { bfd_mach_arm_4,      "arm810"          },
+  { bfd_mach_arm_4,      "arm9"            },
+  { bfd_mach_arm_4T,     "arm920"          },
+  { bfd_mach_arm_4T,     "arm920t"         },
+  { bfd_mach_arm_4T,     "arm922t"         },
+  { bfd_mach_arm_5TEJ,   "arm926ej"        },
+  { bfd_mach_arm_5TEJ,   "arm926ejs"       },
+  { bfd_mach_arm_5TEJ,   "arm926ej-s"      },
+  { bfd_mach_arm_4T,     "arm940t"         },
+  { bfd_mach_arm_5TE,    "arm946e"         },
+  { bfd_mach_arm_5TE,    "arm946e-r0"      },
+  { bfd_mach_arm_5TE,    "arm946e-s"       },
+  { bfd_mach_arm_5TE,    "arm966e"         },
+  { bfd_mach_arm_5TE,    "arm966e-r0"      },
+  { bfd_mach_arm_5TE,    "arm966e-s"       },
+  { bfd_mach_arm_5TE,    "arm968e-s"       },
+  { bfd_mach_arm_5TE,    "arm9e"           },
+  { bfd_mach_arm_5TE,    "arm9e-r0"        },
+  { bfd_mach_arm_4T,     "arm9tdmi"        },
+  { bfd_mach_arm_5TE,    "arm1020"         },
+  { bfd_mach_arm_5T,     "arm1020t"        },
+  { bfd_mach_arm_5TE,    "arm1020e"        },
+  { bfd_mach_arm_5TE,    "arm1022e"        },
+  { bfd_mach_arm_5TEJ,   "arm1026ejs"      },
+  { bfd_mach_arm_5TEJ,   "arm1026ej-s"     },
+  { bfd_mach_arm_5TE,    "arm10e"          },
+  { bfd_mach_arm_5T,     "arm10t"          },
+  { bfd_mach_arm_5T,     "arm10tdmi"       },
+  { bfd_mach_arm_6,      "arm1136j-s"      },
+  { bfd_mach_arm_6,      "arm1136js"       },
+  { bfd_mach_arm_6,      "arm1136jf-s"     },
+  { bfd_mach_arm_6,      "arm1136jfs"      },
+  { bfd_mach_arm_6KZ,    "arm1176jz-s"     },
+  { bfd_mach_arm_6KZ,    "arm1176jzf-s"    },
+  { bfd_mach_arm_6T2,    "arm1156t2-s"     },
+  { bfd_mach_arm_6T2,    "arm1156t2f-s"    },
+  { bfd_mach_arm_7,      "cortex-a5"       },
+  { bfd_mach_arm_7,      "cortex-a7"       },
+  { bfd_mach_arm_7,      "cortex-a8"       },
+  { bfd_mach_arm_7,      "cortex-a9"       },
+  { bfd_mach_arm_7,      "cortex-a12"      },
+  { bfd_mach_arm_7,      "cortex-a15"      },
+  { bfd_mach_arm_7,      "cortex-a17"      },
+  { bfd_mach_arm_8,      "cortex-a32"      },
+  { bfd_mach_arm_8,      "cortex-a35"      },
+  { bfd_mach_arm_8,      "cortex-a53"      },
+  { bfd_mach_arm_8,      "cortex-a55"      },
+  { bfd_mach_arm_8,      "cortex-a57"      },
+  { bfd_mach_arm_8,      "cortex-a72"      },
+  { bfd_mach_arm_8,      "cortex-a73"      },
+  { bfd_mach_arm_8,      "cortex-a75"      },
+  { bfd_mach_arm_8,      "cortex-a76"      },
+  { bfd_mach_arm_8,      "cortex-a76ae"    },
+  { bfd_mach_arm_8,      "cortex-a77"      },
+  { bfd_mach_arm_6SM,    "cortex-m0"       },
+  { bfd_mach_arm_6SM,    "cortex-m0plus"   },
+  { bfd_mach_arm_6SM,    "cortex-m1"       },
+  { bfd_mach_arm_8M_BASE, "cortex-m23"     },
+  { bfd_mach_arm_7,      "cortex-m3"       },
+  { bfd_mach_arm_8M_MAIN, "cortex-m33"     },
+  { bfd_mach_arm_8M_MAIN, "cortex-m35p"            },
+  { bfd_mach_arm_7EM,    "cortex-m4"       },
+  { bfd_mach_arm_7EM,    "cortex-m7"       },
+  { bfd_mach_arm_7,      "cortex-r4"       },
+  { bfd_mach_arm_7,      "cortex-r4f"      },
+  { bfd_mach_arm_7,      "cortex-r5"       },
+  { bfd_mach_arm_8R,     "cortex-r52"      },
+  { bfd_mach_arm_7,      "cortex-r7"       },
+  { bfd_mach_arm_7,      "cortex-r8"       },
+  { bfd_mach_arm_4T,     "ep9312"          },
+  { bfd_mach_arm_8,      "exynos-m1"       },
+  { bfd_mach_arm_4,      "fa526"           },
+  { bfd_mach_arm_5TE,    "fa606te"         },
+  { bfd_mach_arm_5TE,    "fa616te"         },
+  { bfd_mach_arm_4,      "fa626"           },
+  { bfd_mach_arm_5TE,    "fa626te"         },
+  { bfd_mach_arm_5TE,    "fa726te"         },
+  { bfd_mach_arm_5TE,    "fmp626"          },
+  { bfd_mach_arm_XScale,  "i80200"         },
+  { bfd_mach_arm_7,      "marvell-pj4"     },
+  { bfd_mach_arm_7,      "marvell-whitney" },
+  { bfd_mach_arm_6K,     "mpcore"          },
+  { bfd_mach_arm_6K,     "mpcorenovfp"     },
+  { bfd_mach_arm_4,      "sa1"             },
+  { bfd_mach_arm_4,      "strongarm"       },
+  { bfd_mach_arm_4,      "strongarm1"      },
+  { bfd_mach_arm_4,      "strongarm110"    },
+  { bfd_mach_arm_4,      "strongarm1100"   },
+  { bfd_mach_arm_4,      "strongarm1110"   },
+  { bfd_mach_arm_XScale,  "xscale"         },
+  { bfd_mach_arm_8,      "xgene1"          },
+  { bfd_mach_arm_8,      "xgene2"          },
+  { bfd_mach_arm_ep9312,  "ep9312"         },
+  { bfd_mach_arm_iWMMXt,  "iwmmxt"         },
+  { bfd_mach_arm_iWMMXt2, "iwmmxt2"        },
+  { bfd_mach_arm_unknown, "arm_any"        }

 };
 
 static bfd_boolean
 };
 
 static bfd_boolean


@@ -122,22 +221,39 @@ scan (const struct bfd_arch_info *info, const char *string)
 }
 
 #define N(number, print, default, next)  \
 }
 
 #define N(number, print, default, next)  \

-{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, scan, next }
+{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, \
+    scan, bfd_arch_default_fill, next, 0 }

 
 static const bfd_arch_info_type arch_info_struct[] =
 {
 
 static const bfd_arch_info_type arch_info_struct[] =
 {

-  N (bfd_mach_arm_2,      "armv2",   FALSE, & arch_info_struct[1]),
-  N (bfd_mach_arm_2a,     "armv2a",  FALSE, & arch_info_struct[2]),
-  N (bfd_mach_arm_3,      "armv3",   FALSE, & arch_info_struct[3]),
-  N (bfd_mach_arm_3M,     "armv3m",  FALSE, & arch_info_struct[4]),
-  N (bfd_mach_arm_4,      "armv4",   FALSE, & arch_info_struct[5]),
-  N (bfd_mach_arm_4T,     "armv4t",  FALSE, & arch_info_struct[6]),
-  N (bfd_mach_arm_5,      "armv5",   FALSE, & arch_info_struct[7]),
-  N (bfd_mach_arm_5T,     "armv5t",  FALSE, & arch_info_struct[8]),
-  N (bfd_mach_arm_5TE,    "armv5te", FALSE, & arch_info_struct[9]),
-  N (bfd_mach_arm_XScale, "xscale",  FALSE, & arch_info_struct[10]),
-  N (bfd_mach_arm_ep9312, "ep9312",  FALSE, & arch_info_struct[11]),
-  N (bfd_mach_arm_iWMMXt,"iwmmxt",  FALSE, NULL)
+  N (bfd_mach_arm_2,         "armv2",          FALSE, & arch_info_struct[1]),
+  N (bfd_mach_arm_2a,        "armv2a",         FALSE, & arch_info_struct[2]),
+  N (bfd_mach_arm_3,         "armv3",          FALSE, & arch_info_struct[3]),
+  N (bfd_mach_arm_3M,        "armv3m",         FALSE, & arch_info_struct[4]),
+  N (bfd_mach_arm_4,         "armv4",          FALSE, & arch_info_struct[5]),
+  N (bfd_mach_arm_4T,        "armv4t",         FALSE, & arch_info_struct[6]),
+  N (bfd_mach_arm_5,         "armv5",          FALSE, & arch_info_struct[7]),
+  N (bfd_mach_arm_5T,        "armv5t",         FALSE, & arch_info_struct[8]),
+  N (bfd_mach_arm_5TE,       "armv5te",        FALSE, & arch_info_struct[9]),
+  N (bfd_mach_arm_XScale,    "xscale",         FALSE, & arch_info_struct[10]),
+  N (bfd_mach_arm_ep9312,    "ep9312",         FALSE, & arch_info_struct[11]),
+  N (bfd_mach_arm_iWMMXt,    "iwmmxt",         FALSE, & arch_info_struct[12]),
+  N (bfd_mach_arm_iWMMXt2,   "iwmmxt2",        FALSE, & arch_info_struct[13]),
+  N (bfd_mach_arm_5TEJ,      "armv5tej",       FALSE, & arch_info_struct[14]),
+  N (bfd_mach_arm_6,         "armv6",          FALSE, & arch_info_struct[15]),
+  N (bfd_mach_arm_6KZ,       "armv6kz",        FALSE, & arch_info_struct[16]),
+  N (bfd_mach_arm_6T2,       "armv6t2",        FALSE, & arch_info_struct[17]),
+  N (bfd_mach_arm_6K,        "armv6k",         FALSE, & arch_info_struct[18]),
+  N (bfd_mach_arm_7,         "armv7",          FALSE, & arch_info_struct[19]),
+  N (bfd_mach_arm_6M,        "armv6-m",        FALSE, & arch_info_struct[20]),
+  N (bfd_mach_arm_6SM,       "armv6s-m",       FALSE, & arch_info_struct[21]),
+  N (bfd_mach_arm_7EM,       "armv7e-m",       FALSE, & arch_info_struct[22]),
+  N (bfd_mach_arm_8,         "armv8-a",        FALSE, & arch_info_struct[23]),
+  N (bfd_mach_arm_8R,        "armv8-r",        FALSE, & arch_info_struct[24]),
+  N (bfd_mach_arm_8M_BASE,   "armv8-m.base",   FALSE, & arch_info_struct[25]),
+  N (bfd_mach_arm_8M_MAIN,   "armv8-m.main",   FALSE, & arch_info_struct[26]),
+  N (bfd_mach_arm_8_1M_MAIN, "armv8.1-m.main", FALSE, & arch_info_struct[27]),
+  N (bfd_mach_arm_unknown,   "arm_any",        FALSE, NULL)

 };
 
 const bfd_arch_info_type bfd_arm_arch =
 };
 
 const bfd_arch_info_type bfd_arm_arch =


@@ -179,19 +295,25 @@ bfd_arm_merge_machines (bfd *ibfd, bfd *obfd)
      Intel XScale binary, since these architecture have co-processors which
      will not both be present on the same physical hardware.  */
   else if (in == bfd_mach_arm_ep9312
      Intel XScale binary, since these architecture have co-processors which
      will not both be present on the same physical hardware.  */
   else if (in == bfd_mach_arm_ep9312

-          && (out == bfd_mach_arm_XScale || out == bfd_mach_arm_iWMMXt))
+          && (out == bfd_mach_arm_XScale
+              || out == bfd_mach_arm_iWMMXt
+              || out == bfd_mach_arm_iWMMXt2))

     {
     {

+      /* xgettext: c-format */

       _bfd_error_handler (_("\
       _bfd_error_handler (_("\

-ERROR: %B is compiled for the EP9312, whereas %B is compiled for XScale"),
+error: %pB is compiled for the EP9312, whereas %pB is compiled for XScale"),

                          ibfd, obfd);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;
     }
   else if (out == bfd_mach_arm_ep9312
                          ibfd, obfd);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;
     }
   else if (out == bfd_mach_arm_ep9312

-          && (in == bfd_mach_arm_XScale || in == bfd_mach_arm_iWMMXt))
+          && (in == bfd_mach_arm_XScale
+              || in == bfd_mach_arm_iWMMXt
+              || in == bfd_mach_arm_iWMMXt2))

     {
     {

+      /* xgettext: c-format */

       _bfd_error_handler (_("\
       _bfd_error_handler (_("\

-ERROR: %B is compiled for the EP9312, whereas %B is compiled for XScale"),
+error: %pB is compiled for the EP9312, whereas %pB is compiled for XScale"),

                          obfd, ibfd);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;
                          obfd, ibfd);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;


@@ -222,7 +344,7 @@ arm_check_note (bfd *abfd,
   unsigned long namesz;
   unsigned long descsz;
   unsigned long type;
   unsigned long namesz;
   unsigned long descsz;
   unsigned long type;

-  char *        descr;
+  char *       descr;

 
   if (buffer_size < offsetof (arm_Note, name))
     return FALSE;
 
   if (buffer_size < offsetof (arm_Note, name))
     return FALSE;


@@ -244,10 +366,10 @@ arm_check_note (bfd *abfd,
        return FALSE;
     }
   else
        return FALSE;
     }
   else

-    { 
+    {

       if (namesz != ((strlen (expected_name) + 1 + 3) & ~3))
        return FALSE;
       if (namesz != ((strlen (expected_name) + 1 + 3) & ~3))
        return FALSE;

-      
+

       if (strcmp (descr, expected_name) != 0)
        return FALSE;
 
       if (strcmp (descr, expected_name) != 0)
        return FALSE;
 


@@ -255,6 +377,7 @@ arm_check_note (bfd *abfd,
     }
 
   /* FIXME: We should probably check the type as well.  */
     }
 
   /* FIXME: We should probably check the type as well.  */

+  (void) type;

 
   if (description_return != NULL)
     * description_return = descr;
 
   if (description_return != NULL)
     * description_return = descr;


@@ -262,16 +385,16 @@ arm_check_note (bfd *abfd,
   return TRUE;
 }
 
   return TRUE;
 }
 

-#define NOTE_ARCH_STRING       "arch: "
+#define NOTE_ARCH_STRING       "arch: "

 
 bfd_boolean
 bfd_arm_update_notes (bfd *abfd, const char *note_section)
 {
 
 bfd_boolean
 bfd_arm_update_notes (bfd *abfd, const char *note_section)
 {

-  asection *     arm_arch_section;
-  bfd_size_type  buffer_size;
-  bfd_byte *     buffer;
-  char *         arch_string;
-  char *         expected;
+  asection *    arm_arch_section;
+  bfd_size_type         buffer_size;
+  bfd_byte *    buffer;
+  char *        arch_string;
+  char *        expected;

 
   /* Look for a note section.  If one is present check the architecture
      string encoded in it, and set it to the current architecture if it is
 
   /* Look for a note section.  If one is present check the architecture
      string encoded in it, and set it to the current architecture if it is


@@ -292,7 +415,9 @@ bfd_arm_update_notes (bfd *abfd, const char *note_section)
   if (! arm_check_note (abfd, buffer, buffer_size, NOTE_ARCH_STRING, & arch_string))
     goto FAIL;
 
   if (! arm_check_note (abfd, buffer, buffer_size, NOTE_ARCH_STRING, & arch_string))
     goto FAIL;
 

-  /* Check the architecture in the note against the architecture of the bfd.  */
+  /* Check the architecture in the note against the architecture of the bfd.
+     Newer architectures versions should not be added here as build attribute
+     are a better mechanism to convey ISA used.  */

   switch (bfd_get_mach (abfd))
     {
     default:
   switch (bfd_get_mach (abfd))
     {
     default:


@@ -309,6 +434,7 @@ bfd_arm_update_notes (bfd *abfd, const char *note_section)
     case bfd_mach_arm_XScale:  expected = "XScale"; break;
     case bfd_mach_arm_ep9312:  expected = "ep9312"; break;
     case bfd_mach_arm_iWMMXt:  expected = "iWMMXt"; break;
     case bfd_mach_arm_XScale:  expected = "XScale"; break;
     case bfd_mach_arm_ep9312:  expected = "ep9312"; break;
     case bfd_mach_arm_iWMMXt:  expected = "iWMMXt"; break;

+    case bfd_mach_arm_iWMMXt2: expected = "iWMMXt2"; break;

     }
 
   if (strcmp (arch_string, expected) != 0)
     }
 
   if (strcmp (arch_string, expected) != 0)


@@ -320,9 +446,10 @@ bfd_arm_update_notes (bfd *abfd, const char *note_section)
       if (! bfd_set_section_contents (abfd, arm_arch_section, buffer,
                                      (file_ptr) 0, buffer_size))
        {
       if (! bfd_set_section_contents (abfd, arm_arch_section, buffer,
                                      (file_ptr) 0, buffer_size))
        {

-         (*_bfd_error_handler)
-           (_("warning: unable to update contents of %s section in %s"),
-            note_section, bfd_get_filename (abfd));
+         _bfd_error_handler
+           /* xgettext: c-format */
+           (_("warning: unable to update contents of %s section in %pB"),
+            note_section, abfd);

          goto FAIL;
        }
     }
          goto FAIL;
        }
     }


@@ -342,6 +469,9 @@ static struct
   const char * string;
   unsigned int mach;
 }
   const char * string;
   unsigned int mach;
 }

+
+/* Newer architectures versions should not be added here as build attribute are
+   a better mechanism to convey ISA used.  */

 architectures[] =
 {
   { "armv2",   bfd_mach_arm_2 },
 architectures[] =
 {
   { "armv2",   bfd_mach_arm_2 },


@@ -355,18 +485,20 @@ architectures[] =
   { "armv5te", bfd_mach_arm_5TE },
   { "XScale",  bfd_mach_arm_XScale },
   { "ep9312",  bfd_mach_arm_ep9312 },
   { "armv5te", bfd_mach_arm_5TE },
   { "XScale",  bfd_mach_arm_XScale },
   { "ep9312",  bfd_mach_arm_ep9312 },

-  { "iWMMXt",  bfd_mach_arm_iWMMXt }
+  { "iWMMXt",  bfd_mach_arm_iWMMXt },
+  { "iWMMXt2", bfd_mach_arm_iWMMXt2 },
+  { "arm_any", bfd_mach_arm_unknown }

 };
 
 /* Extract the machine number stored in a note section.  */
 unsigned int
 bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
 {
 };
 
 /* Extract the machine number stored in a note section.  */
 unsigned int
 bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
 {

-  asection *     arm_arch_section;
-  bfd_size_type  buffer_size;
-  bfd_byte *     buffer;
-  char *         arch_string;
-  int            i;
+  asection *    arm_arch_section;
+  bfd_size_type         buffer_size;
+  bfd_byte *    buffer;
+  char *        arch_string;
+  int           i;

 
   /* Look for a note section.  If one is present check the architecture
      string encoded in it, and set it to the current architecture if it is
 
   /* Look for a note section.  If one is present check the architecture
      string encoded in it, and set it to the current architecture if it is


@@ -402,11 +534,22 @@ bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
 }
 
 bfd_boolean
 }
 
 bfd_boolean

-bfd_is_arm_mapping_symbol_name (const char * name)
+bfd_is_arm_special_symbol_name (const char * name, int type)

 {
 {

-  return (name != NULL)
-    && (name[0] == '$')
-    && ((name[1] == 'a') || (name[1] == 't') || (name[1] == 'd'))
-    && (name[2] == 0);
+  /* The ARM compiler outputs several obsolete forms.  Recognize them
+     in addition to the standard $a, $t and $d.  We are somewhat loose
+     in what we accept here, since the full set is not documented.  */
+  if (!name || name[0] != '$')
+    return FALSE;
+  if (name[1] == 'a' || name[1] == 't' || name[1] == 'd')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_MAP;
+  else if (name[1] == 'm' || name[1] == 'f' || name[1] == 'p')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_TAG;
+  else if (name[1] >= 'a' && name[1] <= 'z')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_OTHER;
+  else
+    return FALSE;
+
+  return (type != 0 && (name[2] == 0 || name[2] == '.'));

 }
 
 }