2002-12-10 Roland McGrath <roland@redhat.com>

	* sysdeps/unix/sysv/linux/dl-librecon.h (EXTRA_LD_ENVVARS): Refer to
	and move contents to ...
	(EXTRA_LD_ENVVARS_LINUX): ... this new macro.  Add break for nonmatch.
	* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS): Use
	it instead of duplicating its contents.
	(EXTRA_LD_ENVVARS): Likewise.  Add break for nonmatch.
2002-12-09  Jakub Jelinek  <jakub@redhat.com>

	* elf/dl-support.c (_dl_non_dynamic_init): Add DL_OSVERSION_INIT if
	defined.
	* sysdeps/unix/sysv/linux/dl-librecon.h (_dl_osversion_init): New
	function.
	(EXTRA_LD_ENVVARS): Use it.
	(DL_OSVERSION_INIT): Define.
	* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Include linux
	dl-librecon.h.
	(EXTRA_LD_ENVVARS): Undef before defining.  Use _dl_osversion_init.

diff --git a/sysdeps/unix/sysv/linux/dl-librecon.h b/sysdeps/unix/sysv/linux/dl-librecon.h
index d98afcb8a89eeca814000e20560ffaf7df8d2ece..afe1ec4b72909d0ae0cbe8a84d3caae1df9c28af 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/dl-librecon.h
@@ -1,5 +1,5 @@
 /* Optional code to distinguish library flavours.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
 
@@ -21,29 +21,41 @@
 #ifndef _DL_LIBRECON_H
 #define _DL_LIBRECON_H 1
 
+static inline void __attribute__ ((unused, always_inline))
+_dl_osversion_init (char *assume_kernel)
+{
+  unsigned long int i, j, osversion = 0;
+  char *p = assume_kernel, *q;
+
+  for (i = 0; i < 3; i++, p = q + 1)
+    {
+      j = __strtoul_internal (p, &q, 0, 0);
+      if (j >= 255 || p == q || (i < 2 && *q && *q != '.'))
+       {
+         osversion = 0;
+         break;
+       }
+      osversion |= j << (16 - 8 * i);
+      if (!*q)
+       break;
+    }
+  if (osversion)
+    GL(dl_osversion) = osversion;
+}
+
 /* Recognizing extra environment variables.  */
-#define EXTRA_LD_ENVVARS \
+#define EXTRA_LD_ENVVARS EXTRA_LD_ENVVARS_LINUX
+#define EXTRA_LD_ENVVARS_LINUX \
   case 13:                                                                   \
     if (memcmp (envline, "ASSUME_KERNEL", 13) == 0)                          \
-      {                                                                              \
-       unsigned long int i, j, osversion = 0;                                \
-       char *p = &envline[14], *q;                                           \
-                                                                             \
-       for (i = 0; i < 3; i++, p = q + 1)                                    \
-         {                                                                   \
-           j = __strtoul_internal (p, &q, 0, 0);                             \
-           if (j >= 255 || p == q || (i < 2 && *q && *q != '.'))             \
-             {                                                               \
-               osversion = 0;                                                \
-               break;                                                        \
-             }                                                               \
-           osversion |= j << (16 - 8 * i);                                   \
-           if (!*q)                                                          \
-             break;                                                          \
-         }                                                                   \
-       if (osversion)                                                        \
-         GL(dl_osversion) = osversion;                                       \
-       break;                                                                \
-      }
+      _dl_osversion_init (&envline[14]);                                     \
+    break;                                                                   \
+
+#define DL_OSVERSION_INIT \
+  do {                                                                       \
+    char *assume_kernel = getenv ("LD_ASSUME_KERNEL");                       \
+    if (assume_kernel)                                                       \
+      _dl_osversion_init (assume_kernel);                                    \
+  } while (0)
 
 #endif /* dl-librecon.h */

diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h
index e01631146a49f68b6330b7827bfd0c4a1fc761c2..3163c581030b8a7fcccfcb4ad881e4fe63c103bc 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h
@@ -19,7 +19,8 @@
    02111-1307 USA.  */
 
 #ifndef _DL_LIBRECON_H
-#define _DL_LIBRECON_H 1
+
+#include <sysdeps/unix/sysv/linux/dl-librecon.h>
 
 #define DISTINGUISH_LIB_VERSIONS \
   do                                                                         \
@@ -47,36 +48,12 @@
   while (0)
 
 /* Recognizing extra environment variables.  */
-#define EXTRA_LD_ENVVARS \
-  case 13:                                                                   \
-    if (memcmp (envline, "ASSUME_KERNEL", 13) == 0)                          \
-      {                                                                              \
-       unsigned long int i, j, osversion = 0;                                \
-       char *p = &envline[14], *q;                                           \
-                                                                             \
-       for (i = 0; i < 3; i++, p = q + 1)                                    \
-         {                                                                   \
-           j = __strtoul_internal (p, &q, 0, 0);                             \
-           if (j >= 255 || p == q || (i < 2 && *q && *q != '.'))             \
-             {                                                               \
-               osversion = 0;                                                \
-               break;                                                        \
-             }                                                               \
-           osversion |= j << (16 - 8 * i);                                   \
-           if (!*q)                                                          \
-             break;                                                          \
-         }                                                                   \
-       if (osversion)                                                        \
-         GL(dl_osversion) = osversion;                                       \
-       break;                                                                \
-      }                                                                              \
-                                                                             \
+#undef EXTRA_LD_ENVVARS
+#define EXTRA_LD_ENVVARS EXTRA_LD_ENVVARS_LINUX \
   case 15:                                                                   \
     if (memcmp (envline, "LIBRARY_VERSION", 15) == 0)                        \
-      {                                                                              \
-       GL(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3;                 \
-       break;                                                                \
-      }
+      GL(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3;                  \
+    break;                                                                   \
 
 /* Extra unsecure variables.  The names are all stuffed in a single
    string which means they have to be terminated with a '\0' explicitly.  */