Commit ac7b4261 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Support for 64-bit Solaris build with GCC 3.0 and later. It should be 

explicitely noted that 64-bit SPARCv9 ABI is not officially supported
by GCC 3.0 (support is scheduled for 3.1 release), but it appears to
work, at the very least 'make test' passes...
parent 7abe76e1

Configure

+4 −1
Original line number Diff line number Diff line
@@ -162,10 +162,13 @@ my %table=( 
#### SPARC Solaris with GNU C setups

"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc

"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8

# but keep the assembler modules.

"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



####

"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

TABLE

+47 −2
Original line number Diff line number Diff line 
Output of `Configure TABLE':



*** BC-16

$cc           = bcc
@@ -989,6 +988,29 @@ $shared_cflag = 
$shared_extension = 

$ranlib       = 



*** debug-ben-openbsd

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = 

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_extension = 

$ranlib       = 



*** debug-ben-strict

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe
@@ -2670,7 +2692,7 @@ $ranlib = 


*** solaris-sparcv9-gcc

$cc           = gcc

$cflags       = -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W

$cflags       = -m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = ULTRASPARC
@@ -2783,6 +2805,29 @@ $shared_cflag = -KPIC 
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = /usr/ccs/bin/ar rs



*** solaris64-sparcv9-gcc

$cc           = gcc

$cflags       = -m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = ULTRASPARC

$lflags       = -lsocket -lnsl -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = asm/md5-sparcv9.o

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= gnu-shared

$shared_cflag = -fPIC

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 



*** sunos-gcc

$cc           = gcc

$cflags       = -O3 -mv8 -Dssize_t=int

config

+39 −7
Original line number Diff line number Diff line
@@ -361,8 +361,18 @@ if [ "$GCCVER" != "" ]; then 
else

  CC=cc

fi

GCCVER=${GCCVER:-0}



if [ "$SYSTEM" = "SunOS" ]; then

  if [ $GCCVER -ge 30 ]; then

    # 64-bit ABI isn't officially supported in gcc 3.0, but it appears

    # to be working, at the very least 'make test' passes...

    if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then

      GCC_ARCH="-m64"

    else

      GCC_ARCH="-m32"

    fi

  fi

  # check for WorkShop C, expected output is "cc: blah-blah C x.x"

  CCVER=`(cc -V 2>&1) 2>/dev/null | \

  	egrep -e '^cc: .* C [0-9]\.[0-9]' | \
@@ -393,7 +403,6 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then 
  fi

fi



GCCVER=${GCCVER:-0}

CCVER=${CCVER:-0}



# read the output of the embedded GuessOS
@@ -426,9 +435,9 @@ case "$GUESSOS" in 
  mips4-sgi-irix64)

	echo "WARNING! If you wish to build 64-bit library, then you have to"

	echo "         invoke './Configure irix64-mips4-$CC' *manually*."

	echo "         Type return if you want to continue, Ctrl-C to abort."

	if [ "$TEST" = "false" ]; then

	  read waste < /dev/tty

	  echo "         You have about 5 seconds to press Ctrl-C to abort."

	  (stty -icanon min 0 time 50; read waste) < /dev/tty

	fi

        CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`

        CPU=${CPU:-0}
@@ -496,16 +505,39 @@ EOF 
  *-*-linux2) OUT="linux-elf" ;;

  *-*-linux1) OUT="linux-aout" ;;

  sun4u*-*-solaris2)

	OUT="solaris-sparcv9-$CC"

	ISA64=`(isalist) 2>/dev/null | grep sparcv9`

	if [ "$ISA64" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then

	if [ "$ISA64" != "" ]; then

	    if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then

		echo "WARNING! If you wish to build 64-bit library, then you have to"

		echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."

		echo "         Type return if you want to continue, Ctrl-C to abort."

		if [ "$TEST" = "false" ]; then

		  read waste < /dev/tty

		  echo "         You have about 5 seconds to press Ctrl-C to abort."

		  (stty -icanon min 0 max 50; read waste) < /dev/tty

		fi

	    elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then

		# $GCC_ARCH denotes default ABI chosen by compiler driver

		# (first one found on the $PATH). I assume that user

		# expects certain consistency with the rest of his builds

		# and therefore switch over to 64-bit. <appro>

		OUT="solaris64-sparcv9-gcc"

		echo "WARNING! If you wish to build 32-bit library, then you have to"

		echo "         invoke './Configure solaris-sparcv9-gcc' *manually*."

		if [ "$TEST" = "false" ]; then

		  echo "         You have about 5 seconds to press Ctrl-C to abort."

		  (stty -icanon min 0 max 50; read waste) < /dev/tty

		fi

	OUT="solaris-sparcv9-$CC" ;;

	    elif [ "$GCC_ARCH" = "-m32" ]; then

		echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"

		echo "        and wish to build 64-bit library, then you have to"

		echo "        invoke './Configure solaris64-sparcv9-gcc' *manually*."

		if [ "$TEST" = "false" ]; then

		  echo "         You have about 5 seconds to press Ctrl-C to abort."

		  (stty -icanon min 0 max 50; read waste) < /dev/tty

		fi

	    fi

	fi

	;;

  sun4m-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;

  sun4d-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;

  sun4*-*-solaris2)	OUT="solaris-sparcv7-$CC" ;;