aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-16 01:28:07 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-16 01:28:07 +0000
commit5763742fc789ef23864c0b093a2a5e434e65f392 (patch)
tree4e88dd882c27d82da5b058c17df4eef345e840ea
parented2d7a57e53fd8cb0575eee0077c55aa4e0641a0 (diff)
downloadglibc-5763742fc789ef23864c0b093a2a5e434e65f392.zip
glibc-5763742fc789ef23864c0b093a2a5e434e65f392.tar.gz
glibc-5763742fc789ef23864c0b093a2a5e434e65f392.tar.bz2
Update.
2000-08-15 Ulrich Drepper <drepper@redhat.com> * include/link.h: Undo last patches. Hurd now had stat64. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/dl-misc.c: Likewise. * elf/dl-profile.c: Likewise. * sysdeps/generic/sysd-link.h: Removed. * sysdeps/unix/sysv/linux/sysd-link.h: Removed. * rt/aio_notify.c (notify_func_wrapper): Wrapper function to call thread event callback function. (__aio_notify_only): Use function above. Patch by Kaz Kylheku <kaz@ashi.footprints.net>.
-rw-r--r--ChangeLog15
-rw-r--r--elf/Makefile3
-rw-r--r--elf/dl-load.c12
-rw-r--r--elf/dl-misc.c4
-rw-r--r--elf/dl-profile.c4
-rw-r--r--include/link.h5
-rw-r--r--sysdeps/generic/sysd-link.h5
-rw-r--r--sysdeps/unix/sysv/linux/sysd-link.h5
8 files changed, 27 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 7caa885..efbe1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-08-15 Ulrich Drepper <drepper@redhat.com>
+
+ * include/link.h: Undo last patches. Hurd now had stat64.
+ * elf/Makefile: Likewise.
+ * elf/dl-load.c: Likewise.
+ * elf/dl-misc.c: Likewise.
+ * elf/dl-profile.c: Likewise.
+ * sysdeps/generic/sysd-link.h: Removed.
+ * sysdeps/unix/sysv/linux/sysd-link.h: Removed.
+
+ * rt/aio_notify.c (notify_func_wrapper): Wrapper function to call
+ thread event callback function.
+ (__aio_notify_only): Use function above.
+ Patch by Kaz Kylheku <kaz@ashi.footprints.net>.
+
2000-08-16 Mark Kettenis <kettenis@gnu.org>
* sysdeps/mach/hurd/lseek64.c: New file.
diff --git a/elf/Makefile b/elf/Makefile
index 420db73..3021596 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -47,8 +47,7 @@ distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
vismain.c vismod1.c vismod2.c vismod3.c \
constload2.c constload3.c filtmod1.c filtmod2.c \
nodlopenmod.c nodelete.c nodelmod1.c nodelmod2.c \
- nodelmod3.c nodelmod4.c nodlopen.c \
- sysd-link.h
+ nodelmod3.c nodelmod4.c nodlopen.c
include ../Makeconfig
diff --git a/elf/dl-load.c b/elf/dl-load.c
index e0c9a61..a1e4e5a 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -730,10 +730,10 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
int type;
char *readbuf;
ssize_t readlength;
- struct elf_stat st;
+ struct stat64 st;
/* Get file information. */
- if (elf_fxstat (_STAT_VER, fd, &st) < 0)
+ if (__fxstat64 (_STAT_VER, fd, &st) < 0)
LOSE (errno, N_("cannot stat shared object"));
/* Look again to see if the real name matched another already loaded. */
@@ -1260,11 +1260,11 @@ open_path (const char *name, size_t namelen, int preloaded,
{
/* We failed to open machine dependent library. Let's
test whether there is any directory at all. */
- struct elf_stat st;
+ struct stat64 st;
buf[buflen - namelen - 1] = '\0';
- if (elf_xstat (_STAT_VER, buf, &st) != 0
+ if (__xstat64 (_STAT_VER, buf, &st) != 0
|| ! S_ISDIR (st.st_mode))
/* The directory does not exist or it is no directory. */
this_dir->status[cnt] = nonexisting;
@@ -1281,9 +1281,9 @@ open_path (const char *name, size_t namelen, int preloaded,
/* This is an extra security effort to make sure nobody can
preload broken shared objects which are in the trusted
directories and so exploit the bugs. */
- struct elf_stat st;
+ struct stat64 st;
- if (elf_fxstat (_STAT_VER, fd, &st) != 0
+ if (__fxstat64 (_STAT_VER, fd, &st) != 0
|| (st.st_mode & S_ISUID) == 0)
{
/* The shared object cannot be tested for being SUID
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index 5261007..4a811a0 100644
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -45,11 +45,11 @@ void *
_dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
{
void *result;
- struct elf_stat st;
+ struct stat64 st;
int fd = __open (file, O_RDONLY);
if (fd < 0)
return NULL;
- if (elf_fxstat (_STAT_VER, fd, &st) < 0
+ if (__fxstat64 (_STAT_VER, fd, &st) < 0
/* No need to map the file if it is empty. */
|| st.st_size == 0)
result = NULL;
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index 9f5ee14..b9d1287 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -175,7 +175,7 @@ _dl_start_profile (struct link_map *map, const char *output_dir)
{
char *filename;
int fd;
- struct elf_stat st;
+ struct stat64 st;
const ElfW(Phdr) *ph;
ElfW(Addr) mapstart = ~((ElfW(Addr)) 0);
ElfW(Addr) mapend = 0;
@@ -267,7 +267,7 @@ _dl_start_profile (struct link_map *map, const char *output_dir)
return;
}
- if (elf_fxstat (_STAT_VER, fd, &st) < 0 || !S_ISREG (st.st_mode))
+ if (__fxstat64 (_STAT_VER, fd, &st) < 0 || !S_ISREG (st.st_mode))
{
/* Not stat'able or not a regular file => don't use it. */
char buf[400];
diff --git a/include/link.h b/include/link.h
index 8e69f57..681b654 100644
--- a/include/link.h
+++ b/include/link.h
@@ -34,9 +34,6 @@
#include <bits/elfclass.h> /* Defines __ELF_NATIVE_CLASS. */
-/* Get some system specific definitions. */
-#include <sysd-link.h>
-
/* Rendezvous structure used by the run-time dynamic linker to communicate
details of shared object loading to the debugger. If the executable's
dynamic section has a DT_DEBUG element, the run-time linker sets that
@@ -205,7 +202,7 @@ struct link_map
/* This information is kept to check for sure whether a shared
object is the same as one already loaded. */
dev_t l_dev;
- elf_ino_t l_ino;
+ ino64_t l_ino;
/* Collected information about own RUNPATH directories. */
struct r_search_path_elem **l_runpath_dirs;
diff --git a/sysdeps/generic/sysd-link.h b/sysdeps/generic/sysd-link.h
deleted file mode 100644
index 2faa1a4..0000000
--- a/sysdeps/generic/sysd-link.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* In general we don't have stat64 available. */
-#define elf_stat stat
-#define elf_fxstat __fxstat
-#define elf_xstat __xstat
-#define elf_ino_t ino_t
diff --git a/sysdeps/unix/sysv/linux/sysd-link.h b/sysdeps/unix/sysv/linux/sysd-link.h
deleted file mode 100644
index c722d55..0000000
--- a/sysdeps/unix/sysv/linux/sysd-link.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* On Linux we have stat64 available. */
-#define elf_stat stat64
-#define elf_fxstat __fxstat64
-#define elf_xstat __xstat64
-#define elf_ino_t ino64_t