system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

update from main archive 960814

Browse Source
This commit is contained in:
Ulrich Drepper 1996-08-15 01:23:29 +00:00
parent f526ac60c5
commit 404e621688
4 changed files with 87 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/alpha/dl-machine.h
View File

@ -341,8 +341,8 @@ elf_machine_rela (struct link_map *map,
{
Elf64_Addr loadbase, sym_value;
loadbase = RESOLVE (&sym, (Elf64_Addr)reloc_addr,
r_info == R_ALPHA_JMP_SLOT);
loadbase = RESOLVE (&sym,
r_info == R_ALPHA_JMP_SLOT ? DL_LOOKUP_NOPLT : 0);
sym_value = sym ? loadbase + sym->st_value : 0;
if (r_info == R_ALPHA_GLOB_DAT)

18
sysdeps/m68k/dl-machine.h
View File

@ -205,29 +205,29 @@ elf_machine_rela (struct link_map *map,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_68K_COPY:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, DL_LOOKUP_NOEXEC);
memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size);
break;
case R_68K_GLOB_DAT:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break;
case R_68K_JMP_SLOT:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 1);
loadbase = RESOLVE (&sym, DL_LOOKUP_NOPLT);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break;
case R_68K_8:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend);
break;
case R_68K_16:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend);
break;
case R_68K_32:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend);
break;
@ -235,17 +235,17 @@ elf_machine_rela (struct link_map *map,
*reloc_addr = map->l_addr + reloc->r_addend;
break;
case R_68K_PC8:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr);
break;
case R_68K_PC16:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr);
break;
case R_68K_PC32:
loadbase = RESOLVE (&sym, (Elf32_Addr) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr);
break;

2
sysdeps/mips/dl-machine.h
View File

@ -453,7 +453,7 @@ elf_machine_rel (struct link_map *map,
else
#endif
undo = 0;
loadbase = RESOLVE (&sym, (ElfW(Addr)) reloc_addr, 0);
loadbase = RESOLVE (&sym, 0);
*reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
}
break;

75
sysdeps/unix/sysv/linux/m68k/clone.S Normal file
View File

@ -0,0 +1,75 @@
/* Copyright (C) 1996 Free Software Foundation, Inc.
Contributed by Andreas Schwab (schwab@issan.informatik.uni-dortmund.de)
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
/* clone is even more special than fork as it mucks with stacks
and invokes a function in the right context after its all over. */
#include <sysdep.h>
#include <errnos.h>
/* int clone (int (*fn) (), void *child_stack, int flags, int nargs, ...) */
.text
ENTRY (__clone)
/* Sanity check arguments. */
movel #-EINVAL, %d0
movel 4(%sp), %a0 /* no NULL function pointers */
tstl %a0
jeq syscall_error
movel 8(%sp), %a1 /* no NULL stack pointers */
tstl %a1
jeq syscall_error
movel 16(%sp), %d1 /* no negative argument counts */
jmi syscall_error
/* Allocate space on the new stack and copy args over */
movel %d1, %d0
negl %d0
lea (%a1,%d0.l*4), %a1
jeq 2f
1: movel 16(%sp,%d1.l*4), -4(%a1,%d1.l*4)
subql #1, %d1
jne 1b
2:
/* Do the system call */
exg %d2, %a1 /* save %d2 and get stack pointer */
movel 12(%sp), %d1 /* get flags */
movel #SYS_ify (clone), %d0
trap #0
exg %d2, %a1 /* restore %d2 */
tstl %d0
jmi syscall_error
jeq thread_start
rts
SYSCALL_ERROR_HANDLER
thread_start:
subl %fp, %fp /* terminate the stack frame */
jsr (%a0)
movel %d0, -(%sp)
#ifdef PIC
bsrl _exit@PLTPC
#else
jbsr _exit
#endif
weak_alias (__clone, clone)