You're not forgetting to apply this to HEAD, I hope... In message <[EMAIL PROTECTED]> on Wed, 21 Jan 2004 10:58:20 +0100 (CET), "Andy Polyakov" <[EMAIL PROTECTED]> said:
appro> OpenSSL CVS Repository appro> http://cvs.openssl.org/ appro> ____________________________________________________________________________ appro> appro> Server: cvs.openssl.org Name: Andy Polyakov appro> Root: /e/openssl/cvs Email: [EMAIL PROTECTED] appro> Module: openssl Date: 21-Jan-2004 10:58:19 appro> Branch: OpenSSL_0_9_7-stable Handle: 2004012109581701 appro> appro> Modified files: (Branch: OpenSSL_0_9_7-stable) appro> openssl Configure config appro> openssl/crypto/bn Makefile.ssl appro> appro> Log: appro> Proper support for HP-UX64 gcc build. appro> PR: 772 appro> appro> Summary: appro> Revision Changes Path appro> 1.314.2.89 +1 -0 openssl/Configure appro> 1.95.2.27 +7 -6 openssl/config appro> 1.65.2.7 +3 -0 openssl/crypto/bn/Makefile.ssl appro> ____________________________________________________________________________ appro> appro> patch -p0 <<'@@ .' appro> Index: openssl/Configure appro> ============================================================================ appro> $ cvs diff -u -r1.314.2.88 -r1.314.2.89 Configure appro> --- openssl/Configure 28 Sep 2003 14:07:01 -0000 1.314.2.88 appro> +++ openssl/Configure 21 Jan 2004 09:58:17 -0000 1.314.2.89 appro> @@ -260,6 +260,7 @@ appro> # 64bit PARISC for GCC without optimization, which seems to make problems. appro> # Submitted by <[EMAIL PROTECTED]> appro> "hpux64-parisc-gcc","gcc:-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", appro> +"hpux64-parisc2-gcc","gcc:-O3 -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:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", appro> appro> # IA-64 targets appro> "hpux-ia64-cc","cc:-Ae +DD32 +O3 +Olit=all -z -DB_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/ia64-cpp.o:::::::::dlfcn:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", appro> @@ . appro> patch -p0 <<'@@ .' appro> Index: openssl/config appro> ============================================================================ appro> $ cvs diff -u -r1.95.2.26 -r1.95.2.27 config appro> --- openssl/config 20 Mar 2003 11:44:31 -0000 1.95.2.26 appro> +++ openssl/config 21 Jan 2004 09:58:17 -0000 1.95.2.27 appro> @@ -134,7 +134,7 @@ appro> HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'` appro> case "$HPUXVER" in appro> 1[0-9].*) # HPUX 10 and 11 targets are unified appro> - echo "${MACHINE}-hp-hpux10"; exit 0 appro> + echo "${MACHINE}-hp-hpux1x"; exit 0 appro> ;; appro> *) appro> echo "${MACHINE}-hp-hpux"; exit 0 appro> @@ -410,9 +410,10 @@ appro> GCC_BITS="32" appro> if [ $GCCVER -ge 30 ]; then appro> # PA64 support only came in with gcc 3.0.x. appro> - # We look for the preprocessor symbol __LP64__ indicating appro> - # 64bit bit long and pointer. sizeof(int) == 32 on HPUX64. appro> - if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then appro> + # We check if the preprocessor symbol __LP64__ is defined... appro> + if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then appro> + : # __LP64__ has slipped through, it therefore is not defined appro> + else appro> GCC_BITS="64" appro> fi appro> fi appro> @@ -685,7 +686,7 @@ appro> if [ $CC = "gcc" ]; appro> then appro> if [ $GCC_BITS = "64" ]; then appro> - OUT="hpux64-parisc-gcc" appro> + OUT="hpux64-parisc2-gcc" appro> else appro> OUT="hpux-parisc-gcc" appro> fi appro> @@ -700,7 +701,7 @@ appro> if [ $CPU_VERSION -ge 768 ]; then # IA-64 CPU appro> echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi." appro> echo " If you wish to build 32-bit library, the you have to" appro> - echo " invoke './Configure hpux-ia32-cc' *manually*." appro> + echo " invoke './Configure hpux-ia64-cc' *manually*." appro> if [ "$TEST" = "false" ]; then appro> echo " You have about 5 seconds to press Ctrl-C to abort." appro> (stty -icanon min 0 time 50; read waste) < /dev/tty appro> @@ . appro> patch -p0 <<'@@ .' appro> Index: openssl/crypto/bn/Makefile.ssl appro> ============================================================================ appro> $ cvs diff -u -r1.65.2.6 -r1.65.2.7 Makefile.ssl appro> --- openssl/crypto/bn/Makefile.ssl 27 Dec 2003 15:00:19 -0000 1.65.2.6 appro> +++ openssl/crypto/bn/Makefile.ssl 21 Jan 2004 09:58:18 -0000 1.65.2.7 appro> @@ -120,6 +120,9 @@ appro> appro> asm/x86_64-gcc.o: asm/x86_64-gcc.c appro> appro> +asm/pa-risc2W.o: asm/pa-risc2W.s appro> + /usr/ccs/bin/as -o asm/pa-rics2W.o asm/pa-risc2W.s appro> + appro> files: appro> $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO appro> appro> @@ . appro> ______________________________________________________________________ appro> OpenSSL Project http://www.openssl.org appro> CVS Repository Commit List [EMAIL PROTECTED] appro> Automated List Manager [EMAIL PROTECTED] ----- Please consider sponsoring my work on free software. See http://www.free.lp.se/sponsoring.html for details. You don't have to be rich, a $10 donation is appreciated! -- Richard Levitte \ Tunnlandsv�gen 3 \ [EMAIL PROTECTED] [EMAIL PROTECTED] \ S-168 36 BROMMA \ T: +46-8-26 52 47 \ SWEDEN \ or +46-708-26 53 44 Procurator Odiosus Ex Infernis -- [EMAIL PROTECTED] Member of the OpenSSL development team: http://www.openssl.org/ Unsolicited commercial email is subject to an archival fee of $400. See <http://www.stacken.kth.se/~levitte/mail/> for more info. ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List [EMAIL PROTECTED] Automated List Manager [EMAIL PROTECTED]
