about summary refs log tree commit diff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-08 01:48:57 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-08 01:48:57 +0000
commit40b07f5b942d6af4d575274853331590d2ee8ab3 (patch)
tree61cbcd7aa37ec6f649d1d04f7707564ed37d32c9 /elf/rtld.c
parent6ed623f848489d5946b1caf61a8a5061bc933b0d (diff)
downloadglibc-40b07f5b942d6af4d575274853331590d2ee8ab3.tar.gz
glibc-40b07f5b942d6af4d575274853331590d2ee8ab3.tar.xz
glibc-40b07f5b942d6af4d575274853331590d2ee8ab3.zip
Update.
	* sysdeps/generic/dl-cache.c: Optimize SEARCH_CACHE and
	HWCAP_CHECK macro code.

	* elf/dl-misc.c (_dl_sysdep_read_whole_file): Optimize code a bit.
	Now returns MAP_FAILED on error.
	* elf/rtld.c: Adjust caller.
	* sysdeps/generic/dl-cache.c: Likewise.
	* sysdeps/generic/ldsodefs.h: Adjust description.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 2d2befc627..8ed86eaedb 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -710,7 +710,7 @@ of this helper program; chances are you did not intend to run this program.\n\
   /* Read the contents of the file.  */
   file = _dl_sysdep_read_whole_file ("/etc/ld.so.preload", &file_size,
 				     PROT_READ | PROT_WRITE);
-  if (__builtin_expect (file != NULL, 0))
+  if (__builtin_expect (file != MAP_FAILED, 0))
     {
       /* Parse the file.  It contains names of libraries to be loaded,
 	 separated by white spaces or `:'.  It may also contain