OSDN Git Service

powerpc: Add TLS and NPTL support
[uclinux-h8/uClibc.git] / ldso / ldso / powerpc / elfinterp.c
index b7b6843..855c040 100644 (file)
@@ -1,8 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /* powerpc shared library loader suppport
  *
- * Copyright (C) 2001-2002,  David A. Schleef
- * Copyright (C) 2003, Erik Andersen
+ * Copyright (C) 2001-2002 David A. Schleef
+ * Copyright (C) 2003-2004 Erik Andersen
+ * Copyright (C) 2004 Joakim Tjernlund
  *
  * All rights reserved.
  *
  * SUCH DAMAGE.
  */
 
-#if defined (__SUPPORT_LD_DEBUG__)
-static const char *_dl_reltypes_tab[] =
-       { "R_PPC_NONE", "R_PPC_ADDR32", "R_PPC_ADDR24", "R_PPC_ADDR16",
-       "R_PPC_ADDR16_LO", "R_PPC_ADDR16_HI", "R_PPC_ADDR16_HA",
-       "R_PPC_ADDR14", "R_PPC_ADDR14_BRTAKEN", "R_PPC_ADDR14_BRNTAKEN",
-       "R_PPC_REL24", "R_PPC_REL14", "R_PPC_REL14_BRTAKEN",
-       "R_PPC_REL14_BRNTAKEN", "R_PPC_GOT16", "R_PPC_GOT16_LO",
-       "R_PPC_GOT16_HI", "R_PPC_GOT16_HA", "R_PPC_PLTREL24",
-       "R_PPC_COPY", "R_PPC_GLOB_DAT", "R_PPC_JMP_SLOT", "R_PPC_RELATIVE",
-       "R_PPC_LOCAL24PC", "R_PPC_UADDR32", "R_PPC_UADDR16", "R_PPC_REL32",
-       "R_PPC_PLT32", "R_PPC_PLTREL32", "R_PPC_PLT16_LO", "R_PPC_PLT16_HI",
-       "R_PPC_PLT16_HA", "R_PPC_SDAREL16", "R_PPC_SECTOFF",
-       "R_PPC_SECTOFF_LO", "R_PPC_SECTOFF_HI", "R_PPC_SECTOFF_HA",
-};
-
-static const char *
-_dl_reltypes(int type)
-{
-  static char buf[22];  
-  const char *str;
-  
-  if (type >= (int)(sizeof (_dl_reltypes_tab)/sizeof(_dl_reltypes_tab[0])) ||
-      NULL == (str = _dl_reltypes_tab[type]))
-  {
-    str =_dl_simple_ltoa( buf, (unsigned long)(type));
-  }
-  return str;
-}
-
-static 
-void debug_sym(Elf32_Sym *symtab,char *strtab,int symtab_index)
-{
-  if(_dl_debug_symbols)
-  {
-    if(symtab_index){
-      _dl_dprintf(_dl_debug_file, "\n%s\n\tvalue=%x\tsize=%x\tinfo=%x\tother=%x\tshndx=%x",
-                 strtab + symtab[symtab_index].st_name,
-                 symtab[symtab_index].st_value,
-                 symtab[symtab_index].st_size,
-                 symtab[symtab_index].st_info,
-                 symtab[symtab_index].st_other,
-                 symtab[symtab_index].st_shndx);
-    }
-  }
-}
-
-static 
-void debug_reloc(Elf32_Sym *symtab,char *strtab, ELF_RELOC *rpnt)
-{
-  if(_dl_debug_reloc)
-  {
-    int symtab_index;
-    const char *sym;
-    symtab_index = ELF32_R_SYM(rpnt->r_info);
-    sym = symtab_index ? strtab + symtab[symtab_index].st_name : "sym=0x0";
-    
-  if(_dl_debug_symbols)
-         _dl_dprintf(_dl_debug_file, "\n\t");
-  else
-         _dl_dprintf(_dl_debug_file, "\n%s\n\t", sym);
-#ifdef ELF_USES_RELOCA
-    _dl_dprintf(_dl_debug_file, "%s\toffset=%x\taddend=%x",
-               _dl_reltypes(ELF32_R_TYPE(rpnt->r_info)),
-               rpnt->r_offset,
-               rpnt->r_addend);
-#else
-    _dl_dprintf(_dl_debug_file, "%s\toffset=%x\n",
-               _dl_reltypes(ELF32_R_TYPE(rpnt->r_info)),
-               rpnt->r_offset);
-#endif
-  }
-}
-#endif
+#include "ldso.h"
+#define TLS_DTV_OFFSET 0x8000
+#define TLS_TP_OFFSET 0x7000
 
 extern int _dl_linux_resolve(void);
 
 void _dl_init_got(unsigned long *plt,struct elf_resolve *tpnt)
 {
-       unsigned long target_addr = (unsigned long)_dl_linux_resolve;
-       unsigned int n_plt_entries;
-       unsigned long *tramp;
-       unsigned long data_words;
-       unsigned int rel_offset_words;
-
-       //DPRINTF("init_got plt=%x, tpnt=%x\n", (unsigned long)plt,(unsigned long)tpnt);
-
-       n_plt_entries = tpnt->dynamic_info[DT_PLTRELSZ] / sizeof(ELF_RELOC);
-       //DPRINTF("n_plt_entries %d\n",n_plt_entries);
-
-       rel_offset_words = PLT_DATA_START_WORDS(n_plt_entries);
-       //DPRINTF("rel_offset_words %x\n",rel_offset_words);
-       data_words = (unsigned long)(plt + rel_offset_words);
-       //DPRINTF("data_words %x\n",data_words);
-
+       Elf32_Word *tramp;
+       Elf32_Word num_plt_entries;
+       Elf32_Word data_words;
+       Elf32_Word rel_offset_words;
+       Elf32_Word dlrr = (Elf32_Word) _dl_linux_resolve;
+
+       if (tpnt->dynamic_info[DT_JMPREL] == 0)
+               return;
+       if (tpnt->dynamic_info[DT_PPC_GOT_IDX] != 0) {
+               tpnt->dynamic_info[DT_PPC_GOT_IDX] += tpnt->loadaddr;
+               return;
+       }
+       num_plt_entries = tpnt->dynamic_info[DT_PLTRELSZ] / sizeof(ELF_RELOC);
+       rel_offset_words = PLT_DATA_START_WORDS(num_plt_entries);
+       data_words = (Elf32_Word) (plt + rel_offset_words);
        tpnt->data_words = data_words;
 
        plt[PLT_LONGBRANCH_ENTRY_WORDS] = OPCODE_ADDIS_HI(11, 11, data_words);
@@ -132,23 +62,38 @@ void _dl_init_got(unsigned long *plt,struct elf_resolve *tpnt)
 
        /* [4] */
        /* [5] */
+       tramp = (Elf32_Word *) (plt + PLT_TRAMPOLINE_ENTRY_WORDS);
 
-       tramp = plt + PLT_TRAMPOLINE_ENTRY_WORDS;
+       /* For the long entries, subtract off data_words.  */
        tramp[0] = OPCODE_ADDIS_HI(11,11,-data_words);
        tramp[1] = OPCODE_ADDI(11,11,-data_words);
+
+       /* Multiply index of entry by 3 (in r11).  */
        tramp[2] = OPCODE_SLWI(12,11,1);
        tramp[3] = OPCODE_ADD(11,12,11);
-       tramp[4] = OPCODE_LI(12,target_addr);
-       tramp[5] = OPCODE_ADDIS_HI(12,12,target_addr);
-       tramp[6] = OPCODE_MTCTR(12);
-       tramp[7] = OPCODE_LI(12,(unsigned long)tpnt);
-       tramp[8] = OPCODE_ADDIS_HI(12,12,(unsigned long)tpnt);
-       tramp[9] = OPCODE_BCTR();
-
+       if (dlrr <= 0x01fffffc || dlrr >= 0xfe000000) {
+               /* Load address of link map in r12.  */
+               tramp[4] = OPCODE_LI (12, (Elf32_Word) tpnt);
+               tramp[5] = OPCODE_ADDIS_HI (12, 12, (Elf32_Word) tpnt);
+
+               /* Call _dl_linux_resolve .  */
+               tramp[6] = OPCODE_BA (dlrr);
+       } else {
+               /* Get address of _dl_linux_resolve in CTR.  */
+               tramp[4] = OPCODE_LI(12,dlrr);
+               tramp[5] = OPCODE_ADDIS_HI(12,12,dlrr);
+               tramp[6] = OPCODE_MTCTR(12);
+
+               /* Load address of link map in r12.  */
+               tramp[7] = OPCODE_LI(12,(Elf32_Word) tpnt);
+               tramp[8] = OPCODE_ADDIS_HI(12,12,(Elf32_Word) tpnt);
+
+               /* Call _dl_linux_resolve.  */
+               tramp[9] = OPCODE_BCTR();
+       }
        /* [16] unused */
        /* [17] unused */
 
-       /* instructions were modified */
        PPC_DCBST(plt);
        PPC_DCBST(plt+4);
        PPC_DCBST(plt+8);
@@ -156,117 +101,290 @@ void _dl_init_got(unsigned long *plt,struct elf_resolve *tpnt)
        PPC_DCBST(plt+16-1);
        PPC_SYNC;
        PPC_ICBI(plt);
-       PPC_ICBI(plt+4); /* glibc thinks this is not needed */
-       PPC_ICBI(plt+8); /* glibc thinks this is not needed */
-       PPC_ICBI(plt+12); /* glibc thinks this is not needed */
        PPC_ICBI(plt+16-1);
        PPC_ISYNC;
 }
 
 unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
-       int reloc_type;
        ELF_RELOC *this_reloc;
        char *strtab;
        Elf32_Sym *symtab;
        ELF_RELOC *rel_addr;
        int symtab_index;
        char *symname;
-       unsigned long insn_addr;
-       unsigned long *insns;
-       unsigned long new_addr;
-       unsigned long delta;
+       Elf32_Addr *reloc_addr;
+       Elf32_Addr  finaladdr;
+       Elf32_Sword delta;
 
-       rel_addr = (ELF_RELOC *) (tpnt->dynamic_info[DT_JMPREL] + tpnt->loadaddr);
+       rel_addr = (ELF_RELOC *)tpnt->dynamic_info[DT_JMPREL];
 
        this_reloc = (void *)rel_addr + reloc_entry;
-       reloc_type = ELF32_R_TYPE(this_reloc->r_info);
        symtab_index = ELF32_R_SYM(this_reloc->r_info);
 
-       symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
-       strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
-       symname      = strtab + symtab[symtab_index].st_name;
+       symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB];
+       strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
+       symname = strtab + symtab[symtab_index].st_name;
 
-#if defined (__SUPPORT_LD_DEBUG__)
        debug_sym(symtab,strtab,symtab_index);
        debug_reloc(symtab,strtab,this_reloc);
-#endif
-
-       if (reloc_type != R_PPC_JMP_SLOT) {
-               _dl_dprintf(2, "%s: Incorrect relocation type in jump relocation\n", _dl_progname);
-               _dl_exit(1);
-       };
 
        /* Address of dump instruction to fix up */
-       insn_addr = (unsigned long) tpnt->loadaddr +
-               (unsigned long) this_reloc->r_offset;
+       reloc_addr = (Elf32_Addr *) (tpnt->loadaddr + this_reloc->r_offset);
 
 #if defined (__SUPPORT_LD_DEBUG__)
-       if(_dl_debug_reloc && _dl_debug_detail)
-               _dl_dprintf(_dl_debug_file, "\n\tResolving symbol %s %x --> ", symname, insn_addr);
+       if (_dl_debug_reloc && _dl_debug_detail)
+               _dl_dprintf(_dl_debug_file, "\n\tResolving symbol %s %x --> ", symname, (Elf32_Addr)reloc_addr);
 #endif
 
        /* Get the address of the GOT entry */
-       new_addr = (unsigned long) _dl_find_hash(
-               strtab + symtab[symtab_index].st_name, 
-               tpnt->symbol_scope, tpnt, resolver);
-       if (!new_addr) {
-               _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
-                       _dl_progname, symname);
+       finaladdr = (Elf32_Addr) _dl_find_hash(symname,
+                       tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, NULL);
+       if (unlikely(!finaladdr)) {
+               _dl_dprintf(2, "%s: can't resolve symbol '%s' in lib '%s'.\n", _dl_progname, symname, tpnt->libname);
                _dl_exit(1);
-       };
-
+       }
+       finaladdr += this_reloc->r_addend;
 #if defined (__SUPPORT_LD_DEBUG__)
-       if(_dl_debug_reloc && _dl_debug_detail)
-               _dl_dprintf(_dl_debug_file, "%x\n", new_addr);
+       if (_dl_debug_reloc && _dl_debug_detail)
+               _dl_dprintf(_dl_debug_file, "%x\n", finaladdr);
 #endif
+       if (tpnt->dynamic_info[DT_PPC_GOT_IDX] != 0) {
+               *reloc_addr = finaladdr;
+       } else {
+               delta = finaladdr - (Elf32_Word)reloc_addr;
+               if (delta<<6>>6 == delta) {
+                       *reloc_addr = OPCODE_B(delta);
+               } else if (finaladdr <= 0x01fffffc) {
+                       *reloc_addr = OPCODE_BA (finaladdr);
+               } else {
+                       /* Warning: we don't handle double-sized PLT entries */
+                       Elf32_Word *plt, *data_words, idx, offset;
+
+                       plt = (Elf32_Word *)tpnt->dynamic_info[DT_PLTGOT];
+                       offset = reloc_addr - plt;
+                       idx = (offset - PLT_INITIAL_ENTRY_WORDS)/2;
+                       data_words = (Elf32_Word *)tpnt->data_words;
+                       reloc_addr += 1;
+
+                       data_words[idx] = finaladdr;
+                       PPC_SYNC;
+                       *reloc_addr =  OPCODE_B ((PLT_LONGBRANCH_ENTRY_WORDS - (offset+1)) * 4);
+               }
 
-       insns = (unsigned long *)insn_addr;
-       delta = new_addr - insn_addr;
-
-       if(delta<<6>>6 == delta){
-               insns[0] = OPCODE_B(delta);
-       }else if (new_addr <= 0x01fffffc || new_addr >= 0xfe000000){
-               insns[0] = OPCODE_BA (new_addr);
-       }else{
-               /* Warning: we don't handle double-sized PLT entries */
-               unsigned long plt_addr;
-               unsigned long *ptr;
-               int index;
-
-               plt_addr = (unsigned long)tpnt->dynamic_info[DT_PLTGOT] + 
-                       (unsigned long)tpnt->loadaddr;
-
-               delta = PLT_LONGBRANCH_ENTRY_WORDS*4 - (insn_addr-plt_addr+4);
-
-               index = (insn_addr - plt_addr - PLT_INITIAL_ENTRY_WORDS*4)/8;
-
-               ptr = (unsigned long *)tpnt->data_words;
-               //DPRINTF("plt_addr=%x delta=%x index=%x ptr=%x\n", plt_addr, delta, index, ptr);
-               insns += 1;
-
-               ptr[index] = new_addr;
+               /* instructions were modified */
+               PPC_DCBST(reloc_addr);
                PPC_SYNC;
-               /* icache sync is not necessary, since this will be a data load */
-               //PPC_DCBST(ptr+index);
-               //PPC_SYNC;
-               //PPC_ICBI(ptr+index);
-               //PPC_ISYNC;
+               PPC_ICBI(reloc_addr);
+               PPC_ISYNC;
+       }
+       return finaladdr;
+}
+
+static __inline__ int
+_dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
+             ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
+{
+       int reloc_type;
+       int symtab_index;
+       ElfW(Sym) *sym;
+       Elf32_Addr *reloc_addr;
+       Elf32_Addr finaladdr;
+       struct elf_resolve *tls_tpnt = NULL;
+       unsigned long symbol_addr;
+       char *symname;
+#if defined (__SUPPORT_LD_DEBUG__)
+       unsigned long old_val;
+#endif
 
-               insns[0] = OPCODE_B(delta);
+       symbol_addr  = tpnt->loadaddr; /* For R_PPC_RELATIVE */
+       reloc_addr   = (Elf32_Addr *)(intptr_t) (symbol_addr + (unsigned long) rpnt->r_offset);
+       reloc_type   = ELF32_R_TYPE(rpnt->r_info);
+       symtab_index = ELF32_R_SYM(rpnt->r_info);
+       sym          = &symtab[symtab_index];
+       symname      = strtab + sym->st_name;
+       if (symtab_index) {
+               symbol_addr = (unsigned long) _dl_find_hash(symname, scope, tpnt,
+                                                           elf_machine_type_class(reloc_type), &tls_tpnt);
+               /* We want to allow undefined references to weak symbols - this might
+                * have been intentional.  We should not be linking local symbols
+                * here, so all bases should be covered.
+                */
+               if (unlikely(!symbol_addr
+                       && (ELF32_ST_TYPE(sym->st_info) != STT_TLS
+                               && ELF32_ST_BIND(sym->st_info) != STB_WEAK)))
+                       return 1;
+       } else {
+               symbol_addr = sym->st_value;
+               tls_tpnt = tpnt;
+       }
+#if defined (__SUPPORT_LD_DEBUG__)
+       old_val = *reloc_addr;
+#endif
+       finaladdr = (Elf32_Addr) (symbol_addr + rpnt->r_addend);
 
+       switch (reloc_type) {
+       case R_PPC_RELATIVE:
+       case R_PPC_ADDR32:
+       case R_PPC_GLOB_DAT:
+               *reloc_addr = finaladdr;
+               goto out_nocode; /* No code code modified */
+       case R_PPC_JMP_SLOT:
+       {
+               if (tpnt->dynamic_info[DT_PPC_GOT_IDX] != 0) {
+                       *reloc_addr = finaladdr;
+                       goto out_nocode; /* No code code modified */
+               } else {
+                       Elf32_Sword delta = finaladdr - (Elf32_Word)reloc_addr;
+                       if (delta<<6>>6 == delta) {
+                               *reloc_addr = OPCODE_B(delta);
+                       } else if (finaladdr <= 0x01fffffc) {
+                               *reloc_addr = OPCODE_BA (finaladdr);
+                       } else {
+                               /* Warning: we don't handle double-sized PLT entries */
+                               Elf32_Word *plt, *data_words, idx, offset;
+
+                               plt = (Elf32_Word *)tpnt->dynamic_info[DT_PLTGOT];
+                               offset = reloc_addr - plt;
+                               idx = (offset - PLT_INITIAL_ENTRY_WORDS)/2;
+                               data_words = (Elf32_Word *)tpnt->data_words;
+
+                               data_words[idx] = finaladdr;
+                               reloc_addr[0] = OPCODE_LI(11,idx*4);
+                               reloc_addr[1] = OPCODE_B((PLT_LONGBRANCH_ENTRY_WORDS - (offset+1)) * 4);
+
+                               /* instructions were modified */
+                               PPC_DCBST(reloc_addr+1);
+                               PPC_SYNC;
+                               PPC_ICBI(reloc_addr+1);
+                       }
+               }
+               break;
+       }
+       case R_PPC_COPY:
+#if defined (__SUPPORT_LD_DEBUG__)
+               if (_dl_debug_move)
+                       _dl_dprintf(_dl_debug_file,"\n%s move %x bytes from %x to %x",
+                                   symname, sym->st_size,
+                                   symbol_addr, reloc_addr);
+#endif
+               _dl_memcpy((char *) reloc_addr, (char *) finaladdr, sym->st_size);
+               goto out_nocode; /* No code code modified */
+       case R_PPC_ADDR16_HA:
+               finaladdr += 0x8000; /* fall through. */
+       case R_PPC_ADDR16_HI:
+               finaladdr >>= 16; /* fall through. */
+       case R_PPC_ADDR16_LO:
+               *(short *)reloc_addr = finaladdr;
+               break;
+#if USE_TLS
+       case R_PPC_DTPMOD32:
+               *reloc_addr = tls_tpnt->l_tls_modid;
+               break;
+       case R_PPC_DTPREL32:
+               /* During relocation all TLS symbols are defined and used.
+                  Therefore the offset is already correct.  */
+               *reloc_addr = finaladdr - TLS_DTV_OFFSET;
+               break;
+       case R_PPC_TPREL32:
+               *reloc_addr = tls_tpnt->l_tls_offset + finaladdr - TLS_TP_OFFSET;
+               break;
+#endif
+       case R_PPC_REL24:
+#if 0
+               {
+                       Elf32_Sword delta = finaladdr - (Elf32_Word)reloc_addr;
+                       if (unlikely(delta<<6>>6 != delta)) {
+                               _dl_dprintf(2, "%s: symbol '%s' R_PPC_REL24 is out of range.\n\t"
+                                               "Compile shared libraries with -fPIC!\n",
+                                               _dl_progname, symname);
+                               _dl_exit(1);
+                       }
+                       *reloc_addr = (*reloc_addr & 0xfc000003) | (delta & 0x3fffffc);
+                       break;
+               }
+#else
+               _dl_dprintf(2,"R_PPC_REL24: Compile shared libraries with -fPIC!\n");
+               return -1;
+#endif
+       case R_PPC_NONE:
+               goto out_nocode; /* No code code modified */
+       default:
+               _dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
+#if defined (__SUPPORT_LD_DEBUG__)
+               _dl_dprintf(2, "%s ", _dl_reltypes(reloc_type));
+#endif
+               if (symtab_index)
+                       _dl_dprintf(2, "'%s'\n", symname);
+               return -1;
        }
 
        /* instructions were modified */
-       PPC_DCBST(insns);
+       PPC_DCBST(reloc_addr);
        PPC_SYNC;
-       PPC_ICBI(insns);
+       PPC_ICBI(reloc_addr);
        PPC_ISYNC;
+ out_nocode:
+#if defined (__SUPPORT_LD_DEBUG__)
+       if (_dl_debug_reloc && _dl_debug_detail)
+               _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n", old_val, *reloc_addr, reloc_addr);
+#endif
+       return 0;
+}
+
+void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
+       unsigned long rel_addr, unsigned long rel_size)
+{
+       struct elf_resolve *tpnt = rpnt->dyn;
+       Elf32_Word *plt, offset, i,  num_plt_entries, rel_offset_words;
+
+       num_plt_entries = rel_size / sizeof(ELF_RELOC);
+       plt = (Elf32_Word *)tpnt->dynamic_info[DT_PLTGOT];
+       if (tpnt->dynamic_info[DT_PPC_GOT_IDX] != 0) {
+               /* Secure PLT */
+               Elf32_Addr *got = (Elf32_Addr *)tpnt->dynamic_info[DT_PPC_GOT_IDX];
+               Elf32_Word dlrr = (Elf32_Word) _dl_linux_resolve;
+
+               got[1] = (Elf32_Addr) dlrr;
+               got[2] = (Elf32_Addr) tpnt;
+
+               /* Relocate everything in .plt by the load address offset.  */
+               while (num_plt_entries-- != 0)
+                       *plt++ += tpnt->loadaddr;
+               return;
+       }
 
-       return new_addr;
+       rel_offset_words = PLT_DATA_START_WORDS(num_plt_entries);
+
+       /* Set up the lazy PLT entries.  */
+       offset = PLT_INITIAL_ENTRY_WORDS;
+       i = 0;
+       /* Warning: we don't handle double-sized PLT entries */
+       while (i < num_plt_entries) {
+               plt[offset  ] = OPCODE_LI(11, i * 4);
+               plt[offset+1] = OPCODE_B((PLT_TRAMPOLINE_ENTRY_WORDS + 2 - (offset+1)) * 4);
+               i++;
+               offset += 2;
+       }
+       /* Now, we've modified code.  We need to write the changes from
+          the data cache to a second-level unified cache, then make
+          sure that stale data in the instruction cache is removed.
+          (In a multiprocessor system, the effect is more complex.)
+          Most of the PLT shouldn't be in the instruction cache, but
+          there may be a little overlap at the start and the end.
+
+          Assumes that dcbst and icbi apply to lines of 16 bytes or
+          more.  Current known line sizes are 16, 32, and 128 bytes.  */
+       for (i = 0; i < rel_offset_words; i += 4)
+               PPC_DCBST (plt + i);
+       PPC_DCBST (plt + rel_offset_words - 1);
+       PPC_SYNC;
+       PPC_ICBI (plt);
+       PPC_ICBI (plt + rel_offset_words - 1);
+       PPC_ISYNC;
 }
 
-static int
+static __inline__ int
 _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
          unsigned long rel_addr, unsigned long rel_size,
          int (*reloc_fnc) (struct elf_resolve *tpnt, struct dyn_elf *scope,
@@ -279,343 +397,50 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
        int symtab_index;
 
        /* Now parse the relocation information */
-       rpnt = (ELF_RELOC *)(intptr_t) (rel_addr + tpnt->loadaddr);
+       rpnt = (ELF_RELOC *)(intptr_t)rel_addr;
        rel_size = rel_size / sizeof(ELF_RELOC);
 
-       symtab = (Elf32_Sym *)(intptr_t) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
-       strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
+       symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
+       strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
 
          for (i = 0; i < rel_size; i++, rpnt++) {
                int res;
-           
+
                symtab_index = ELF32_R_SYM(rpnt->r_info);
-               
-               /* When the dynamic linker bootstrapped itself, it resolved some symbols.
-                  Make sure we do not do them again */
-               if (!symtab_index && tpnt->libtype == program_interpreter)
-                       continue;
-               if (symtab_index && tpnt->libtype == program_interpreter &&
-                   _dl_symbol(strtab + symtab[symtab_index].st_name))
-                       continue;
 
-#if defined (__SUPPORT_LD_DEBUG__)
                debug_sym(symtab,strtab,symtab_index);
                debug_reloc(symtab,strtab,rpnt);
-#endif
 
                res = reloc_fnc (tpnt, scope, rpnt, symtab, strtab);
 
                if (res==0) continue;
 
                _dl_dprintf(2, "\n%s: ",_dl_progname);
-               
+
                if (symtab_index)
                  _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name);
-                 
-               if (res <0)
+
+               if (unlikely(res <0))
                {
                        int reloc_type = ELF32_R_TYPE(rpnt->r_info);
 #if defined (__SUPPORT_LD_DEBUG__)
-                       _dl_dprintf(2, "can't handle reloc type %s\n ", _dl_reltypes(reloc_type));
+                       _dl_dprintf(2, "can't handle reloc type '%s' in lib '%s'\n", _dl_reltypes(reloc_type), tpnt->libname);
 #else
-                       _dl_dprintf(2, "can't handle reloc type %x\n", reloc_type);
-#endif                 
-                       _dl_exit(-res);
+                       _dl_dprintf(2, "can't handle reloc type %x in lib '%s'\n", reloc_type, tpnt->libname);
+#endif
+                       return res;
                }
-               else if (res >0)
+               if (unlikely(res >0))
                {
-                       _dl_dprintf(2, "can't resolve symbol\n");
+                       _dl_dprintf(2, "can't resolve symbol in lib '%s'.\n", tpnt->libname);
                        return res;
                }
          }
          return 0;
 }
 
-static int
-_dl_do_lazy_reloc (struct elf_resolve *tpnt, struct dyn_elf *scope,
-                  ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
-{
-       int reloc_type;
-       unsigned long reloc_addr;
-#if defined (__SUPPORT_LD_DEBUG__)
-       unsigned long old_val;
-#endif
-       (void)scope;
-       (void)symtab;
-       (void)strtab;
-
-       reloc_addr = (unsigned long)tpnt->loadaddr + (unsigned long) rpnt->r_offset;
-       reloc_type = ELF32_R_TYPE(rpnt->r_info);
-
-#if defined (__SUPPORT_LD_DEBUG__)
-       old_val = reloc_addr;
-#endif
-
-       switch (reloc_type) {
-               case R_PPC_NONE:
-                       return 0;
-                       break;
-               case R_PPC_JMP_SLOT:
-                       {
-                               int index;
-                               unsigned long delta;
-                               unsigned long *plt;
-                               unsigned long *insns;
-
-                               plt = (unsigned long *)(tpnt->dynamic_info[DT_PLTGOT] + tpnt->loadaddr);
-
-                               delta = (unsigned long)(plt+PLT_TRAMPOLINE_ENTRY_WORDS+2) - (reloc_addr+4);
-
-                               index = (reloc_addr - (unsigned long)(plt+PLT_INITIAL_ENTRY_WORDS)) 
-                                               /sizeof(unsigned long);
-                               index /= 2;
-                               //DPRINTF("        index %x delta %x\n",index,delta);
-                               insns = (unsigned long *)reloc_addr;
-                               insns[0] = OPCODE_LI(11,index*4);
-                               insns[1] = OPCODE_B(delta);
-                               break;
-                       }
-               default:
-#if 0
-                       _dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", 
-                                       _dl_progname);
-#if defined (__SUPPORT_LD_DEBUG__)
-                       _dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
-#endif
-                       if (symtab_index)
-                               _dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
-#endif
-                       //_dl_exit(1);
-                       return -1;
-       };
-
-       /* instructions were modified */
-       PPC_DCBST(reloc_addr);
-       PPC_DCBST(reloc_addr+4);
-       PPC_SYNC;
-       PPC_ICBI(reloc_addr);
-       PPC_ICBI(reloc_addr+4);
-       PPC_ISYNC;
-
-#if defined (__SUPPORT_LD_DEBUG__)
-       if(_dl_debug_reloc && _dl_debug_detail)
-               _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x", old_val, reloc_addr);
-#endif
-       return 0;
-
-}
-
-static int
-_dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
-             ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
-{
-       int reloc_type;
-       int symtab_index;
-       char *symname;
-       unsigned long *reloc_addr;
-       unsigned long symbol_addr;
-#if defined (__SUPPORT_LD_DEBUG__)
-       unsigned long old_val;
-#endif
-
-       reloc_addr   = (unsigned long *)(intptr_t) (tpnt->loadaddr + (unsigned long) rpnt->r_offset);
-       reloc_type   = ELF32_R_TYPE(rpnt->r_info);
-       symtab_index = ELF32_R_SYM(rpnt->r_info);
-       symbol_addr  = 0;
-       symname      = strtab + symtab[symtab_index].st_name;
-
-       if (symtab_index) {
-
-               symbol_addr = (unsigned long) _dl_find_hash(symname, scope, 
-                               (reloc_type == R_PPC_JMP_SLOT ? tpnt : NULL), symbolrel);
-
-               /*
-                * We want to allow undefined references to weak symbols - this might
-                * have been intentional.  We should not be linking local symbols
-                * here, so all bases should be covered.
-                */
-
-               if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
-#if defined (__SUPPORT_LD_DEBUG__)
-                       _dl_dprintf(2, "\tglobal symbol '%s' already defined in '%s'\n",
-                                       symname, tpnt->libname);
-#endif
-                       return 0;
-               }
-       }
-
-#if defined (__SUPPORT_LD_DEBUG__)
-       old_val = *reloc_addr;
-#endif
-               switch (reloc_type) {
-                       case R_PPC_NONE:
-                               return 0;
-                               break;
-                       case R_PPC_REL24:
-#if 0
-                               {
-                                       unsigned long delta = symbol_addr - (unsigned long)reloc_addr;
-                                       if(delta<<6>>6 != delta){
-                                               _dl_dprintf(2,"R_PPC_REL24: Reloc out of range\n");
-                                               _dl_exit(1);
-                                       }
-                                       *reloc_addr &= 0xfc000003;
-                                       *reloc_addr |= delta&0x03fffffc;
-                               }
-                               break;
-#else
-                               _dl_dprintf(2, "%s: symbol '%s' is type R_PPC_REL24\n\tCompile shared libraries with -fPIC!\n",
-                                               _dl_progname, symname);
-                               _dl_exit(1);
-#endif
-                       case R_PPC_RELATIVE:
-                               *reloc_addr = (unsigned long)tpnt->loadaddr + (unsigned long)rpnt->r_addend;
-                               break;
-                       case R_PPC_ADDR32:
-                               *reloc_addr += symbol_addr;
-                               break;
-                       case R_PPC_ADDR16_HA:
-                               /* XXX is this correct? */
-                               *(short *)reloc_addr += (symbol_addr+0x8000)>>16;
-                               break;
-                       case R_PPC_ADDR16_HI:
-                               *(short *)reloc_addr += symbol_addr>>16;
-                               break;
-                       case R_PPC_ADDR16_LO:
-                               *(short *)reloc_addr += symbol_addr;
-                               break;
-                       case R_PPC_JMP_SLOT:
-                               {
-                                       unsigned long targ_addr = (unsigned long)*reloc_addr;
-                                       unsigned long delta = targ_addr - (unsigned long)reloc_addr;
-                                       if(delta<<6>>6 == delta){
-                                               *reloc_addr = OPCODE_B(delta);
-                                       }else if (targ_addr <= 0x01fffffc || targ_addr >= 0xfe000000){
-                                               *reloc_addr = OPCODE_BA (targ_addr);
-                                       }else{
-                                               {
-                                                       int index;
-                                                       unsigned long delta2;
-                                                       unsigned long *plt, *ptr;
-                                                       plt = (unsigned long *)(tpnt->dynamic_info[DT_PLTGOT] + tpnt->loadaddr);
-
-                                                       delta2 = (unsigned long)(plt+PLT_LONGBRANCH_ENTRY_WORDS)
-                                                               - (unsigned long)(reloc_addr+1);
-
-                                                       index = ((unsigned long)reloc_addr -
-                                                                       (unsigned long)(plt+PLT_INITIAL_ENTRY_WORDS))
-                                                               /sizeof(unsigned long);
-                                                       index /= 2;
-                                                       //DPRINTF("        index %x delta %x\n",index,delta2);
-                                                       ptr = (unsigned long *)tpnt->data_words;
-                                                       ptr[index] = targ_addr;
-                                                       reloc_addr[0] = OPCODE_LI(11,index*4);
-                                                       reloc_addr[1] = OPCODE_B(delta2);
-
-                                                       /* instructions were modified */
-                                                       PPC_DCBST(reloc_addr+1);
-                                                       PPC_SYNC;
-                                                       PPC_ICBI(reloc_addr+1);
-                                               }
-                                       }
-                                       break;
-                               }
-                       case R_PPC_GLOB_DAT:
-                               *reloc_addr += symbol_addr;
-                               break;
-                       case R_PPC_COPY:
-                               // handled later
-                               return 0;
-                               break;
-                       default:
-#if 0
-                               _dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
-#if defined (__SUPPORT_LD_DEBUG__)
-                               _dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
-#endif
-                               if (symtab_index)
-                                       _dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
-#endif
-                               //_dl_exit(1);
-                               return -1;
-               };
-
-               /* instructions were modified */
-               PPC_DCBST(reloc_addr);
-               PPC_SYNC;
-               PPC_ICBI(reloc_addr);
-               PPC_ISYNC;
-
-#if defined (__SUPPORT_LD_DEBUG__)
-       if(_dl_debug_reloc && _dl_debug_detail)
-               _dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x", old_val, *reloc_addr, reloc_addr);
-#endif
-
-       return 0;
-}
-
-
-/* This is done as a separate step, because there are cases where
-   information is first copied and later initialized.  This results in
-   the wrong information being copied.  Someone at Sun was complaining about
-   a bug in the handling of _COPY by SVr4, and this may in fact be what he
-   was talking about.  Sigh. */
-static int
-_dl_do_copy (struct elf_resolve *tpnt, struct dyn_elf *scope,
-            ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
+int _dl_parse_relocation_information(struct dyn_elf *rpnt,
+       unsigned long rel_addr, unsigned long rel_size)
 {
-       int reloc_type;
-       int symtab_index;
-       unsigned long *reloc_addr;
-       unsigned long symbol_addr;
-       int goof = 0;
-       char *symname;
-         
-       reloc_addr = (unsigned long *)(intptr_t) (tpnt->loadaddr + (unsigned long) rpnt->r_offset);
-       reloc_type = ELF32_R_TYPE(rpnt->r_info);
-       if (reloc_type != R_PPC_COPY) 
-               return 0;
-       symtab_index = ELF32_R_SYM(rpnt->r_info);
-       symbol_addr = 0;
-       symname      = strtab + symtab[symtab_index].st_name;
-               
-       if (symtab_index) {
-               symbol_addr = (unsigned long) _dl_find_hash(symname, scope, NULL, copyrel);
-               if (!symbol_addr) goof++;
-       }
-       if (!goof) {
-#if defined (__SUPPORT_LD_DEBUG__)
-               if(_dl_debug_move)
-                 _dl_dprintf(_dl_debug_file,"\n%s move %x bytes from %x to %x",
-                            symname, symtab[symtab_index].st_size,
-                            symbol_addr, symtab[symtab_index].st_value);
-#endif
-                       _dl_memcpy((char *) reloc_addr,
-                                       (char *) symbol_addr, symtab[symtab_index].st_size);
-       }
-
-       return goof;
-}
-
-void _dl_parse_lazy_relocation_information(struct elf_resolve *tpnt, 
-       unsigned long rel_addr, unsigned long rel_size, int type)
-{
-       (void) type;
-       (void)_dl_parse(tpnt, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
-}
-
-int _dl_parse_relocation_information(struct elf_resolve *tpnt, 
-       unsigned long rel_addr, unsigned long rel_size, int type)
-{
-       (void) type;
-       return _dl_parse(tpnt, tpnt->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
-}
-
-int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr, 
-       unsigned long rel_size, int type)
-{
-       (void) type;
-       return _dl_parse(xpnt->dyn, xpnt->next, rel_addr, rel_size, _dl_do_copy);
+       return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
 }
-
-