From: Willy Tarreau <w@1wt.eu>
Date: Fri, 7 Feb 2025 18:51:15 +0000 (+0100)
Subject: Revert "IMPORT: plock: export the uninlined version of the lock wait function"
X-Git-Tag: v3.2-dev5~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae540e3d9cb539ed503d2d4ec0d59a4801cc25b3;p=thirdparty%2Fhaproxy.git

Revert "IMPORT: plock: export the uninlined version of the lock wait function"

This reverts commit 5496d06b2b1ea276ffb6aec78ffca177b88d89cd.

It breaks the build on Windows which apparently doesn't support the weak
attribute well on functions. It's not big deal anyway, playing with build
options while debugging still works though it's less easy to use.
---

diff --git a/include/import/plock.h b/include/import/plock.h
index bc281cb8d..996fd8a16 100644
--- a/include/import/plock.h
+++ b/include/import/plock.h
@@ -114,11 +114,11 @@ static unsigned long __pl_wait_unlock_long(const unsigned long *lock, const unsi
 }
 
 # if defined(PLOCK_INLINE_EBO)
-__attribute__((unused,always_inline,no_instrument_function)) static inline
+__attribute__((unused,always_inline,no_instrument_function)) inline
 # else
-__attribute__((unused,noinline,no_instrument_function,weak))
+__attribute__((unused,noinline,no_instrument_function))
 # endif
-unsigned long pl_wait_unlock_long(const unsigned long *lock, const unsigned long mask)
+static unsigned long pl_wait_unlock_long(const unsigned long *lock, const unsigned long mask)
 {
 	return __pl_wait_unlock_long(lock, mask);
 }
@@ -183,11 +183,11 @@ static unsigned int __pl_wait_unlock_int(const unsigned int *lock, const unsigne
 }
 
 # if defined(PLOCK_INLINE_EBO)
-__attribute__((unused,always_inline,no_instrument_function)) static inline
+__attribute__((unused,always_inline,no_instrument_function)) inline
 # else
-__attribute__((unused,noinline,no_instrument_function,weak))
+__attribute__((unused,noinline,no_instrument_function))
 # endif
-unsigned int pl_wait_unlock_int(const unsigned int *lock, const unsigned int mask)
+static unsigned int pl_wait_unlock_int(const unsigned int *lock, const unsigned int mask)
 {
 	return __pl_wait_unlock_int(lock, mask);
 }