RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Emit the build attribute Tag_conformance.

Browse Source 
Claim conformance to version 2.09 of the ARM ABI.

This build attribute must be emitted first amongst the build attributes when
written to an object file. This is to simplify conformance detection by
consumers.

Change-Id: If9eddcfc416bc9ad6e5cc8cdcb05d0031af7657e
llvm-svn: 225166
This commit is contained in:
Charlie Turner 2015-01-05 13:12:17 +00:00
parent be56428c62
commit 2aaa47418b
6 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -629,6 +629,8 @@ void ARMAsmPrinter::emitAttributes() {
MCTargetStreamer &TS = *OutStreamer.getTargetStreamer();
ARMTargetStreamer &ATS = static_cast<ARMTargetStreamer &>(TS);
ATS.emitTextAttribute(ARMBuildAttrs::conformance, "2.09");
ATS.switchVendor("aeabi");
std::string CPUString = Subtarget->getCPUString();

14
lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
View File

@ -300,7 +300,19 @@ private:
StringRef StringValue;
static bool LessTag(const AttributeItem &LHS, const AttributeItem &RHS) {
return (LHS.Tag < RHS.Tag);
// The conformance tag must be emitted first when serialised
// into an object file. Specifically, the addenda to the ARM ABI
// states that (2.3.7.4):
//
// "To simplify recognition by consumers in the common case of
// claiming conformity for the whole file, this tag should be
// emitted first in a file-scope sub-subsection of the first
// public subsection of the attributes section."
//
// So it is special-cased in this comparison predicate when the
// attributes are sorted in finishAttributeSection().
return (RHS.Tag != ARMBuildAttrs::conformance) &&
((LHS.Tag == ARMBuildAttrs::conformance) || (LHS.Tag < RHS.Tag));
}
};

1
test/CodeGen/ARM/build-attributes.ll
View File

@ -279,6 +279,7 @@
; V7-FAST: .eabi_attribute 23, 1
; V8: .syntax unified
; V8: .eabi_attribute 67, "2.09"
; V8: .eabi_attribute 6, 14
; V8-NOT: .eabi_attribute 19
; V8: .eabi_attribute 20, 1

13
test/MC/ARM/directive-eabi_attribute.s
View File

@ -5,6 +5,14 @@
.syntax unified
.thumb
.eabi_attribute Tag_conformance, "2.09"
@ CHECK: .eabi_attribute 67, "2.09"
@ Tag_conformance should be be emitted first in a file-scope
@ sub-subsection of the first public subsection of the attributes
@ section. 2.3.7.4 of ABI Addenda.
@ CHECK-OBJ: Tag: 67
@ CHECK-OBJ-NEXT: TagName: conformance
@ CHECK-OBJ-NEXT: Value: 2.09
.eabi_attribute Tag_CPU_raw_name, "Cortex-A9"
@ CHECK: .eabi_attribute 4, "Cortex-A9"
@ CHECK-OBJ: Tag: 4
@ -220,11 +228,6 @@
@ CHECK-OBJ-NEXT: Value: 0
@ CHECK-OBJ-NEXT: TagName: T2EE_use
@ CHECK-OBJ-NEXT: Description: Not Permitted
.eabi_attribute Tag_conformance, "2.09"
@ CHECK: .eabi_attribute 67, "2.09"
@ CHECK-OBJ: Tag: 67
@ CHECK-OBJ-NEXT: TagName: conformance
@ CHECK-OBJ-NEXT: Value: 2.09
.eabi_attribute Tag_Virtualization_use, 0
@ CHECK: .eabi_attribute 68, 0
@ CHECK-OBJ: Tag: 68

8
test/tools/llvm-readobj/ARM/attribute-conformance-1.s Normal file
View File

@ -0,0 +1,8 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_conformance, "0"
@CHECK: .eabi_attribute 67, "0"
@CHECK-OBJ: Tag: 67
@CHECK-OBJ-NEXT: TagName: conformance
@CHECK-OBJ-NEXT: Value: 0

8
test/tools/llvm-readobj/ARM/attribute-conformance-2.s Normal file
View File

@ -0,0 +1,8 @@
@ RUN: llvm-mc -triple armv7-elf -filetype asm -o - %s | FileCheck %s
@ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s \
@ RUN: | llvm-readobj -arm-attributes - | FileCheck %s --check-prefix=CHECK-OBJ
.eabi_attribute Tag_conformance, "A.long--non numeric oddity...!!"
@CHECK: .eabi_attribute 67, "A.long--non numeric oddity...!!"
@CHECK-OBJ: Tag: 67
@CHECK-OBJ-NEXT: TagName: conformance
@CHECK-OBJ-NEXT: Value: A.long--non numeric oddity...!!