diff options
author | Rich Salz <rsalz@openssl.org> | 2016-03-17 14:47:49 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-17 15:29:15 -0400 |
commit | 23d38992fca13773291ca647220707bfb0636361 (patch) | |
tree | b7e4bb7468ff30cbcf953ebb70690847ed3d16f8 | |
parent | 8e56a4227bcd2e3eeb1cb18f3d0d5876ed76a8ce (diff) | |
download | openssl-23d38992fca13773291ca647220707bfb0636361.tar.gz |
Remove ultrix/mips support.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | Configurations/10-main.conf | 17 | ||||
-rw-r--r-- | crypto/bio/bss_log.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_lib.c | 6 | ||||
-rw-r--r-- | include/openssl/e_os2.h | 2 | ||||
-rwxr-xr-x | util/mk1mf.pl | 7 | ||||
-rw-r--r-- | util/pl/ultrix.pl | 38 |
7 files changed, 5 insertions, 70 deletions
@@ -7,6 +7,9 @@ *) Removed the aged BC-32 config and all its supporting scripts [Richard Levitte] + *) Removed support for Ultrix as a platform. + [Rich Salz] + *) Add support for HKDF. [Alessandro Ghedini] diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 1870568846..1d943862f4 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1551,23 +1551,6 @@ sub vc_wince_info { perlasm_scheme => "a.out", }, -#### Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at> - "ultrix-cc" => { - inherit_from => [ "BASE_unix" ], - cc => "cc", - cflags => "-std1 -O -Olimit 2500 -DL_ENDIAN", - thread_scheme => "(unknown)", - }, - "ultrix-gcc" => { - inherit_from => [ "BASE_unix" ], - cc => "gcc", - cflags => "-O3 -DL_ENDIAN", - bn_ops => "BN_LLONG", - thread_scheme => "(unknown)", - }, -# K&R C is no longer supported; you need gcc on old Ultrix installations -##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::", - ##### MacOS X (a.k.a. Darwin) setup "darwin-common" => { inherit_from => [ "BASE_unix" ], diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 320ff775f3..560f1b7aa3 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -83,8 +83,6 @@ void *_malloc32(__size_t); # endif /* __INITIAL_POINTER_SIZE == 64 */ # endif /* __INITIAL_POINTER_SIZE && defined * _ANSI_C_SOURCE */ -#elif defined(__ultrix) -# include <sys/syslog.h> #elif defined(OPENSSL_SYS_NETWARE) # define NO_SYSLOG #elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG) diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index 09d3954dad..ce9f768cdb 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -345,11 +345,6 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) A[2] = a2; A[3] = a3; } - /* - * workaround for ultrix cc: without 'case 0', the optimizer does - * the switch table by doing a=top&3; a--; goto jump_table[a]; - * which fails for top== 0 - */ switch (b->top & 3) { case 3: A[2] = B[2]; @@ -358,6 +353,7 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) case 1: A[0] = B[0]; case 0: + /* Without the "case 0" some old optimizers got this wrong. */ ; } } diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index ba3345a025..15b3400f71 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -269,7 +269,7 @@ extern "C" { # endif # endif -# if (defined(__ultrix) || defined(OPENSSL_SYS_UEFI)) && !defined(ssize_t) +# if defined(OPENSSL_SYS_UEFI) && !defined(ssize_t) # define ossl_ssize_t int # define OSSL_SSIZE_MAX INT_MAX # endif diff --git a/util/mk1mf.pl b/util/mk1mf.pl index a2cd0407e1..55a8ddddd8 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -107,7 +107,6 @@ $infile="MINFO"; "Mingw32", "GNU C++ - Windows NT or 9x", "Mingw32-files", "Create files with DOS copy ...", "linux-elf","Linux elf", - "ultrix-mips","DEC mips ultrix", "FreeBSD","FreeBSD distribution", "OS2-EMX", "EMX GCC OS/2", "netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets", @@ -234,12 +233,6 @@ elsif ($platform eq "linux-elf") require "linux.pl"; $unix=1; } -elsif ($platform eq "ultrix-mips") - { - require "unix.pl"; - require "ultrix.pl"; - $unix=1; - } elsif ($platform eq "OS2-EMX") { $wc=1; diff --git a/util/pl/ultrix.pl b/util/pl/ultrix.pl deleted file mode 100644 index 2cccd115a0..0000000000 --- a/util/pl/ultrix.pl +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/local/bin/perl -# -# linux.pl - the standard unix makefile stuff. -# - -$o='/'; -$cp='/bin/cp'; -$rm='/bin/rm -f'; - -# C compiler stuff - -$cc='cc'; -if ($debug) - { $cflags="-g -DREF_DEBUG"; } -else - { $cflags="-O2"; } - -$cflags.=" -std1 -DL_ENDIAN"; - -if (!$no_asm) - { - $bn_asm_obj='$(OBJ_D)/mips1.o'; - $bn_asm_src='crypto/bn/asm/mips1.s'; - } - -sub do_link_rule - { - local($target,$files,$dep_libs,$libs)=@_; - local($ret,$_); - - $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($target); - $ret.="$target: $files $dep_libs\n"; - $ret.="\t\$(LINK_CMD) ${efile}$target \$(LFLAGS) $files $libs\n\n"; - return($ret); - } - -1; |