am 4fc2a74b: Merge "Remove partial implementation of MIPS non-PIC support."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4fc2a74b29a12ed7fb4edc6b76db96b9d7dfa3f2':
Remove partial implementation of MIPS non-PIC support.
diff --git a/linker/linker.cpp b/linker/linker.cpp
index c8a2a84..502035b 100755
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1160,12 +1160,6 @@
*((unsigned*)reloc) = sym_addr;
break;
#elif defined(ANDROID_MIPS_LINKER)
- case R_MIPS_JUMP_SLOT:
- count_relocation(kRelocAbsolute);
- MARK(rel->r_offset);
- TRACE_TYPE(RELO, "RELO JMP_SLOT %08x <- %08x %s\n", reloc, sym_addr, sym_name);
- *((unsigned*)reloc) = sym_addr;
- break;
case R_MIPS_REL32:
count_relocation(kRelocAbsolute);
MARK(rel->r_offset);
@@ -1640,14 +1634,6 @@
case DT_MIPS_FLAGS:
case DT_MIPS_BASE_ADDRESS:
case DT_MIPS_UNREFEXTNO:
- case DT_MIPS_RWPLT:
- break;
-
- case DT_MIPS_PLTGOT:
-#if 0
- /* not yet... */
- si->mips_pltgot = (unsigned *)(si->base + *d);
-#endif
break;
case DT_MIPS_SYMTABNO:
diff --git a/linker/linker.h b/linker/linker.h
index 0f6f128..cf6fff9 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -127,10 +127,6 @@
unsigned* ARM_exidx;
unsigned ARM_exidx_count;
#elif defined(ANDROID_MIPS_LINKER)
-#if 0
- // Not yet.
- unsigned* mips_pltgot
-#endif
unsigned mips_symtabno;
unsigned mips_local_gotno;
unsigned mips_gotsym;
@@ -159,16 +155,6 @@
extern soinfo libdl_info;
-#if defined(ANDROID_MIPS_LINKER)
-
-// These aren't defined in <arch-arm/mips/elf.h>.
-#define R_MIPS_JUMP_SLOT 127
-
-#define DT_MIPS_PLTGOT 0x70000032
-#define DT_MIPS_RWPLT 0x70000034
-
-#endif
-
// These aren't defined in <sys/exec_elf.h>.
#ifndef DT_PREINIT_ARRAY
#define DT_PREINIT_ARRAY 32