Update.

	* elf/rtld.c: Correct use of __builtin_expect.

	* elf/dl-close.c: Remove commented-out code.

diff --git a/ChangeLog b/ChangeLog
index 923c79c..4f321a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-04  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/rtld.c: Correct use of __builtin_expect.
+
+       * elf/dl-close.c: Remove commented-out code.
+
        * libio/genops.c (_IO_unbuffer_write): Force streams in narrow
        orientation so that conversion modules aren't used anymore.
        * malloc/set-freeres.c: Call _IO_cleanup before running subfreeres

diff --git a/elf/dl-close.c b/elf/dl-close.c
index 5ec8615..3d24892 100644 (file)
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -67,8 +67,7 @@ _dl_close (void *_map)
   if (map->l_opencount > 1 || map->l_type != lt_loaded)
     {
       /* There are still references to this object.  Do nothing more.  */
-      if (//__builtin_expect (_dl_debug_files, 0))
-         __builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
+      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
        {
          char buf[20];
 

diff --git a/elf/rtld.c b/elf/rtld.c
index 36dbc6f..2eddb5a 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -823,7 +823,7 @@ of this helper program; chances are you did not intend to run this program.\n\
   if (_dl_rtld_map.l_next)
     _dl_rtld_map.l_next->l_prev = _dl_rtld_map.l_prev;
 
-  if (__builtin_expect (_dl_rtld_map.l_opencount, 2) > 1)
+  if (__builtin_expect (_dl_rtld_map.l_opencount > 1, 1))
     {
       /* Some DT_NEEDED entry referred to the interpreter object itself, so
         put it back in the list of visible objects.  We insert it into the