diff options
| author | Joey Gouly <joey.gouly@arm.com> | 2013-06-26 16:39:06 +0000 |
|---|---|---|
| committer | Joey Gouly <joey.gouly@arm.com> | 2013-06-26 16:39:06 +0000 |
| commit | 05b04cf3a513a543004f7a62a781b167047725a7 (patch) | |
| tree | 190402f6e1156ae1af7dfe39a112b197931bd966 | |
| parent | c4b26ad00641e013bf195b7998baeb703ffa8b67 (diff) | |
| download | bcm5719-llvm-05b04cf3a513a543004f7a62a781b167047725a7.tar.gz bcm5719-llvm-05b04cf3a513a543004f7a62a781b167047725a7.zip | |
Remove the 'generic' CPU from the ARM eabi attributes printer.
Make v4 the default ARM architecture attribute, to match CodeGen.
llvm-svn: 184962
| -rw-r--r-- | llvm/lib/Target/ARM/ARMAsmPrinter.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll | 7 |
2 files changed, 5 insertions, 13 deletions
diff --git a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp index dd7e20fcd04..f8d4da58f0b 100644 --- a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp @@ -749,15 +749,6 @@ void ARMAsmPrinter::emitAttributes() { ARMBuildAttrs::Allowed); AttrEmitter->EmitAttribute(ARMBuildAttrs::THUMB_ISA_use, ARMBuildAttrs::Allowed); - } else if (CPUString == "generic") { - // For a generic CPU, we assume a standard v7a architecture in Subtarget. - AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch, ARMBuildAttrs::v7); - AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch_profile, - ARMBuildAttrs::ApplicationProfile); - AttrEmitter->EmitAttribute(ARMBuildAttrs::ARM_ISA_use, - ARMBuildAttrs::Allowed); - AttrEmitter->EmitAttribute(ARMBuildAttrs::THUMB_ISA_use, - ARMBuildAttrs::AllowThumb32); } else if (Subtarget->hasV7Ops()) { AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch, ARMBuildAttrs::v7); AttrEmitter->EmitAttribute(ARMBuildAttrs::THUMB_ISA_use, @@ -772,6 +763,8 @@ void ARMAsmPrinter::emitAttributes() { AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch, ARMBuildAttrs::v5T); else if (Subtarget->hasV4TOps()) AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch, ARMBuildAttrs::v4T); + else + AttrEmitter->EmitAttribute(ARMBuildAttrs::CPU_arch, ARMBuildAttrs::v4); if (Subtarget->hasNEON() && emitFPU) { /* NEON is not exactly a VFP architecture, but GAS emit one of diff --git a/llvm/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll b/llvm/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll index b253fefe87c..d19adcc1eb9 100644 --- a/llvm/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll +++ b/llvm/test/CodeGen/ARM/2010-10-19-mc-elf-objheader.ll @@ -15,15 +15,14 @@ ; BASIC-NEXT: ] ; BASIC-NEXT: Address: 0x0 ; BASIC-NEXT: Offset: 0x3C -; BASIC-NEXT: Size: 34 +; BASIC-NEXT: Size: 28 ; BASIC-NEXT: Link: 0 ; BASIC-NEXT: Info: 0 ; BASIC-NEXT: AddressAlignment: 1 ; BASIC-NEXT: EntrySize: 0 ; BASIC-NEXT: SectionData ( -; BASIC-NEXT: 0000: 41210000 00616561 62690001 17000000 -; BASIC-NEXT: 0010: 060A0741 08010902 14011501 17031801 -; BASIC-NEXT: 0020: 1901 +; BASIC-NEXT: 0000: 411B0000 00616561 62690001 11000000 +; BASIC-NEXT: 0010: 06011401 15011703 18011901 ; BASIC-NEXT: ) ; CORTEXA8: Name: .ARM.attributes |
