From: Rich Salz Date: Sun, 28 Dec 2014 06:17:52 +0000 (-0500) Subject: RT3548: Remove unsupported platforms X-Git-Tag: master-post-reformat~116 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fopenssl.git;a=commitdiff_plain;h=32dfde107636ac9bc62a5b3233fe2a54dbc27008 RT3548: Remove unsupported platforms This commit removes DG-UX. It also flushes out some left-behinds in config. And regenerates TABLE from Configure (hadn't been done in awhile). Reviewed-by: Richard Levitte --- diff --git a/CHANGES b/CHANGES index 055d99138c..0f37df74cc 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,7 @@ SUNOS MPE/iX Sinix/ReliantUNIX RM400 + DGUX [Rich Salz] *) Experimental support for a new, fast, unbiased prime candidate generator, diff --git a/Configure b/Configure index f7d1b20b73..5c4a4600d4 100755 --- a/Configure +++ b/Configure @@ -512,11 +512,6 @@ my %table=( # did not like it. "cray-t3e", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown):CRAY::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:::", -# DGUX, 88100. -"dgux-R3-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):::RC4_INDEX DES_UNROLL:::", -"dgux-R4-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown)::-lnsl -lsocket:RC4_INDEX DES_UNROLL:::", -"dgux-R4-x86-gcc", "gcc:-O3 -fomit-frame-pointer -DL_ENDIAN::(unknown)::-lnsl -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", - # SIEMENS BS2000/OSD: an EBCDIC-based mainframe "BS2000-OSD","c89:-O -XLLML -XLLMK -XL -DB_ENDIAN -DTERMIOS -DCHARSET_EBCDIC::(unknown)::-lsocket -lnsl:THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR:::", diff --git a/TABLE b/TABLE index d778dac1df..3cd660c351 100644 --- a/TABLE +++ b/TABLE @@ -646,108 +646,6 @@ $ranlib = $arflags = $multilib = -*** ReliantUNIX -$cc = cc -$cflags = -KPIC -g -DTERMIOS -DB_ENDIAN -$unistd = -$thread_cflag = -Kthread -$sys_id = SNI -$lflags = -lsocket -lnsl -lc -L/usr/ucblib -lucb -$bn_ops = BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = void -$dso_scheme = dlfcn -$shared_target= reliantunix-shared -$shared_cflag = -$shared_ldflag = -$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) -$ranlib = -$arflags = -$multilib = - -*** SINIX -$cc = cc -$cflags = -O -$unistd = -$thread_cflag = (unknown) -$sys_id = SNI -$lflags = -lsocket -lnsl -lc -L/usr/ucblib -lucb -$bn_ops = RC4_INDEX RC4_CHAR -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - -*** SINIX-N -$cc = /usr/ucb/cc -$cflags = -O2 -misaligned -$unistd = -$thread_cflag = (unknown) -$sys_id = -$lflags = -lucb -$bn_ops = RC4_INDEX RC4_CHAR -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - *** UWIN $cc = cc $cflags = -DTERMIOS -DL_ENDIAN -O -Wall @@ -1530,6 +1428,40 @@ $ranlib = $arflags = $multilib = +*** darwin64-debug-test-64-clang +$cc = clang +$cflags = -arch x86_64 -DL_ENDIAN -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe +$unistd = +$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT +$sys_id = MACOSX +$lflags = +$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL +$cpuid_obj = x86_64cpuid.o +$bn_obj = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o +$ec_obj = ecp_nistz256.o ecp_nistz256-x86_64.o +$des_obj = +$aes_obj = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +$bf_obj = +$md5_obj = md5-x86_64.o +$sha1_obj = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o +$cast_obj = +$rc4_obj = rc4-x86_64.o rc4-md5-x86_64.o +$rmd160_obj = +$rc5_obj = +$wp_obj = wp-x86_64.o +$cmll_obj = cmll-x86_64.o cmll_misc.o +$modes_obj = ghash-x86_64.o aesni-gcm-x86_64.o +$engines_obj = e_padlock-x86_64.o +$perlasm_scheme = macosx +$dso_scheme = dlfcn +$shared_target= darwin-shared +$shared_cflag = -fPIC -fno-common +$shared_ldflag = -arch x86_64 -dynamiclib +$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib +$ranlib = +$arflags = +$multilib = + *** darwin64-ppc-cc $cc = cc $cflags = -arch ppc64 -O3 -DB_ENDIAN @@ -3094,6 +3026,40 @@ $ranlib = $arflags = $multilib = +*** debug-test-64-clang +$cc = clang +$cflags = -Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe +$unistd = +$thread_cflag = -pthread -D_THREAD_SAFE -D_REENTRANT +$sys_id = +$lflags = +$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL +$cpuid_obj = x86_64cpuid.o +$bn_obj = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o +$ec_obj = ecp_nistz256.o ecp_nistz256-x86_64.o +$des_obj = +$aes_obj = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +$bf_obj = +$md5_obj = md5-x86_64.o +$sha1_obj = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o +$cast_obj = +$rc4_obj = rc4-x86_64.o rc4-md5-x86_64.o +$rmd160_obj = +$rc5_obj = +$wp_obj = wp-x86_64.o +$cmll_obj = cmll-x86_64.o cmll_misc.o +$modes_obj = ghash-x86_64.o aesni-gcm-x86_64.o +$engines_obj = e_padlock-x86_64.o +$perlasm_scheme = elf +$dso_scheme = dlfcn +$shared_target= bsd-gcc-shared +$shared_cflag = -fPIC +$shared_ldflag = +$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) +$ranlib = +$arflags = +$multilib = + *** debug-ulf $cc = gcc $cflags = -DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations @@ -3162,108 +3128,6 @@ $ranlib = $arflags = $multilib = -*** dgux-R3-gcc -$cc = gcc -$cflags = -O3 -fomit-frame-pointer -$unistd = -$thread_cflag = (unknown) -$sys_id = -$lflags = -$bn_ops = RC4_INDEX DES_UNROLL -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - -*** dgux-R4-gcc -$cc = gcc -$cflags = -O3 -fomit-frame-pointer -$unistd = -$thread_cflag = (unknown) -$sys_id = -$lflags = -lnsl -lsocket -$bn_ops = RC4_INDEX DES_UNROLL -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - -*** dgux-R4-x86-gcc -$cc = gcc -$cflags = -O3 -fomit-frame-pointer -DL_ENDIAN -$unistd = -$thread_cflag = (unknown) -$sys_id = -$lflags = -lnsl -lsocket -$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT -$cpuid_obj = x86cpuid.o -$bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o -$ec_obj = -$des_obj = des-586.o crypt586.o -$aes_obj = aes-586.o vpaes-x86.o aesni-x86.o -$bf_obj = bf-586.o -$md5_obj = md5-586.o -$sha1_obj = sha1-586.o sha256-586.o sha512-586.o -$cast_obj = cast-586.o -$rc4_obj = rc4-586.o -$rmd160_obj = rmd-586.o -$rc5_obj = rc5-586.o -$wp_obj = wp_block.o wp-mmx.o -$cmll_obj = cmll-x86.o -$modes_obj = ghash-x86.o -$engines_obj = e_padlock-x86.o -$perlasm_scheme = elf -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - *** dist $cc = cc $cflags = -O @@ -5474,40 +5338,6 @@ $ranlib = $arflags = $multilib = -*** newsos4-gcc -$cc = gcc -$cflags = -O -DB_ENDIAN -$unistd = -$thread_cflag = (unknown) -$sys_id = NEWS4 -$lflags = -lmld -liberty -$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - *** nextstep $cc = cc $cflags = -O -Wall @@ -6188,40 +6018,6 @@ $ranlib = $arflags = $multilib = /64 -*** sunos-gcc -$cc = gcc -$cflags = -O3 -mv8 -Dssize_t=int -$unistd = -$thread_cflag = (unknown) -$sys_id = SUNOS -$lflags = -$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1 -$cpuid_obj = -$bn_obj = -$ec_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$wp_obj = -$cmll_obj = -$modes_obj = -$engines_obj = -$perlasm_scheme = void -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = -$multilib = - *** tandem-c89 $cc = c89 $cflags = -Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN diff --git a/bugs/dggccbug.c b/bugs/dggccbug.c deleted file mode 100644 index 30e07a60ea..0000000000 --- a/bugs/dggccbug.c +++ /dev/null @@ -1,45 +0,0 @@ -/* NOCW */ -/* dggccbug.c */ -/* bug found by Eric Young (eay@cryptsoft.com) - May 1995 */ - -#include - -/* There is a bug in - * gcc version 2.5.8 (88open OCS/BCS, DG-2.5.8.3, Oct 14 1994) - * as shipped with DGUX 5.4R3.10 that can be bypassed by defining - * DG_GCC_BUG in my code. - * The bug manifests itself by the vaule of a pointer that is - * used only by reference, not having it's value change when it is used - * to check for exiting the loop. Probably caused by there being 2 - * copies of the valiable, one in a register and one being an address - * that is passed. */ - -/* compare the out put from - * gcc dggccbug.c; ./a.out - * and - * gcc -O dggccbug.c; ./a.out - * compile with -DFIXBUG to remove the bug when optimising. - */ - -void inc(a) -int *a; - { - (*a)++; - } - -main() - { - int p=0; -#ifdef FIXBUG - int dummy; -#endif - - while (p<3) - { - fprintf(stderr,"%08X\n",p); - inc(&p); -#ifdef FIXBUG - dummy+=p; -#endif - } - } diff --git a/config b/config index 26a79c91e0..d0c8993635 100755 --- a/config +++ b/config @@ -102,10 +102,6 @@ fi # Now we simply scan though... In most cases, the SYSTEM info is enough # case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in - MPE/iX:*) - MACHINE=`echo "$MACHINE" | sed -e 's/-/_/g'` - echo "parisc-hp-MPE/iX"; exit 0 - ;; A/UX:*) echo "m68k-apple-aux3"; exit 0 ;; @@ -122,18 +118,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-ibm-aix3"; exit 0 ;; - BeOS:*:BePC) - if [ -e /boot/develop/headers/be/bone ]; then - echo "beos-x86-bone"; exit 0 - else - echo "beos-x86-r5"; exit 0 - fi - ;; - - dgux:*) - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - HI-UX:*) echo "${MACHINE}-hi-hiux"; exit 0 ;; @@ -336,10 +320,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-v11-${SYSTEM}"; exit 0; ;; - NEWS-OS:4.*) - echo "mips-sony-newsos4"; exit 0; - ;; - MINGW*) echo "${MACHINE}-whatever-mingw"; exit 0; ;; @@ -845,14 +825,11 @@ case "$GUESSOS" in fi ;; # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;; *-*-cygwin) OUT="Cygwin" ;; t3e-cray-unicosmk) OUT="cray-t3e" ;; j90-cray-unicos) OUT="cray-j90" ;; nsr-tandem-nsk) OUT="tandem-c89" ;; - beos-*) OUT="$GUESSOS" ;; x86pc-*-qnx6) OUT="QNX6-i386" ;; *-*-qnx6) OUT="QNX6" ;; x86-*-android|i?86-*-android) OUT="android-x86" ;; diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in index faa33a496d..504d93d0aa 100644 --- a/crypto/opensslconf.h.in +++ b/crypto/opensslconf.h.in @@ -154,8 +154,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! /* Unknown */ #elif defined( __aux ) /* 68K */ /* Unknown */ -#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ -# define DES_UNROLL #elif defined( __sgi ) /* Newer MIPS */ # define DES_PTR # define DES_RISC2 diff --git a/e_os.h b/e_os.h index ec011c8ceb..8b7bcf22c6 100644 --- a/e_os.h +++ b/e_os.h @@ -625,8 +625,6 @@ extern char *sys_errlist[]; extern int sys_nerr; /***********************************************/ -#define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */ - #ifdef sgi #define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */ #endif