From c4f3d474982d1f9a4ed851fa08b8d1578d02f88b Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 2 Mar 2023 16:06:12 +0000
Subject: Revert r1907986.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1907987 13f79535-47bb-0310-9956-ffa450edef68
---
 configure.in | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index d8356b76e..e47d8925b 100644
--- a/configure.in
+++ b/configure.in
@@ -566,9 +566,6 @@ if test "$ap_cv_atomic_builtins" = "yes" -o "$ap_cv__atomic_builtins" = "yes"; t
     if test "$ap_cv__atomic_builtins" = "yes"; then
         AC_DEFINE(HAVE__ATOMIC_BUILTINS, 1, [Define if compiler provides 32bit __atomic builtins])
     fi
-    has_atomic_builtins=yes
-else
-    has_atomic_builtins=no
 fi
 
 AC_CACHE_CHECK([whether the compiler provides 64bit atomic builtins], [ap_cv_atomic_builtins64],
@@ -832,15 +829,10 @@ AC_ARG_ENABLE(nonportable-atomics,
    force_generic_atomics=yes
  fi
 ],
-[force_generic_atomics=no
-case $host_cpu in
-   i[[34]]86) force_generic_atomics=yes;;
-   i[[56]]86)
-      if test $has_atomic_builtins != yes; then
-        force_generic_atomics=yes
-      fi
-      ;;
-   *) case $host in
+[case $host_cpu in
+   i[[456]]86) force_generic_atomics=yes ;;
+   *) force_generic_atomics=no
+      case $host in
          *solaris2.10*)
             AC_TRY_COMPILE(
                 [#include <atomic.h>],
@@ -855,6 +847,7 @@ case $host_cpu in
       ;;
 esac
 ])
+
 if test $force_generic_atomics = yes; then
    AC_DEFINE([USE_ATOMICS_GENERIC], 1,
              [Define if use of generic atomics is requested])
-- 
cgit v1.2.1