From 106ee3549a5b065c6e107f61f142b824b69a7c99 Mon Sep 17 00:00:00 2001 From: Ludovic Hirlimann Date: Wed, 7 Sep 2022 21:14:23 +0000 Subject: Bug 1563221 remove support for older unix in NSS part 1 OSF r=nss-reviewers,djackson Differential Revision: https://phabricator.services.mozilla.com/D36755 --- coreconf/OSF1.mk | 48 ------------------------------------------------ coreconf/OSF1V2.0.mk | 5 ----- coreconf/OSF1V3.0.mk | 5 ----- coreconf/OSF1V3.2.mk | 16 ---------------- coreconf/OSF1V4.0.mk | 24 ------------------------ coreconf/OSF1V4.0B.mk | 5 ----- coreconf/OSF1V4.0D.mk | 9 --------- coreconf/OSF1V5.0.mk | 20 -------------------- coreconf/OSF1V5.1.mk | 20 -------------------- coreconf/arch.mk | 14 -------------- 10 files changed, 166 deletions(-) delete mode 100644 coreconf/OSF1.mk delete mode 100644 coreconf/OSF1V2.0.mk delete mode 100644 coreconf/OSF1V3.0.mk delete mode 100644 coreconf/OSF1V3.2.mk delete mode 100644 coreconf/OSF1V4.0.mk delete mode 100644 coreconf/OSF1V4.0B.mk delete mode 100644 coreconf/OSF1V4.0D.mk delete mode 100644 coreconf/OSF1V5.0.mk delete mode 100644 coreconf/OSF1V5.1.mk (limited to 'coreconf') 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 @@ -73,20 +73,6 @@ ifeq ($(OS_ARCH),AIX) OS_RELEASE := $(shell uname -v).$(shell uname -r) 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 # -- cgit v1.2.1