From 14798930ec71ef0c95afa32c9c92d0c353be3af3 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 13 Feb 2020 15:40:07 -0800 Subject: [PATCH] Remove unused mips/mips64 code from the linker. Test: treehugger Change-Id: I42f1e4c492ac644cf78e7c1196ba9b3518f9c8f8 --- linker/Android.bp | 26 --- linker/arch/mips/begin.S | 104 ----------- linker/arch/mips64/begin.S | 124 ------------- linker/linker.cpp | 52 +----- linker/linker.h | 14 -- linker/linker_common_types.h | 7 +- linker/linker_mips.cpp | 334 ----------------------------------- linker/linker_phdr.cpp | 3 - linker/linker_relocate.cpp | 6 - linker/linker_soinfo.h | 16 +- 10 files changed, 5 insertions(+), 681 deletions(-) delete mode 100644 linker/arch/mips/begin.S delete mode 100644 linker/arch/mips64/begin.S delete mode 100644 linker/linker_mips.cpp diff --git a/linker/Android.bp b/linker/Android.bp index e21ee6011..a411a9026 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -205,22 +205,6 @@ filegroup { ], } -filegroup { - name: "linker_sources_mips", - srcs: [ - "arch/mips/begin.S", - "linker_mips.cpp", - ], -} - -filegroup { - name: "linker_sources_mips64", - srcs: [ - "arch/mips64/begin.S", - "linker_mips.cpp", - ], -} - cc_defaults { name: "linker_version_script_overlay", arch: { @@ -228,8 +212,6 @@ cc_defaults { arm64: { version_script: "linker.generic.map" }, x86: { version_script: "linker.generic.map" }, x86_64: { version_script: "linker.generic.map" }, - mips: { version_script: "linker.generic.map" }, - mips64: { version_script: "linker.generic.map" }, }, } @@ -257,14 +239,6 @@ cc_defaults { srcs: [":linker_sources_x86_64"], static_libs: ["libgcc_stripped"], }, - mips: { - srcs: [":linker_sources_mips"], - static_libs: ["libgcc_stripped"], - }, - mips64: { - srcs: [":linker_sources_mips64"], - static_libs: ["libgcc_stripped"], - }, }, // -shared is used to overwrite the -Bstatic and -static flags triggered by enabling diff --git a/linker/arch/mips/begin.S b/linker/arch/mips/begin.S deleted file mode 100644 index 1bdd3584a..000000000 --- a/linker/arch/mips/begin.S +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - .text - .balign 16 - .type __start,@function - - .ent __start - .globl __start - .globl _start -__start: -_start: - .set noreorder - bal 1f - nop -1: .cpload $31 - .set reorder - - /* Discover the load address */ - la $t0, 1f - bal 1f -1: subu $t0, $ra, $t0 - -#define DT_PLTGOT 3 -#define DT_MIPS_LOCAL_GOTNO 0x7000000a - - /* Search dynamic table for DT_MIPS_LOCAL_GOTNO and DT_PLTGOT values */ - la $t1, _DYNAMIC - addu $t1, $t0 - li $t3, DT_PLTGOT - li $t4, DT_MIPS_LOCAL_GOTNO -0: - lw $t2, 0($t1) - beqz $t2, .Lrelocate_local_got - - bne $t2, $t3, 1f /* DT_PLTGOT? */ - lw $s0, 4($t1) - addu $s0, $t0 - b 2f - -1: bne $t2, $t4, 1f /* DT_MIPS_LOCAL_GOTNO? */ - lw $s1, 4($t1) - b 2f - -1: -2: addu $t1, 8 - b 0b - -.Lrelocate_local_got: - /* - * Relocate the local GOT entries - * got[0] is address of lazy resolver function - * got[1] may be used for a GNU extension - */ - - addu $s0, 4 - subu $s1, 1 - lw $t1, ($s0) - bgez $t1, 9f - addu $s0, 4 - subu $s1, 1 - b 9f - -1: lw $t1, ($s0) - addu $t1, $t0 - sw $t1, ($s0) - addu $s0, 4 -9: subu $s1, 1 - bgez $s1, 1b - - /* call linker_init */ - move $a0, $sp - addiu $sp, -4*4 /* space for arg saves in linker_init */ - la $t9, __linker_init - jalr $t9 - move $t9, $v0 - addu $sp, 4*4 /* restore sp */ - j $t9 - .end __start diff --git a/linker/arch/mips64/begin.S b/linker/arch/mips64/begin.S deleted file mode 100644 index 60169b40f..000000000 --- a/linker/arch/mips64/begin.S +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) -#define ELF_DYNSZ 8 -#define ELF_DYN_TAG 0 -#define ELF_DYN_VAL 4 -#define GOTENT_SZ 4 -#else -#define ELF_DYNSZ 16 -#define ELF_DYN_TAG 0 -#define ELF_DYN_VAL 8 -#define GOTENT_SZ 8 -#endif - - .text - .balign 16 - .type __start,@function - - .ent __start - .globl __start - .globl _start -__start: -_start: - .set noreorder - bal 1f - nop -1: -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - .cpload $ra -#else - .cpsetup $ra, $0, 1b -#endif - .set reorder - - /* Discover the load address */ - LA $t0, 1b - PTR_SUBU $t0, $ra, $t0 - -#define DT_PLTGOT 3 -#define DT_MIPS_LOCAL_GOTNO 0x7000000a - - /* Search dynamic table for DT_MIPS_LOCAL_GOTNO and DT_PLTGOT values */ - LA $t1, _DYNAMIC - PTR_ADDU $t1, $t0 - LI $t3, DT_PLTGOT - LI $ta0, DT_MIPS_LOCAL_GOTNO -0: - REG_L $t2, ELF_DYN_TAG($t1) - beqz $t2, .Lrelocate_local_got - - bne $t2, $t3, 1f /* DT_PLTGOT? */ - REG_L $s0, ELF_DYN_VAL($t1) - PTR_ADDU $s0, $t0 - b 2f - -1: - bne $t2, $ta0, 2f /* DT_MIPS_LOCAL_GOTNO? */ - REG_L $s1, ELF_DYN_VAL($t1) - -2: PTR_ADDU $t1, ELF_DYNSZ - b 0b - -.Lrelocate_local_got: - /* - * Relocate the local GOT entries - * got[0] is address of lazy resolver function - * got[1] may be used for a GNU extension - */ - - PTR_ADDU $s0, GOTENT_SZ - SUBU $s1, 1 - PTR_L $t1, ($s0) - bgez $t1, 9f - PTR_ADDU $s0, GOTENT_SZ - SUBU $s1, 1 - b 9f - -1: PTR_L $t1, ($s0) - PTR_ADDU $t1, $t0 - PTR_S $t1, ($s0) - PTR_ADDU $s0, GOTENT_SZ -9: SUBU $s1, 1 - bgez $s1, 1b - - /* call linker_init */ - move $a0, $sp -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_SUBU $sp, 4*REGSZ /* space for arg saves in linker_init */ -#endif - jal __linker_init -#if (_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABI32) - PTR_ADDU $sp, 4*REGSZ /* restore sp */ -#endif - move $t9, $v0 - j $t9 - .end __start diff --git a/linker/linker.cpp b/linker/linker.cpp index 0e682592a..03b08b695 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -2949,25 +2949,15 @@ bool soinfo::prelink_image() { break; case DT_PLTGOT: -#if defined(__mips__) - // Used by mips and mips64. - plt_got_ = reinterpret_cast(load_bias + d->d_un.d_ptr); -#endif - // Ignore for other platforms... (because RTLD_LAZY is not supported) + // Ignored (because RTLD_LAZY is not supported). break; case DT_DEBUG: // Set the DT_DEBUG entry to the address of _r_debug for GDB // if the dynamic table is writable -// FIXME: not working currently for N64 -// The flags for the LOAD and DYNAMIC program headers do not agree. -// The LOAD section containing the dynamic table has been mapped as -// read-only, but the DYNAMIC header claims it is writable. -#if !(defined(__mips__) && defined(__LP64__)) if ((dynamic_flags & PF_W) != 0) { d->d_un.d_val = reinterpret_cast(&_r_debug); } -#endif break; #if defined(USE_RELA) case DT_RELA: @@ -3162,41 +3152,7 @@ bool soinfo::prelink_image() { get_realpath(), reinterpret_cast(d->d_un.d_val)); } break; -#if defined(__mips__) - case DT_MIPS_RLD_MAP: - // Set the DT_MIPS_RLD_MAP entry to the address of _r_debug for GDB. - { - r_debug** dp = reinterpret_cast(load_bias + d->d_un.d_ptr); - *dp = &_r_debug; - } - break; - case DT_MIPS_RLD_MAP_REL: - // Set the DT_MIPS_RLD_MAP_REL entry to the address of _r_debug for GDB. - { - r_debug** dp = reinterpret_cast( - reinterpret_cast(d) + d->d_un.d_val); - *dp = &_r_debug; - } - break; - case DT_MIPS_RLD_VERSION: - case DT_MIPS_FLAGS: - case DT_MIPS_BASE_ADDRESS: - case DT_MIPS_UNREFEXTNO: - break; - - case DT_MIPS_SYMTABNO: - mips_symtabno_ = d->d_un.d_val; - break; - - case DT_MIPS_LOCAL_GOTNO: - mips_local_gotno_ = d->d_un.d_val; - break; - - case DT_MIPS_GOTSYM: - mips_gotsym_ = d->d_un.d_val; - break; -#endif // Ignored: "Its use has been superseded by the DF_BIND_NOW flag" case DT_BIND_NOW: break; @@ -3254,12 +3210,6 @@ bool soinfo::prelink_image() { } } -#if defined(__mips__) && !defined(__LP64__) - if (!mips_check_and_adjust_fp_modes()) { - return false; - } -#endif - DEBUG("si->base = %p, si->strtab = %p, si->symtab = %p", reinterpret_cast(base), strtab_, symtab_); diff --git a/linker/linker.h b/linker/linker.h index 80c11d08d..2da14041b 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -51,20 +51,6 @@ #define ELFW(what) ELF32_ ## what #endif -// mips64 interprets Elf64_Rel structures' r_info field differently. -// bionic (like other C libraries) has macros that assume regular ELF files, -// but the dynamic linker needs to be able to load mips64 ELF files. -#if defined(__mips__) && defined(__LP64__) -#undef ELF64_R_SYM -#undef ELF64_R_TYPE -#undef ELF64_R_INFO -#define ELF64_R_SYM(info) (((info) >> 0) & 0xffffffff) -#define ELF64_R_SSYM(info) (((info) >> 32) & 0xff) -#define ELF64_R_TYPE3(info) (((info) >> 40) & 0xff) -#define ELF64_R_TYPE2(info) (((info) >> 48) & 0xff) -#define ELF64_R_TYPE(info) (((info) >> 56) & 0xff) -#endif - #define SUPPORTED_DT_FLAGS_1 (DF_1_NOW | DF_1_GLOBAL | DF_1_NODELETE | DF_1_PIE) // Class used construct version dependency graph. diff --git a/linker/linker_common_types.h b/linker/linker_common_types.h index ae78aa99b..276fd66b8 100644 --- a/linker/linker_common_types.h +++ b/linker/linker_common_types.h @@ -33,11 +33,8 @@ #include -// TODO(dimitry): move this to linker_defines.h? Unless it is removed by -// consequent refactoring steps. - -// Android uses RELA for aarch64 and x86_64. mips64 still uses REL. -#if defined(__aarch64__) || defined(__x86_64__) +// Android uses RELA for LP64. +#if defined(__LP64__) #define USE_RELA 1 #endif diff --git a/linker/linker_mips.cpp b/linker/linker_mips.cpp deleted file mode 100644 index 71a96e681..000000000 --- a/linker/linker_mips.cpp +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if !defined(__LP64__) && __mips_isa_rev >= 5 -#include -#endif - -#include "linker.h" -#include "linker_debug.h" -#include "linker_globals.h" -#include "linker_phdr.h" -#include "linker_relocs.h" -#include "linker_reloc_iterators.h" -#include "linker_sleb128.h" -#include "linker_soinfo.h" - -template bool soinfo::relocate(const VersionTracker& version_tracker, - plain_reloc_iterator&& rel_iterator, - const soinfo_list_t& global_group, - const soinfo_list_t& local_group); - -template bool soinfo::relocate>( - const VersionTracker& version_tracker, - packed_reloc_iterator&& rel_iterator, - const soinfo_list_t& global_group, - const soinfo_list_t& local_group); - -template -bool soinfo::relocate(const VersionTracker& version_tracker, - ElfRelIteratorT&& rel_iterator, - const soinfo_list_t& global_group, - const soinfo_list_t& local_group) { - for (size_t idx = 0; rel_iterator.has_next(); ++idx) { - const auto rel = rel_iterator.next(); - - if (rel == nullptr) { - return false; - } - - ElfW(Word) type = ELFW(R_TYPE)(rel->r_info); - ElfW(Word) sym = ELFW(R_SYM)(rel->r_info); - - ElfW(Addr) reloc = static_cast(rel->r_offset + load_bias); - ElfW(Addr) sym_addr = 0; - const char* sym_name = nullptr; - - DEBUG("Processing \"%s\" relocation at index %zd", get_realpath(), idx); - if (type == R_GENERIC_NONE) { - continue; - } - - const ElfW(Sym)* s = nullptr; - soinfo* lsi = nullptr; - - if (sym != 0) { - sym_name = get_string(symtab_[sym].st_name); - const version_info* vi = nullptr; - - if (!lookup_version_info(version_tracker, sym, sym_name, &vi)) { - return false; - } - - if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) { - return false; - } - - if (s == nullptr) { - // mips does not support relocation with weak-undefined symbols - DL_ERR("cannot locate symbol \"%s\" referenced by \"%s\"...", - sym_name, get_realpath()); - return false; - } else { - // We got a definition. - sym_addr = lsi->resolve_symbol_address(s); - } - count_relocation(kRelocSymbol); - } - - switch (type) { - case R_MIPS_REL32: -#if defined(__LP64__) - // MIPS Elf64_Rel entries contain compound relocations - // We only handle the R_MIPS_NONE|R_MIPS_64|R_MIPS_REL32 case - if (ELF64_R_TYPE2(rel->r_info) != R_MIPS_64 || - ELF64_R_TYPE3(rel->r_info) != R_MIPS_NONE) { - DL_ERR("Unexpected compound relocation type:%d type2:%d type3:%d @ %p (%zu)", - type, static_cast(ELF64_R_TYPE2(rel->r_info)), - static_cast(ELF64_R_TYPE3(rel->r_info)), rel, idx); - return false; - } -#endif - count_relocation(s == nullptr ? kRelocAbsolute : kRelocRelative); - MARK(rel->r_offset); - TRACE_TYPE(RELO, "RELO REL32 %08zx <- %08zx %s", static_cast(reloc), - static_cast(sym_addr), sym_name ? sym_name : "*SECTIONHDR*"); - if (s != nullptr) { - *reinterpret_cast(reloc) += sym_addr; - } else { - *reinterpret_cast(reloc) += load_bias; - } - break; - default: - DL_ERR("unknown reloc type %d @ %p (%zu)", type, rel, idx); - return false; - } - } - return true; -} - -bool soinfo::mips_relocate_got(const VersionTracker& version_tracker, - const soinfo_list_t& global_group, - const soinfo_list_t& local_group) { - ElfW(Addr)** got = plt_got_; - if (got == nullptr) { - return true; - } - - // got[0] is the address of the lazy resolver function. - // got[1] may be used for a GNU extension. - // FIXME: maybe this should be in a separate routine? - if ((flags_ & FLAG_LINKER) == 0) { - size_t g = 1; - // Check for the high bit to determine whether to skip got[1] - if (reinterpret_cast(got[g]) < 0) { - g++; - } - // Relocate the local GOT entries. - for (; g < mips_local_gotno_; g++) { - got[g] = reinterpret_cast(reinterpret_cast(got[g]) + load_bias); - } - } - - // Now for the global GOT entries... - got = plt_got_ + mips_local_gotno_; - for (ElfW(Word) sym = mips_gotsym_; sym < mips_symtabno_; sym++, got++) { - // This is an undefined reference... try to locate it. - const ElfW(Sym)* local_sym = symtab_ + sym; - const char* sym_name = get_string(local_sym->st_name); - soinfo* lsi = nullptr; - const ElfW(Sym)* s = nullptr; - - ElfW(Word) st_visibility = (local_sym->st_other & 0x3); - - if (st_visibility == STV_DEFAULT) { - const version_info* vi = nullptr; - - if (!lookup_version_info(version_tracker, sym, sym_name, &vi)) { - return false; - } - - if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) { - return false; - } - } else if (st_visibility == STV_PROTECTED) { - if (local_sym->st_value == 0) { - DL_ERR("%s: invalid symbol \"%s\" (PROTECTED/UNDEFINED) ", - get_realpath(), sym_name); - return false; - } - s = local_sym; - lsi = this; - } else { - DL_ERR("%s: invalid symbol \"%s\" visibility: 0x%x", - get_realpath(), sym_name, st_visibility); - return false; - } - - if (s == nullptr) { - // We only allow an undefined symbol if this is a weak reference. - if (ELF_ST_BIND(local_sym->st_info) != STB_WEAK) { - DL_ERR("%s: cannot locate \"%s\"...", get_realpath(), sym_name); - return false; - } - *got = 0; - } else { - // FIXME: is this sufficient? - // For reference see NetBSD link loader - // http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/ld.elf_so/arch/mips/mips_reloc.c?rev=1.53&content-type=text/x-cvsweb-markup - *got = reinterpret_cast(lsi->resolve_symbol_address(s)); - } - } - return true; -} - -#if !defined(__LP64__) - -// Checks for mips32's various floating point abis. -// (Mips64 Android has a single floating point abi and doesn't need any checks) - -// Linux kernel has declarations similar to the following -// in /arch/mips/include/asm/elf.h, -// but that non-uapi internal header file will never be imported -// into bionic's kernel headers. - -#define PT_MIPS_ABIFLAGS 0x70000003 // is .MIPS.abiflags segment - -struct mips_elf_abiflags_v0 { - uint16_t version; // version of this structure - uint8_t isa_level, isa_rev, gpr_size, cpr1_size, cpr2_size; - uint8_t fp_abi; // mips32 ABI variants for floating point - uint32_t isa_ext, ases, flags1, flags2; -}; - -// Bits of flags1: -#define MIPS_AFL_FLAGS1_ODDSPREG 1 // Uses odd-numbered single-prec fp regs - -// Some values of fp_abi: via compiler flag: -#define MIPS_ABI_FP_ANY 0 // Not tagged or not using any ABIs affected by the differences. -#define MIPS_ABI_FP_DOUBLE 1 // -mdouble-float -#define MIPS_ABI_FP_XX 5 // -mfpxx -#define MIPS_ABI_FP_64A 7 // -mips32r* -mfp64 -mno-odd-spreg - -#if __mips_isa_rev >= 5 -static bool mips_fre_mode_on = false; // have set FRE=1 mode for process -#endif - -bool soinfo::mips_check_and_adjust_fp_modes() { - mips_elf_abiflags_v0* abiflags = nullptr; - int mips_fpabi; - - // Find soinfo's optional .MIPS.abiflags segment - for (size_t i = 0; i(ph.p_vaddr + load_bias); - break; - } - } - - // FP ABI-variant compatibility checks for MIPS o32 ABI - if (abiflags == nullptr) { - // Old compilers lack the new abiflags section. - // These compilers used -mfp32 -mdouble-float -modd-spreg defaults, - // ie FP32 aka DOUBLE, using odd-numbered single-prec regs - mips_fpabi = MIPS_ABI_FP_DOUBLE; - } else { - mips_fpabi = abiflags->fp_abi; - if ( (abiflags->flags1 & MIPS_AFL_FLAGS1_ODDSPREG) - && (mips_fpabi == MIPS_ABI_FP_XX || - mips_fpabi == MIPS_ABI_FP_64A ) ) { - // Android supports fewer cases than Linux - DL_ERR("Unsupported odd-single-prec FloatPt reg uses in \"%s\"", - get_realpath()); - return false; - } - } - if (!(mips_fpabi == MIPS_ABI_FP_DOUBLE || -#if __mips_isa_rev >= 5 - mips_fpabi == MIPS_ABI_FP_64A || -#endif - mips_fpabi == MIPS_ABI_FP_ANY || - mips_fpabi == MIPS_ABI_FP_XX )) { - DL_ERR("Unsupported MIPS32 FloatPt ABI %d found in \"%s\"", - mips_fpabi, get_realpath()); - return false; - } - -#if __mips_isa_rev >= 5 - // Adjust process's FR Emulation mode, if needed - // - // On Mips R5 & R6, Android runs continuously in FR=1 64bit-fpreg mode. - // NDK mips32 apps compiled with old compilers generate FP32 code - // which expects FR=0 32-bit fp registers. - // NDK mips32 apps compiled with newer compilers generate modeless - // FPXX code which runs on both FR=0 and FR=1 modes. - // Android itself is compiled in FP64A which requires FR=1 mode. - // FP32, FPXX, and FP64A all interlink okay, without dynamic FR mode - // changes during calls. For details, see - // http://dmz-portal.mips.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking - // Processes containing FR32 FR=0 code are run via kernel software assist, - // which maps all odd-numbered single-precision reg refs onto the - // upper half of the paired even-numbered double-precision reg. - // FRE=1 triggers traps to the kernel's emulator on every single-precision - // fp op (for both odd and even-numbered registers). - // Turning on FRE=1 traps is done at most once per process, simultanously - // for all threads of that process, when dlopen discovers FP32 code. - // The kernel repacks threads' registers when FRE mode is turn on or off. - // These asynchronous adjustments are wrong if any thread was executing - // FPXX code using odd-numbered single-precision regs. - // Current Android compilers default to the -mno-oddspreg option, - // and this requirement is checked by Android's dlopen. - // So FRE can always be safely turned on for FP32, anytime. - // Deferred enhancement: Allow loading of odd-spreg FPXX modules. - - if (mips_fpabi == MIPS_ABI_FP_DOUBLE && !mips_fre_mode_on) { - // Turn on FRE mode, which emulates mode-sensitive FR=0 code on FR=1 - // register files, by trapping to kernel on refs to single-precision regs - if (prctl(PR_SET_FP_MODE, PR_FP_MODE_FR|PR_FP_MODE_FRE)) { - DL_ERR("Kernel or cpu failed to set FRE mode required for running \"%s\"", - get_realpath()); - return false; - } - DL_WARN("Using FRE=1 mode to run \"%s\"", get_realpath()); - mips_fre_mode_on = true; // Avoid future redundant mode-switch calls - // FRE mode is never turned back off. - // Deferred enhancement: - // Reset FRE mode when dlclose() removes all FP32 modules - } -#else - // Android runs continuously in FR=0 32bit-fpreg mode. -#endif // __mips_isa_rev - return true; -} - -#endif // __LP64___ diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index da2d03c79..9b7a461cd 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp @@ -51,8 +51,6 @@ static int GetTargetElfMachine() { return EM_AARCH64; #elif defined(__i386__) return EM_386; -#elif defined(__mips__) - return EM_MIPS; #elif defined(__x86_64__) return EM_X86_64; #endif @@ -204,7 +202,6 @@ static const char* EM_to_string(int em) { if (em == EM_386) return "EM_386"; if (em == EM_AARCH64) return "EM_AARCH64"; if (em == EM_ARM) return "EM_ARM"; - if (em == EM_MIPS) return "EM_MIPS"; if (em == EM_X86_64) return "EM_X86_64"; return "EM_???"; } diff --git a/linker/linker_relocate.cpp b/linker/linker_relocate.cpp index 17516e9e9..72be5f74c 100644 --- a/linker/linker_relocate.cpp +++ b/linker/linker_relocate.cpp @@ -643,12 +643,6 @@ bool soinfo::relocate(const SymbolLookupList& lookup_list) { } #endif -#if defined(__mips__) - if (!mips_relocate_got(version_tracker, global_group, local_group)) { - return false; - } -#endif - // Once the tlsdesc_args_ vector's size is finalized, we can write the addresses of its elements // into the TLSDESC relocations. #if defined(__aarch64__) diff --git a/linker/linker_soinfo.h b/linker/linker_soinfo.h index 3a3394931..e1a3c303d 100644 --- a/linker/linker_soinfo.h +++ b/linker/linker_soinfo.h @@ -191,10 +191,8 @@ struct soinfo { uint32_t* bucket_; uint32_t* chain_; -#if defined(__mips__) || !defined(__LP64__) - // This is only used by mips and mips64, but needs to be here for - // all 32-bit architectures to preserve binary compatibility. - ElfW(Addr)** plt_got_; +#if !defined(__LP64__) + ElfW(Addr)** unused4; // DO NOT USE, maintained for compatibility #endif #if defined(USE_RELA) @@ -228,16 +226,6 @@ struct soinfo { uint32_t* ARM_exidx; size_t ARM_exidx_count; private: -#elif defined(__mips__) - uint32_t mips_symtabno_; - uint32_t mips_local_gotno_; - uint32_t mips_gotsym_; - bool mips_relocate_got(const VersionTracker& version_tracker, - const soinfo_list_t& global_group, - const soinfo_list_t& local_group); -#if !defined(__LP64__) - bool mips_check_and_adjust_fp_modes(); -#endif #endif size_t ref_count_; public: