Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit c9180bf

Browse files
Artyom SkrobovArtyom Skrobov
authored andcommitted
Avoid duplicate entry for cortex-a7 in the TargetParser (NFC)
Reviewers: t.p.northover, rengolin Subscribers: aemerson, rengolin, llvm-commits Differential Revision: http://reviews.llvm.org/D14757 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253676 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 7cbf72b commit c9180bf

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

include/llvm/Support/ARMTargetParser.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ ARM_CPU_NAME("iwmmxt", AK_IWMMXT, FK_NONE, true, AEK_NONE)
213213
ARM_CPU_NAME("xscale", AK_XSCALE, FK_NONE, true, AEK_NONE)
214214
ARM_CPU_NAME("swift", AK_ARMV7S, FK_NEON_VFPV4, true,
215215
(AEK_HWDIVARM | AEK_HWDIV))
216-
ARM_CPU_NAME("cortex-a7", AK_ARMV7K, FK_NONE, true, AEK_HWDIVARM | AEK_HWDIV)
217216
// Invalid CPU
218217
ARM_CPU_NAME("invalid", AK_INVALID, FK_INVALID, true, AEK_INVALID)
219218
#undef ARM_CPU_NAME

lib/Support/Triple.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,6 +1370,12 @@ StringRef Triple::getARMCPUForArch(StringRef MArch) const {
13701370
case llvm::Triple::Win32:
13711371
// FIXME: this is invalid for WindowsCE
13721372
return "cortex-a9";
1373+
case llvm::Triple::MacOSX:
1374+
case llvm::Triple::IOS:
1375+
case llvm::Triple::WatchOS:
1376+
if (MArch == "v7k")
1377+
return "cortex-a7";
1378+
break;
13731379
default:
13741380
break;
13751381
}

0 commit comments

Comments
 (0)