summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Smith <bradley.smith@arm.com>2015-11-17 13:38:29 +0000
committerBradley Smith <bradley.smith@arm.com>2015-11-17 13:38:29 +0000
commit982a8888b8eb3f9b287e4a5fba19b835ddd0f7e0 (patch)
treed0c316081f296d54acab461cb81b5f8e7d03560a
parentb4613c6973032948b6fc2d3211b33b6956657f1c (diff)
downloadbcm5719-llvm-982a8888b8eb3f9b287e4a5fba19b835ddd0f7e0.tar.gz
bcm5719-llvm-982a8888b8eb3f9b287e4a5fba19b835ddd0f7e0.zip
[ARM] Default to ARMv4t in favour of adding Other to ARMArch
llvm-svn: 253335
-rw-r--r--llvm/lib/Target/ARM/ARMSubtarget.cpp2
-rw-r--r--llvm/lib/Target/ARM/ARMSubtarget.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp
index 1f95be07fb5..52b188949fb 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.cpp
+++ b/llvm/lib/Target/ARM/ARMSubtarget.cpp
@@ -88,7 +88,7 @@ ARMSubtarget::ARMSubtarget(const Triple &TT, const std::string &CPU,
const std::string &FS,
const ARMBaseTargetMachine &TM, bool IsLittle)
: ARMGenSubtargetInfo(TT, CPU, FS), ARMProcFamily(Others),
- ARMProcClass(None), ARMArch(Other), stackAlignment(4), CPUString(CPU),
+ ARMProcClass(None), ARMArch(ARMv4t), stackAlignment(4), CPUString(CPU),
IsLittle(IsLittle), TargetTriple(TT), Options(TM.Options), TM(TM),
FrameLowering(initializeFrameLowering(CPU, FS)),
// At this point initializeSubtargetDependencies has been called so
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.h b/llvm/lib/Target/ARM/ARMSubtarget.h
index dd927a808fd..c194149e845 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.h
+++ b/llvm/lib/Target/ARM/ARMSubtarget.h
@@ -50,7 +50,7 @@ protected:
None, AClass, RClass, MClass
};
enum ARMArchEnum {
- Other, ARMv2, ARMv2a, ARMv3, ARMv3m, ARMv4, ARMv4t, ARMv5, ARMv5t, ARMv5te,
+ ARMv2, ARMv2a, ARMv3, ARMv3m, ARMv4, ARMv4t, ARMv5, ARMv5t, ARMv5te,
ARMv5tej, ARMv6, ARMv6k, ARMv6kz, ARMv6t2, ARMv6m, ARMv6sm, ARMv7a, ARMv7r,
ARMv7m, ARMv7em, ARMv8a, ARMv81a
};
OpenPOWER on IntegriCloud