autoconf: Combine the sparc/solaris configurations
authorChas Williams (CONTRACTOR) <chas@cmf.nrl.navy.mil>
Wed, 6 Nov 2013 12:36:02 +0000 (07:36 -0500)
committerDerrick Brashear <shadow@your-file-system.com>
Mon, 18 Nov 2013 12:24:48 +0000 (04:24 -0800)
According to cc's man page:

  v9        Is equivalent to -m64 -xarch=sparc
    Legacy makefiles and scripts that use
    -xarch=v9 to obtain the 64-bit memory model
    need only use -m64.

Change-Id: Idd1021f3fef9c427072079f3c7d7aa9ca6fa0060
Reviewed-on: http://gerrit.openafs.org/10462
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Hutzelman <jhutz@cmu.edu>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

src/cf/osconf.m4

index 22b99f8..60af6e7 100644 (file)
@@ -508,24 +508,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sun4x_58|sun4x_59)
-               CC=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=v9'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
-       sun4x_510)
+       sun4x_5*)
                CC=$SOLARISCC
                LD="/usr/ccs/bin/ld"
                MT_CFLAGS='-mt'
@@ -542,23 +525,6 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-g"
                ;;
 
-       sun4x_511)
-               CC=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=v9'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
        sunx86_58|sunx86_59)
                CC=$SOLARISCC
                LD="/usr/ccs/bin/ld"