are usually many many terabytes away. */
Elf64_Addr dot;
- long zero_disp;
+ long int zero_disp;
asm("br %0, 1f\n\t"
".weak __load_address_undefined\n\t"
/* If the first instruction of the plt entry is not
"br $28, plt0", we cannot do lazy relocation. */
- lazy = (*(unsigned *)(plt + 32) == 0xc39ffff7);
+ lazy = (*(unsigned int *)(plt + 32) == 0xc39ffff7);
}
return lazy;
/* Fix up the instructions of a PLT entry to invoke the function
rather than the dynamic linker. */
-static inline void
-elf_machine_fixup_plt(struct link_map *l, const Elf64_Rela *reloc,
- Elf64_Addr *got_addr, Elf64_Addr value)
+static inline Elf64_Addr
+elf_machine_fixup_plt (struct link_map *l, lookup_t t,
+ const Elf64_Rela *reloc,
+ Elf64_Addr *got_addr, Elf64_Addr value)
{
const Elf64_Rela *rela_plt;
Elf64_Word *plte;
- long edisp;
+ long int edisp;
/* Store the value we are going to load. */
*got_addr = value;
plte += 3 * (reloc - rela_plt);
/* Find the displacement from the plt entry to the function. */
- edisp = (long)(value - (Elf64_Addr)&plte[3]) / 4;
+ edisp = (long int) (value - (Elf64_Addr)&plte[3]) / 4;
if (edisp >= -0x100000 && edisp < 0x100000)
{
int hi, lo;
hi = value - (Elf64_Addr)&plte[0];
- lo = (short)hi;
+ lo = (short int) hi;
hi = (hi - lo) >> 16;
/* Emit "lda $27,lo($27)" */
This will be taken care of in _dl_runtime_resolve. If instead we are
doing this as part of non-lazy startup relocation, that bit of code
hasn't made it into Icache yet, so there's nothing to clean up. */
+
+ return value;
}
/* Return the final value of a plt relocation. */
const struct r_found_version *version,
Elf64_Addr *const reloc_addr)
{
- unsigned long const r_type = ELF64_R_TYPE (reloc->r_info);
+ unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info);
#ifndef RTLD_BOOTSTRAP
/* This is defined in rtld.c, but nowhere in the static libc.a; make the
Elf64_Addr l_addr, const Elf64_Rela *reloc)
{
Elf64_Addr * const reloc_addr = (void *)(l_addr + reloc->r_offset);
- unsigned long const r_type = ELF64_R_TYPE (reloc->r_info);
+ unsigned long int const r_type = ELF64_R_TYPE (reloc->r_info);
if (r_type == R_ALPHA_JMP_SLOT)
{
_dl_platform = NULL;
}
-static inline void
-elf_machine_fixup_plt (struct link_map *map, const Elf32_Rel *reloc,
+static inline Elf32_Addr
+elf_machine_fixup_plt (struct link_map *map, lookup_t t,
+ const Elf32_Rel *reloc,
Elf32_Addr *reloc_addr, Elf32_Addr value)
{
- *reloc_addr = value;
+ return *reloc_addr = value;
}
/* Return the final value of a plt relocation. */
/* The m68k never uses Elf32_Rel relocations. */
#define ELF_MACHINE_NO_REL 1
-static inline void
-elf_machine_fixup_plt (struct link_map *map, const Elf32_Rela *reloc,
+static inline Elf32_Addr
+elf_machine_fixup_plt (struct link_map *map, lookup_t t,
+ const Elf32_Rela *reloc,
Elf32_Addr *reloc_addr, Elf32_Addr value)
{
- *reloc_addr = value;
+ return *reloc_addr = value;
}
/* Return the final value of a plt relocation. On the m68k the JMP_SLOT