Commit 9239e45b authored by Bodo Möller's avatar Bodo Möller
Browse files

Provide fallback configurations for all hpux... configurations 

(problems with BN_LLONG have been reported both for hpux-cc
and for hpux10-gcc).
parent d7fcc7f6

Configure

+16 −1
Original line number Diff line number Diff line
@@ -142,11 +142,26 @@ my %table=( 
# HPUX 9.X config.

# Don't use the bundled cc.  It is broken.  Use HP ANSI C if possible, or

# egcs.  gcc 2.8.1 is also broken.

"hpux-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z::(unknown)::DES_PTR DES_UNROLL DES_RISC1:::", # BN_LLONG does not work



"hpux-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z::(unknown)::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",

# If hpux-cc fails (e.g. during "make test"), try the next one; otherwise,

# please report your OS and compiler version to the bugs@openssl.org

# mailing list.

"hpux-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z::(unknown)::DES_PTR DES_UNROLL DES_RISC1:::",



"hpux-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",

# If hpux-gcc fails, try this one:

"hpux-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::DES_PTR DES_UNROLL DES_RISC1:::",



# HPUX 10.X config.  Supports threads.

"hpux10-cc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z::-D_REENTRANT::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",

# If hpux10-cc fails, try this one:

"hpux10-brokencc",	"cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z::-D_REENTRANT::DES_PTR DES_UNROLL DES_RISC1:::",



"hpux10-gcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT::BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",

# If hpux10-gcc fails, try this one:

"hpux10-brokengcc",	"gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT::DES_PTR DES_UNROLL DES_RISC1:::",



# HPUX 11.X from www.globus.org.

# Only works on PA-RISC 2.0 cpus, and not optimized.  Why?

"hpux11-32bit-cc","cc:+DA2.0 -DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit::-D_REENTRANT::DES_PTR DES_UNROLL DES_RISC1:::",

TABLE

+69 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 



*** hpux-cc

*** hpux-brokencc

$cc           = cc

$cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z

$unistd       =
@@ -850,6 +850,40 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 



*** hpux-brokengcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DBN_DIV2W -O3

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

$bn_ops       = DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 



*** hpux-cc

$cc           = cc

$cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

$bn_ops       = BN_LLONG DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 



*** hpux-gcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DBN_DIV2W -O3
@@ -867,6 +901,40 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 



*** hpux10-brokencc

$cc           = cc

$cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 



*** hpux10-brokengcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DBN_DIV2W -O3

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = 

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 



*** hpux10-cc

$cc           = cc

$cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O4 -z