generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 0e51a861: am 4fc2a74b: Merge "Remove partial implementation of MIPS non-PIC support."

Browse Source 
# Via Android Git Automerger (1) and others
* commit '0e51a861241ea49455c519890b34e80eccfd4709':
  Remove partial implementation of MIPS non-PIC support.
This commit is contained in:
Elliott Hughes
2013-02-06 11:55:06 -08:00
committed by Android Git Automerger
parent 6dd470d4d0 0e51a86124
commit 1c3039301b
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
linker/linker.cpp
View File

@@ -1160,12 +1160,6 @@ static int soinfo_relocate(soinfo *si, Elf32_Rel *rel, unsigned count,
*((unsigned*)reloc) = sym_addr; *((unsigned*)reloc) = sym_addr;
break; break;
#elif defined(ANDROID_MIPS_LINKER) #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: case R_MIPS_REL32:
count_relocation(kRelocAbsolute); count_relocation(kRelocAbsolute);
MARK(rel->r_offset); MARK(rel->r_offset);
@@ -1640,14 +1634,6 @@ static bool soinfo_link_image(soinfo* si) {
case DT_MIPS_FLAGS: case DT_MIPS_FLAGS:
case DT_MIPS_BASE_ADDRESS: case DT_MIPS_BASE_ADDRESS:
case DT_MIPS_UNREFEXTNO: 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; break;
case DT_MIPS_SYMTABNO: case DT_MIPS_SYMTABNO:

14
linker/linker.h
View File

@@ -127,10 +127,6 @@ struct soinfo {
unsigned* ARM_exidx; unsigned* ARM_exidx;
unsigned ARM_exidx_count; unsigned ARM_exidx_count;
#elif defined(ANDROID_MIPS_LINKER) #elif defined(ANDROID_MIPS_LINKER)
#if 0
// Not yet.
unsigned* mips_pltgot
#endif
unsigned mips_symtabno; unsigned mips_symtabno;
unsigned mips_local_gotno; unsigned mips_local_gotno;
unsigned mips_gotsym; unsigned mips_gotsym;
@@ -159,16 +155,6 @@ struct soinfo {
extern soinfo libdl_info; 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>. // These aren't defined in <sys/exec_elf.h>.
#ifndef DT_PREINIT_ARRAY #ifndef DT_PREINIT_ARRAY
#define DT_PREINIT_ARRAY 32 #define DT_PREINIT_ARRAY 32