[Glibc-bsd-commits] r1839 - in trunk: glibc-2.3-head/sysdeps/kfreebsd/i386 glibc-2.3-head/sysdeps/kfreebsd/x86_64 glibc-ports/kfreebsd/i386 glibc-ports/kfreebsd/x86_64

[Petr Salinger]

Author: ps-guest
Date: 2007-01-04 21:21:18 +0100 (Thu, 04 Jan 2007)
New Revision: 1839

Modified:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/i386/ldconfig.h
   trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldconfig.h
   trunk/glibc-ports/kfreebsd/i386/ldconfig.h
   trunk/glibc-ports/kfreebsd/x86_64/ldconfig.h
Log:
* update ldconfig.h to be closer to reality



Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/i386/ldconfig.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/i386/ldconfig.h	2007-01-04 20:09:37 UTC (rev 1838)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/i386/ldconfig.h	2007-01-04 20:21:18 UTC (rev 1839)
@@ -23,9 +23,15 @@
   { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
 
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
-  { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
-  { "libm.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
+  { "libc.so.0.1", FLAG_ELF_LIBC6 },				\
+  { "libm.so.1", FLAG_ELF_LIBC6 },				\
   { "libc.so.4", FLAG_ELF_LIBC5 },				\
   { "libm.so.4", FLAG_ELF_LIBC5 },				\
   { "libc.so.5", FLAG_ELF_LIBC5 },				\
-  { "libm.so.5", FLAG_ELF_LIBC5 },
+  { "libm.so.5", FLAG_ELF_LIBC5 },				\
+  { "libc.so.6", FLAG_ELF_LIBC5 },				\
+  { "libm.so.6", FLAG_ELF_LIBC5 },				\
+  { "libc.so.7", FLAG_ELF_LIBC5 },				\
+  { "libm.so.7", FLAG_ELF_LIBC5 },				\
+  { "libc.so.8", FLAG_ELF_LIBC5 },				\
+  { "libm.so.8", FLAG_ELF_LIBC5 },

Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldconfig.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldconfig.h	2007-01-04 20:09:37 UTC (rev 1838)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldconfig.h	2007-01-04 20:21:18 UTC (rev 1839)
@@ -20,13 +20,20 @@
 
 #define SYSDEP_KNOWN_INTERPRETER_NAMES \
   { "/lib/ld.so.1", FLAG_ELF_LIBC6 },				\
+  { "/lib/ld-kfreebsd-x86-64.so.1", FLAG_ELF_LIBC6 },		\
   { "/lib64/ld-kfreebsd-x86-64.so.1", FLAG_ELF_LIBC6 },		\
   { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
 
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
-  { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
-  { "libm.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
+  { "libc.so.0.1", FLAG_ELF_LIBC6 },				\
+  { "libm.so.1", FLAG_ELF_LIBC6 },				\
   { "libc.so.4", FLAG_ELF_LIBC5 },				\
   { "libm.so.4", FLAG_ELF_LIBC5 },				\
   { "libc.so.5", FLAG_ELF_LIBC5 },				\
-  { "libm.so.5", FLAG_ELF_LIBC5 },
+  { "libm.so.5", FLAG_ELF_LIBC5 },				\
+  { "libc.so.6", FLAG_ELF_LIBC5 },				\
+  { "libm.so.6", FLAG_ELF_LIBC5 },				\
+  { "libc.so.7", FLAG_ELF_LIBC5 },				\
+  { "libm.so.7", FLAG_ELF_LIBC5 },				\
+  { "libc.so.8", FLAG_ELF_LIBC5 },				\
+  { "libm.so.8", FLAG_ELF_LIBC5 },

Modified: trunk/glibc-ports/kfreebsd/i386/ldconfig.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/ldconfig.h	2007-01-04 20:09:37 UTC (rev 1838)
+++ trunk/glibc-ports/kfreebsd/i386/ldconfig.h	2007-01-04 20:21:18 UTC (rev 1839)
@@ -23,9 +23,15 @@
   { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
 
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
-  { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
-  { "libm.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
+  { "libc.so.0.1", FLAG_ELF_LIBC6 },				\
+  { "libm.so.1", FLAG_ELF_LIBC6 },				\
   { "libc.so.4", FLAG_ELF_LIBC5 },				\
   { "libm.so.4", FLAG_ELF_LIBC5 },				\
   { "libc.so.5", FLAG_ELF_LIBC5 },				\
-  { "libm.so.5", FLAG_ELF_LIBC5 },
+  { "libm.so.5", FLAG_ELF_LIBC5 },				\
+  { "libc.so.6", FLAG_ELF_LIBC5 },				\
+  { "libm.so.6", FLAG_ELF_LIBC5 },				\
+  { "libc.so.7", FLAG_ELF_LIBC5 },				\
+  { "libm.so.7", FLAG_ELF_LIBC5 },				\
+  { "libc.so.8", FLAG_ELF_LIBC5 },				\
+  { "libm.so.8", FLAG_ELF_LIBC5 },

Modified: trunk/glibc-ports/kfreebsd/x86_64/ldconfig.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/ldconfig.h	2007-01-04 20:09:37 UTC (rev 1838)
+++ trunk/glibc-ports/kfreebsd/x86_64/ldconfig.h	2007-01-04 20:21:18 UTC (rev 1839)
@@ -20,12 +20,20 @@
 
 #define SYSDEP_KNOWN_INTERPRETER_NAMES \
   { "/lib/ld.so.1", FLAG_ELF_LIBC6 },				\
+  { "/lib/ld-kfreebsd-x86-64.so.1", FLAG_ELF_LIBC6 },		\
   { "/lib64/ld-kfreebsd-x86-64.so.1", FLAG_ELF_LIBC6 },		\
   { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
+
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
-  { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
-  { "libm.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\
+  { "libc.so.0.1", FLAG_ELF_LIBC6 },				\
+  { "libm.so.1", FLAG_ELF_LIBC6 },				\
   { "libc.so.4", FLAG_ELF_LIBC5 },				\
   { "libm.so.4", FLAG_ELF_LIBC5 },				\
   { "libc.so.5", FLAG_ELF_LIBC5 },				\
-  { "libm.so.5", FLAG_ELF_LIBC5 },
+  { "libm.so.5", FLAG_ELF_LIBC5 },				\
+  { "libc.so.6", FLAG_ELF_LIBC5 },				\
+  { "libm.so.6", FLAG_ELF_LIBC5 },				\
+  { "libc.so.7", FLAG_ELF_LIBC5 },				\
+  { "libm.so.7", FLAG_ELF_LIBC5 },				\
+  { "libc.so.8", FLAG_ELF_LIBC5 },				\
+  { "libm.so.8", FLAG_ELF_LIBC5 },