Hi!
Appended you will find an attempt to clean up the lot of HP-UX targets.
I have removed the hpux10-* targets, as they are replaced by the hpux-parisc-*
targets. I have also combined some targets that were more or less identical,
only missing minor compiler flags (like -z: cause segfault when trying to
dereference NULL).
All HP-UX 10 and 11 targets now have -D_REENTRANT hardcoded, the exception
in "config" is no longer necessary.
I don't fully understand the 64bit-handling and according definitions, which
are not completely clear between the targets.
HP-UX ANSI C with -Ae as well as gcc provide 64bit longlong at processors.
Only on 11.x with +DD64 a real 64bit environment is available. I dont' have
11.x (only 10.20), so I cannot cross check.
I have removed the parisc1_1 target, as one can simply use a default target
with an additional +DAportable.
The HP-UX 9.X targets I left untouched. It is a long time ago I have seen one
and moemory is slowly fading.
Hopefully, somebody else will go over it add his 0.02 Swedish Krona
Best regards,
Lutz
--
Lutz Jaenicke [EMAIL PROTECTED]
BTU Cottbus http://www.aet.TU-Cottbus.DE/personen/jaenicke/
Lehrstuhl Allgemeine Elektrotechnik Tel. +49 355 69-4129
Universitaetsplatz 3-4, D-03044 Cottbus Fax. +49 355 69-4153
diff -r -u --new-file openssl-SNAP-20000919-vanilla/Configure
openssl-SNAP-20000919/Configure
--- openssl-SNAP-20000919-vanilla/Configure Mon Sep 18 19:00:09 2000
+++ openssl-SNAP-20000919/Configure Tue Sep 19 22:04:59 2000
@@ -200,61 +200,49 @@
# - Keep in mind that the HP compiler by default generates code
# suitable for execution on the host you're currently compiling at.
# If the toolkit is ment to be used on various PA-RISC processors
-# consider './config +Dportable'.
+# consider './config +DAportable'.
# - +DD64 is chosen in favour of +DA2.0W because it's ment to be
-# compatible with *future* releases.
-# - If you run ./Configure hpux-parisc-[g]cc manually don't forget to
-# pass -D_REENTRANT on HP-UX 10 and later.
+# compatible with *future* releases. The 64bit versions (+DD64) are
+# only availabe starting with HP-UX 11.
# - -DMD32_XARRAY triggers workaround for compiler bug we ran into in
# 32-bit message digests. (For the moment of this writing) HP C
# doesn't seem to "digest" too many local variables (they make "him"
# chew forever:-). For more details look-up MD32_XARRAY comment in
# crypto/sha/sha_lcl.h.
-# <[EMAIL PROTECTED]>
-#
-#!#"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W
-DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
-# Since there is mention of this in shlib/hpux10-cc.sh
-"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W
-DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
-"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL
DES_RISC1::::::::::dl",
-"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN
-DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR
DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn",
-
-# More attempts at unified 10.X and 11.X targets for HP C compiler.
#
+# Andy Polykov <[EMAIL PROTECTED]>
# Chris Ruemmler <[EMAIL PROTECTED]>
# Kevin Steves <[EMAIL PROTECTED]>
-"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN
-DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL
DES_RISC1 DES_INT::::::::::dl",
+#
+# The targets are as follows:
+# hpux-parisc-cc: default target for HP-UX 10 and 11, 32bit binary
+# hpux-parisc-cc-o4: same with +O4, for shlib/hpux10-cc.sh
+# hpux64-parisc-cc: HP-UX 11, 64bit binary
+# hpux-parisc-gcc: default target for HP-UX 10 and 11, 32bit, with gcc
+#
+"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -z -DB_ENDIAN
+-DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR
+DES_PTR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",
+"hpux-parisc-cc-o4","cc:+O4 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -z -DB_ENDIAN
+-DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR
+DES_PTR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",
+"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +Optrs_strongly_typed +Olibcalls +ESlit -z
+-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX
+RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn",
+"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-ldld:BN_LLONG DES_PTR
+DES_UNROLL DES_RISC1::::::::::dl",
+
+# Targets with included assembler files
+# hpux-parisc2-cc: like hpux-parisc-cc, but with PA-RISC 2.0 asm file
+# hpux64-parisc2-cc: like hpux64-parisc-cc, but with PA-RISC 2.0W asm file
"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit
-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX
RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl",
"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit
-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX
RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn",
-"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit
-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL
DES_RISC1 DES_INT::::::::::dl",
# 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 -DMD32_XARRAY -Ae +ESlit +O3
-z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
# If hpux-cc fails (e.g. during "make test"), try the next one; otherwise,
# please report your OS and compiler version to the [EMAIL PROTECTED]
# mailing list.
"hpux-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2
-z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
-
"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR
DES_UNROLL DES_RISC1::::::::::dl",
# If hpux-gcc fails, try this one:
"hpux-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR
DES_UNROLL DES_RISC1::::::::::dl",
-# HPUX 10.X config. Supports threads.
-"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3
-z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
-# If hpux10-cc fails, try this one (if still fails, try deleting BN_LLONG):
-"hpux10-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2
-z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",
-
-"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR
DES_UNROLL DES_RISC1::::::::::dl",
-# If hpux10-gcc fails, try this one:
-"hpux10-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR
DES_UNROLL DES_RISC1::::::::::dl",
-
-# 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:::",
-#"hpux11-64bit-cc","cc:+DA2.0W -g -D_HPUX_SOURCE -Aa -Ae
+ESlit::-D_REENTRANT::SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL
DES_RISC1 DES_INT :::",
-# Use unified settings above instead.
# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with
# the new compiler
diff -r -u --new-file openssl-SNAP-20000919-vanilla/config openssl-SNAP-20000919/config
--- openssl-SNAP-20000919-vanilla/config Thu Sep 14 15:00:07 2000
+++ openssl-SNAP-20000919/config Tue Sep 19 22:05:18 2000
@@ -469,7 +469,6 @@
RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
*-siemens-sysv4) OUT="SINIX" ;;
*-hpux1*) OUT="hpux-parisc-$CC"
- options="$options -D_REENTRANT" ;;
*-hpux) OUT="hpux-parisc-$CC" ;;
# these are all covered by the catchall below
# *-aix) OUT="aix-$CC" ;;
