diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2015-04-23 16:06:12 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2015-04-23 16:06:12 +0000 |
| commit | e259b6473724ece4574fcf88c5728c4adbbbc551 (patch) | |
| tree | 4061193dfa0f594bc1bb0e6638d40fd5bc009764 | |
| parent | ed4932968fb15a4313d053cf37f29a46076a8328 (diff) | |
| download | libapr-e259b6473724ece4574fcf88c5728c4adbbbc551.tar.gz | |
Merge r1675668 from trunk.
Switch to generic atomics for (unpatched) Solaris 10 not exporting some atomic
functions. PR 55418.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1675670 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.in b/configure.in index b6f9a6590..e01774be1 100644 --- a/configure.in +++ b/configure.in @@ -640,7 +640,20 @@ AC_ARG_ENABLE(nonportable-atomics, ], [case $host_cpu in i[[456]]86) force_generic_atomics=yes ;; - *) force_generic_atomics=no ;; + *) force_generic_atomics=no + case $host in + *solaris2.10*) + AC_TRY_COMPILE( + [#include <atomic.h>], + [void *ptr = NULL; atomic_cas_ptr(&ptr, NULL, NULL);],, + [force_generic_atomics=yes] + ) + if test $force_generic_atomics = yes; then + AC_MSG_NOTICE([nonportable atomic support disabled, system needs Patch-ID 118884 or 118885]) + fi + ;; + esac + ;; esac ]) |