about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-05 18:52:18 +0000
committerRoland McGrath <roland@gnu.org>2002-09-05 18:52:18 +0000
commitbe3c40b627f1f39f9e60240c533cc9535a18f172 (patch)
tree115ec69f81074a3fc4a4fe3ad5942e9c4b5a2472 /elf
parent43e3d6e3e2a33853b45d0ac770cb91426f944423 (diff)
downloadglibc-be3c40b627f1f39f9e60240c533cc9535a18f172.tar.gz
glibc-be3c40b627f1f39f9e60240c533cc9535a18f172.tar.xz
glibc-be3c40b627f1f39f9e60240c533cc9535a18f172.zip
2002-09-04 Bruno Haible <bruno@clisp.org>
        * elf/readlib.c (process_file): Conditionalize check for QMAGIC.

	* sysdeps/unix/sysv/linux/sigset-cvt-mask.h (sigset_set_old_mask,
	sigset_get_old_mask): Turn into inline functions.
	* sysdeps/unix/sysv/aix/sigset-cvt-mask.h (sigset_set_old_mask,
	sigset_get_old_mask): Likewise.
	* sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h (sigset_set_old_mask,
	sigset_get_old_mask): Likewise.

	* sysdeps/generic/_strerror.c (_sys_errlist, _sys_nerr): Remove
	default definitions.
	(__strerror_r): Use _sys_errlist_internal instead of _sys_errlist,
	_sys_nerr_internal instead of _sys_nerr.

	* nscd/connections.c (handle_request): Declare CALLER inside #if.
Diffstat (limited to 'elf')
-rw-r--r--elf/readlib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/elf/readlib.c b/elf/readlib.c
index 361f78c95d..efc2e10053 100644
--- a/elf/readlib.c
+++ b/elf/readlib.c
@@ -123,7 +123,10 @@ process_file (const char *real_file_name, const char *file_name,
   /* First check if this is an aout file.  */
   aout_header = (struct exec *) file_contents;
   if (N_MAGIC (*aout_header) == ZMAGIC
-      || N_MAGIC (*aout_header) == QMAGIC)
+#ifdef QMAGIC			/* Linuxism.  */
+      || N_MAGIC (*aout_header) == QMAGIC
+#endif
+      )
     {
       /* Aout files don't have a soname, just return the name
          including the major number.  */