summaryrefslogtreecommitdiff
path: root/sysdeps/generic/libc-start.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-03 03:51:04 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-03 03:51:04 +0000
commitcf197e41e7e468697e5a8d7b3f4c4930dd557990 (patch)
treee1872dc669824d35aa47cc9964aa6fe9ea159f7b /sysdeps/generic/libc-start.c
parentec79422d9e17bd5388a3fc34fcd2ef434e0cac26 (diff)
Update.
2000-04-02 Ulrich Drepper <drepper@redhat.com> * elf/dl-fini.c (_dl_fini): Increment j counter after swapping in element at this position. * elf/Versions [ld.so] (GLIBC_2.2): Export _dl_load_lock. * elf/link.h (struct link_map): Add l_reldepsmax, l_reldepsact, and l_reldeps elements. * elf/dl-lookup.c (add_dependency): New function. (_dl_lookup_symbol): Use it whenever symbol was found in a global, dynamically loaded object. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. * elf/dl-open.c: Don't define _dl_load_lock here... * elf/rtld.c: ...but here... * elf/dl-support.c: ...and here. * elf/dl-close.c (_dl_close): Close also dependent objects introduce through relocation. * elf/dl-fini.c (_dl_fini): Also take dependencies introduced through relocations. * dlfcn/Makefile (glrefmain.out): Test is not expected to fail anymore. * dlfcn/glrefmain.c: Add one more debug message. * Makeconfig (preprocess-versions): Don't add $(CPPFLAGS) to compiler command line. * Makerules (sysd-versions): Use ( ) instead of { }. * elf/dl-load.c: Use __builtin_expect to signal that compiler should optimize for the non-debugging case. * elf/dl-lookup.c: Likewise. * sysdeps/generic/libc-start.c: Likewise.
Diffstat (limited to 'sysdeps/generic/libc-start.c')
-rw-r--r--sysdeps/generic/libc-start.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index 6fabb7c41c..fe4966cd46 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -56,11 +56,11 @@ __libc_start_main (int (*main) (int, char **, char **), int argc,
/* Some security at this point. Prevent starting a SUID binary where
the standard file descriptors are not opened. */
- if (__libc_enable_secure)
+ if (__builtin_expect (__libc_enable_secure, 0))
check_standard_fds ();
/* Register the destructor of the dynamic linker if there is any. */
- if (rtld_fini != NULL)
+ if (__builtin_expect (rtld_fini != NULL, 1))
atexit (rtld_fini);
/* Call the initializer of the libc. This is only needed here if we
@@ -76,14 +76,14 @@ __libc_start_main (int (*main) (int, char **, char **), int argc,
/* Call the initializer of the program, if any. */
#ifdef SHARED
- if (_dl_debug_impcalls)
+ if (__builtin_expect (_dl_debug_impcalls, 0))
_dl_debug_message (1, "\ninitialize program: ", argv[0], "\n\n", NULL);
#endif
if (init)
(*init) ();
#ifdef SHARED
- if (_dl_debug_impcalls)
+ if (__builtin_expect (_dl_debug_impcalls, 0))
_dl_debug_message (1, "\ntransferring control: ", argv[0], "\n\n", NULL);
#endif