diff options
author | Jack Carter <jcarter@mips.com> | 2013-01-30 02:24:33 +0000 |
---|---|---|
committer | Jack Carter <jcarter@mips.com> | 2013-01-30 02:24:33 +0000 |
commit | 97130e2b3de080e231caac86dbce1500e4e7af16 (patch) | |
tree | da46428e84806cc0f89fe3c5a94c231c68c5fb39 | |
parent | dba14301f0098f9fc5c0d244bf334f55a6a21960 (diff) | |
download | external_llvm-97130e2b3de080e231caac86dbce1500e4e7af16.zip external_llvm-97130e2b3de080e231caac86dbce1500e4e7af16.tar.gz external_llvm-97130e2b3de080e231caac86dbce1500e4e7af16.tar.bz2 |
This patch implements runtime ARM specific
setting of ELF header e_flags.
Contributer: Jack Carter
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173885 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Support/ELF.h | 10 | ||||
-rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 11 | ||||
-rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 10 | ||||
-rw-r--r-- | test/MC/ARM/elf-eflags-eabi-cg.ll | 13 | ||||
-rw-r--r-- | test/MC/ARM/elf-eflags-eabi.s | 1 |
5 files changed, 43 insertions, 2 deletions
diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index e359244..746ea31 100644 --- a/include/llvm/Support/ELF.h +++ b/include/llvm/Support/ELF.h @@ -495,7 +495,15 @@ enum { }; // ARM Specific e_flags -enum { EF_ARM_EABIMASK = 0xFF000000U }; +enum { + EF_ARM_EABI_UNKNOWN = 0x00000000U, + EF_ARM_EABI_VER1 = 0x01000000U, + EF_ARM_EABI_VER2 = 0x02000000U, + EF_ARM_EABI_VER3 = 0x03000000U, + EF_ARM_EABI_VER4 = 0x04000000U, + EF_ARM_EABI_VER5 = 0x05000000U, + EF_ARM_EABIMASK = 0xFF000000U +}; // ELF Relocation types for ARM // Meets 2.08 ABI Specs. diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index ee2a228..397736a 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -37,6 +37,7 @@ #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCContext.h" +#include "llvm/MC/MCELFStreamer.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCInstBuilder.h" #include "llvm/MC/MCObjectStreamer.h" @@ -45,6 +46,7 @@ #include "llvm/MC/MCSymbol.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" +#include "llvm/Support/ELF.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/raw_ostream.h" @@ -699,6 +701,15 @@ void ARMAsmPrinter::EmitEndOfAsmFile(Module &M) { // generates code that does this, it is always safe to set. OutStreamer.EmitAssemblerFlag(MCAF_SubsectionsViaSymbols); } + // FIXME: This should eventually end up somewhere else where more + // intelligent flag decisions can be made. For now we are just maintaining + // the status quo for ARM and setting EF_ARM_EABI_VER5 as the default. + if (Subtarget->isTargetELF()) { + if (OutStreamer.hasRawTextSupport()) return; + + MCELFStreamer &MES = static_cast<MCELFStreamer &>(OutStreamer); + MES.getAssembler().setELFHeaderEFlags(ELF::EF_ARM_EABI_VER5); + } } //===----------------------------------------------------------------------===// diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index e9bdc4a..77620e9 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -18,7 +18,9 @@ #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/Twine.h" #include "llvm/MC/MCAsmInfo.h" +#include "llvm/MC/MCAssembler.h" #include "llvm/MC/MCContext.h" +#include "llvm/MC/MCELFStreamer.h" #include "llvm/MC/MCExpr.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCInstrDesc.h" @@ -28,6 +30,7 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" +#include "llvm/Support/ELF.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetRegistry.h" @@ -250,6 +253,13 @@ public: // Not in an ITBlock to start with. ITState.CurPosition = ~0U; + + // Set ELF header flags. + // FIXME: This should eventually end up somewhere else where more + // intelligent flag decisions can be made. For now we are just maintaining + // the status quo for ARM and setting EF_ARM_EABI_VER5 as the default. + MCELFStreamer &MES = static_cast<MCELFStreamer &>(Parser.getStreamer()); + MES.getAssembler().setELFHeaderEFlags(ELF::EF_ARM_EABI_VER5); } // Implementation of the MCTargetAsmParser interface: diff --git a/test/MC/ARM/elf-eflags-eabi-cg.ll b/test/MC/ARM/elf-eflags-eabi-cg.ll new file mode 100644 index 0000000..2e86a0f --- /dev/null +++ b/test/MC/ARM/elf-eflags-eabi-cg.ll @@ -0,0 +1,13 @@ +; Codegen version to check for ELF header flags. +; +; RUN: llc %s -mtriple=thumbv7-linux-gnueabi -relocation-model=pic \ +; RUN: -filetype=obj -o - | elf-dump --dump-section-data | \ +; RUN: FileCheck %s + +define void @bar() nounwind { +entry: + ret void +} + +; For now the only e_flag set is EF_ARM_EABI_VER5 +;CHECK: 'e_flags', 0x05000000 diff --git a/test/MC/ARM/elf-eflags-eabi.s b/test/MC/ARM/elf-eflags-eabi.s index 6f70a5b..ea89eac 100644 --- a/test/MC/ARM/elf-eflags-eabi.s +++ b/test/MC/ARM/elf-eflags-eabi.s @@ -1,4 +1,3 @@ -@ XFAIL: @ RUN: llvm-mc %s -triple=armv7-linux-gnueabi -filetype=obj -o - | \ @ RUN: elf-dump --dump-section-data | FileCheck -check-prefix=OBJ %s .syntax unified |