solaris: build 64-bit binaries for sunx86_51x by default
[openafs.git] / src / cf / osconf.m4
index 660a7d1..d5f42e8 100644 (file)
@@ -8,6 +8,7 @@ CCOBJ="$CC"
 MT_CC="$CC"
 XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
 MT_LIBS='-lpthread ${XLIBS}'
+XCFLAGS=
 
 dnl debugging and optimization flag defaults
 dnl Note, these are all the defaults for if debug/optimize turned on, and
@@ -48,20 +49,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
                ;;
 
-       alpha_dux50)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               LEX="flex -l"
-               DBG="-g3"
-               CSTATIC="-non_shared"
-               MT_CFLAGS='-D_REENTRANT=1 -pthread'
-               MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
-               XCFLAGS="-D_NO_PROTO -DOSF"
-               SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
-               ;;
-
-       alpha_dux51)
+       alpha_dux50 | alpha_dux51)
                CC="cc"
                CCOBJ="cc"
                MT_CC="cc"
@@ -74,62 +62,23 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
                ;;
 
-       alpha_linux_22)
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       alpha_linux_24)
+       alpha_linux_22 | alpha_linux_24 | alpha_linux_26)
                CCOBJ="${CC} -fPIC"
-               KERN_OPTMZ=-O2
                MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       alpha_linux_26)
+       arm_linux_24 | arm_linux26)
                CCOBJ="${CC} -fPIC"
-               KERN_OPTMZ=-O2
                MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       arm_linux24)
-               CCOBJ="${CC} -fPIC"
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       arm_linux26)
-               CCOBJ="${CC} -fPIC"
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -242,7 +191,7 @@ case $AFS_SYSNAME in
                XCFLAGS="-O2 -pipe -fPIC"
                ;;
 
-       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*)
+       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
                MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
@@ -268,7 +217,7 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE -G0"
+               XCFLAGS="-G0"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -280,41 +229,19 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       ppc64_linux24)
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               SHLIB_CFLAGS="-fPIC"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       ppc64_linux26)
-               KERN_OPTMZ=-O2
+       ppc64_linux24 | ppc64_linux26)
                MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_CFLAGS="-fPIC"
-               XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       i386_umlinux22)
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
+               SHLIB_LINKER="${MT_CC} -shared -m64"
+               XCFLAGS="-m64"
+               XLDFLAGS="-m64"
+               ASFLAGS="-a64"
                ;;
 
        i386_linux*)
@@ -328,15 +255,12 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_umlinux24)
-               KERN_OPTMZ=-O2
+       i386_umlinux22 | i386_umlinux24 | i386_umlinux26)
                MT_CFLAGS='-pthread -D_REENTRANT'
                DBG=-g
-               KERN_DBG=-g
                LWP_DBG=-g
                LWP_OPTMZ=-O2
                OPTMZ=-O2
@@ -344,23 +268,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       i386_umlinux26)
-               KERN_OPTMZ=-O2
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               DBG=-g
-               KERN_DBG=-g
-               LWP_DBG=-g
-               LWP_OPTMZ=-O2
-               OPTMZ=-O2
-               PAM_OPTMZ=-O2
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -384,7 +291,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -464,7 +370,7 @@ case $AFS_SYSNAME in
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       *_darwin_100)
+       *_darwin_100 | *_darwin_110 )
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
                MT_CFLAGS="-D_REENTRANT"
                MT_LIBS='${XLIBS}'
@@ -491,7 +397,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -509,36 +414,7 @@ case $AFS_SYSNAME in
                AIX64="no"
                ;;
 
-
-       rs_aix51)
-               CC="cc"
-               CCOBJ="cc"
-               DBG=""
-               LIBSYS_AIX_EXP="afsl.exp"
-               MT_CC="xlc_r"
-               SHLIB_SUFFIX="o"
-               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
-               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32="yes"
-               AIX64="yes"
-               ;;
-
-       rs_aix52)       
-               CC="cc"
-               CCOBJ="cc"
-               DBG=""
-               LIBSYS_AIX_EXP="afsl.exp"
-               MT_CC="xlc_r"
-               SHLIB_SUFFIX="o"
-               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
-               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32="yes"
-               AIX64="yes"
-               ;;
-
-       rs_aix53)       
+       rs_aix51 | rs_aix52 | rs_aix53) 
                CC="cc"
                CCOBJ="cc"
                DBG="-g"
@@ -566,21 +442,7 @@ case $AFS_SYSNAME in
                AIX64="yes"
                ;;
 
-       s390_linux22)
-               LD="ld"
-               KERN_OPTMZ=-O2
-               MT_CC="$CC"
-               MT_CFLAGS='-pthread -D_REENTRANT'
-               PAM_OPTMZ=-O
-               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               OPTMZ=-O
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       s390_linux24|s390_linux26)
+       s390_linux22|s390_linux24|s390_linux26)
                LD="ld"
                KERN_OPTMZ=-O2
                MT_CC="$CC"
@@ -589,7 +451,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -604,7 +465,7 @@ case $AFS_SYSNAME in
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic"
                OPTMZ=-O
-               XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
+               XCFLAGS="-D__s390x__"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -672,96 +533,12 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               XCFLAGS="-D_LARGEFILE64_SOURCE"
-               XCFLAGS64="-D_LARGEFILE64_SOURCE -m64"
+               XCFLAGS64="-m64"
                XLDFLAGS64="-m64"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       sun4_413)
-               CCXPG2="/usr/xpg2bin/cc"
-               CC="gcc"
-               CCOBJ="gcc"
-               SHLIB_CFLAGS="-PIC"
-               XCFLAGS=""
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB}"
-               LD="ld"
-               ;;
-
-       sun4x_55)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               MT_CC=$SOLARISCC
-               MT_CFLAGS='-mt'
-               SHLIB_CFLAGS="-KPIC"
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               LD="/usr/ccs/bin/ld"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
-       sun4x_56)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               MT_CC=$SOLARISCC
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               LD="/usr/ccs/bin/ld"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               LWP_OPTMZ="-g"
-               ;;
-
-       sun4x_57)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CC=$SOLARISCC
-               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_58)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CC=$SOLARISCC
-               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_59)
+       sun4x_58|sun4x_59)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
@@ -818,43 +595,7 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-g"
                ;;
 
-       sunx86_57)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CC=$SOLARISCC
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               ;;
-
-       sunx86_58)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CC=$SOLARISCC
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               ;;
-
-       sunx86_59)
+       sunx86_58|sunx86_59)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
@@ -872,7 +613,19 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
-       sunx86_510)
+       sunx86_510|sunx86_511)
+               if test "x`echo "${ARCHFLAGS}" | grep m32`" != "x" ; then
+                       CURRENTBUILDARCH=i386
+               fi
+               if test "x`echo "${ARCHFLAGS}" | grep m64`" != "x" ; then
+                       CURRENTBUILDARCH=amd64
+               fi
+               if test "x${CURRENTBUILDARCH}" = "x" ; then
+                       CURRENTBUILDARCH=`isainfo -k`
+               fi
+               if test "${CURRENTBUILDARCH}" = "amd64" ; then
+                       XARCHFLAGS="-m64"
+               fi
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
@@ -882,31 +635,18 @@ case $AFS_SYSNAME in
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -m64'
-               XCFLAGS="-dy -Bdynamic"
+               XCFLAGS0="-dy -Bdynamic"
+               XCFLAGS64="${XCFLAGS0} -m64"
+               XCFLAGS="${XCFLAGS0} ${XARCHFLAGS}"
+               XLDFLAGS64="-m64"
+               XLDFLAGS="${XARCHFLAGS}"
+               ASFLAGS="${XARCHFLAGS}"
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               SHLIB_LINKER="${CC} ${XCFLAGS} -G -z text"
                ;;
 
-       sunx86_511)
-               CC=$SOLARISCC
-               CCOBJ=$SOLARISCC
-               LD="/usr/ccs/bin/ld"
-               MT_CC=$SOLARISCC
-               MT_CFLAGS='-mt'
-               PAM_CFLAGS="-KPIC"
-               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
-               SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               XLIBKVM="-lkvm"
-               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
-               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
-               ;;
 esac
 
 MT_CFLAGS="${MT_CFLAGS} -DAFS_PTHREAD_ENV"
@@ -967,6 +707,7 @@ CFLAGS_NOERROR=
 CFLAGS_NOSTRICT=
 CFLAGS_NOUNUSED=
 CFLAGS_NOOLDSTYLE=
+XCFLAGS_NOCHECKING="$XCFLAGS"
 
 if test "x$GCC" = "xyes"; then
   if test "x$enable_warnings" = "xyes"; then
@@ -1019,6 +760,7 @@ AC_SUBST(AIX32)
 AC_SUBST(AIX64)
 AC_SUBST(AR)
 AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
 AC_SUBST(CP)
 AC_SUBST(DBG)
 AC_SUBST(FSINCLUDES)