Bug 1563221 remove support for older unix in NSS part 1 OSF r=nss-reviewers,djackson

Differential Revision: https://phabricator.services.mozilla.com/D36755

22 files changed, 3 insertions, 284 deletions

diff --git a/cmd/modutil/install.c b/cmd/modutil/install.c
index ea4aeb77c..4862cbc35 100644
--- a/cmd/modutil/install.c
+++ b/cmd/modutil/install.c
@@ -252,23 +252,10 @@ Pk11Install_Release()
  * and sends the string to the handler function if it exists.
  */
 
-#ifdef OSF1
-/* stdarg has already been pulled in from NSPR */
-#undef va_start
-#undef va_end
-#undef va_arg
-#include <varargs.h>
-#else
 #include <stdarg.h>
-#endif
 
-#ifdef OSF1
-static void
-error(long va_alist, ...)
-#else
 static void
 error(PRErrorCode errcode, ...)
-#endif
 {
 
     va_list ap;
@@ -286,13 +273,8 @@ error(PRErrorCode errcode, ...)
     PR_Unlock(errorHandlerLock);
 
     if (handler) {
-#ifdef OSF1
-        va_start(ap);
-        errstr = PR_vsmprintf(errorString[va_arg(ap, Pk11Install_Error)], ap);
-#else
         va_start(ap, errcode);
         errstr = PR_vsmprintf(errorString[errcode], ap);
-#endif
         handler(errstr);
         PR_smprintf_free(errstr);
         va_end(ap);
diff --git a/coreconf/OSF1.mk b/coreconf/OSF1.mk
deleted file mode 100644
index 4e411c139..000000000
--- a/coreconf/OSF1.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#
-# The Bourne shell (sh) on OSF1 doesn't handle "set -e" correctly,
-# which we use to stop LOOP_OVER_DIRS submakes as soon as any
-# submake fails.  So we use the Korn shell instead.
-#
-SHELL = /usr/bin/ksh
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC         = cc
-OS_CFLAGS += $(NON_LD_FLAGS) -std1
-CCC        = cxx
-RANLIB     = /bin/true
-CPU_ARCH   = alpha
-
-ifdef BUILD_OPT
-	OPTIMIZER += -Olimit 4000
-endif
-
-NON_LD_FLAGS += -ieee_with_inexact
-OS_CFLAGS    += -DOSF1 -D_REENTRANT 
-
-ifeq ($(USE_PTHREADS),1)
-	OS_CFLAGS += -pthread
-endif
-
-# The command to build a shared library on OSF1.
-MKSHLIB    += ld -shared -expect_unresolved "*" -soname $(notdir $@)
-ifdef MAPFILE
-MKSHLIB += -hidden -input $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
- sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@
-
-DSO_LDOPTS += -shared
-
-# required for freebl
-USE_64=1
-# this platform name does not use a bit tag due to only having a 64-bit ABI
-64BIT_TAG=
-
diff --git a/coreconf/OSF1V2.0.mk b/coreconf/OSF1V2.0.mk
deleted file mode 100644
index e1e9f23db..000000000
--- a/coreconf/OSF1V2.0.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1.mk
diff --git a/coreconf/OSF1V3.0.mk b/coreconf/OSF1V3.0.mk
deleted file mode 100644
index e1e9f23db..000000000
--- a/coreconf/OSF1V3.0.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1.mk
diff --git a/coreconf/OSF1V3.2.mk b/coreconf/OSF1V3.2.mk
deleted file mode 100644
index 17178e73c..000000000
--- a/coreconf/OSF1V3.2.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V3.2, classic nspr is the default (and only) implementation
-# strategy.
-
-#
-# Config stuff for DEC OSF/1 V3.2
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V3.2)
-	OS_CFLAGS += -DOSF1V3
-endif
diff --git a/coreconf/OSF1V4.0.mk b/coreconf/OSF1V4.0.mk
deleted file mode 100644
index b563c7291..000000000
--- a/coreconf/OSF1V4.0.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V4.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V4.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V4.0)
-	OS_CFLAGS += -DOSF1V4
-endif
diff --git a/coreconf/OSF1V4.0B.mk b/coreconf/OSF1V4.0B.mk
deleted file mode 100644
index 7282ba727..000000000
--- a/coreconf/OSF1V4.0B.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
diff --git a/coreconf/OSF1V4.0D.mk b/coreconf/OSF1V4.0D.mk
deleted file mode 100644
index 6b0802ec8..000000000
--- a/coreconf/OSF1V4.0D.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
-DEFINES	+= -DOSF1V4D
-
-OS_LIBS += -lpthread -lrt
-
diff --git a/coreconf/OSF1V5.0.mk b/coreconf/OSF1V5.0.mk
deleted file mode 100644
index 02fc8d2d8..000000000
--- a/coreconf/OSF1V5.0.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V5.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
diff --git a/coreconf/OSF1V5.1.mk b/coreconf/OSF1V5.1.mk
deleted file mode 100644
index 854bb5316..000000000
--- a/coreconf/OSF1V5.1.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# On OSF1 V5.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.1
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
diff --git a/coreconf/arch.mk b/coreconf/arch.mk
index 2012d1879..378bbb6eb 100644
--- a/coreconf/arch.mk
+++ b/coreconf/arch.mk
@@ -74,20 +74,6 @@ ifeq ($(OS_ARCH),AIX)
 endif
 
 #
-# Distinguish between OSF1 V4.0B and V4.0D
-#
-
-ifeq ($(OS_ARCH)$(OS_RELEASE),OSF1V4.0)
-    OS_VERSION := $(shell uname -v)
-    ifeq ($(OS_VERSION),564)
-	OS_RELEASE := V4.0B
-    endif
-    ifeq ($(OS_VERSION),878)
-	OS_RELEASE := V4.0D
-    endif
-endif
-
-#
 # SINIX changes name to ReliantUNIX with 5.43
 #
 
diff --git a/lib/dbm/config/config.mk b/lib/dbm/config/config.mk
index 9ad98af82..2ced44a95 100644
--- a/lib/dbm/config/config.mk
+++ b/lib/dbm/config/config.mk
@@ -15,15 +15,7 @@ DEFINES += -DSTDC_HEADERS -DHAVE_STRERROR
 # Most platforms have snprintf, so it's simpler to list the exceptions.
 #
 HAVE_SNPRINTF = 1
-#
-# OSF1 V4.0D doesn't have snprintf but V5.0A does.
-#
-ifeq ($(OS_TARGET)$(OS_RELEASE),OSF1V4.0D)
-HAVE_SNPRINTF =
-endif
-ifdef HAVE_SNPRINTF
 DEFINES += -DHAVE_SNPRINTF
-endif
 
 ifeq (,$(filter-out DGUX NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET)))
 DEFINES += -DHAVE_SYS_BYTEORDER_H
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
index 767335730..536bdbb19 100644
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -175,11 +175,6 @@ endif
     endif
 endif
 
-ifeq ($(OS_TARGET),OSF1)
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
-    MPI_SRCS += mpvalpha.c
-endif
-
 ifeq (OS2,$(OS_TARGET))
     ASFILES  = mpi_x86_os2.s
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
diff --git a/lib/freebl/arcfour.c b/lib/freebl/arcfour.c
index e37b45843..72e696e52 100644
--- a/lib/freebl/arcfour.c
+++ b/lib/freebl/arcfour.c
@@ -22,7 +22,7 @@
 #define CONVERT_TO_WORDS
 #endif
 
-#if defined(AIX) || defined(OSF1) || defined(NSS_BEVAND_ARCFOUR)
+#if defined(AIX) || defined(NSS_BEVAND_ARCFOUR)
 /* Treat array variables as words, not bytes, on CPUs that take
  * much longer to write bytes than to write words, or when using
  * assembler code that required it.
diff --git a/lib/freebl/mpi/mpi.c b/lib/freebl/mpi/mpi.c
index 1d306696f..3c5494a64 100644
--- a/lib/freebl/mpi/mpi.c
+++ b/lib/freebl/mpi/mpi.c
@@ -9,9 +9,6 @@
 
 #include "mpi-priv.h"
 #include "mplogic.h"
-#if defined(OSF1)
-#include <c_asm.h>
-#endif
 
 #if defined(__arm__) && \
     ((defined(__thumb__) && !defined(__thumb2__)) || defined(__ARM_ARCH_3__))
@@ -3930,12 +3927,6 @@ s_mp_mul(mp_int *a, const mp_int *b)
         Plo = (mp_digit)product;                                \
         Phi = (mp_digit)(product >> MP_DIGIT_BIT);              \
     }
-#elif defined(OSF1)
-#define MP_MUL_DxD(a, b, Phi, Plo)              \
-    {                                           \
-        Plo = asm("mulq %a0, %a1, %v0", a, b);  \
-        Phi = asm("umulh %a0, %a1, %v0", a, b); \
-    }
 #else
 #define MP_MUL_DxD(a, b, Phi, Plo)                                 \
     {                                                              \
@@ -4081,12 +4072,6 @@ s_mpv_mul_d_add_prop(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *c)
         Plo = (mp_digit)square;                                \
         Phi = (mp_digit)(square >> MP_DIGIT_BIT);              \
     }
-#elif defined(OSF1)
-#define MP_SQR_D(a, Phi, Plo)                \
-    {                                        \
-        Plo = asm("mulq  %a0, %a0, %v0", a); \
-        Phi = asm("umulh %a0, %a0, %v0", a); \
-    }
 #else
 #define MP_SQR_D(a, Phi, Plo)                                      \
     {                                                              \
diff --git a/lib/freebl/unix_rand.c b/lib/freebl/unix_rand.c
index 24381cb26..d0c00a8ef 100644
--- a/lib/freebl/unix_rand.c
+++ b/lib/freebl/unix_rand.c
@@ -287,49 +287,6 @@ GiveSystemInfo(void)
 }
 #endif /* HPUX */
 
-#if defined(OSF1)
-#include <sys/types.h>
-#include <sys/sysinfo.h>
-#include <sys/systeminfo.h>
-#include <c_asm.h>
-
-static void
-GiveSystemInfo(void)
-{
-    char buf[BUFSIZ];
-    int rv;
-    int off = 0;
-
-    rv = sysinfo(SI_MACHINE, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-    rv = sysinfo(SI_RELEASE, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-    rv = sysinfo(SI_HW_SERIAL, buf, sizeof(buf));
-    if (rv > 0) {
-        RNG_RandomUpdate(buf, rv);
-    }
-}
-
-/*
- * Use the "get the cycle counter" instruction on the alpha.
- * The low 32 bits completely turn over in less than a minute.
- * The high 32 bits are some non-counter gunk that changes sometimes.
- */
-static size_t
-GetHighResClock(void *buf, size_t maxbytes)
-{
-    unsigned long t;
-
-    t = asm("rpcc %v0");
-    return CopyLowBits(buf, maxbytes, &t, sizeof(t));
-}
-
-#endif /* Alpha */
-
 #if defined(_IBMR2)
 static size_t
 GetHighResClock(void *buf, size_t maxbytes)
diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c
index acb51a145..fcb680b14 100644
--- a/lib/ssl/sslsnce.c
+++ b/lib/ssl/sslsnce.c
@@ -237,8 +237,6 @@ static PRBool isMultiProcess = PR_FALSE;
 
 #if defined(AIX) || defined(LINUX) || defined(NETBSD) || defined(OPENBSD)
 #define MAX_SID_CACHE_LOCKS 8 /* two FDs per lock */
-#elif defined(OSF1)
-#define MAX_SID_CACHE_LOCKS 16 /* one FD per lock */
 #else
 #define MAX_SID_CACHE_LOCKS 256
 #endif
diff --git a/tests/header b/tests/header
index 5a1dead72..d15d117ad 100644
--- a/tests/header
+++ b/tests/header
@@ -314,7 +314,6 @@ map_os64()
 {
   IS_64=""
   case `uname -s` in
-      #OSF1) has been done already - always 64 bit
       SunOS)
           MAPPED_OS=Solaris*8
           IS_64=`(isainfo -v | grep 64)>/dev/null 2>/dev/null && echo 64 bit`
@@ -1200,7 +1199,7 @@ bc()
 ########################################################################
 Ps()
 {
-#AIX, OSF ps -ef, solaris /usr/5bin/ps -ef, win ps -ef but no user id
+#AIX, ps -ef, solaris /usr/5bin/ps -ef, win ps -ef but no user id
 #linux ps -ef, HP
 
     if [ $os_name = "SunOS" ]
diff --git a/tests/mksymlinks b/tests/mksymlinks
index aae3386ce..d592f789b 100755
--- a/tests/mksymlinks
+++ b/tests/mksymlinks
@@ -54,18 +54,6 @@ fi
 
 ErrorFlag=0
 
-#if [  ! -h OSF1V5.1_DBG.OBJ -a ! -d OSF1V5.1_DBG.OBJ ] ; then 
-    #ln -s OSF1V4.0D_DBG.OBJ OSF1V5.1_DBG.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.1_OPT.OBJ -a ! -d OSF1V5.1_OPT.OBJ ] ; then 
-    #ln -s OSF1V4.0D_OPT.OBJ OSF1V5.1_OPT.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.0_DBG.OBJ -a ! -d OSF1V5.0_DBG.OBJ ] ; then 
-    #ln -s OSF1V4.0D_DBG.OBJ OSF1V5.0_DBG.OBJ || ErrorFlag=1
-#fi
-#if [  ! -h OSF1V5.0_OPT.OBJ -a ! -d OSF1V5.0_OPT.OBJ ] ; then 
-    #ln -s OSF1V4.0D_OPT.OBJ OSF1V5.0_OPT.OBJ || ErrorFlag=1
-#fi
 if [  ! -h SunOS5.9_64_DBG.OBJ  -a ! -d  SunOS5.9_64_DBG.OBJ ] ; then 
     ln -s SunOS5.8_64_DBG.OBJ SunOS5.9_64_DBG.OBJ || ErrorFlag=1
 fi
diff --git a/tests/nssqa b/tests/nssqa
index 441128155..6df92fedd 100755
--- a/tests/nssqa
+++ b/tests/nssqa
@@ -143,9 +143,6 @@ map_os32()
                 MAPPED_OS=Solaris8_forte6
             fi
             ;;
-        OSF1)
-            MAPPED_OS=OSF1V4.0
-            ;;
         Darwin)
             MAPPED_OS=Darwin6.5
             ;;	
@@ -190,8 +187,7 @@ nssqa_main()
 
   if [ $O_WIN = "OFF" -a "$O_TBX" = "OFF" -a $O_LOCAL = "OFF" ] ; then
       if [ ! -h ${NTDIST}/WINNT5.0_DBG.OBJ -o \
-              ! -h ${UXDIST}/SunOS5.8_OPT.OBJ -o \
-              ! -h ${UXDIST}/OSF1V5.0_DBG.OBJ ] ; then
+              ! -h ${UXDIST}/SunOS5.8_OPT.OBJ -o ] ; then
           # determine if all needed symbolic links are present, in case
           # we build on one platform and QA on another
           # create the symbolic links
diff --git a/tests/platformlist.tbx b/tests/platformlist.tbx
index 435284cff..debb34b2a 100644
--- a/tests/platformlist.tbx
+++ b/tests/platformlist.tbx
@@ -2,8 +2,6 @@ AIX_3_32_bit AIX4.3_DBG.OBJ AIX4.3_OPT.OBJ
 AIX_3_64_bit AIX4.3_DBG.OBJ AIX4.3_OPT.OBJ AIX4.3_64_DBG.OBJ AIX4.3_64_OPT.OBJ
 HP-UX_B.11.00_32_bit  HP-UXB.11.00_DBG.OBJ HP-UXB.11.00_OPT.OBJ
 HP-UX_B.11.00_64_bit  HP-UXB.11.00_DBG.OBJ HP-UXB.11.00_OPT.OBJ 
-OSF1_V4.0 OSF1V4.0D_DBG.OBJ OSF1V4.0D_OPT.OBJ
-OSF1_V5.0 OSF1V5.0_DBG.OBJ OSF1V5.0_OPT.OBJ
 RH_Linux_6.2_(Zoot) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
 RH_Linux_6.1_(Cartman) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
 RH_Linux_6.0_(Hedwig) Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ
diff --git a/tests/set_environment b/tests/set_environment
index 5a3515cca..3558f9e28 100644
--- a/tests/set_environment
+++ b/tests/set_environment
@@ -121,11 +121,6 @@ then
     export TERM
     JAVA_HOME="/share/builds/components/cms_jdk/AIX/1.3.0"
     JAVA_HOME14=$JAVA_HOME
-elif [ "$os_name" = "OSF1" ]
-then
-    PATH=$PATH:/usr/local/bin
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/OSF1"
-    JAVA_HOME14=$JAVA_HOME
 fi
 
 if [ "$os_name" = "IRIX" ]