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

HP/UX PA-RISC 2 targets update.

parent 7e22a1df

Configure

+11 −7
Original line number Diff line number Diff line
@@ -252,21 +252,15 @@ my %table=( 
#   crypto/sha/sha_lcl.h.

#					<appro@fy.chalmers.se>

#

#!#"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-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN::-D_REENTRANT::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1:asm/pa-risc2.o:::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# 64bit PARISC for GCC without optimization, which seems to make problems.

# Submitted by <ross.alexander@uk.neceur.com>

"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)",

"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN::-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)",



# HP/UX IA-64 targets

"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)",

# Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted with

# with debugging of the following config.

"hpux64-ia64-cc","cc:-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/ia64-cpp.o:::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



# More attempts at unified 10.X and 11.X targets for HP C compiler.

#

# Chris Ruemmler <ruemmler@cup.hp.com>
@@ -278,6 +272,16 @@ my %table=( 
# hpux-parisc1_0-cc with +DAportable flag would make more sense. <appro>

"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



# HP/UX IA-64 targets

"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)",

# Frank Geurts <frank.geurts@nl.abnamro.com> has patiently assisted with

# with debugging of the following config.

"hpux64-ia64-cc","cc:-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/ia64-cpp.o:::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# GCC builds [not tested yet]...

# _ILP32 should have been defined by compiler driver, but it isn't...

"hpux-ia64-gcc","gcc:-O3 -DB_ENDIAN -D_ILP32::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/ia64.o:::::::::dlfcn:hpux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"hpux64-ia64-gcc","gcc:-mlp64 -O3 -DB_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/ia64.o:::::::::dlfcn:hpux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 



# 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.

TABLE

+79 −4
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ $arflags = 


*** debug-levitte-linux-elf

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wmissing-prototypes -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -1727,7 +1727,7 @@ $arflags = 


*** debug-levitte-linux-elf-extreme

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wmissing-prototypes -Wconversion -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -1752,7 +1752,7 @@ $arflags = 


*** debug-levitte-linux-noasm

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wmissing-prototypes -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -1777,7 +1777,7 @@ $arflags = 


*** debug-levitte-linux-noasm-extreme

$cc           = gcc

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wmissing-prototypes -Wconversion -Wno-long-long -pipe

$cflags       = -DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       =
@@ -2350,6 +2350,31 @@ $shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR) 
$ranlib       = 

$arflags      = 



*** hpux-ia64-gcc

$cc           = gcc

$cflags       = -O3 -DB_ENDIAN -D_ILP32

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT

$bn_obj       = asm/ia64.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

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

$ranlib       = 

$arflags      = 



*** hpux-m68k-gcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DBN_DIV2W -O3
@@ -2500,6 +2525,31 @@ $shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR) 
$ranlib       = 

$arflags      = 



*** hpux-parisc2-gcc

$cc           = gcc

$cflags       = -march=2.0 -O3 -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -Wl,+s -ldld

$bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1

$bn_obj       = asm/pa-risc2.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dl

$shared_target= hpux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

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

$ranlib       = 

$arflags      = 



*** hpux10-brokencc

$cc           = cc

$cflags       = -DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z
@@ -2625,6 +2675,31 @@ $shared_extension = .sl.$(SHLIB_MAJOR).$(SHLIB_MINOR) 
$ranlib       = 

$arflags      = 



*** hpux64-ia64-gcc

$cc           = gcc

$cflags       = -mlp64 -O3 -DB_ENDIAN

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT

$bn_obj       = asm/ia64.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= hpux-shared

$shared_cflag = -fpic

$shared_ldflag = 

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

$ranlib       = 

$arflags      = 



*** hpux64-parisc-gcc

$cc           = gcc

$cflags       = -DB_ENDIAN -DMD32_XARRAY

config

+5 −14
Original line number Diff line number Diff line
@@ -683,15 +683,8 @@ EOF 
  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;

  *-siemens-sysv4) OUT="SINIX" ;;

  *-hpux1*)

	if [ $CC = "gcc" ];

	then

	  if [ $GCC_BITS = "64" ]; then

	    OUT="hpux64-parisc-gcc"

	  else

	    OUT="hpux-parisc-gcc"

	  fi

	else

	  OUT="hpux-parisc-$CC"

	if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then

	    OUT="hpux64-parisc2-gcc"

	fi

	KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`

	KERNEL_BITS=${KERNEL_BITS:-32}
@@ -708,9 +701,7 @@ EOF 
	     fi

	     OUT="hpux64-ia64-cc"

	elif [ $CPU_VERSION -ge 532 ]; then	# PA-RISC 2.x CPU

	     if [ "$CC" = "cc" ]; then

		OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc?

	     fi

	     OUT=${OUT:-"hpux-parisc2-${CC}"}

	     if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then

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

		echo "         invoke './Configure hpux64-parisc2-cc' *manually*."
@@ -720,9 +711,9 @@ EOF 
		fi

	     fi

	elif [ $CPU_VERSION -ge 528 ]; then	# PA-RISC 1.1+ CPU

	     :

	     OUT="hpux-parisc-${CC}

	elif [ $CPU_VERSION -ge 523 ]; then	# PA-RISC 1.0 CPU

	     :

	     OUT="hpux-parisc-${CC}

	else					# Motorola(?) CPU

	     OUT="hpux-$CC"

	fi

crypto/bn/Makefile.ssl

+7 −0
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ asm/ia64-cpp.o: asm/ia64.S 


asm/x86_64-gcc.o: asm/x86_64-gcc.c



# GNU assembler fails to compile PA-RISC2 modules, insist on calling

# vendor assembler...

asm/pa-risc2W.o: asm/pa-risc2W.s

	/usr/ccs/bin/as -o asm/pa-rics2W.o asm/pa-risc2W.s

asm/pa-risc2.o: asm/pa-risc2.s

	/usr/ccs/bin/as -o asm/pa-rics2.o asm/pa-risc2.s



files:

	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO