Commit 64ed18ef authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent 72645b83

Configure

+7 −2
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ my %table=( 
"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:solaris-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:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

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

"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-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:solaris-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 -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -179,10 +180,10 @@ my %table=( 
"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",

# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently

# assisted with debugging of following two configs.

"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",

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

# it's a real mess with -mcpu=ultrasparc option under Linux, but

# -Wa,-Av8plus should do the trick no matter what.

"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# !!!Folowing can't be even tested yet!!!

#    We have to wait till 64-bit glibc for SPARC is operational!!!

#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",
@@ -921,6 +922,10 @@ if ($rmd160_obj =~ /\.o$/) 
	$cflags.=" -DRMD160_ASM";

	}



# "Stringify" the C flags string.  This permits it to be made part of a string

# and works as well on command lines.

$cflags =~ s/([\\\"])/\\\1/g;



my $version = "unknown";

my $major = "unknown";

my $minor = "unknown";

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ install_docs: 
		fn=`basename $$i .pod`; \

		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "`cd ../../util; ./pod2mantest ignore` \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \
@@ -691,7 +691,7 @@ install_docs: 
		fn=`basename $$i .pod`; \

		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "`cd ../../util; ./pod2mantest ignore` \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

TABLE

+29 −6
Original line number Diff line number Diff line
@@ -2443,7 +2443,7 @@ $cc = gcc 
$cflags       = -mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR

$bn_obj       = asm/sparcv8.o

$des_obj      =
@@ -2454,11 +2454,11 @@ $cast_obj = 
$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = 

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

$ranlib       = 



*** linux-sparcv9
@@ -2466,7 +2466,7 @@ $cc = gcc 
$cflags       = -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR

$bn_obj       = asm/sparcv8plus.o

$des_obj      =
@@ -3059,6 +3059,29 @@ $shared_ldflag = -xarch=v9 
$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

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



*** solaris64-sparcv9-gcc31

$cc           = gcc

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

$unistd       = 

$thread_cflag = -D_REENTRANT

$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= solaris-shared

$shared_cflag = -fPIC

$shared_ldflag = 

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

$ranlib       = 



*** sunos-gcc

$cc           = gcc

$cflags       = -O3 -mv8 -Dssize_t=int

apps/Makefile.ssl

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ OPENSSLDIR= /usr/local/ssl 
MAKE=		make -f Makefile.ssl

MAKEDEPEND=	$(TOP)/util/domd $(TOP)

MAKEFILE=	Makefile.ssl

PERL=/usr/local/bin/perl

RM=		rm -f



PEX_LIBS=

config

+5 −3
Original line number Diff line number Diff line
@@ -381,11 +381,13 @@ done 


# figure out if gcc is available and if so we use it otherwise

# we fallback to whatever cc does on the system

GCCVER=`(gcc --version) 2>/dev/null`

GCCVER=`(gcc --version) 2>/dev/null | head -1`

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

  CC=gcc

  # then strip off whatever prefix Cygnus prepends the number with...

  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`

  # then strip off whatever prefix Cygnus as well as GCC 3.1 prepends

  # the number with...  Hopefully, this will work for any future prefixes

  # as well.

  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z ()]*\-//'`

  # peak single digit before and after first dot, e.g. 2.95.1 gives 29

  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`

else