This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

mips64 lib32, lib64 and ldd


This patch gets n32 libraries installed in lib32 and n64 libraries in
lib64, as well as arranging for a single ldd to be able to test
binaries of any of the 3 ABIs.  Ok?

Index: ChangeLog
2003-03-14  Alexandre Oliva  <aoliva at redhat dot com>

	* sysdeps/unix/sysv/linux/configure.in (libc_cv_slibdir): Use
	lib64 for mips64/n64 and lib32 for mips64/n32.
	(ldd_rewrite_script): Needed for all mips64 configurations.
	* sysdeps/unix/sysv/linux/configure: Rebuilt.
	* sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed: New file.
	* sysdeps/unix/sysv/linux/mips/mips64/Dist: New file.

Index: sysdeps/unix/sysv/linux/configure.in
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/configure.in,v
retrieving revision 1.60
diff -u -p -r1.60 configure.in
--- sysdeps/unix/sysv/linux/configure.in 19 Nov 2002 06:41:00 -0000 1.60
+++ sysdeps/unix/sysv/linux/configure.in 15 Jan 2003 15:30:20 -0000
@@ -157,7 +157,8 @@ case "$prefix" in
 /usr | /usr/)
   # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib
   case $machine in
-  sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 )
+  sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64 | \
+  mips/mips64/n64 | mips/mips64/n64/el )
     libc_cv_slibdir="/lib64"
     if test "$libdir" = '${exec_prefix}/lib'; then
       libdir='${exec_prefix}/lib64';
@@ -165,6 +166,14 @@ case "$prefix" in
       libc_cv_localedir='${exec_prefix}/lib/locale'
     fi
     ;;
+  mips/mips64/n32 | mips/mips64/n32/el )
+    libc_cv_slibdir="/lib32"
+    if test "$libdir" = '${exec_prefix}/lib'; then
+      libdir='${exec_prefix}/lib32';
+      # Locale data can be shared between 32bit and 64bit libraries
+      libc_cv_localedir='${exec_prefix}/lib/locale'
+    fi
+    ;;
   *)
     libc_cv_slibdir="/lib"
     ;;
@@ -243,6 +252,9 @@ case "$machine" in
     ;;
   ia64*)
     ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+    ;;
+  mips/*64*)
+    ldd_rewrite_script=../sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed
     ;;
   s390*)
     ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
Index: sysdeps/unix/sysv/linux/mips/mips64/Dist
--- /dev/null	2002-10-04 15:48:04.000000000 -0300
+++ sysdeps/unix/sysv/linux/mips/mips64/Dist	2003-01-15 12:28:59.000000000 -0200
@@ -0,0 +1 @@
+ldd-rewrite.sed
Index: sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed
--- /dev/null	2002-10-04 15:48:04.000000000 -0300
+++ sysdeps/unix/sysv/linux/mips/mips64/ldd-rewrite.sed	2003-01-15 12:28:59.000000000 -0200
@@ -0,0 +1 @@
+s_^\(RTLDLIST=\)\(.*lib\)\(\|32\|64\)\(/[^/]*\.so\.[0-9.]*\)[ 	]*$_\1"\232\4 \264\4 \2\4"_
-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva at {redhat dot com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva at {lsd dot ic dot unicamp dot br, gnu.org}
Free Software Evangelist                Professional serial bug killer

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]