diff options
| author | Bradley Smith <bradley.smith@arm.com> | 2015-11-17 11:57:33 +0000 |
|---|---|---|
| committer | Bradley Smith <bradley.smith@arm.com> | 2015-11-17 11:57:33 +0000 |
| commit | 43202054842c4be47de1d8333e788d4167d1861a (patch) | |
| tree | 7c7401aacbbbe55736dbf9f633951f89d80db941 | |
| parent | b39c96aa1981871766d364f638f2442e2164b87d (diff) | |
| download | bcm5719-llvm-43202054842c4be47de1d8333e788d4167d1861a.tar.gz bcm5719-llvm-43202054842c4be47de1d8333e788d4167d1861a.zip | |
[ARM] Properly initialize ARMArch in the ARM subtarget
llvm-svn: 253331
| -rw-r--r-- | llvm/lib/Target/ARM/ARMSubtarget.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/ARMSubtarget.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp index 50eb37890fd..1f95be07fb5 100644 --- a/llvm/lib/Target/ARM/ARMSubtarget.cpp +++ b/llvm/lib/Target/ARM/ARMSubtarget.cpp @@ -88,8 +88,8 @@ 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), stackAlignment(4), CPUString(CPU), IsLittle(IsLittle), - TargetTriple(TT), Options(TM.Options), TM(TM), + ARMProcClass(None), ARMArch(Other), 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 // we can query directly. diff --git a/llvm/lib/Target/ARM/ARMSubtarget.h b/llvm/lib/Target/ARM/ARMSubtarget.h index c194149e845..dd927a808fd 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 { - ARMv2, ARMv2a, ARMv3, ARMv3m, ARMv4, ARMv4t, ARMv5, ARMv5t, ARMv5te, + Other, ARMv2, ARMv2a, ARMv3, ARMv3m, ARMv4, ARMv4t, ARMv5, ARMv5t, ARMv5te, ARMv5tej, ARMv6, ARMv6k, ARMv6kz, ARMv6t2, ARMv6m, ARMv6sm, ARMv7a, ARMv7r, ARMv7m, ARMv7em, ARMv8a, ARMv81a }; |
