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

[Aurelien Jarno]

Author: aurel32
Date: 2007-01-04 21:42:08 +0100 (Thu, 04 Jan 2007)
New Revision: 1840

Added:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldd-rewrite.sed
   trunk/glibc-ports/kfreebsd/x86_64/ldd-rewrite.sed
Modified:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/configure
   trunk/glibc-2.3-head/sysdeps/kfreebsd/configure.in
   trunk/glibc-ports/kfreebsd/configure
   trunk/glibc-ports/kfreebsd/configure.in
Log:
Add biarch support for ldd


Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/configure
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/configure	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/configure	2007-01-04 20:42:08 UTC (rev 1840)
@@ -295,6 +295,16 @@
 # One kFreeBSD we use ldconfig.
 use_ldconfig=yes
 
+# We need some extensions to the `ldd' script.
+case "$machine" in
+  x86_64*)
+    ldd_rewrite_script=../sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ldd-rewrite.sed
+    ;;
+  *)
+    ;;
+esac
+
+
 if test $host = $build; then
   # If $prefix/include/{net,scsi} are symlinks, make install will
   # clobber what they're linked to (probably a kernel tree).

Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/configure.in
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/configure.in	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/configure.in	2007-01-04 20:42:08 UTC (rev 1840)
@@ -227,6 +227,17 @@
 # One kFreeBSD we use ldconfig.
 use_ldconfig=yes
 
+# We need some extensions to the `ldd' script.
+changequote(,)
+case "$machine" in
+  x86_64*)
+    ldd_rewrite_script=../sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ldd-rewrite.sed
+    ;;
+  *)
+    ;;
+esac
+changequote([,])
+
 if test $host = $build; then
   # If $prefix/include/{net,scsi} are symlinks, make install will
   # clobber what they're linked to (probably a kernel tree).

Added: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldd-rewrite.sed
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldd-rewrite.sed	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/ldd-rewrite.sed	2007-01-04 20:42:08 UTC (rev 1840)
@@ -0,0 +1,3 @@
+/LD_TRACE_LOADED_OBJECTS=1/a\
+add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-kfreebsd-x86-64\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4\5\6"_

Modified: trunk/glibc-ports/kfreebsd/configure
===================================================================
--- trunk/glibc-ports/kfreebsd/configure	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-ports/kfreebsd/configure	2007-01-04 20:42:08 UTC (rev 1840)
@@ -295,6 +295,16 @@
 # One kFreeBSD we use ldconfig.
 use_ldconfig=yes
 
+# We need some extensions to the `ldd' script.
+case "$machine" in
+  x86_64*)
+    ldd_rewrite_script=../ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ldd-rewrite.sed
+    ;;
+  *)
+    ;;
+esac
+
+
 if test $host = $build; then
   # If $prefix/include/{net,scsi} are symlinks, make install will
   # clobber what they're linked to (probably a kernel tree).

Modified: trunk/glibc-ports/kfreebsd/configure.in
===================================================================
--- trunk/glibc-ports/kfreebsd/configure.in	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-ports/kfreebsd/configure.in	2007-01-04 20:42:08 UTC (rev 1840)
@@ -227,6 +227,17 @@
 # One kFreeBSD we use ldconfig.
 use_ldconfig=yes
 
+# We need some extensions to the `ldd' script.
+changequote(,)
+case "$machine" in
+  x86_64*)
+    ldd_rewrite_script=../ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ldd-rewrite.sed
+    ;;
+  *)
+    ;;
+esac
+changequote([,])
+
 if test $host = $build; then
   # If $prefix/include/{net,scsi} are symlinks, make install will
   # clobber what they're linked to (probably a kernel tree).

Added: trunk/glibc-ports/kfreebsd/x86_64/ldd-rewrite.sed
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/ldd-rewrite.sed	2007-01-04 20:21:18 UTC (rev 1839)
+++ trunk/glibc-ports/kfreebsd/x86_64/ldd-rewrite.sed	2007-01-04 20:42:08 UTC (rev 1840)
@@ -0,0 +1,3 @@
+/LD_TRACE_LOADED_OBJECTS=1/a\
+add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-kfreebsd-x86-64\)\(\.so\.[0-9.]*\)[ 	]*$_\1"\2\4\6 \264\4\5\6"_