upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUILD: tools: silence a build warning when USE_THREAD=0

Browse source 
The dladdr_lock that was added to avoid re-entering into dladdr is
conditioned by threads, but the way it's declared causes a build
warning if threads are disabled due to the insertion of a lone semi
colon in the variables block. Let's switch to __decl_thread_var()
for this.

This can be backported wherever commit eb41d768f9 ("MINOR: tools:
use only opportunistic symbols resolution") is backported. It relies
on these previous two commits:

   bb4addabb7 ("MINOR: compiler: add a simple macro to concatenate resolved strings")
   69ac4cd315 ("MINOR: compiler: add a new __decl_thread_var() macro to declare local variables")
This commit is contained in:
Willy Tarreau 2025-03-12 18:11:14 +01:00
parent 69ac4cd315
commit b61ed9babe
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools.c
View file

@ -5543,7 +5543,7 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad
#if (defined(__ELF__) && !defined(__linux__)) || defined(USE_DL)
static Dl_info dli_main;
static int dli_main_done; // 0 = not resolved, 1 = resolve in progress, 2 = done
static __decl_thread(HA_SPINLOCK_T dladdr_lock);
__decl_thread_var(static HA_SPINLOCK_T dladdr_lock);
int isolated;
Dl_info dli;
size_t size;