RT3548: Remove some obsolete platforms
authorRich Salz <rsalz@openssl.org>
Thu, 18 Dec 2014 19:17:33 +0000 (14:17 -0500)
committerRich Salz <rsalz@openssl.org>
Thu, 18 Dec 2014 19:17:33 +0000 (14:17 -0500)
This commit removes Sony NEWS4

Reviewed-by: Richard Levitte <levitte@openssl.org>
CHANGES
Configure
e_os.h
e_os2.h

diff --git a/CHANGES b/CHANGES
index 770ece4e947ee421c1fd135bf10d940d2874af9a..4510706333ebbbb49e2c9b83735a09db23f3c442 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,7 +17,9 @@
      done while fixing the error code for the key-too-small case.
      [Annie Yousar <a.yousar@informatik.hu-berlin.de>]
 
      done while fixing the error code for the key-too-small case.
      [Annie Yousar <a.yousar@informatik.hu-berlin.de>]
 
-  *) Remove BEOS and BEOS_R5 code.
+  *) Remove various unsupported platforms:
+       Sony NEWS4
+       Remove BEOS and BEOS_R5
      [Rich Salz]
 
   *) Experimental support for a new, fast, unbiased prime candidate generator,
      [Rich Salz]
 
   *) Experimental support for a new, fast, unbiased prime candidate generator,
index b59f807fbcc8cbfe3743ee217b18f969382c2b22..43f1b30c1702d6501c9cc01cc7f32ffa82edb0a7 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -626,9 +626,6 @@ my %table=(
 ##### A/UX
 "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
 
 ##### A/UX
 "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
 
-##### Sony NEWS-OS 4.x
-"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
-
 ##### GNU Hurd
 "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
 
 ##### GNU Hurd
 "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
 
diff --git a/e_os.h b/e_os.h
index 6f5edfba2a9dc763f16ab141092bf392bd6dda85..d0c8ed592438af8c21c1f967cf035204cabb22b7 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -432,15 +432,11 @@ static __inline unsigned int _strlen31(const char *str)
 #    ifndef NO_SYS_TYPES_H
 #      include <sys/types.h>
 #    endif
 #    ifndef NO_SYS_TYPES_H
 #      include <sys/types.h>
 #    endif
-#    if defined(NeXT) || defined(OPENSSL_SYS_NEWS4)
+#    if defined(NeXT)
 #      define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP
                          * (unless when compiling with -D_POSIX_SOURCE,
                          * which doesn't work for us) */
 #    endif
 #      define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP
                          * (unless when compiling with -D_POSIX_SOURCE,
                          * which doesn't work for us) */
 #    endif
-#    ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */
-#      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
-       typedef unsigned long clock_t;
-#    endif
 #    ifdef OPENSSL_SYS_WIN32_CYGWIN
 #      include <io.h>
 #      include <fcntl.h>
 #    ifdef OPENSSL_SYS_WIN32_CYGWIN
 #      include <io.h>
 #      include <fcntl.h>
diff --git a/e_os2.h b/e_os2.h
index bfc9606bb3f7d783805e389363718cd638f326b3..68801f419ef583b87ea2c75529ea15fd8cb2ee63 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -165,9 +165,6 @@ extern "C" {
 # ifdef OPENSSL_SYSNAME_ULTRASPARC
 #  define OPENSSL_SYS_ULTRASPARC
 # endif
 # ifdef OPENSSL_SYSNAME_ULTRASPARC
 #  define OPENSSL_SYS_ULTRASPARC
 # endif
-# ifdef OPENSSL_SYSNAME_NEWS4
-#  define OPENSSL_SYS_NEWS4
-# endif
 # ifdef OPENSSL_SYSNAME_MACOSX
 #  define OPENSSL_SYS_MACOSX
 # endif
 # ifdef OPENSSL_SYSNAME_MACOSX
 #  define OPENSSL_SYS_MACOSX
 # endif
@@ -272,7 +269,7 @@ extern "C" {
 #  define ossl_ssize_t long
 #endif
 
 #  define ossl_ssize_t long
 #endif
 
-#if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
+#if defined(NeXT) || defined(OPENSSL_SYS_SUNOS)
 #  define ssize_t int
 #endif
 
 #  define ssize_t int
 #endif