Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 30 Apr 2002 23:49:41 -0000
Message-ID: <20020430234941.55439.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr configure.in

jerenkrantz    02/04/30 16:49:41

  Modified:    .        configure.in
  Log:
  Add --disable-atomics flag which will prevent APR from using its *own*
  optimized code.  On those OSes that properly support atomics from userspace,
  we will use those no matter what the user specifies.  Therefore, this change
  only affects Solaris/Sparc - if --disable-atomics is passed, we will use
  APR's generic code.
  
  Rewrite/simplify Sparc CPU m4 test to make more sense.
  
  Revision  Changes    Path
  1.438     +27 -23    apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.437
  retrieving revision 1.438
  diff -u -r1.437 -r1.438
  --- configure.in	29 Apr 2002 11:03:14 -0000	1.437
  +++ configure.in	30 Apr 2002 23:49:41 -0000	1.438
  @@ -304,6 +304,14 @@
   dnl  (ie.. old sparcs)
   apr_force_atomic_generic=0
   proc_mutex_is_global=0
  +user_disabled_atomics=0
  +
  +AC_ARG_ENABLE(atomics,
  +  [  --disable-atomics            Turn off optimized atomic code],
  +  [ if test "$enableval" = "no"; then
  +        user_disabled_atomics=1
  +    fi ], [] )
  +
   
   config_subdirs="none"
   INSTALL_SUBDIRS="none"
  @@ -356,43 +364,39 @@
          ;;
      *sun*)
          case $host_cpu in
  -        *sparc*)
  +         *sparc*)
               OSDIR="solaris_sparc"
               eolstr="\\n"
  -            apr_atomic_sparc_compile=apr_atomic_sparc.lo
  -            sparc_arch=`uname -m`
  -            is_gnu_as=`${AS} --help 2>/dev/null | grep gnu.org`
  -            if test -n "$is_gnu_as" 
  -            then
  -                case "$sparc_arch" in
  -                 sun4c|sun4m|sun4d|sun4t|sun4)
  -                    apr_force_atomic_generic=1
  -                    apr_atomic_sparc_compile=apr_atomic_sparc_no_support.lo
  -                    ;;
  -                 *)
  +            if test "$user_disabled_atomics" = 0; then
  +              apr_atomic_sparc_compile=apr_atomic_sparc.lo
  +              sparc_arch=`uname -m`
  +              is_gnu_as=`${AS} --help 2>/dev/null | grep gnu.org`
  +              case "$sparc_arch" in
  +                sun4c|sun4m|sun4d|sun4t|sun4)
  +                  apr_force_atomic_generic=1
  +                  apr_atomic_sparc_compile=apr_atomic_sparc_no_support.lo
  +                  ;;
  +                *)
  +                  if test -n "$is_gnu_as"; then
                       ASFLAGS="-xarch=v8plus -K PIC"
                       ASCPPFLAGS="-traditional-cpp -D_ASM -D__STDC__=0"
                       ASCPP="gcc -E"
  -                    ;;
  -                esac
  -            else
  -                case "$sparc_arch" in
  -                 sun4c|sun4m|sun4d|sun4t|sun4)
  -                    apr_force_atomic_generic=1
  -                    apr_atomic_sparc_compile=apr_atomic_sparc_no_support.lo
  -                    ;;
  -                 *)
  +                  else 
                       ASFLAGS="-K pic -P -D_ASM -D__STDC__=0 -xarch=v8plus"
                       ASCPPFLAGS=""
                       ASCPP="cat"
  -                    ;;
  +                  fi
  +                  ;;
                   esac
  +            else
  +              apr_force_atomic_generic=1
  +              apr_atomic_sparc_compile=apr_atomic_sparc_no_support.lo
               fi
               AC_SUBST(ASCPPFLAGS)
               AC_SUBST(ASFLAGS)
               AC_SUBST(apr_atomic_sparc_compile)
               ;;
  -        *)
  +         *)
               OSDIR="unix"
               eolstr="\\n"
               ;;