X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fcpu-arm.c;h=a9a8965d959b4a6ae4d42c1f5642d4885d4930a0;hb=b03202e32c8235997b3485b0b4655926ad97a1cc;hp=4ef409b4516c6b0abdf0a4fa8f9dbde7eb974163;hpb=c0c468d562649df0f695737262b6230b7a56a4bb;p=binutils-gdb.git diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index 4ef409b4516..a9a8965d959 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -1,5 +1,5 @@ /* BFD support for the ARM processor - Copyright (C) 1994-2018 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. @@ -23,6 +23,7 @@ #include "bfd.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 @@ -65,36 +66,132 @@ static struct } 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_iWMMXt2, "iwmmxt2" }, - { bfd_mach_arm_unknown, "arm_any" } + { 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 @@ -125,7 +222,7 @@ scan (const struct bfd_arch_info *info, const char *string) #define N(number, print, default, next) \ { 32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, \ - scan, bfd_arch_default_fill, next } + scan, bfd_arch_default_fill, next, 0 } static const bfd_arch_info_type arch_info_struct[] = { @@ -155,6 +252,7 @@ static const bfd_arch_info_type arch_info_struct[] = 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) }; @@ -317,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; - /* 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: @@ -369,6 +469,9 @@ static struct 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 },