diff options
author | Zack Weinberg <zackw@panix.com> | 2018-06-01 12:53:59 -0400 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2018-06-02 17:19:45 -0400 |
commit | e5ad85ddb460a199771b9993a00d2ece48385e23 (patch) | |
tree | f5d6e17fdf73c3078f3618f0ff93b7ef162daaa3 /elf/dl-minimal.c | |
parent | 7938a423898d6daeb17c339698c581d0558272df (diff) | |
download | glibc-e5ad85ddb460a199771b9993a00d2ece48385e23.tar.gz |
Convert __builtin_expect to __glibc_(un)likely throughout elf/.zack/no-cancellation-in-ldso-2
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/dl-minimal.c')
-rw-r--r-- | elf/dl-minimal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index 25ceded6fe..ea511282a3 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -96,7 +96,7 @@ calloc (size_t nmemb, size_t size) size_t bytes = nmemb * size; #define HALF_SIZE_T (((size_t) 1) << (8 * sizeof (size_t) / 2)) - if (__builtin_expect ((nmemb | size) >= HALF_SIZE_T, 0) + if (__glibc_unlikely ((nmemb | size) >= HALF_SIZE_T) && size != 0 && bytes / size != nmemb) return NULL; |