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

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

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

[PATCH] Fix amd64 ldconfig

Hi!

amd64 ldconfig does not handle IA-32 hwcaps and platforms, say if you have
libraries in /lib/i686 and /lib, it will only record those in /lib
and never those in /lib/i686.
This is because amd64 uses generic dl-procinfo.[ch] while i386 linux uses
its own. The following patch fixes this (by using the i386 dl-procinfo.[ch]
in ldconfig and generic (dummy) dl-procinfo.[ch] in 64-bit ld.so, statically
linked 64-bit apps etc.).

2003-07-21  Jakub Jelinek  <jakub@redhat.com>

	* elf/Makefile (CFLAGS-ldconfig.c): Define IS_IN_ldconfig.
	* elf/ldconfig.c: Include dl-procinfo.c.
	* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: New file.
	* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: New file.

--- libc/elf/Makefile.jj	2003-06-02 18:43:44.000000000 -0400
+++ libc/elf/Makefile	2003-07-21 07:25:14.000000000 -0400
@@ -335,7 +335,7 @@ $(objpfx)sprof: $(libdl)
 
 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
 SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' -D'SLIBDIR="$(slibdir)"'
+CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
 CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
 CFLAGS-cache.c = $(SYSCONF-FLAGS)
 
--- libc/elf/ldconfig.c.jj	2003-06-25 04:01:04.000000000 -0400
+++ libc/elf/ldconfig.c	2003-07-21 07:26:45.000000000 -0400
@@ -132,6 +132,8 @@ static const struct argp_option options[
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
+#include <dl-procinfo.c>
+
 /* Short description of program.  */
 static const char doc[] = N_("Configure Dynamic Linker Run Time Bindings.");
 
--- libc/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c.jj	2003-07-21 07:25:36.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c	2003-07-21 07:24:36.000000000 -0400
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
--- libc/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h.jj	2003-07-21 07:25:36.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h	2003-07-21 07:24:14.000000000 -0400
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif

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