apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: apr/atomic/solaris_sparc Makefile.in
Date Thu, 21 Feb 2002 15:48:18 GMT
jfclere     02/02/21 07:48:18

  Modified:    .        configure.in
               atomic/solaris_sparc Makefile.in
  Log:
  Allow assembly of  atomic/solaris_sparc/apr_atomic_sparc.s with the gnu as.
  
  Revision  Changes    Path
  1.410     +16 -2     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.409
  retrieving revision 1.410
  diff -u -r1.409 -r1.410
  --- configure.in	19 Feb 2002 23:45:06 -0000	1.409
  +++ configure.in	21 Feb 2002 15:48:18 -0000	1.410
  @@ -89,6 +89,8 @@
   AC_PROG_RANLIB
   AC_PROG_INSTALL
   AC_CHECK_PROG(RM, rm, rm)
  +AC_CHECK_PROG(AS, as, as)
  +AC_CHECK_PROG(ASCPP, cpp, cpp)
   AC_CHECK_TOOL(AR, ar, ar)
   
   dnl Various OS checks that apparently set required flags
  @@ -325,8 +327,20 @@
      *sun*)
          case $host_cpu in
           *sparc*)
  -           OSDIR="solaris_sparc"
  -           eolstr="\\n"
  +            OSDIR="solaris_sparc"
  +            eolstr="\\n"
  +            is_gnu_as=`${AS} --help | grep gnu.org`
  +            if [ -z "$is_gnu_as" ]
  +            then
  +                ASFLAGS="-xarch=v8plus -KPIC -q"
  +                ASCPPFLAGS="-D_ASM -D__STDC__=0"
  +            else
  +                ASFLAGS="-K pic -P -D_ASM -D__STDC__=0 -xarch=v8plus"
  +                ASCPPFLAGS=""
  +                ASCPP="cat"
  +            fi
  +            AC_SUBST(ASCPPFLAGS)
  +            AC_SUBST(ASFLAGS)
               ;;
           *)
               OSDIR="unix"
  
  
  
  1.2       +6 -4      apr/atomic/solaris_sparc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/atomic/solaris_sparc/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	17 Feb 2002 20:17:53 -0000	1.1
  +++ Makefile.in	21 Feb 2002 15:48:18 -0000	1.2
  @@ -1,12 +1,14 @@
   
   TARGETS =  apr_atomic_sparc.lo
   
  -ASFLAGS += -K pic 
  -ASFLAGS += -P -D_ASM -D__STDC__=0
  -ASFLAGS += -xarch=v8plus
  +ASFLAGS += @ASFLAGS@
  +ASCPPFLAGS = @ASCPPFLAGS@
  +AS = @AS@
  +ASCPP = @ASCPP@
   
   apr_atomic_sparc.lo: apr_atomic_sparc.s
  -	$(AS) -P -D_ASM -D__STDC__=0 -K PIC -q -o $@ $<
  +	$(ASCPP) $(ASCPPFLAGS) $*.s > $*.S
  +	$(AS) $(ASFLAGS) -o $@ $*.S
   
   
   # bring in rules.mk for standard functionality
  
  
  

Mime
View raw message