From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 9 Mar 2022 14:04:15 +0000 (+0000)
Subject: Merge r1898771 from trunk:
X-Git-Tag: 2.4.53-rc2-candidate~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee9fefa98bf684d6c7263202a32947745db8bfb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1898771 from trunk:

* Improve detection of _Thread_local

GCC < 4.9 reports __STDC_VERSION__ >= 201112 but does not implement
_Thread_local. Take care of this in the condition.

See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203066

Reviewed by: ylavic, covener, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898786 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 7b75f7e59aa..414e34b5878 100644
--- a/STATUS
+++ b/STATUS
@@ -143,11 +143,6 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-  *) Improve detection of _Thread_local
-     trunk patch: https://svn.apache.org/r1898771
-     2.4.x patch: svn merge -c 1898771 ^/httpd/httpd/trunk .
-     +1: ylavic, covener, rpluem
-
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
diff --git a/include/httpd.h b/include/httpd.h
index f27bb2fb0e8..799cf9705e9 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2437,7 +2437,9 @@ AP_DECLARE(void *) ap_realloc(void *ptr, size_t size)
  */
 #if defined(__cplusplus) && __cplusplus >= 201103L
 #define AP_THREAD_LOCAL thread_local
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112 && \
+      (!defined(__GNUC__) || \
+      __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))
 #define AP_THREAD_LOCAL _Thread_local
 #elif defined(__GNUC__) /* works for clang too */
 #define AP_THREAD_LOCAL __thread