summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/dl-cache.c86
-rw-r--r--sysdeps/mach/hurd/dl-cache.c24
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/i386/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/m68k/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sysdep.S39
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sysdep.h20
7 files changed, 152 insertions, 20 deletions
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c
index 6cd454c7ac..20a312fee3 100644
--- a/sysdeps/generic/dl-cache.c
+++ b/sysdeps/generic/dl-cache.c
@@ -84,3 +84,89 @@ _dl_load_cache_lookup (const char *name)
return NULL;
}
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+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. */
+
+#include <link.h>
+#include <stddef.h>
+#include <sys/mman.h>
+
+/* System-dependent function to read a file's whole contents
+ in the most convenient manner available. */
+extern void *_dl_sysdep_read_whole_file (const char *filename,
+ size_t *filesize_ptr,
+ int mmap_prot);
+
+#define CACHEMAGIC "ld.so-1.7.0"
+
+struct cache_file
+ {
+ char magic[sizeof CACHEMAGIC - 1];
+ unsigned int nlibs;
+ struct
+ {
+ int flags; /* This is 1 for an ELF library. */
+ unsigned int key, value; /* String table indices. */
+ } libs[0];
+ };
+
+/* Look up NAME in ld.so.cache and return the file name stored there,
+ or null if none is found. */
+
+const char *
+_dl_load_cache_lookup (const char *name)
+{
+ static struct cache_file *cache;
+ static size_t cachesize;
+ unsigned int i;
+
+ if (cache == (void *) -1)
+ /* Previously looked for the cache file and didn't find it. */
+ return NULL;
+
+ if (cache == NULL)
+ {
+ /* Read the contents of the file. */
+ void *file = _dl_sysdep_read_whole_file ("/etc/ld.so.cache", &cachesize,
+ PROT_READ);
+ if (file && cachesize > sizeof *cache &&
+ !memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1))
+ /* Looks ok. */
+ cache = file;
+ else
+ {
+ if (file)
+ __munmap (file, cachesize);
+ cache = (void *) -1;
+ return NULL;
+ }
+ }
+
+ for (i = 0; i < cache->nlibs; ++i)
+ if (cache->libs[i].flags == 1 && /* ELF library entry. */
+ /* Make sure string table indices are not bogus before using them. */
+ cache->libs[i].key < cachesize - sizeof *cache &&
+ cache->libs[i].value < cachesize - sizeof *cache &&
+ /* Does the name match? */
+ ! strcmp (name, ((const char *) &cache->libs[cache->nlibs] +
+ cache->libs[i].key)))
+ return (const char *) &cache->libs[cache->nlibs] + cache->libs[i].value;
+
+ return NULL;
+}
diff --git a/sysdeps/mach/hurd/dl-cache.c b/sysdeps/mach/hurd/dl-cache.c
index 7d919cd6a9..2981245c00 100644
--- a/sysdeps/mach/hurd/dl-cache.c
+++ b/sysdeps/mach/hurd/dl-cache.c
@@ -22,3 +22,27 @@ _dl_load_cache_lookup (const char *name)
{
return 0;
}
+/* Stubby version of dl-cache; the Hurd doesn't support this "feature".
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+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. */
+
+const char *
+_dl_load_cache_lookup (const char *name)
+{
+ return 0;
+}
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index a6b5db6749..db0cd6000d 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,3 +1,4 @@
+init-first.h
sysctl.c
net/if.h
nfs/nfs.h
diff --git a/sysdeps/unix/sysv/linux/i386/Dist b/sysdeps/unix/sysv/linux/i386/Dist
index 780edfca50..d5cc620549 100644
--- a/sysdeps/unix/sysv/linux/i386/Dist
+++ b/sysdeps/unix/sysv/linux/i386/Dist
@@ -1,3 +1,2 @@
sys/perm.h sys/vm86.h
-init-first.h
clone.S
diff --git a/sysdeps/unix/sysv/linux/m68k/Dist b/sysdeps/unix/sysv/linux/m68k/Dist
index a281cba3f9..738b9cc542 100644
--- a/sysdeps/unix/sysv/linux/m68k/Dist
+++ b/sysdeps/unix/sysv/linux/m68k/Dist
@@ -1,2 +1 @@
-init-first.h
clone.S
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S
index 895ea2770b..674715f824 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.S
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S
@@ -33,8 +33,9 @@ errno: .space 4
_errno = errno /* This name is expected by hj libc.so.5 startup code. */
.text
-/* The following code is not used at all in the shared library.
- The PIC system call stubs set errno themselves. */
+/* The following code is only used in the shared library when we
+ compile the reentrant version. Otherwise each system call defines
+ each own version. */
#ifndef PIC
@@ -42,30 +43,34 @@ _errno = errno /* This name is expected by hj libc.so.5 startup code. */
#define _ERRNO_H
#include <errnos.h>
-.globl errno
-.globl __syscall_error
-
/* The syscall stubs jump here when they detect an error. */
.globl __syscall_error
__syscall_error:
neg.l %d0
-
-#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN
- /* We translate the system's EWOULDBLOCK error into EAGAIN.
- The GNU C library always defines EWOULDBLOCK==EAGAIN.
- EWOULDBLOCK_sys is the original number. */
- move.l #EWOULDBLOCK_sys, %d1
- cmp.l %d0, %d1
- jne 1f
- move.l #EAGAIN, %d0
-1:
-#endif
-
move.l %d0, errno
+#ifdef _LIBC_REENTRANT
+ move.l %d0, -(%sp)
+ jbsr __errno_location
+ move.l (%sp)+, (%a0)
+#endif
move.l #-1, %d0
/* Copy return value to %a0 for syscalls that are declared to
return a pointer. */
move.l %d0, %a0
rts
+ .size __syscall_error, . - __syscall_error
#endif /* PIC */
+
+#ifdef _LIBC_REENTRANT
+ .globl __errno_location
+ .type __errno_location, @function
+__errno_location:
+#ifdef PIC
+ move.l (%pc, errno@GOTPC), %a0
+#else
+ lea errno, %a0
+#endif
+ rts
+ .size __errno_location, . - __errno_location
+#endif
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index fe2c6aa823..9de750c326 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -78,19 +78,37 @@ Cambridge, MA 02139, USA. */
#ifdef PIC
/* Store (- %d0) into errno through the GOT. */
+#ifdef _LIBC_REENTRANT
#define SYSCALL_ERROR_HANDLER \
+ .type syscall_error, @function; \
syscall_error: \
move.l (errno@GOTPC, %pc), %a0; \
neg.l %d0; \
move.l %d0, (%a0); \
+ move.l %d0, -(%sp); \
+ jbsr __errno_location@PLTPC \
+ move.l (%sp)+, (%a0); \
move.l POUND -1, %d0; \
/* Copy return value to %a0 for syscalls that are declared to return \
a pointer (e.g., mmap). */ \
move.l %d0, %a0; \
rts;
#else
+#define SYSCALL_ERROR_HANDLER \
+ .type syscall_error, @function; \
+syscall_error: \
+ move.l (errno@GOTPC, %pc), %a0; \
+ neg.l %d0; \
+ move.l %d0, (%a0); \
+ move.l POUND -1, %d0; \
+ /* Copy return value to %a0 for syscalls that are declared to return \
+ a pointer (e.g., mmap). */ \
+ move.l %d0, %a0; \
+ rts;
+#endif /* _LIBC_REENTRANT */
+#else
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
-#endif
+#endif /* PIC */
/* Linux takes system call arguments in registers:
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 09:19:55 +0000