This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH] Two small fixes for i386-gnu
- From: Jeroen Dekkers <jeroen at dekkers dot cx>
- To: libc-alpha at sources dot redhat dot com
- Date: Mon, 8 Mar 2004 21:31:34 +0100
- Subject: [PATCH] Two small fixes for i386-gnu
This patch fixes some i386-gnu things which broke by the recent
changes. The patch should be self-explanatory.
2004-03-08 Jeroen Dekkers <jeroen@dekkers.cx>
* elf/rtld.c (_rtld_global_ro) [MAP_COPY]: Don't set _dl_unload_cache.
* sysdeps/mach/hurd/dl-sysdep.c (_dl_important_hwcaps):
Don't use INTUSE with _dl_signal_error.
Index: elf/rtld.c
===================================================================
RCS file: /cvs/glibc/libc/elf/rtld.c,v
retrieving revision 1.322
diff -u -p -r1.322 rtld.c
--- elf/rtld.c 7 Mar 2004 08:35:44 -0000 1.322
+++ elf/rtld.c 8 Mar 2004 20:06:28 -0000
@@ -133,7 +133,9 @@ struct rtld_global_ro _rtld_global_ro at
._dl_check_map_versions = _dl_check_map_versions,
._dl_init = _dl_init,
._dl_debug_state = _dl_debug_state,
+#ifndef MAP_COPY
._dl_unload_cache = _dl_unload_cache,
+#endif
._dl_debug_printf = _dl_debug_printf,
._dl_catch_error = _dl_catch_error,
._dl_signal_error = _dl_signal_error,
Index: sysdeps/mach/hurd/dl-sysdep.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dl-sysdep.c,v
retrieving revision 1.76
diff -u -p -r1.76 dl-sysdep.c
--- sysdeps/mach/hurd/dl-sysdep.c 6 Mar 2004 08:06:01 -0000 1.76
+++ sysdeps/mach/hurd/dl-sysdep.c 8 Mar 2004 20:06:28 -0000
@@ -649,8 +649,7 @@ _dl_important_hwcaps (const char *platfo
/* Return an empty array. Hurd has no hardware capabilities. */
result = (struct r_strlenpair *) malloc (sizeof (*result));
if (result == NULL)
- INTUSE (_dl_signal_error) (ENOMEM, NULL, NULL,
- "cannot create capability list");
+ _dl_signal_error (ENOMEM, NULL, NULL, "cannot create capability list");
result[0].str = (char *) result; /* Does not really matter. */
result[0].len = 0;
--
Jeroen Dekkers