Bug 1563221 remove older unix support in NSS part 3 Irix r=nss-reviewers,djackson
authorLudovic Hirlimann <ludovic@mozilla.com>
Wed, 07 Sep 2022 21:14:23 +0000
changeset 16321 ee2e9b06b590e75bc79154fbfacab20a51135655
parent 16320 b066df5e9148958e93fa804f8b7688ae897d9c77
child 16322 e0b144ea73b75cc3b9c319dcd2217f09fe6c4584
push id4197
push userjschanck@mozilla.com
push dateWed, 07 Sep 2022 21:16:34 +0000
reviewersnss-reviewers, djackson
bugs1563221
Bug 1563221 remove older unix support in NSS part 3 Irix r=nss-reviewers,djackson Depends on D36756 Differential Revision: https://phabricator.services.mozilla.com/D36757
coreconf/IRIX.mk
coreconf/IRIX5.2.mk
coreconf/IRIX5.3.mk
coreconf/IRIX5.mk
coreconf/IRIX6.2.mk
coreconf/IRIX6.3.mk
coreconf/IRIX6.5.mk
coreconf/IRIX6.mk
coreconf/arch.mk
lib/freebl/Makefile
lib/freebl/mpi/mpi.h
tests/set_environment
deleted file mode 100644
--- a/coreconf/IRIX.mk
+++ /dev/null
@@ -1,91 +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/UNIX.mk
-
-#
-# The default implementation strategy for Irix is classic nspr.
-#
-ifeq ($(USE_PTHREADS),1)
-	ifeq ($(USE_N32),1)
-		IMPL_STRATEGY = _n32_PTH
-	else
-		IMPL_STRATEGY = _PTH
-	endif
-endif
-
-DEFAULT_COMPILER = cc
-
-ifdef NS_USE_GCC
-	CC		= gcc
-	AS		= $(CC) -x assembler-with-cpp
-	ODD_CFLAGS	= -Wall -Wno-format -Wno-switch
-	ifdef BUILD_OPT
-		OPTIMIZER	= -O6
-	endif
-else
-	CC	= cc
-	CCC		= CC
-	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
-	ifdef BUILD_OPT
-		ifeq ($(USE_N32),1)
-			OPTIMIZER	= -O -OPT:Olimit=4000
-		else
-			OPTIMIZER	= -O -Olimit 4000
-		endif
-	endif
-
-	# For 6.x machines, include this flag
-	ifeq (6., $(findstring 6., $(OS_RELEASE)))
-		ifeq ($(USE_N32),1)
-			ODD_CFLAGS	+= -n32 -mips3 -exceptions
-		else
-			ODD_CFLAGS	+= -32 -multigot
-		endif
-	else
-		ODD_CFLAGS		+= -xgot
-	endif
-	ifeq ($(USE_N32),1)
-		OS_CFLAGS	+= -dollar
-	endif
-endif
-
-ODD_CFLAGS	+= -DSVR4 -DIRIX 
-
-CPU_ARCH	= mips
-
-RANLIB		= /bin/true
-# For purify
-# NOTE: should always define _SGI_MP_SOURCE
-NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
-
-OS_CFLAGS += $(NOMD_OS_CFLAGS)
-
-ifeq ($(USE_N32),1)
-	SHLIB_LD_OPTS	+= -n32 -mips3
-endif
-
-MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $< $@
-
-DSO_LDOPTS	= -elf -shared -all
-
-ifdef DSO_BACKEND
-	DSO_LDOPTS += -soname $(DSO_NAME)
-endif
-
-#
-# Revision notes:
-#
-# In the IRIX compilers prior to version 7.2, -n32 implied -mips3.
-# Beginning in the 7.2 compilers, -n32 implies -mips4 when the compiler
-# is running on a system with a mips4 CPU (e.g. R8K, R10K).
-# We want our code to explicitly be mips3 code, so we now explicitly
-# set -mips3 whenever we set -n32.
-#
deleted file mode 100644
--- a/coreconf/IRIX5.2.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/IRIX5.mk
deleted file mode 100644
--- a/coreconf/IRIX5.3.mk
+++ /dev/null
@@ -1,7 +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/IRIX5.mk
-
-OS_CFLAGS += -DIRIX5_3
deleted file mode 100644
--- a/coreconf/IRIX5.mk
+++ /dev/null
@@ -1,10 +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/IRIX.mk
-
-ifndef NS_USE_GCC
-	ODD_CFLAGS += -xgot
-endif
deleted file mode 100644
--- a/coreconf/IRIX6.2.mk
+++ /dev/null
@@ -1,13 +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/.
-
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_2
deleted file mode 100644
--- a/coreconf/IRIX6.3.mk
+++ /dev/null
@@ -1,12 +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/.
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_3
deleted file mode 100644
--- a/coreconf/IRIX6.5.mk
+++ /dev/null
@@ -1,15 +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/.
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_5
-ifndef NS_USE_GCC
-OS_CFLAGS += -mips3
-endif
deleted file mode 100644
--- a/coreconf/IRIX6.mk
+++ /dev/null
@@ -1,17 +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/IRIX.mk
-
-ifndef NS_USE_GCC
-	ifneq ($(USE_N32),1)
-	OS_CFLAGS  += -32
-	endif
-	ODD_CFLAGS += -multigot
-endif
-
-ifeq ($(USE_PTHREADS),1)
-OS_LIBS += -lpthread
-endif
--- a/coreconf/arch.mk
+++ b/coreconf/arch.mk
@@ -28,23 +28,16 @@ OS_ARCH := $(subst /,_,$(shell uname -s)
 
 OS_TEST := $(shell uname -m)
 ifeq ($(OS_TEST),i86pc)
     OS_RELEASE := $(shell uname -r)_$(OS_TEST)
 else
     OS_RELEASE := $(shell uname -r)
 endif
 
-#
-# Force the IRIX64 machines to use IRIX.
-#
-
-ifeq ($(OS_ARCH),IRIX64)
-    OS_ARCH = IRIX
-endif
 
 #
 # Force the older BSD/OS versions to use the new arch name.
 #
 
 ifeq ($(OS_ARCH),BSD_386)
     OS_ARCH = BSD_OS
 endif
@@ -84,20 +77,19 @@ endif
 
 ifeq ($(OS_ARCH),SINIX-N)
     OS_ARCH    = ReliantUNIX
     OS_RELEASE = 5.4
 endif
 
 #
 # Handle FreeBSD 2.2-STABLE, Linux 2.0.30-osfmach3, and
-# IRIX 6.5-ALPHA-1289139620.
 #
 
-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
+ifeq (,$(filter-out Linux FreeBSD ,$(OS_ARCH)))
     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
 endif
 
 ifeq ($(OS_ARCH),Linux)
     OS_RELEASE := $(subst ., ,$(OS_RELEASE))
     ifneq ($(words $(OS_RELEASE)),1)
 	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
     endif
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -250,29 +250,16 @@ ifeq ($(CPU_ARCH),x86_64)
         EXTRA_SRCS += sha256-x86.c
     endif
     MPI_SRCS += mpi_amd64.c
 endif
 endif
 endif
 endif
 
-ifeq ($(OS_TARGET),IRIX)
-ifeq ($(USE_N32),1)
-    ASFILES  = mpi_mips.s
-    ifeq ($(NS_USE_GCC),1)
-	ASFLAGS = -Wp,-P -Wp,-traditional -O -mips3
-    else
-	ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3
-    endif
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
-    DEFINES += -DMP_USE_UINT_DIGIT
-endif
-endif
-
 ifeq ($(OS_TARGET),Darwin)
 ifeq ($(CPU_ARCH),x86_64)
     ASFILES  = mpi_amd64_common.s
     DEFINES += -DMPI_AMD64 -DMP_IS_LITTLE_ENDIAN
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DNSS_USE_COMBA
     MPI_SRCS += mpi_amd64.c mp_comba.c
 else ifeq ($(CPU_ARCH),x86)
     ASFILES  = mpi_sse2.s
--- a/lib/freebl/mpi/mpi.h
+++ b/lib/freebl/mpi/mpi.h
@@ -59,17 +59,17 @@ typedef int mp_err;
 #error "USHRT_MAX not defined"
 #endif
 
 #if defined(ULLONG_MAX) /* C99, Solaris */
 #define MP_ULONG_LONG_MAX ULLONG_MAX
 /* MP_ULONG_LONG_MAX was defined to be ULLONG_MAX */
 #elif defined(ULONG_LONG_MAX) /* HPUX */
 #define MP_ULONG_LONG_MAX ULONG_LONG_MAX
-#elif defined(ULONGLONG_MAX) /* IRIX, AIX */
+#elif defined(ULONGLONG_MAX) /* AIX */
 #define MP_ULONG_LONG_MAX ULONGLONG_MAX
 #endif
 
 /* We only use unsigned long for mp_digit iff long is more than 32 bits. */
 #if !defined(MP_USE_UINT_DIGIT) && ULONG_MAX > MP_32BIT_MAX
 typedef unsigned long mp_digit;
 #define MP_DIGIT_MAX ULONG_MAX
 #define MP_DIGIT_FMT "%016lX" /* printf() format for 1 digit */
--- a/tests/set_environment
+++ b/tests/set_environment
@@ -87,28 +87,16 @@ then
             PATH=$PATH:/usr/dist/pkgs/forte_dev,v6.2/SUNWspro/bin:/tools/ns/workshop/bin
         else
             PATH=$PATH:/usr/dist/share/devpro,v5.0/5.x-sparc/bin:/tools/ns/workshop/bin
         fi
         PATH=$PATH:/usr/ccs/bin:/usr/ucb/bin:/opt/SUNWwabi/bin:/usr/local/bin:/tools/ns/bin:/etc:/tools/contrib/bin
      fi
     export XAPPLRESDIR  OPENWINHOME LD_LIBRARY_PATH
 
-elif [ "$os_name" = "IRIX" ]
-then
-    PATH=$PATH:/tools/ns/bin:/usr/local/bin:/etc:/usr/bsd
-    MANPATH=/tools/ns/man:/usr/local/man
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/IRIX"
-    JAVA_HOME14=$JAVA_HOME
-elif [ "$os_name" = "IRIX64" ]
-then
-    PATH=$PATH:/tools/ns/bin:/usr/local/bin:/etc:/usr/bsd
-    MANPATH=/tools/ns/man:/usr/local/man
-    JAVA_HOME="/share/builds/components/jdk/1.2.2/IRIX"
-    JAVA_HOME14=$JAVA_HOME
 elif [ "$os_name" = "Linux" ]
 then
     PATH=/lib:/usr/lib:/bin:/sbin:/usr/bin:/usr/sbin:$PATH
     RMAIL=sendmail
     #the gnu grep, on Linux can output 10 lines above and 3 lines below 
     #the errormessage
     BEFORE_CONTEXT_GREP="--before-context=10"
     AFTER_CONTEXT_GREP="--after-context=3"
@@ -118,24 +106,16 @@ elif [ "$os_name" = "AIX" ]
 then
     PATH=$PATH:/tools/contrib/bin:/usr/local/bin 
     TERM=vt100
     export TERM
     JAVA_HOME="/share/builds/components/cms_jdk/AIX/1.3.0"
     JAVA_HOME14=$JAVA_HOME
 fi
 
-if [ "$os_name" = "IRIX" ]
-then
-    PATH=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin:$PATH
-elif [ "$os_name" = "IRIX64" ]
-then
-    PATH=/tools/ns-arch/soft/perl-5.004_04/run/default/mips_sgi_irix5.3/bin:$PATH
-fi
-
 O_CYGNUS=OFF
 O_MKS=OFF
 O_WIN=OFF
 
 if [ "$os_name" = "CYGWIN_NT-4.0" -o \
     "$os_name" = "CYGWIN_NT-5.0" -o \
     "$os_name" = "CYGWIN_95-4.0" -o \
     "$os_name" = "CYGWIN_98-4.10" ]