diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-04 23:06:02 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-04 23:06:02 +0000 |
| commit | f68b86cc7bdcee246296d49f3a3318c1b97693f0 (patch) | |
| tree | 34a9e7bde9fd4f15d76192869b800ff7ff461874 /sysdeps | |
| parent | 14d898aef6373abaf64a7b17f32e8ce3f655cdf3 (diff) | |
| download | glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.tar.gz glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.tar.xz glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.zip | |
Tue Jun 4 18:57:57 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* elf/dladdr.c: Remove #include <setjmp.h>, we don't use it. * shlib-versions: Set libdl=2. * elf/dl-deps.c (_dl_map_object_deps): Use a linked list of alloca'd elements and then scan it to fill the single malloc'd array, instead of using realloc to grow the array in the first pass. _dl_map_object may do some mallocs that break our stream of reallocs, and the minimal realloc can't handle that. * elf/dl-init.c (_dl_init_next): Take argument, link_map whose searchlist describes the piece of the DT_NEEDED graph to be initialized. * elf/link.h: Update prototype. * sysdeps/i386/dl-machine.h (RTLD_START): Pass _dl_loaded as argument to _dl_init_next. * sysdeps/m68k/dl-machine.h: Likewise. * elf/dl-deps.c (_dl_open): Pass new object as arg to _dl_init_next. * elf/link.h (struct link_map): Add `l_reserved' member, soaking up extra bits in last byte. * elf/dl-deps.c (_dl_map_object_deps): Use that for mark bit to avoid putting dup elts in search list. * elf/dlclose.c: Use MAP->l_searchlist to find deps to close. * elf/dlsym.c: Don't tweak linked list. Scope array given to _dl_lookup_symbol does the right thing. Tue Jun 4 02:25:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 9 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-machine.h | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index e53c779ec3..7ed20de8c2 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -225,14 +225,19 @@ _dl_start_user:\n\ leal (%esp,%eax,4), %esp\n\ # Push back the modified argument count.\n\ pushl %ecx\n\ + # Push _dl_loaded as argument in _dl_init_next call below.\n\ + movl _dl_loaded@GOT(%ebx), %eax\n\ + movl (%eax), %esi\n\ +0: pushl %esi\n\ # Call _dl_init_next to return the address of an initializer\n\ # function to run.\n\ -0: call _dl_init_next@PLT\n\ + call _dl_init_next@PLT\n\ + addl $4, %esp # Pop argument.\n\ # Check for zero return, when out of initializers.\n\ testl %eax,%eax\n\ jz 1f\n\ # Call the shared object initializer function.\n\ - # NOTE: We depend only on the registers (%ebx and %edi)\n\ + # NOTE: We depend only on the registers (%ebx, %esi and %edi)\n\ # and the return address pushed by this call;\n\ # the initializer is called with the stack just\n\ # as it appears on entry, and it is free to move\n\ diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 760bf9662d..6c6b01de2b 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -250,14 +250,18 @@ _dl_start_user: lea (%sp, %d0*4), %sp | Push back the modified argument count. move.l %d1, -(%sp) + | Push _dl_loaded as argument in _dl_init_next call below. + move.l ([_dl_loaded@GOT, %a5]), %d2 +0: move.l %d2, -(%sp) | Call _dl_init_next to return the address of an initializer | function to run. -0: bsr.l _dl_init_next@PLTPC + bsr.l _dl_init_next@PLTPC + add.l #4, %sp | Pop argument. | Check for zero return, when out of initializers. tst.l %d0 jeq 1f | Call the shared object initializer function. - | NOTE: We depend only on the registers (%a4 and %a5) + | NOTE: We depend only on the registers (%d2, %a4 and %a5) | and the return address pushed by this call; | the initializer is called with the stack just | as it appears on entry, and it is free to move |