diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-06-01 12:53:59 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-06-12 10:02:27 -0400 |
| commit | 2ba9f2eb978b27ddfa39cd769b73136d0ac4c4ae (patch) | |
| tree | fabc08af34d8fbe8227e072ade54be411c6a4123 /elf/ldconfig.c | |
| parent | 329ea513b451ae8322aa7a24ed84da13992af2dd (diff) | |
| download | glibc-zack/elf-builtin-expect-conversion.zip glibc-zack/elf-builtin-expect-conversion.tar.gz glibc-zack/elf-builtin-expect-conversion.tar.bz2 | |
Convert __builtin_expect to __glibc_(un)likely throughout elf/.zack/elf-builtin-expect-conversion
In the previous patch I didn't change a use of __builtin_expect to
__glibc_(un)likely that happened to be right next to the code I was
actually working on; Andreas asked why not, and I said that there were
a bunch more uses of __builtin_expect in that file and I would convert
them all in a separate patch. This is that patch, converting all of
elf/.
I would appreciate someone checking over this patch very carefully
indeed. In a whole bunch of places, __builtin_expect was used in a
way that did not map mechanically to the newer convention. The test
suite caught one mistake; I'm not confident I didn't make any more.
Writing this patch gave me a deeper appreciation for why we _want_ to
switch to __glibc_(un)likely, but also for how difficult it can be. I
now think that people should _not_ be asked to change existing uses of
__builtin_expect in a patch whose purpose is something else.
* elf/dl-addr.c, elf/dl-cache.c, elf/dl-close.c, elf/dl-deps.c
* elf/dl-environ.c, elf/dl-error-skeleton.c, elf/dl-fini.c
* elf/dl-fptr.c, elf/dl-init.c, elf/dl-libc.c, elf/dl-minimal.c
* elf/dl-open.c, elf/dl-reloc.c, elf/dl-runtime.c
* elf/dl-sysdep.c, elf/dl-tls.c, elf/dl-version.c, elf/ldconfig.c
* elf/rtld.c: Replace __builtin_expect with __glibc_likely or
__glibc_unlikely, as appropriate, throughout.
Diffstat (limited to 'elf/ldconfig.c')
| -rw-r--r-- | elf/ldconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/ldconfig.c b/elf/ldconfig.c index fbdd814..deb7295 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -820,7 +820,7 @@ search_dir (const struct dir_entry *entry) new_entry->next = NULL; if (!is_link && direntry->d_type != DT_UNKNOWN - && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) + && __glibc_unlikely (lstat64 (real_file_name, &lstat_buf) != 0)) { error (0, errno, _("Cannot lstat %s"), file_name); free (new_entry->path); @@ -852,7 +852,7 @@ search_dir (const struct dir_entry *entry) /* Call lstat64 if not done yet. */ if (!is_link && direntry->d_type != DT_UNKNOWN - && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) + && __glibc_unlikely (lstat64 (real_file_name, &lstat_buf) != 0)) { error (0, errno, _("Cannot lstat %s"), file_name); continue; |