Remove ultrix/mips support.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/CHANGES b/CHANGES
index b403d039e58cf6df47c8f6a977ec0b3a26829f0c..e73a95b1a5ddb531638381a8cc7025d8f74ab91e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 18705688467d5f71f5a03ed892c318692a32a62c..1d943862f4dbe591bcccc564cbdf36c763f29f83 100644 (file)
--- 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 320ff775f3932d8c4e57d4bc523a6566980a58b3..560f1b7aa3798df779cda63fbc7e2c9fc159523d 100644 (file)
--- 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 09d3954dada8049efbfa04d0bb815498c5a7acf4..ce9f768cdb149b60db829645f80d2ed5aa584259 100644 (file)
--- 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 ba3345a025229745554dadbdf47508f4834d550c..15b3400f71d0396f9f27e806af2637351a37d961 100644 (file)
--- 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 a2cd0407e1fad150d51204055856641e655b914a..55a8ddddd85536de99382f1597bde0d4ae97b312 100755 (executable)
--- 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 (file)
index 2cccd11..0000000
--- 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;