diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2013-12-26 11:50:28 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2013-12-26 11:50:28 +0000 |
| commit | c01b59658f0f993de312a4703487a89fbb901a9d (patch) | |
| tree | 25996edac859edb7cfca420aeb98250c9e9e203f /lib/Target/ARM | |
| parent | 68418605322b4168a62cc815c154bee29f0904c9 (diff) | |
| download | llvm-c01b59658f0f993de312a4703487a89fbb901a9d.tar.gz llvm-c01b59658f0f993de312a4703487a89fbb901a9d.tar.bz2 llvm-c01b59658f0f993de312a4703487a89fbb901a9d.tar.xz | |
Recognize armv7a and friends as aliases for armv7-a etc. for the purpose
of architecture naming.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198043 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM')
| -rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMArchName.def | 5 | ||||
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMArchName.h | 1 | ||||
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 209741aaae..073d6c8dbd 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -8119,6 +8119,8 @@ bool ARMAsmParser::parseDirectiveArch(SMLoc L) { unsigned ID = StringSwitch<unsigned>(Arch) #define ARM_ARCH_NAME(NAME, ID, DEFAULT_CPU_NAME, DEFAULT_CPU_ARCH) \ .Case(NAME, ARM::ID) +#define ARM_ARCH_ALIAS(NAME, ID) \ + .Case(NAME, ARM::ID) #include "MCTargetDesc/ARMArchName.def" .Default(ARM::INVALID_ARCH); diff --git a/lib/Target/ARM/MCTargetDesc/ARMArchName.def b/lib/Target/ARM/MCTargetDesc/ARMArchName.def index 37e814e072..9f007a035a 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMArchName.def +++ b/lib/Target/ARM/MCTargetDesc/ARMArchName.def @@ -36,10 +36,15 @@ ARM_ARCH_NAME("armv6zk", ARMV6ZK, "6ZK", v6KZ) ARM_ARCH_NAME("armv6-m", ARMV6M, "6-M", v6_M) ARM_ARCH_NAME("armv7", ARMV7, "7", v7) ARM_ARCH_NAME("armv7-a", ARMV7A, "7-A", v7) +ARM_ARCH_ALIAS("armv7a", ARMV7A) ARM_ARCH_NAME("armv7-r", ARMV7R, "7-R", v7) +ARM_ARCH_ALIAS("armv7r", ARMV7R) ARM_ARCH_NAME("armv7-m", ARMV7M, "7-M", v7) +ARM_ARCH_ALIAS("armv7m", ARMV7M) ARM_ARCH_NAME("armv8-a", ARMV8A, "8-A", v8) +ARM_ARCH_ALIAS("armv8a", ARMV8A) ARM_ARCH_NAME("iwmmxt", IWMMXT, "iwmmxt", v5TE) ARM_ARCH_NAME("iwmmxt2", IWMMXT2, "iwmmxt2", v5TE) #undef ARM_ARCH_NAME +#undef ARM_ARCH_ALIAS diff --git a/lib/Target/ARM/MCTargetDesc/ARMArchName.h b/lib/Target/ARM/MCTargetDesc/ARMArchName.h index d0de9ccb8a..34b9fc126f 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMArchName.h +++ b/lib/Target/ARM/MCTargetDesc/ARMArchName.h @@ -17,6 +17,7 @@ enum ArchKind { INVALID_ARCH = 0 #define ARM_ARCH_NAME(NAME, ID, DEFAULT_CPU_NAME, DEFAULT_CPU_ARCH) , ID +#define ARM_ARCH_ALIAS(NAME, ID) /* empty */ #include "ARMArchName.def" }; diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp index 2d2497895c..39bcbf3e52 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp @@ -71,6 +71,7 @@ static const char *GetArchName(unsigned ID) { break; #define ARM_ARCH_NAME(NAME, ID, DEFAULT_CPU_NAME, DEFAULT_CPU_ARCH) \ case ARM::ID: return NAME; +#define ARM_ARCH_ALIAS(NAME, ID) /* empty */ #include "ARMArchName.def" } return NULL; @@ -83,6 +84,7 @@ static const char *GetArchDefaultCPUName(unsigned ID) { break; #define ARM_ARCH_NAME(NAME, ID, DEFAULT_CPU_NAME, DEFAULT_CPU_ARCH) \ case ARM::ID: return DEFAULT_CPU_NAME; +#define ARM_ARCH_ALIAS(NAME, ID) /* empty */ #include "ARMArchName.def" } return NULL; @@ -95,6 +97,7 @@ static unsigned GetArchDefaultCPUArch(unsigned ID) { break; #define ARM_ARCH_NAME(NAME, ID, DEFAULT_CPU_NAME, DEFAULT_CPU_ARCH) \ case ARM::ID: return ARMBuildAttrs::DEFAULT_CPU_ARCH; +#define ARM_ARCH_ALIAS(NAME, ID) /* empty */ #include "ARMArchName.def" } return 0; |