diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-07-14 15:21:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-14 15:21:35 +0000 |
| commit | 3a8599b21c3127b3d99915b7be58975606f89775 (patch) | |
| tree | dd0ecb9ed5ec00268ea89e2849d7848d3d07fba4 /sysdeps/unix | |
| parent | c33bd0123ed605d201ee43dcd80998b6ab858022 (diff) | |
| download | glibc-3a8599b21c3127b3d99915b7be58975606f89775.tar.gz glibc-3a8599b21c3127b3d99915b7be58975606f89775.tar.xz glibc-3a8599b21c3127b3d99915b7be58975606f89775.zip | |
Update.
1999-07-13 Jakub Jelinek <jj@ultra.linux.cz> * elf/ldd.bash.in: Add support for multiple dynamic linkers. * sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed: On sparc*linux*, try both 32bit and 64bit dynamic linker. * sysdeps/unix/sysv/linux/configure.in: Apply sparc ldd-rewrite script on all sparc targets. 1999-07-13 Jakub Jelinek <jj@ultra.linux.cz> * sysdeps/unix/sysv/linux/shmat.c (shmat): Avoid casting a pointer to int.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shmat.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 2e3ba901e1..87a5bff15b 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -155,7 +155,7 @@ case "$machine" in i[3456]86* | m68*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed ;; - sparc/sparc32) + sparc*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed ;; *) diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index d7b2bd97c4..fae7934312 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -126,7 +126,7 @@ case "$machine" in i[3456]86* | m68*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed ;; - sparc/sparc32) + sparc*) ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed ;; *) diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index 9ebac49537..6e25d452a3 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. @@ -33,11 +33,11 @@ shmat (shmid, shmaddr, shmflg) const void *shmaddr; int shmflg; { - int retval; + long int retval; unsigned long raddr; - retval = INLINE_SYSCALL (ipc, 5, IPCOP_shmat, shmid, shmflg, (int) &raddr, - (void *) shmaddr); + retval = INLINE_SYSCALL (ipc, 5, IPCOP_shmat, shmid, shmflg, + (long int) &raddr, (void *) shmaddr); return ((unsigned long int) retval > -(unsigned long int) SHMLBA ? (void *) retval : (void *) raddr); } diff --git a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed index f0a192c7e0..7dc2698fa8 100644 --- a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed +++ b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed @@ -1,2 +1,3 @@ /LD_TRACE_LOADED_OBJECTS=1/a\ add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\.so\.[0-9.]*\)[ ]*$_\1"\2\4 \264\4"_ |