|
@@ -0,0 +1,33 @@
|
|
|
|
+From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Edgar Bonet <bonet@grenoble.cnrs.fr>
|
|
|
|
+Date: Thu, 16 May 2024 11:15:10 +0200
|
|
|
|
+Subject: [PATCH] Configure: fixed building libatomic test.
|
|
|
|
+
|
|
|
|
+Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types
|
|
|
|
+or -Wpointer-sign warnings, depending on whether long and size_t are compatible
|
|
|
|
+types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings
|
|
|
|
+are enabled by default in Clang only, and -Wincompatible-pointer-types is an
|
|
|
|
+error starting from GCC 14.
|
|
|
|
+
|
|
|
|
+Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
|
|
|
|
+Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238
|
|
|
|
+---
|
|
|
|
+ auto/lib/libatomic/conf | 2 +-
|
|
|
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
+
|
|
|
|
+diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
|
|
|
|
+index d1e484a..0f12b9c 100644
|
|
|
|
+--- a/auto/lib/libatomic/conf
|
|
|
|
++++ b/auto/lib/libatomic/conf
|
|
|
|
+@@ -20,7 +20,7 @@ else
|
|
|
|
+ #include <atomic_ops.h>"
|
|
|
|
+ ngx_feature_path=
|
|
|
|
+ ngx_feature_libs="-latomic_ops"
|
|
|
|
+- ngx_feature_test="long n = 0;
|
|
|
|
++ ngx_feature_test="AO_t n = 0;
|
|
|
|
+ if (!AO_compare_and_swap(&n, 0, 1))
|
|
|
|
+ return 1;
|
|
|
|
+ if (AO_fetch_and_add(&n, 1) != 1)
|
|
|
|
+--
|
|
|
|
+2.34.1
|
|
|
|
+
|