From d067089e444124e723d1405cc13c058883b66e6d Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Wed, 6 Nov 2013 07:36:02 -0500 Subject: [PATCH] autoconf: Combine the sparc/solaris configurations 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 Reviewed-by: Jeffrey Hutzelman Reviewed-by: Derrick Brashear --- src/cf/osconf.m4 | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 22b99f8..60af6e7 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -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" -- 1.9.4