[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r1907442 - /apr/apr/trunk/atomic/unix/builtins.c
From:       sf () apache ! org
Date:       2023-02-05 20:27:30
Message-ID: 20230205202730.5FC9417B192 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: sf
Date: Sun Feb  5 20:27:29 2023
New Revision: 1907442

URL: http://svn.apache.org/viewvc?rev=1907442&view=rev
Log:
Call apr__atomic_generic64_init() if needed

Otherwise we get a segfault.  Seen on Debian on powerpc with

/* Define if compiler provides 32bit atomic builtins */
#define HAVE_ATOMIC_BUILTINS 1
/* Define if compiler provides 64bit atomic builtins */
/* #undef HAVE_ATOMIC_BUILTINS64 */
/* Define if compiler provides 32bit __atomic builtins */
#define HAVE__ATOMIC_BUILTINS 1
/* Define if compiler provides 64bit __atomic builtins */
/* #undef HAVE__ATOMIC_BUILTINS64 */
/* Define if use of generic atomics is requested */
/* #undef USE_ATOMICS_GENERIC */


Modified:
    apr/apr/trunk/atomic/unix/builtins.c

Modified: apr/apr/trunk/atomic/unix/builtins.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/atomic/unix/builtins.c?rev=1907442&r1=1907441&r2=1907442&view=diff
 ==============================================================================
--- apr/apr/trunk/atomic/unix/builtins.c (original)
+++ apr/apr/trunk/atomic/unix/builtins.c Sun Feb  5 20:27:29 2023
@@ -26,7 +26,11 @@
 
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
 {
+#if defined (NEED_ATOMICS_GENERIC64)
+    return apr__atomic_generic64_init(p);
+#else
     return APR_SUCCESS;
+#endif
 }
 
 APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)


[prev in list] [next in list] [prev in thread] [next in thread]