diff options
author | Ludovic Hirlimann <ludovic@mozilla.com> | 2019-06-29 00:05:57 +0200 |
---|---|---|
committer | Ludovic Hirlimann <ludovic@mozilla.com> | 2019-06-29 00:05:57 +0200 |
commit | 16a07da54fbffad404ba49c87f9a8ac1e324a27f (patch) | |
tree | 7226f0ebd02700bac68a5ebb126056f070962ba9 | |
parent | 7092dcd28386bae5d2e539351dda35c6014b2370 (diff) | |
download | nspr-hg-16a07da54fbffad404ba49c87f9a8ac1e324a27f.tar.gz |
Bug 1535665 - removing OLD unsupported unix Systems part 1 OSF1/Tru64. r=kaie
-rw-r--r-- | admin/makeTargetDirs.sh | 2 | ||||
-rw-r--r-- | admin/symlinks.sh | 3 | ||||
-rwxr-xr-x | configure | 88 | ||||
-rw-r--r-- | configure.in | 63 | ||||
-rw-r--r-- | lib/prstreams/tests/testprstrm/Makefile.in | 4 | ||||
-rw-r--r-- | lib/tests/Makefile.in | 4 | ||||
-rw-r--r-- | pr/include/gencfg.c | 4 | ||||
-rw-r--r-- | pr/include/md/_osf1.cfg | 116 | ||||
-rw-r--r-- | pr/include/md/_osf1.h | 222 | ||||
-rw-r--r-- | pr/include/md/_pth.h | 15 | ||||
-rw-r--r-- | pr/include/md/prosdep.h | 3 | ||||
-rw-r--r-- | pr/include/prinet.h | 2 | ||||
-rw-r--r-- | pr/include/prnetdb.h | 2 | ||||
-rw-r--r-- | pr/src/Makefile.in | 9 | ||||
-rw-r--r-- | pr/src/cplus/tests/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/io/prscanf.c | 2 | ||||
-rw-r--r-- | pr/src/linking/prlink.c | 72 | ||||
-rw-r--r-- | pr/src/md/unix/osf1.c | 75 | ||||
-rw-r--r-- | pr/src/md/unix/unix.c | 38 | ||||
-rw-r--r-- | pr/src/md/unix/uxrng.c | 22 | ||||
-rw-r--r-- | pr/src/md/unix/uxwrap.c | 4 | ||||
-rw-r--r-- | pr/src/misc/pripc.c | 2 | ||||
-rw-r--r-- | pr/src/misc/prnetdb.c | 6 | ||||
-rw-r--r-- | pr/src/pthreads/ptio.c | 26 | ||||
-rw-r--r-- | pr/tests/Makefile.in | 15 | ||||
-rw-r--r-- | tools/Makefile.in | 4 |
26 files changed, 22 insertions, 785 deletions
diff --git a/admin/makeTargetDirs.sh b/admin/makeTargetDirs.sh index 46ad8947..a78f8db5 100644 --- a/admin/makeTargetDirs.sh +++ b/admin/makeTargetDirs.sh @@ -32,8 +32,6 @@ mkdir Linux2.2_x86_glibc_PTH_DBG.OBJ mkdir Linux2.2_x86_glibc_PTH_OPT.OBJ mkdir Linux2.4_x86_glibc_PTH_DBG.OBJ mkdir Linux2.4_x86_glibc_PTH_OPT.OBJ -mkdir OSF1V4.0D_DBG.OBJ -mkdir OSF1V4.0D_OPT.OBJ mkdir SunOS5.6_DBG.OBJ mkdir SunOS5.6_OPT.OBJ mkdir SunOS5.7_64_DBG.OBJ diff --git a/admin/symlinks.sh b/admin/symlinks.sh index 8cd6a806..4b5071df 100644 --- a/admin/symlinks.sh +++ b/admin/symlinks.sh @@ -33,9 +33,6 @@ ln -s SunOS5.6_OPT.OBJ SunOS5.8_OPT.OBJ ln -s SunOS5.7_64_DBG.OBJ SunOS5.8_64_DBG.OBJ ln -s SunOS5.7_64_OPT.OBJ SunOS5.8_64_OPT.OBJ -ln -s OSF1V4.0D_DBG.OBJ OSF1V5.0_DBG.OBJ -ln -s OSF1V4.0D_OPT.OBJ OSF1V5.0_OPT.OBJ - ln -s WINNT4.0_DBG.OBJ WINNT5.0_DBG.OBJ ln -s WINNT4.0_DBG.OBJD WINNT5.0_DBG.OBJD ln -s WINNT4.0_OPT.OBJ WINNT5.0_OPT.OBJ @@ -2988,10 +2988,6 @@ if test -z "$CC"; then CC=cc ;; - *-osf*) - CC=cc - ;; - *-solaris*) CC=cc ;; @@ -3028,10 +3024,6 @@ if test -z "$CXX"; then CXX=CC ;; - *-osf*) - CXX=cxx - ;; - *-solaris*) CXX=CC ;; @@ -3889,15 +3881,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters inside strings and character constants. */ #define FOO(x) 'x' @@ -6730,7 +6713,7 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 $as_echo "#define _HPUX_SOURCE 1" >>confdefs.h - # OSF1 and HPUX report the POLLHUP event for a socket when the + # HPUX report the POLLHUP event for a socket when the # shutdown(SHUT_WR) operation is called for the remote end, even though # the socket is still writeable. Use select(), instead of poll(), to # workaround this problem. @@ -7393,61 +7376,6 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ;; -*-osf*) - SHELL_OVERRIDE="SHELL = /usr/bin/ksh" - $as_echo "#define XP_UNIX 1" >>confdefs.h - - $as_echo "#define OSF1 1" >>confdefs.h - - $as_echo "#define _REENTRANT 1" >>confdefs.h - - # OSF1 and HPUX report the POLLHUP event for a socket when the - # shutdown(SHUT_WR) operation is called for the remote end, even though - # the socket is still writeable. Use select(), instead of poll(), to - # workaround this problem. - $as_echo "#define _PR_POLL_WITH_SELECT 1" >>confdefs.h - - - if echo "$OS_RELEASE" | egrep -c '(V2.0|V3.2)' 2>/dev/null ; then - USE_NSPR_THREADS=1 - fi - - if test -z "$GNU_CC"; then - CC="$CC -std1 -ieee_with_inexact" - if test "$OS_RELEASE" != "V2.0"; then - CC="$CC -readonly_strings" - fi - _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" - ac_fn_c_check_header_mongrel "$LINENO" "machine/builtins.h" "ac_cv_header_machine_builtins_h" "$ac_includes_default" -if test "x$ac_cv_header_machine_builtins_h" = xyes; then : - $as_echo "#define OSF1_HAVE_MACHINE_BUILTINS_H 1" >>confdefs.h - -fi - - - else - CFLAGS="$CFLAGS -mieee" - CXXFLAGS="$CXXFLAGS -mieee" - fi - - if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then - $as_echo "#define HAVE_INT_LOCALTIME_R 1" >>confdefs.h - - else - $as_echo "#define HAVE_FCNTL_FILE_LOCKING 1" >>confdefs.h - - $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h - - fi - if echo $OS_RELEASE | grep -c V4.0 >/dev/null; then - $as_echo "#define OSF1V4_MAP_PRIVATE_BUG 1" >>confdefs.h - - fi - DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)' - MDCPUCFG_H=_osf1.cfg - PR_MD_CSRCS=osf1.c - ;; - *-qnx*) $as_echo "#define XP_UNIX 1" >>confdefs.h @@ -8506,20 +8434,6 @@ _ACEOF fi ;; -*-osf*) - if test -n "$USE_NSPR_THREADS"; then - $as_echo "#define _PR_LOCAL_THREADS_ONLY 1" >>confdefs.h - - fi - if test -n "$USE_PTHREADS"; then - if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then - : - else - $as_echo "#define _PR_HAVE_THREADSAFE_GETHOST 1" >>confdefs.h - - fi - fi - ;; *-solaris*) if test -n "$USE_NSPR_THREADS"; then $as_echo "#define _PR_LOCAL_THREADS_ONLY 1" >>confdefs.h diff --git a/configure.in b/configure.in index 6f505ba4..199ab8a6 100644 --- a/configure.in +++ b/configure.in @@ -458,10 +458,6 @@ if test -z "$CC"; then CC=cc ;; - *-osf*) - CC=cc - ;; - *-solaris*) CC=cc ;; @@ -503,10 +499,6 @@ if test -z "$CXX"; then CXX=CC ;; - *-osf*) - CXX=cxx - ;; - *-solaris*) CXX=CC ;; @@ -1569,7 +1561,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(XP_UNIX) AC_DEFINE(HPUX) AC_DEFINE(_HPUX_SOURCE) - # OSF1 and HPUX report the POLLHUP event for a socket when the + # HPUX report the POLLHUP event for a socket when the # shutdown(SHUT_WR) operation is called for the remote end, even though # the socket is still writeable. Use select(), instead of poll(), to # workaround this problem. @@ -2179,47 +2171,6 @@ tools are selected during the Xcode/Developer Tools installation.]) MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ;; -*-osf*) - SHELL_OVERRIDE="SHELL = /usr/bin/ksh" - AC_DEFINE(XP_UNIX) - AC_DEFINE(OSF1) - AC_DEFINE(_REENTRANT) - # OSF1 and HPUX report the POLLHUP event for a socket when the - # shutdown(SHUT_WR) operation is called for the remote end, even though - # the socket is still writeable. Use select(), instead of poll(), to - # workaround this problem. - AC_DEFINE(_PR_POLL_WITH_SELECT) - - if echo "$OS_RELEASE" | egrep -c '(V2.0|V3.2)' 2>/dev/null ; then - USE_NSPR_THREADS=1 - fi - - if test -z "$GNU_CC"; then - CC="$CC -std1 -ieee_with_inexact" - if test "$OS_RELEASE" != "V2.0"; then - CC="$CC -readonly_strings" - fi - _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" - AC_CHECK_HEADER(machine/builtins.h, AC_DEFINE(OSF1_HAVE_MACHINE_BUILTINS_H)) - else - CFLAGS="$CFLAGS -mieee" - CXXFLAGS="$CXXFLAGS -mieee" - fi - - if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then - AC_DEFINE(HAVE_INT_LOCALTIME_R) - else - AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) - AC_DEFINE(HAVE_POINTER_LOCALTIME_R) - fi - if echo $OS_RELEASE | grep -c V4.0 >/dev/null; then - AC_DEFINE(OSF1V4_MAP_PRIVATE_BUG) - fi - DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)' - MDCPUCFG_H=_osf1.cfg - PR_MD_CSRCS=osf1.c - ;; - *-qnx*) AC_DEFINE(XP_UNIX) AC_DEFINE(QNX) @@ -2914,18 +2865,6 @@ case "$target" in AC_DEFINE(_PR_LOCAL_THREADS_ONLY) fi ;; -*-osf*) - if test -n "$USE_NSPR_THREADS"; then - AC_DEFINE(_PR_LOCAL_THREADS_ONLY) - fi - if test -n "$USE_PTHREADS"; then - if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then - : - else - AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST) - fi - fi - ;; *-solaris*) if test -n "$USE_NSPR_THREADS"; then AC_DEFINE(_PR_LOCAL_THREADS_ONLY) diff --git a/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in index 1271f94b..4f68ec93 100644 --- a/lib/prstreams/tests/testprstrm/Makefile.in +++ b/lib/prstreams/tests/testprstrm/Makefile.in @@ -61,10 +61,6 @@ ifeq ($(OS_ARCH), IRIX) LDOPTS += -rpath $(PWD)/$(dist_libdir) endif -ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(dist_libdir) -endif - ifeq ($(OS_ARCH), HP-UX) LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index d8f595fd..85519077 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -85,10 +85,6 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH))) endif endif -ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread -endif - ifeq ($(OS_ARCH), HP-UX) LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif diff --git a/pr/include/gencfg.c b/pr/include/gencfg.c index 54c07ba9..6a58f95d 100644 --- a/pr/include/gencfg.c +++ b/pr/include/gencfg.c @@ -24,8 +24,8 @@ #endif #if defined(__alpha) -#if !(defined(_WIN32)) && !(defined(OSF1)) && !(defined(__linux)) && !(defined(__FreeBSD__)) - error - None of OSF1, _WIN32, __linux, or __FreeBSD__ is defined +#if !(defined(_WIN32)) && !(defined(__linux)) && !(defined(__FreeBSD__)) + error - None of _WIN32, __linux, or __FreeBSD__ is defined #endif #endif diff --git a/pr/include/md/_osf1.cfg b/pr/include/md/_osf1.cfg deleted file mode 100644 index 7999402c..00000000 --- a/pr/include/md/_osf1.cfg +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* 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/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef OSF1 -#define OSF1 -#endif - -#define IS_LITTLE_ENDIAN 1 -#undef IS_BIG_ENDIAN -#ifndef HAVE_LONG_LONG -#define HAVE_LONG_LONG -#endif -#define HAVE_ALIGNED_DOUBLES -#define HAVE_ALIGNED_LONGLONGS -#ifndef IS_64 -#define IS_64 -#endif - -#define PR_AF_INET6 26 /* same as AF_INET6 */ - -#define PR_BYTES_PER_BYTE 1 -#define PR_BYTES_PER_SHORT 2 -#define PR_BYTES_PER_INT 4 -#define PR_BYTES_PER_INT64 8 -#define PR_BYTES_PER_LONG 8 -#define PR_BYTES_PER_FLOAT 4 -#define PR_BYTES_PER_DOUBLE 8 -#define PR_BYTES_PER_WORD 8 -#define PR_BYTES_PER_DWORD 8 - -#define PR_BITS_PER_BYTE 8 -#define PR_BITS_PER_SHORT 16 -#define PR_BITS_PER_INT 32 -#define PR_BITS_PER_INT64 64 -#define PR_BITS_PER_LONG 64 -#define PR_BITS_PER_FLOAT 32 -#define PR_BITS_PER_DOUBLE 64 -#define PR_BITS_PER_WORD 64 - -#define PR_BITS_PER_BYTE_LOG2 3 -#define PR_BITS_PER_SHORT_LOG2 4 -#define PR_BITS_PER_INT_LOG2 5 -#define PR_BITS_PER_INT64_LOG2 6 -#define PR_BITS_PER_LONG_LOG2 6 -#define PR_BITS_PER_FLOAT_LOG2 5 -#define PR_BITS_PER_DOUBLE_LOG2 6 -#define PR_BITS_PER_WORD_LOG2 6 - -#define PR_BYTES_PER_WORD_LOG2 3 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#define PR_ALIGN_OF_SHORT 2 -#define PR_ALIGN_OF_INT 4 -#define PR_ALIGN_OF_LONG 8 -#define PR_ALIGN_OF_INT64 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 8 - -#define _PR_POLL_BACKCOMPAT - -#ifndef NO_NSPR_10_SUPPORT - -#define BYTES_PER_BYTE PR_BYTES_PER_BYTE -#define BYTES_PER_SHORT PR_BYTES_PER_SHORT -#define BYTES_PER_INT PR_BYTES_PER_INT -#define BYTES_PER_INT64 PR_BYTES_PER_INT64 -#define BYTES_PER_LONG PR_BYTES_PER_LONG -#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT -#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE -#define BYTES_PER_WORD PR_BYTES_PER_WORD -#define BYTES_PER_DWORD PR_BYTES_PER_DWORD - -#define BITS_PER_BYTE PR_BITS_PER_BYTE -#define BITS_PER_SHORT PR_BITS_PER_SHORT -#define BITS_PER_INT PR_BITS_PER_INT -#define BITS_PER_INT64 PR_BITS_PER_INT64 -#define BITS_PER_LONG PR_BITS_PER_LONG -#define BITS_PER_FLOAT PR_BITS_PER_FLOAT -#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE -#define BITS_PER_WORD PR_BITS_PER_WORD - -#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2 -#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 -#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 -#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 -#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2 -#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 -#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 -#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2 - -#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT -#define ALIGN_OF_INT PR_ALIGN_OF_INT -#define ALIGN_OF_LONG PR_ALIGN_OF_LONG -#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64 -#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT -#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE -#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER -#define ALIGN_OF_WORD PR_ALIGN_OF_WORD - -#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 -#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 -#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 - -#endif /* NO_NSPR_10_SUPPORT */ - -#endif /* nspr_cpucfg___ */ diff --git a/pr/include/md/_osf1.h b/pr/include/md/_osf1.h deleted file mode 100644 index 57445f77..00000000 --- a/pr/include/md/_osf1.h +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* 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/. */ - -#ifndef nspr_osf1_defs_h___ -#define nspr_osf1_defs_h___ - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "osf" -#define _PR_SI_SYSNAME "OSF" -#define _PR_SI_ARCHITECTURE "alpha" -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 131072L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#undef HAVE_STACK_GROWING_UP -#undef HAVE_WEAK_IO_SYMBOLS -#undef HAVE_WEAK_MALLOC_SYMBOLS -#define HAVE_DLL -#define HAVE_BSD_FLOCK - -#define NEED_TIME_R -#define USE_DLFCN - -#define _PR_POLL_AVAILABLE -#define _PR_USE_POLL -#define _PR_STAT_HAS_ONLY_ST_ATIME -#define _PR_HAVE_LARGE_OFF_T -#define _PR_HAVE_GETIPNODEBYNAME -#define _PR_HAVE_GETIPNODEBYADDR -#define _PR_HAVE_GETADDRINFO -#define _PR_INET6_PROBE -#ifdef _PR_INET6 -#define _PR_HAVE_INET_NTOP -#else -#define AF_INET6 26 -#ifndef AI_CANONNAME -#define AI_CANONNAME 0x00000002 -struct addrinfo { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char *ai_canonname; - struct sockaddr *ai_addr; - struct addrinfo *ai_next; -}; -#endif -#define AI_V4MAPPED 0x00000010 -#define AI_ALL 0x00000008 -#define AI_ADDRCONFIG 0x00000020 -#endif -#define _PR_HAVE_POSIX_SEMAPHORES -#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY - -#define USE_SETJMP - -#include <setjmp.h> - -/* - * A jmp_buf is actually a struct sigcontext. The sc_sp field of - * struct sigcontext is the stack pointer. - */ -#define _MD_GET_SP(_t) (((struct sigcontext *) (_t)->md.context)->sc_sp) -#define PR_NUM_GCREGS _JBLEN -#define CONTEXT(_th) ((_th)->md.context) - -/* -** Initialize a thread context to run "_main()" when started -*/ -#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -{ \ - *status = PR_TRUE; \ - if (setjmp(CONTEXT(_thread))) { \ - (*_main)(); \ - } \ - _MD_GET_SP(_thread) = (long) ((_sp) - 64); \ - _MD_GET_SP(_thread) &= ~15; \ -} - -#define _MD_SWITCH_CONTEXT(_thread) \ - if (!setjmp(CONTEXT(_thread))) { \ - (_thread)->md.errcode = errno; \ - _PR_Schedule(); \ - } - -/* -** Restore a thread context, saved by _MD_SWITCH_CONTEXT -*/ -#define _MD_RESTORE_CONTEXT(_thread) \ -{ \ - errno = (_thread)->md.errcode; \ - _MD_SET_CURRENT_THREAD(_thread); \ - longjmp(CONTEXT(_thread), 1); \ -} - -/* Machine-dependent (MD) data structures */ - -struct _MDThread { - jmp_buf context; - int id; - int errcode; -}; - -struct _MDThreadStack { - PRInt8 notused; -}; - -struct _MDLock { - PRInt8 notused; -}; - -struct _MDSemaphore { - PRInt8 notused; -}; - -struct _MDCVar { - PRInt8 notused; -}; - -struct _MDSegment { - PRInt8 notused; -}; - -/* - * md-specific cpu structure field - */ -#define _PR_MD_MAX_OSFD FD_SETSIZE - -struct _MDCPU_Unix { - PRCList ioQ; - PRUint32 ioq_timeout; - PRInt32 ioq_max_osfd; - PRInt32 ioq_osfd_cnt; -#ifndef _PR_USE_POLL - fd_set fd_read_set, fd_write_set, fd_exception_set; - PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD], - fd_exception_cnt[_PR_MD_MAX_OSFD]; -#else - struct pollfd *ioq_pollfds; - int ioq_pollfds_size; -#endif /* _PR_USE_POLL */ -}; - -#define _PR_IOQ(_cpu) ((_cpu)->md.md_unix.ioQ) -#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu)) -#define _PR_FD_READ_SET(_cpu) ((_cpu)->md.md_unix.fd_read_set) -#define _PR_FD_READ_CNT(_cpu) ((_cpu)->md.md_unix.fd_read_cnt) -#define _PR_FD_WRITE_SET(_cpu) ((_cpu)->md.md_unix.fd_write_set) -#define _PR_FD_WRITE_CNT(_cpu) ((_cpu)->md.md_unix.fd_write_cnt) -#define _PR_FD_EXCEPTION_SET(_cpu) ((_cpu)->md.md_unix.fd_exception_set) -#define _PR_FD_EXCEPTION_CNT(_cpu) ((_cpu)->md.md_unix.fd_exception_cnt) -#define _PR_IOQ_TIMEOUT(_cpu) ((_cpu)->md.md_unix.ioq_timeout) -#define _PR_IOQ_MAX_OSFD(_cpu) ((_cpu)->md.md_unix.ioq_max_osfd) -#define _PR_IOQ_OSFD_CNT(_cpu) ((_cpu)->md.md_unix.ioq_osfd_cnt) -#define _PR_IOQ_POLLFDS(_cpu) ((_cpu)->md.md_unix.ioq_pollfds) -#define _PR_IOQ_POLLFDS_SIZE(_cpu) ((_cpu)->md.md_unix.ioq_pollfds_size) - -#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu) 32 - -struct _MDCPU { - struct _MDCPU_Unix md_unix; -}; - -#ifndef _PR_PTHREADS -#define _MD_INIT_LOCKS() -#endif -#define _MD_NEW_LOCK(lock) PR_SUCCESS -#define _MD_FREE_LOCK(lock) -#define _MD_LOCK(lock) -#define _MD_UNLOCK(lock) -#define _MD_INIT_IO() -#define _MD_IOQ_LOCK() -#define _MD_IOQ_UNLOCK() - -/* - * The following are copied from _sunos.h, _aix.h. This means - * some of them should probably be moved into _unixos.h. But - * _irix.h seems to be quite different in regard to these macros. - */ -#define _MD_INTERVAL_USE_GTOD - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) -#define _MD_RESUME_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -/* The following defines unwrapped versions of select() and poll(). */ -#include <sys/time.h> -extern int __select (int, fd_set *, fd_set *, fd_set *, struct timeval *); -#define _MD_SELECT __select - -#include <sys/poll.h> -#define _MD_POLL __poll -extern int __poll(struct pollfd filedes[], unsigned int nfds, int timeout); - -/* - * Atomic operations - */ -#ifdef OSF1_HAVE_MACHINE_BUILTINS_H -#include <machine/builtins.h> -#define _PR_HAVE_ATOMIC_OPS -#define _MD_INIT_ATOMIC() -#define _MD_ATOMIC_INCREMENT(val) (__ATOMIC_INCREMENT_LONG(val) + 1) -#define _MD_ATOMIC_ADD(ptr, val) (__ATOMIC_ADD_LONG(ptr, val) + val) -#define _MD_ATOMIC_DECREMENT(val) (__ATOMIC_DECREMENT_LONG(val) - 1) -#define _MD_ATOMIC_SET(val, newval) __ATOMIC_EXCH_LONG(val, newval) -#endif /* OSF1_HAVE_MACHINE_BUILTINS_H */ - -#endif /* nspr_osf1_defs_h___ */ diff --git a/pr/include/md/_pth.h b/pr/include/md/_pth.h index 5603223a..bbe9e385 100644 --- a/pr/include/md/_pth.h +++ b/pr/include/md/_pth.h @@ -84,7 +84,7 @@ * PR_EnterMonitor calls any of these functions, infinite * recursion ensues. */ -#if defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ +#if defined(IRIX) || defined(AIX) || defined(SOLARIS) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(HPUX) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ @@ -120,10 +120,7 @@ #define PT_NO_SIGTIMEDWAIT #endif -#if defined(OSF1) -#define PT_PRIO_MIN PRI_OTHER_MIN -#define PT_PRIO_MAX PRI_OTHER_MAX -#elif defined(IRIX) +#if defined(IRIX) #include <sys/sched.h> #define PT_PRIO_MIN PX_PRIO_MIN #define PT_PRIO_MAX PX_PRIO_MAX @@ -177,13 +174,7 @@ * Needed for garbage collection -- Look at PR_Suspend/PR_Resume * implementation. */ -#if defined(OSF1) -/* - * sched_yield can't be called from a signal handler. Must use - * the _np version. - */ -#define _PT_PTHREAD_YIELD() pthread_yield_np() -#elif defined(AIX) +#if defined(AIX) extern int (*_PT_aix_yield_fcn)(); #define _PT_PTHREAD_YIELD() (*_PT_aix_yield_fcn)() #elif defined(IRIX) diff --git a/pr/include/md/prosdep.h b/pr/include/md/prosdep.h index 94d89450..45dcb288 100644 --- a/pr/include/md/prosdep.h +++ b/pr/include/md/prosdep.h @@ -55,9 +55,6 @@ PR_BEGIN_EXTERN_C #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) #include "md/_linux.h" -#elif defined(OSF1) -#include "md/_osf1.h" - #elif defined(DARWIN) #include "md/_darwin.h" diff --git a/pr/include/prinet.h b/pr/include/prinet.h index fc9f7391..c082af5e 100644 --- a/pr/include/prinet.h +++ b/pr/include/prinet.h @@ -70,7 +70,7 @@ struct sockaddr_dl; * Prototypes of ntohl() etc. are declared in <machine/endian.h> * on these platforms. */ -#if defined(BSDI) || defined(OSF1) +#if defined(BSDI) #include <machine/endian.h> #endif diff --git a/pr/include/prnetdb.h b/pr/include/prnetdb.h index 49b77b14..99fd62f7 100644 --- a/pr/include/prnetdb.h +++ b/pr/include/prnetdb.h @@ -47,7 +47,7 @@ typedef struct PRHostEnt { } PRHostEnt; /* A safe size to use that will mostly work... */ -#if (defined(AIX) && defined(_THREAD_SAFE)) || defined(OSF1) +#if (defined(AIX) && defined(_THREAD_SAFE)) #define PR_NETDB_BUF_SIZE sizeof(struct protoent_data) #else #define PR_NETDB_BUF_SIZE 1024 diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 19c5a698..f647769b 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -109,15 +109,6 @@ GARBAGE += $(MAPFILE) MKSHLIB += $(MAPFILE) endif -ifeq ($(OS_ARCH),OSF1) -ifeq ($(USE_PTHREADS), 1) -OS_LIBS = -lpthread -lrt -endif -ifneq ($(OS_RELEASE),V2.0) -OS_LIBS += -lc_r -endif -endif - # Linux, GNU/Hurd, and GNU/kFreeBSD systems ifneq (,$(filter Linux GNU%,$(OS_ARCH))) ifeq ($(USE_PTHREADS), 1) diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index c1642387..8be1453f 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/pr/src/cplus/tests/Makefile.in @@ -103,10 +103,6 @@ ifneq ($(OS_ARCH), WINNT) PWD = $(shell pwd) endif -ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(dist_libdir) -endif - ifeq ($(OS_ARCH), HP-UX) LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif diff --git a/pr/src/io/prscanf.c b/pr/src/io/prscanf.c index 377a6e64..5618f878 100644 --- a/pr/src/io/prscanf.c +++ b/pr/src/io/prscanf.c @@ -365,7 +365,7 @@ GetFloat(ScanfState *state) if (state->sizeSpec == _PR_size_l) { *va_arg(state->ap, PRFloat64 *) = dval; } else if (state->sizeSpec == _PR_size_L) { -#if defined(OSF1) || defined(IRIX) +#if defined(IRIX) *va_arg(state->ap, double *) = dval; #else *va_arg(state->ap, long double *) = dval; diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c index 47154608..4503d9f8 100644 --- a/pr/src/linking/prlink.c +++ b/pr/src/linking/prlink.c @@ -38,10 +38,6 @@ #define L_IGNOREUNLOAD 0x10000000 #endif #endif -#ifdef OSF1 -#include <loader.h> -#include <rld_interface.h> -#endif #elif defined(USE_HPSHL) #include <dl.h> #elif defined(USE_MACH_DYLD) @@ -1425,74 +1421,6 @@ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr) } PR_Free(info); return result; -#elif defined(OSF1) - /* Contributed by Steve Streeter of HP */ - ldr_process_t process, ldr_my_process(); - ldr_module_t mod_id; - ldr_module_info_t info; - ldr_region_t regno; - ldr_region_info_t reginfo; - size_t retsize; - int rv; - char *result; - - /* Get process for which dynamic modules will be listed */ - - process = ldr_my_process(); - - /* Attach to process */ - - rv = ldr_xattach(process); - if (rv) { - /* should not happen */ - _PR_MD_MAP_DEFAULT_ERROR(_MD_ERRNO()); - return NULL; - } - - /* Print information for list of modules */ - - mod_id = LDR_NULL_MODULE; - - for (;;) { - - /* Get information for the next module in the module list. */ - - ldr_next_module(process, &mod_id); - if (ldr_inq_module(process, mod_id, &info, sizeof(info), - &retsize) != 0) { - /* No more modules */ - break; - } - if (retsize < sizeof(info)) { - continue; - } - - /* - * Get information for each region in the module and check if any - * contain the address of this function. - */ - - for (regno = 0; ; regno++) { - if (ldr_inq_region(process, mod_id, regno, ®info, - sizeof(reginfo), &retsize) != 0) { - /* No more regions */ - break; - } - if (((unsigned long)reginfo.lri_mapaddr <= - (unsigned long)addr) && - (((unsigned long)reginfo.lri_mapaddr + reginfo.lri_size) > - (unsigned long)addr)) { - /* Found it. */ - result = PR_Malloc(strlen(info.lmi_name)+1); - if (result != NULL) { - strcpy(result, info.lmi_name); - } - return result; - } - } - } - PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0); - return NULL; #elif defined(HPUX) && defined(USE_HPSHL) int index; struct shl_descriptor desc; diff --git a/pr/src/md/unix/osf1.c b/pr/src/md/unix/osf1.c deleted file mode 100644 index a9a1c67d..00000000 --- a/pr/src/md/unix/osf1.c +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* 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 "primpl.h" - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ -#ifndef _PR_PTHREADS - if (isCurrent) { - (void) setjmp(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -#else - *np = 0; - return NULL; -#endif -} - -#ifndef _PR_PTHREADS -void -_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri) -{ - return; -} - -PRStatus -_MD_InitializeThread(PRThread *thread) -{ - return PR_SUCCESS; -} - -PRStatus -_MD_WAIT(PRThread *thread, PRIntervalTime ticks) -{ - PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); - _PR_MD_SWITCH_CONTEXT(thread); - return PR_SUCCESS; -} - -PRStatus -_MD_WAKEUP_WAITER(PRThread *thread) -{ - if (thread) { - PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); - } - return PR_SUCCESS; -} - -/* These functions should not be called for OSF1 */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for OSF1."); -} - -PRStatus -_MD_CREATE_THREAD( - PRThread *thread, - void (*start) (void *), - PRThreadPriority priority, - PRThreadScope scope, - PRThreadState state, - PRUint32 stackSize) -{ - PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1."); - return PR_FAILURE; -} -#endif /* ! _PR_PTHREADS */ diff --git a/pr/src/md/unix/unix.c b/pr/src/md/unix/unix.c index a66bd64f..16172e7f 100644 --- a/pr/src/md/unix/unix.c +++ b/pr/src/md/unix/unix.c @@ -41,7 +41,7 @@ #if defined(HAVE_SOCKLEN_T) \ || (defined(__GLIBC__) && __GLIBC__ >= 2) #define _PRSockLen_t socklen_t -#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ +#elif defined(IRIX) || defined(HPUX) || defined(SOLARIS) \ || defined(AIX4_1) || defined(LINUX) \ || defined(BSDI) || defined(SCO) \ || defined(DARWIN) \ @@ -2735,28 +2735,6 @@ mmap64(void *addr, size_t len, int prot, int flags, int fd, loff_t offset) } #endif -#if defined(OSF1) && defined(__GNUC__) - -/* - * On OSF1 V5.0A, <sys/stat.h> defines stat and fstat as - * macros when compiled under gcc, so it is rather tricky to - * take the addresses of the real functions the macros expend - * to. A simple solution is to define forwarder functions - * and take the addresses of the forwarder functions instead. - */ - -static int stat_forwarder(const char *path, struct stat *buffer) -{ - return stat(path, buffer); -} - -static int fstat_forwarder(int filedes, struct stat *buffer) -{ - return fstat(filedes, buffer); -} - -#endif - static void _PR_InitIOV(void) { #if defined(SOLARIS2_5) @@ -2811,13 +2789,8 @@ static void _PR_InitIOV(void) #elif defined(_PR_HAVE_LARGE_OFF_T) _md_iovector._open64 = open; _md_iovector._mmap64 = mmap; -#if defined(OSF1) && defined(__GNUC__) - _md_iovector._fstat64 = fstat_forwarder; - _md_iovector._stat64 = stat_forwarder; -#else _md_iovector._fstat64 = fstat; _md_iovector._stat64 = stat; -#endif _md_iovector._lseek64 = lseek; #else #error "I don't know yet" @@ -3569,14 +3542,9 @@ PRStatus _MD_CreateFileMap(PRFileMap *fmap, PRInt64 size) } if (fmap->prot == PR_PROT_READONLY) { fmap->md.prot = PROT_READ; -#if defined(OSF1V4_MAP_PRIVATE_BUG) || defined(DARWIN) || defined(ANDROID) +#if defined(DARWIN) || defined(ANDROID) /* - * Use MAP_SHARED to work around a bug in OSF1 V4.0D - * (QAR 70220 in the OSF_QAR database) that results in - * corrupted data in the memory-mapped region. This - * bug is fixed in V5.0. - * - * This is also needed on OS X because its implementation of + * This is needed on OS X because its implementation of * POSIX shared memory returns an error for MAP_PRIVATE, even * when the mapping is read-only. * diff --git a/pr/src/md/unix/uxrng.c b/pr/src/md/unix/uxrng.c index da2f7e9f..cca6f28f 100644 --- a/pr/src/md/unix/uxrng.c +++ b/pr/src/md/unix/uxrng.c @@ -54,28 +54,6 @@ GetHighResClock(void *buf, size_t maxbytes) } #endif -#elif defined(OSF1) - -#include <c_asm.h> - -/* - * 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; - -#ifdef __GNUC__ - __asm__("rpcc %0" : "=r" (t)); -#else - t = asm("rpcc %v0"); -#endif - return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t)); -} - #elif defined(AIX) static size_t diff --git a/pr/src/md/unix/uxwrap.c b/pr/src/md/unix/uxwrap.c index 3f8e149e..99259065 100644 --- a/pr/src/md/unix/uxwrap.c +++ b/pr/src/md/unix/uxwrap.c @@ -255,7 +255,7 @@ int select(int width, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *tv) nbits++; } PR_ASSERT(nbits > 0); -#if defined(HPUX) || defined(SOLARIS) || defined(OSF1) || defined(AIX) +#if defined(HPUX) || defined(SOLARIS) || defined(AIX) retVal += nbits; #else /* IRIX */ retVal += 1; @@ -303,7 +303,7 @@ int select(int width, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *tv) int wrap_poll(void *listptr, unsigned long nfds, long timeout) #elif (defined(AIX) && !defined(AIX_RENAME_SELECT)) int poll(void *listptr, unsigned long nfds, long timeout) -#elif defined(OSF1) || (defined(HPUX) && !defined(HPUX9)) +#elif defined(HPUX) && !defined(HPUX9) int poll(struct pollfd filedes[], unsigned int nfds, int timeout) #elif defined(HPUX9) int poll(struct pollfd filedes[], int nfds, int timeout) diff --git a/pr/src/misc/pripc.c b/pr/src/misc/pripc.c index e41a2afc..64415dd6 100644 --- a/pr/src/misc/pripc.c +++ b/pr/src/misc/pripc.c @@ -17,7 +17,7 @@ * A POSIX IPC name must begin with a '/'. * A POSIX IPC name on Solaris cannot contain any '/' except * the required leading '/'. - * A POSIX IPC name on HP-UX and OSF1 must be a valid pathname + * A POSIX IPC name on HP-UX must be a valid pathname * in the file system. * * The ftok() function for System V IPC requires a valid pathname diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index c482e8e4..21ca20b8 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -29,8 +29,7 @@ extern int h_errno; * The meaning of the macros related to gethostbyname, gethostbyaddr, * and gethostbyname2 is defined below. * - _PR_HAVE_THREADSAFE_GETHOST: the gethostbyXXX functions return - * the result in thread specific storage. For example, AIX, HP-UX, - * and OSF1. + * the result in thread specific storage. For example, AIX, HP-UX. * - _PR_HAVE_GETHOST_R: have the gethostbyXXX_r functions. See next * two macros. * - _PR_HAVE_GETHOST_R_INT: the gethostbyXXX_r functions return an @@ -72,8 +71,7 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_GETPROTO_R_POINTER #endif -#if defined(OSF1) \ - || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ +#if defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \ || (defined(HPUX10_10) && defined(_REENTRANT)) \ || (defined(HPUX10_20) && defined(_REENTRANT)) \ || defined(OPENBSD) diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c index 1549a905..47b37601 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -178,7 +178,7 @@ static PRBool _pr_ipv6_v6only_on_by_default; #elif defined(AIX4_1) #define _PRSelectFdSetArg_t void * #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ - || defined(OSF1) || defined(SOLARIS) \ + || defined(SOLARIS) \ || defined(HPUX10_30) || defined(HPUX11) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ @@ -403,7 +403,7 @@ PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg) #if defined(_PR_POLL_WITH_SELECT) /* - * OSF1 and HPUX report the POLLHUP event for a socket when the + * HPUX report the POLLHUP event for a socket when the * shutdown(SHUT_WR) operation is called for the remote end, even though * the socket is still writeable. Use select(), instead of poll(), to * workaround this problem. @@ -1254,26 +1254,8 @@ static PRStatus pt_Close(PRFileDesc *fd) { if (-1 == close(fd->secret->md.osfd)) { -#ifdef OSF1 - /* - * Bug 86941: On Tru64 UNIX V5.0A and V5.1, the close() - * system call, when called to close a TCP socket, may - * return -1 with errno set to EINVAL but the system call - * does close the socket successfully. An application - * may safely ignore the EINVAL error. This bug is fixed - * on Tru64 UNIX V5.1A and later. The defect tracking - * number is QAR 81431. - */ - if (PR_DESC_SOCKET_TCP != fd->methods->file_type - || EINVAL != errno) - { - pt_MapError(_PR_MD_MAP_CLOSE_ERROR, errno); - return PR_FAILURE; - } -#else pt_MapError(_PR_MD_MAP_CLOSE_ERROR, errno); return PR_FAILURE; -#endif } fd->secret->state = _PR_FILEDESC_CLOSED; } @@ -3352,7 +3334,7 @@ static PRIOMethods _pr_socketpollfd_methods = { (PRReservedFN)_PR_InvalidInt }; -#if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ +#if defined(HPUX) || defined(SOLARIS) || defined (IRIX) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ @@ -4106,7 +4088,7 @@ retry: #if defined(_PR_POLL_WITH_SELECT) /* - * OSF1 and HPUX report the POLLHUP event for a socket when the + * HPUX report the POLLHUP event for a socket when the * shutdown(SHUT_WR) operation is called for the remote end, even though * the socket is still writeable. Use select(), instead of poll(), to * workaround this problem. diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index f1cfba9c..95152152 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -265,21 +265,6 @@ ifeq ($(OS_ARCH), IRIX) endif endif -ifeq ($(OS_ARCH), OSF1) - ifeq ($(USE_CPLUS), 1) - CC = cxx - endif -# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so -# we do static linking. - ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE))) - LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a - LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a - EXTRA_LIBS = -lc_r - else - LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) - endif -endif - ifeq ($(OS_ARCH), HP-UX) LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR) ifeq ($(USE_64),1) diff --git a/tools/Makefile.in b/tools/Makefile.in index 38dd1786..22faf203 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -69,10 +69,6 @@ ifeq ($(OS_ARCH), IRIX) LDOPTS += -rpath $(PWD)/$(dist_libdir) endif -ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread -endif - ifeq ($(OS_ARCH), HP-UX) LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif |