diff options
author | Ludovic Hirlimann <ludovic@mozilla.com> | 2022-09-07 21:14:23 +0000 |
---|---|---|
committer | Ludovic Hirlimann <ludovic@mozilla.com> | 2022-09-07 21:14:23 +0000 |
commit | 0e775c98fd0fbfa50012c4a6254351a8e12f4811 (patch) | |
tree | 237aec017d9014638b46e73cd07da652d7e58d0b | |
parent | 8c03473aea6691a5f668ae8367be2a10c001b203 (diff) | |
download | nss-hg-0e775c98fd0fbfa50012c4a6254351a8e12f4811.tar.gz |
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
-rw-r--r-- | coreconf/IRIX.mk | 91 | ||||
-rw-r--r-- | coreconf/IRIX5.2.mk | 5 | ||||
-rw-r--r-- | coreconf/IRIX5.3.mk | 7 | ||||
-rw-r--r-- | coreconf/IRIX5.mk | 10 | ||||
-rw-r--r-- | coreconf/IRIX6.2.mk | 13 | ||||
-rw-r--r-- | coreconf/IRIX6.3.mk | 12 | ||||
-rw-r--r-- | coreconf/IRIX6.5.mk | 15 | ||||
-rw-r--r-- | coreconf/IRIX6.mk | 17 | ||||
-rw-r--r-- | coreconf/arch.mk | 10 | ||||
-rw-r--r-- | lib/freebl/Makefile | 13 | ||||
-rw-r--r-- | lib/freebl/mpi/mpi.h | 2 | ||||
-rw-r--r-- | tests/set_environment | 20 |
12 files changed, 2 insertions, 213 deletions
diff --git a/coreconf/IRIX.mk b/coreconf/IRIX.mk deleted file mode 100644 index 0afbb62e7..000000000 --- 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. -# diff --git a/coreconf/IRIX5.2.mk b/coreconf/IRIX5.2.mk deleted file mode 100644 index c2f5eb3f8..000000000 --- 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 diff --git a/coreconf/IRIX5.3.mk b/coreconf/IRIX5.3.mk deleted file mode 100644 index 0020ce924..000000000 --- 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 diff --git a/coreconf/IRIX5.mk b/coreconf/IRIX5.mk deleted file mode 100644 index 80d3f8a22..000000000 --- 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 diff --git a/coreconf/IRIX6.2.mk b/coreconf/IRIX6.2.mk deleted file mode 100644 index a5760b92c..000000000 --- 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 diff --git a/coreconf/IRIX6.3.mk b/coreconf/IRIX6.3.mk deleted file mode 100644 index 7faaa7af1..000000000 --- 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 diff --git a/coreconf/IRIX6.5.mk b/coreconf/IRIX6.5.mk deleted file mode 100644 index c3ed17d3d..000000000 --- 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 diff --git a/coreconf/IRIX6.mk b/coreconf/IRIX6.mk deleted file mode 100644 index 95b6f5e6c..000000000 --- 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 diff --git a/coreconf/arch.mk b/coreconf/arch.mk index 378bbb6eb..17e9faeac 100644 --- a/coreconf/arch.mk +++ b/coreconf/arch.mk @@ -33,13 +33,6 @@ 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. @@ -89,10 +82,9 @@ 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 diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index 536bdbb19..228549ede 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -255,19 +255,6 @@ 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 diff --git a/lib/freebl/mpi/mpi.h b/lib/freebl/mpi/mpi.h index b1a07a61d..4ba9b6a4b 100644 --- a/lib/freebl/mpi/mpi.h +++ b/lib/freebl/mpi/mpi.h @@ -64,7 +64,7 @@ typedef int mp_err; /* 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 diff --git a/tests/set_environment b/tests/set_environment index 3558f9e28..9319e43a6 100644 --- a/tests/set_environment +++ b/tests/set_environment @@ -92,18 +92,6 @@ then 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 @@ -123,14 +111,6 @@ then 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 |