* elf/Makefile (distribute): Add dl-osinfo.h.
* sysdeps/generic/dl-osinfo.h: New file.
* sysdeps/unix/sysv/linux/dl-osinfo.h: New file.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Use DL_SYSDEP_OSCHECK
if defined.
* sysdeps/unix/sysv/linux/init-first.c: Perform kernel version test
only for !SHARED case. Get the code from dl-osinfo.h.
2000-08-22 Ulrich Drepper <drepper@redhat.com>
+ * elf/Makefile (distribute): Add dl-osinfo.h.
+ * sysdeps/generic/dl-osinfo.h: New file.
+ * sysdeps/unix/sysv/linux/dl-osinfo.h: New file.
+ * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Use DL_SYSDEP_OSCHECK
+ if defined.
+ * sysdeps/unix/sysv/linux/init-first.c: Perform kernel version test
+ only for !SHARED case. Get the code from dl-osinfo.h.
+
* stdlib/random_r.c: Cleanups.
* stdlib/tst-random.c: New file.
* stdlib/Makefile (tests): Add tst-random.
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
+ nodelmod3.c nodelmod4.c nodlopen.c dl-osinfo.h
include ../Makeconfig
--- /dev/null
+/* Nothing needed in general. */
#include <entry.h>
#include <dl-machine.h>
#include <dl-procinfo.h>
+#include <dl-osinfo.h>
extern int _dl_argc;
extern char **_dl_argv;
#ifndef DL_FIND_ARG_COMPONENTS
-#define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
+# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
do { \
void **_tmp; \
(argc) = *(long *) cookie; \
gid_t egid = 0;
unsigned int seen;
- DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ, _dl_auxv);
+ DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ,
+ _dl_auxv);
user_entry = (ElfW(Addr)) &ENTRY_POINT;
_dl_platform = NULL; /* Default to nothing known about the platform. */
if (__builtin_expect (__libc_enable_secure, 0))
__libc_check_standard_fds ();
+#ifdef DL_SYSDEP_OSCHECK
+ DL_SYSDEP_OSCHECK (dl_fatal);
+#endif
+
(*dl_main) (phdr, phnum, &user_entry);
return user_entry;
}
--- /dev/null
+/* Operating system specific code for generic dynamic loader functions.
+ Copyright (C) 2000 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/sysctl.h>
+
+#ifdef SHARED
+/* This is the function used in the dynamic linker to print the fatal error
+ message. */
+static inline void
+__attribute__ ((__noreturn__))
+dl_fatal (const char *str)
+{
+ _dl_sysdep_output (2, str, NULL);
+ _exit (1);
+}
+#endif
+
+
+#define DL_SYSDEP_OSCHECK(FATAL) \
+ do { \
+ /* Test whether the kernel is new enough. This test is only \
+ performed if the library is not compiled to run on all \
+ kernels. */ \
+ if (__LINUX_KERNEL_VERSION > 0) \
+ { \
+ static const int sysctl_args[] = { CTL_KERN, KERN_OSRELEASE }; \
+ char buf[64]; \
+ size_t reslen = sizeof (buf); \
+ unsigned int version; \
+ int parts; \
+ char *cp; \
+ \
+ /* Try reading the number using `sysctl' first. */ \
+ if (__sysctl ((int *) sysctl_args, \
+ sizeof (sysctl_args) / sizeof (sysctl_args[0]), \
+ buf, &reslen, NULL, 0) < 0) \
+ { \
+ /* This was not successful. Now try reading the /proc \
+ filesystem. */ \
+ int fd = __open ("/proc/sys/kernel/osrelease", O_RDONLY); \
+ if (fd == -1 \
+ || (reslen = __read (fd, buf, sizeof (buf))) <= 0) \
+ /* This also didn't work. We give up since we cannot \
+ make sure the library can actually work. */ \
+ FATAL ("FATAL: cannot determine library version\n"); \
+ \
+ __close (fd); \
+ } \
+ buf[MIN (reslen, sizeof (buf) - 1)] = '\0'; \
+ \
+ /* Now convert it into a number. The string consists of at most \
+ three parts. */ \
+ version = 0; \
+ parts = 0; \
+ cp = buf; \
+ while ((*cp >= '0') && (*cp <= '9')) \
+ { \
+ unsigned int here = *cp++ - '0'; \
+ \
+ while ((*cp >= '0') && (*cp <= '9')) \
+ { \
+ here *= 10; \
+ here += *cp++ - '0'; \
+ } \
+ \
+ ++parts; \
+ version <<= 8; \
+ version |= here; \
+ \
+ if (*cp++ != '.') \
+ /* Another part following? */ \
+ break; \
+ } \
+ \
+ if (parts < 3) \
+ version <<= 8 * (3 - parts); \
+ \
+ /* Now we can test with the required version. */ \
+ if (version < __LINUX_KERNEL_VERSION) \
+ /* Not sufficent. */ \
+ FATAL ("FATAL: kernel too old\n"); \
+ } \
+ } while (0)
#include <sysdep.h>
#include <fpu_control.h>
#include <sys/param.h>
-#include <sys/sysctl.h>
#include <sys/types.h>
#include "kernel-features.h"
+#ifndef SHARED
+# include "dl-osinfo.h"
+#endif
+
extern void __libc_init_secure (void);
extern void __libc_init (int, char **, char **);
extern void __libc_global_ctors (void);
/* Make sure we don't initialize twice. */
if (!__libc_multiple_libcs)
{
- /* Test whether the kernel is new enough. This test is only
- performed if the library is not compiled to run on all
- kernels. */
- if (__LINUX_KERNEL_VERSION > 0)
- {
- static const int sysctl_args[] = { CTL_KERN, KERN_OSRELEASE };
- char buf[64];
- size_t reslen = sizeof (buf);
- unsigned int version;
- int parts;
- char *cp;
-
- /* Try reading the number using `sysctl' first. */
- if (__sysctl ((int *) sysctl_args,
- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
- buf, &reslen, NULL, 0) < 0)
- {
- /* This was not successful. Now try reading the /proc
- filesystem. */
- int fd = __open ("/proc/sys/kernel/osrelease", O_RDONLY);
- if (fd == -1
- || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
- /* This also didn't work. We give up since we cannot
- make sure the library can actually work. */
- __libc_fatal ("FATAL: cannot determine library version\n");
-
- __close (fd);
- }
- buf[MIN (reslen, sizeof (buf) - 1)] = '\0';
-
- /* Now convert it into a number. The string consists of at most
- three parts. */
- version = 0;
- parts = 0;
- cp = buf;
- while ((*cp >= '0') && (*cp <= '9'))
- {
- unsigned int here = *cp++ - '0';
-
- while ((*cp >= '0') && (*cp <= '9'))
- {
- here *= 10;
- here += *cp++ - '0';
- }
-
- ++parts;
- version <<= 8;
- version |= here;
-
- if (*cp++ != '.')
- /* Another part following? */
- break;
- }
-
- if (parts < 3)
- version <<= 8 * (3 - parts);
-
- /* Now we can test with the required version. */
- if (version < __LINUX_KERNEL_VERSION)
- /* Not sufficent. */
- __libc_fatal ("FATAL: kernel too old\n");
- }
+#ifndef SHARED
+ DL_SYSDEP_OSCHECK (__libc_fatal);
+#endif
/* Set the FPU control word to the proper default value if the
kernel would use a different value. (In a static program we
projects / platform / upstream / glibc.git / commitdiff