diff options
author | Andy Polyakov <appro@openssl.org> | 2006-05-20 08:51:11 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2006-05-20 08:51:11 +0000 |
commit | e78fc11a9587091d639473f3c2c68882223418d8 (patch) | |
tree | da0d24e27d05589472678cafab487f588e0df782 | |
parent | 83231cb376ca275f99adc237be3080fe4e06fb88 (diff) |
Tidy up hpux targets.
-rwxr-xr-x | Configure | 2 | ||||
-rw-r--r-- | Makefile.shared | 2 | ||||
-rw-r--r-- | TABLE | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -285,7 +285,7 @@ my %table=( # 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 DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # GCC builds... -"hpux-ia64-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT::bn-ia64.o::aes-ia64.o:::sha256-ia64.o sha512-ia64.o::rc4-ia64.o:::dlfcn:hpux-shared:-fpic:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-ia64-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux64-ia64-gcc","gcc:-mlp64 -O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-mlp64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # Legacy HPUX 9.X configs... diff --git a/Makefile.shared b/Makefile.shared index ef1bfe1223..1b94aa18bc 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -455,7 +455,7 @@ link_o.hpux: @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \ $(CALC_VERSIONS); \ SHLIB=lib$(LIBNAME).sl; \ - expr "$(CFLAGS)" : 'DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \ + expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ ALLSYMSFLAGS='-Wl,-Fl'; \ NOALLSYMSFLAGS=''; \ @@ -1649,7 +1649,7 @@ $arflags = *** debug-steve $cc = gcc -$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe +$cflags = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -march=i486 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe $unistd = $thread_cflag = -D_REENTRANT $sys_id = @@ -1982,10 +1982,10 @@ $bn_ops = SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT $cpuid_obj = $bn_obj = bn-ia64.o $des_obj = -$aes_obj = aes-ia64.o +$aes_obj = aes_core.o aes_cbc.o aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = sha256-ia64.o sha512-ia64.o +$sha1_obj = sha1-ia64.o sha256-ia64.o sha512-ia64.o $cast_obj = $rc4_obj = rc4-ia64.o $rmd160_obj = |