From 5cdeca8b1d726790fe9687bc4a4d615d299bc151 Mon Sep 17 00:00:00 2001 From: Jack Carter Date: Tue, 19 Feb 2013 22:29:00 +0000 Subject: [PATCH] ELF symbol table field st_other support, excluding visibility bits. Mips (o32 abi) specific e_header setting. EF_MIPS_ABI_O32 needs to be set in the ELF header flags for o32 abi output. Contributer: Reed Kotler git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175569 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ELF.h | 1 + lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp | 4 ++++ test/MC/Mips/elf_eflags.ll | 14 +++++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index 3945043bbef..bbd29553e35 100644 --- a/include/llvm/Support/ELF.h +++ b/include/llvm/Support/ELF.h @@ -738,6 +738,7 @@ enum { EF_MIPS_NOREORDER = 0x00000001, // Don't reorder instructions EF_MIPS_PIC = 0x00000002, // Position independent code EF_MIPS_CPIC = 0x00000004, // Call object with Position independent code + EF_MIPS_ABI_O32 = 0x00001000, // This file follows the first MIPS 32 bit ABI //ARCH_ASE EF_MIPS_MICROMIPS = 0x02000000, // microMIPS diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp index e12b176b04c..c33bc9ae303 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp @@ -54,6 +54,10 @@ namespace llvm { if (Subtarget.inMicroMipsMode()) EFlags |= ELF::EF_MIPS_MICROMIPS; + // ABI + if (Subtarget.isABI_O32()) + EFlags |= ELF::EF_MIPS_ABI_O32; + // Relocation Model Reloc::Model RM = Subtarget.getRelocationModel(); if (RM == Reloc::PIC_ || RM == Reloc::Default) diff --git a/test/MC/Mips/elf_eflags.ll b/test/MC/Mips/elf_eflags.ll index 380c2b12955..315cb812bf7 100644 --- a/test/MC/Mips/elf_eflags.ll +++ b/test/MC/Mips/elf_eflags.ll @@ -28,22 +28,22 @@ ; RUN: llc -filetype=obj -mtriple mipsel-unknown-linux -mcpu=mips32r2 -mattr=+mips16 -relocation-model=pic %s -o - | elf-dump --dump-section-data | FileCheck -check-prefix=CHECK-LE32R2-MIPS16 %s ; 32(R1) bit with NO_REORDER and static -; CHECK-BE32: ('e_flags', 0x50000001) +; CHECK-BE32: ('e_flags', 0x50001001) ; ; 32(R1) bit with NO_REORDER and PIC -; CHECK-BE32_PIC: ('e_flags', 0x50000003) +; CHECK-BE32_PIC: ('e_flags', 0x50001003) ; ; 32R2 bit with NO_REORDER and static -; CHECK-BE32R2: ('e_flags', 0x70000001) +; CHECK-BE32R2: ('e_flags', 0x70001001) ; ; 32R2 bit with NO_REORDER and PIC -; CHECK-BE32R2_PIC: ('e_flags', 0x70000003) +; CHECK-BE32R2_PIC: ('e_flags', 0x70001003) ; ; 32R2 bit MICROMIPS with NO_REORDER and static -; CHECK-BE32R2-MICROMIPS: ('e_flags', 0x72000001) +; CHECK-BE32R2-MICROMIPS: ('e_flags', 0x72001001) ; ; 32R2 bit MICROMIPS with NO_REORDER and PIC -;CHECK-BE32R2-MICROMIPS_PIC: ('e_flags', 0x72000003) +;CHECK-BE32R2-MICROMIPS_PIC: ('e_flags', 0x72001003) ; ; 64(R1) bit with NO_REORDER and static ; CHECK-BE64: ('e_flags', 0x60000001) @@ -58,7 +58,7 @@ ; CHECK-BE64R2_PIC: ('e_flags', 0x80000003) ; ; 32R2 bit MIPS16 with PIC -; CHECK-LE32R2-MIPS16: ('e_flags', 0x74000002) +; CHECK-LE32R2-MIPS16: ('e_flags', 0x74001002) define i32 @main() nounwind { entry: