From dd727ee173ba60b492a1105693d11cf05c087276 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 18 Apr 2024 16:27:11 -0300 Subject: x86: Fix bsearch for compiler that do not define __USE_EXTERN_INLINES The bsearch is called early during process initialization on Intel platform, before TCB has been set up; and if compiler does not enable __extern_inline it might call the symbol which might use an invalid thread-pointer. Expand the bsearch implementation from stdlib-bsearch.h with a different name. Checked on x86_64-linux-gnu with Intel chip. --- sysdeps/x86/dl-cacheinfo.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h index 5a98f70364..1943dc7db6 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -98,6 +98,12 @@ static const struct intel_02_cache_info #define nintel_02_known (sizeof (intel_02_known) / sizeof (intel_02_known [0])) +/* The bsearch is called early during process initialization, before TCB has + been set up; and if compiler does not enable __extern_inline it might call + the symbol which might use an invalid thread-pointer. */ +#define bsearch bsearch_inline +#include + static int intel_02_known_compare (const void *p1, const void *p2) { @@ -214,8 +220,8 @@ intel_check_word (int name, unsigned int value, bool *has_level_2, struct intel_02_cache_info search; search.idx = byte; - found = bsearch (&search, intel_02_known, nintel_02_known, - sizeof (intel_02_known[0]), intel_02_known_compare); + found = bsearch_inline (&search, intel_02_known, nintel_02_known, + sizeof (intel_02_known[0]), intel_02_known_compare); if (found != NULL) { if (found->rel_name == folded_rel_name) -- cgit 1.4.1