From 737de9db8ee23d1b953aa147b6b36a18f30920f6 Mon Sep 17 00:00:00 2001 From: Matheus Almeida Date: Wed, 30 Apr 2014 11:21:10 +0000 Subject: [PATCH] [mips] Emit all three relocation operations for each relocation entry on Mips64 big-endian systems. Summary: The N64 ABI allows up to three operations to be specified per relocation record independently of the endianness. Reviewers: dsanders Reviewed By: dsanders Differential Revision: http://reviews.llvm.org/D3529 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207636 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/ELF.h | 13 ++++++++++++- test/MC/Mips/elf-N64.s | 1 + test/MC/Mips/elf-gprel-32-64.s | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index bc9cc673cb1..a9989c2a800 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -317,6 +317,11 @@ public: ELFFile(MemoryBuffer *Object, error_code &ec); + bool isMipsELF64() const { + return Header->e_machine == ELF::EM_MIPS && + Header->getFileClass() == ELF::ELFCLASS64; + } + bool isMips64EL() const { return Header->e_machine == ELF::EM_MIPS && Header->getFileClass() == ELF::ELFCLASS64 && @@ -537,10 +542,16 @@ StringRef ELFFile::getRelocationTypeName(uint32_t Type) const { template void ELFFile::getRelocationTypeName(uint32_t Type, SmallVectorImpl &Result) const { - if (!isMips64EL()) { + if (!isMipsELF64()) { StringRef Name = getRelocationTypeName(Type); Result.append(Name.begin(), Name.end()); } else { + // The Mips N64 ABI allows up to three operations to be specified per + // relocation record. Unfortunately there's no easy way to test for the + // presence of N64 ELFs as they have no special flag that identifies them + // as being N64. We can safely assume at the moment that all Mips + // ELFCLASS64 ELFs are N64. New Mips64 ABIs should provide enough + // information to disambiguate between old vs new ABIs. uint8_t Type1 = (Type >> 0) & 0xFF; uint8_t Type2 = (Type >> 8) & 0xFF; uint8_t Type3 = (Type >> 16) & 0xFF; diff --git a/test/MC/Mips/elf-N64.s b/test/MC/Mips/elf-N64.s index 3c01803d2a9..bf6ebd73091 100644 --- a/test/MC/Mips/elf-N64.s +++ b/test/MC/Mips/elf-N64.s @@ -1,4 +1,5 @@ // RUN: llvm-mc -filetype=obj -triple=mips64el-pc-linux -mcpu=mips64 %s -o - | llvm-readobj -r | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple=mips64-pc-linux -mcpu=mips64 %s -o - | llvm-readobj -r | FileCheck %s // Check for N64 relocation production. // Check that the appropriate relocations were created. diff --git a/test/MC/Mips/elf-gprel-32-64.s b/test/MC/Mips/elf-gprel-32-64.s index ae75197a4fc..2f5ac6652a3 100644 --- a/test/MC/Mips/elf-gprel-32-64.s +++ b/test/MC/Mips/elf-gprel-32-64.s @@ -1,6 +1,9 @@ // RUN: llvm-mc -filetype=obj -triple=mips64el-pc-linux -mcpu=mips64 %s -o - \ // RUN: | llvm-readobj -r \ // RUN: | FileCheck %s +// RUN: llvm-mc -filetype=obj -triple=mips64-pc-linux -mcpu=mips64 %s -o - \ +// RUN: | llvm-readobj -r \ +// RUN: | FileCheck %s // Check that the appropriate relocations were created. -- 2.34.1