qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

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

	* elf/dl-close.c: Remove commented-out code.
This commit is contained in:
Ulrich Drepper 2001-08-04 15:05:57 +00:00
parent 6906cea4cc
commit c2a714f32e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-08-04 Ulrich Drepper <drepper@redhat.com> 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 * libio/genops.c (_IO_unbuffer_write): Force streams in narrow
orientation so that conversion modules aren't used anymore. orientation so that conversion modules aren't used anymore.
* malloc/set-freeres.c: Call _IO_cleanup before running subfreeres * malloc/set-freeres.c: Call _IO_cleanup before running subfreeres

3
elf/dl-close.c
View File

@ -67,8 +67,7 @@ _dl_close (void *_map)
if (map->l_opencount > 1 || map->l_type != lt_loaded) if (map->l_opencount > 1 || map->l_type != lt_loaded)
{ {
/* There are still references to this object. Do nothing more. */ /* There are still references to this object. Do nothing more. */
if (//__builtin_expect (_dl_debug_files, 0)) if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
{ {
char buf[20]; char buf[20];

2
elf/rtld.c
View File

@ -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) if (_dl_rtld_map.l_next)
_dl_rtld_map.l_next->l_prev = _dl_rtld_map.l_prev; _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 /* 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 put it back in the list of visible objects. We insert it into the