diff options
| author | Matheus Almeida <matheus.almeida@imgtec.com> | 2014-01-28 19:24:11 +0000 |
|---|---|---|
| committer | Matheus Almeida <matheus.almeida@imgtec.com> | 2014-01-28 19:24:11 +0000 |
| commit | 4ed4bd0feec4dbf23282e6fbbb360c60b3a98052 (patch) | |
| tree | 23f3efd72448ac70a2269661cf6fc50e3b65cd9e | |
| parent | 1c71a20f32b6c6af85fb26d56b26effe71c710b9 (diff) | |
| download | llvm-4ed4bd0feec4dbf23282e6fbbb360c60b3a98052.tar.gz llvm-4ed4bd0feec4dbf23282e6fbbb360c60b3a98052.tar.bz2 llvm-4ed4bd0feec4dbf23282e6fbbb360c60b3a98052.tar.xz | |
[mips] Fix ELF header flags.
As opposed to GCC/GAS the default ABI for Mips64 is n64.
Compatibility bit should be set if o32 ABI is used when targeting Mips64.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200332 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp | 9 | ||||
| -rw-r--r-- | test/MC/Mips/elf_eflags.s | 24 |
2 files changed, 30 insertions, 3 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp b/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp index 0dec292908..41b8ad6b96 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp @@ -137,7 +137,14 @@ MipsTargetELFStreamer::MipsTargetELFStreamer(MCStreamer &S, EFlags |= ELF::EF_MIPS_ARCH_32; if (T.isArch64Bit()) { - EFlags |= ELF::EF_MIPS_ABI2; + if (Features & Mips::FeatureN32) + EFlags |= ELF::EF_MIPS_ABI2; + else if (Features & Mips::FeatureO32) { + EFlags |= ELF::EF_MIPS_ABI_O32; + EFlags |= ELF::EF_MIPS_32BITMODE; /* Compatibility Mode */ + } + // No need to set any bit for N64 which is the default ABI at the moment + // for 64-bit Mips architectures. } else { if (Features & Mips::FeatureMips64r2 || Features & Mips::FeatureMips64) EFlags |= ELF::EF_MIPS_32BITMODE; diff --git a/test/MC/Mips/elf_eflags.s b/test/MC/Mips/elf_eflags.s index c8fb20330d..7a497785d2 100644 --- a/test/MC/Mips/elf_eflags.s +++ b/test/MC/Mips/elf_eflags.s @@ -13,8 +13,28 @@ # RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS32 %s # MIPSEL-MIPS32: Flags [ (0x50001000) +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mattr=n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32 %s +# MIPS64EL-MIPS64R2-N32: Flags [ (0x80000020) + +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -mattr=n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N32 %s +# MIPS64EL-MIPS64-N32: Flags [ (0x60000020) + +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mattr=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N64 %s +# MIPS64EL-MIPS64R2-N64: Flags [ (0x80000000) + +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mattr=n64 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N64 %s +# MIPS64EL-MIPS64-N64: Flags [ (0x60000000) + +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mattr=o32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-O32 %s +# MIPS64EL-MIPS64R2-O32: Flags [ (0x80001100) + +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mattr=o32 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-O32 %s +# MIPS64EL-MIPS64-O32: Flags [ (0x60001100) + +# Default ABI for MIPS64 is N64 as opposed to GCC/GAS (N32) # RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2 %s -# MIPS64EL-MIPS64R2: Flags [ (0x80000020) +# MIPS64EL-MIPS64R2: Flags [ (0x80000000) +# Default ABI for MIPS64 is N64 as opposed to GCC/GAS (N32) # RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64 %s -# MIPS64EL-MIPS64: Flags [ (0x60000020) +# MIPS64EL-MIPS64: Flags [ (0x60000000) |