Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 804806: Remove code related to NCR, NEC, NEXTSTEP, SINIX, SNI, SONY,

Browse Source 
NEWS-OS, SunOS4, and SunOS 4.1.3_U1. Remove the os_ReliantUNIX.s file.
TBR=ted.
Modified Files:
	config/Makefile.in config/nsinstall.c lib/ds/Makefile.in
	lib/libc/src/Makefile.in lib/prstreams/Makefile.in
	lib/prstreams/tests/testprstrm/Makefile.in
	lib/tests/Makefile.in pr/include/gencfg.c
	pr/include/md/_unixos.h pr/include/private/primpl.h
	pr/src/Makefile.in pr/src/cplus/tests/Makefile.in
	pr/src/io/Makefile.in pr/src/io/prfile.c pr/src/io/prmapopt.c
	pr/src/linking/Makefile.in pr/src/linking/prlink.c
	pr/src/malloc/Makefile.in pr/src/md/prosdep.c
	pr/src/md/beos/beos_errors.c pr/src/md/unix/Makefile.in
	pr/src/md/unix/unix.c pr/src/md/unix/unix_errors.c
	pr/src/md/unix/uxproces.c pr/src/md/unix/uxrng.c
	pr/src/md/unix/uxwrap.c pr/src/misc/prtime.c
	pr/src/pthreads/Makefile.in pr/src/pthreads/ptio.c
	pr/src/threads/combined/Makefile.in pr/tests/Makefile.in
	pr/tests/dll/Makefile.in tools/Makefile.in
Removed Files:
	pr/src/md/unix/os_ReliantUNIX.s


git-svn-id: svn://10.0.0.236/trunk@264433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2012-11-13 23:18:00 +00:00
parent 29457cb04b
commit be98838f49
34 changed files with 42 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/nsprpub/config/Makefile.in
View File

@ -44,7 +44,7 @@ endif
# Temporary workaround to disable the generation of # Temporary workaround to disable the generation of
# library build time because now.c uses the 'long long' # library build time because now.c uses the 'long long'
# data type that's not available on some platforms. # data type that's not available on some platforms.
ifeq (,$(filter-out NEC NEXTSTEP QNX SCOOS UNIXWARE,$(OS_ARCH))) ifeq (,$(filter-out QNX SCOOS UNIXWARE,$(OS_ARCH)))
DEFINES += -DOMIT_LIB_BUILD_TIME DEFINES += -DOMIT_LIB_BUILD_TIME
endif endif

32
mozilla/nsprpub/config/nsinstall.c
View File

@ -38,48 +38,20 @@
* Does getcwd() take NULL as the first argument and malloc * Does getcwd() take NULL as the first argument and malloc
* the result buffer? * the result buffer?
*/ */
#if !defined(DARWIN) && !defined(NEXTSTEP) #if !defined(DARWIN)
#define GETCWD_CAN_MALLOC #define GETCWD_CAN_MALLOC
#endif #endif
#ifdef NEXTSTEP
#include <bsd/libc.h>
/*
** balazs.pataki@sztaki.hu: The getcwd is broken in NEXTSTEP (returns 0),
** when called on a mounted fs. Did anyone notice this? Here's an ugly
** workaround ...
*/
#define getcwd(b,s) my_getcwd(b,s)
static char *
my_getcwd (char *buf, size_t size)
{
FILE *pwd = popen("pwd", "r");
char *result = fgets(buf, size, pwd);
if (result) {
buf[strlen(buf)-1] = '\0';
}
pclose (pwd);
return buf;
}
#endif /* NEXTSTEP */
#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) #if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
#include <getopt.h> #include <getopt.h>
#endif #endif
#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(NEXTSTEP) #if defined(SCO) || defined(UNIXWARE)
#if !defined(S_ISLNK) && defined(S_IFLNK) #if !defined(S_ISLNK) && defined(S_IFLNK)
#define S_ISLNK(a) (((a) & S_IFMT) == S_IFLNK) #define S_ISLNK(a) (((a) & S_IFMT) == S_IFLNK)
#endif #endif
#endif #endif
#if defined(SNI)
extern int fchmod(int fildes, mode_t mode);
#endif
#ifdef QNX #ifdef QNX
#define d_ino d_stat.st_ino #define d_ino d_stat.st_ino
#endif #endif

5
mozilla/nsprpub/lib/ds/Makefile.in
View File

@ -73,13 +73,10 @@ endif
EXTRA_LIBS = $(LIBNSPR) EXTRA_LIBS = $(LIBNSPR)
# On NCR and SCOOS, we can't link with extra libraries when # On SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't # we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time. # complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the .o files. # Therefore on these platforms, we link just the .o files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCOOS) ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS = EXTRA_LIBS =
endif endif

5
mozilla/nsprpub/lib/libc/src/Makefile.in
View File

@ -82,13 +82,10 @@ endif
EXTRA_LIBS = $(LIBNSPR) EXTRA_LIBS = $(LIBNSPR)
# On NCR and SCOOS, we can't link with extra libraries when # On SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't # we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time. # complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the .o files. # Therefore on these platforms, we link just the .o files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCOOS) ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS = EXTRA_LIBS =
endif endif

5
mozilla/nsprpub/lib/prstreams/Makefile.in
View File

@ -77,13 +77,10 @@ endif
EXTRA_LIBS = $(LIBNSPR) EXTRA_LIBS = $(LIBNSPR)
# On NCR and SCOOS, we can't link with extra libraries when # On SCOOS, we can't link with extra libraries when
# we build a shared library. If we do so, the linker doesn't # we build a shared library. If we do so, the linker doesn't
# complain, but we would run into weird problems at run-time. # complain, but we would run into weird problems at run-time.
# Therefore on these platforms, we link just the object files. # Therefore on these platforms, we link just the object files.
ifeq ($(OS_ARCH),NCR)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),SCOOS) ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS = EXTRA_LIBS =
endif endif

20
mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
View File

@ -83,7 +83,6 @@ endif
# Solaris # Solaris
ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
else else
@ -94,27 +93,8 @@ ifdef USE_PTHREADS
EXTRA_LIBS = -lpthread EXTRA_LIBS = -lpthread
endif # USE_PTHREADS endif # USE_PTHREADS
endif # NS_USE_GCC endif # NS_USE_GCC
endif # 4.1.3_U1
endif # SunOS endif # SunOS
ifeq ($(OS_ARCH), NCR)
# XXX: We see some strange problems when we link with libnspr.so.
# So for now we use static libraries on NCR. The shared library
# stuff below is commented out.
LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
# implicitly by $(CC)) again even though we already linked with these
# system libraries when we built libnspr.so.
#EXTRA_LIBS = -lsocket -lnsl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
endif
ifeq ($(OS_ARCH), SCOOS) ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we # SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so. # already linked with these system libraries when we built libnspr.so.

13
mozilla/nsprpub/lib/tests/Makefile.in
View File

@ -102,13 +102,11 @@ endif
# Solaris # Solaris
ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
else else
LDOPTS += -R $(PWD)/$(dist_libdir) LDOPTS += -R $(PWD)/$(dist_libdir)
endif endif
endif
# SunOS 5.5 needs to link with -lpthread, even though we already # SunOS 5.5 needs to link with -lpthread, even though we already
# linked with this system library when we built libnspr.so. # linked with this system library when we built libnspr.so.
@ -119,17 +117,6 @@ endif
endif endif
endif # SunOS endif # SunOS
ifeq ($(OS_ARCH), NCR)
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
# implicitly by $(CC)) again even though we already linked with these
# system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket -lnsl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
export LD_RUN_PATH = $(PWD)/$(dist_libdir)
endif
##################################################### #####################################################
# #
# The rules # The rules

14
mozilla/nsprpub/pr/include/gencfg.c
View File

@ -12,15 +12,9 @@
#endif #endif
#if defined(__sun) #if defined(__sun)
#if defined(__svr4) || defined(__svr4__) || defined(__SVR4)
#ifndef SOLARIS #ifndef SOLARIS
error - SOLARIS is not defined error - SOLARIS is not defined
#endif #endif
#else
#ifndef SUNOS4
error - SUNOS4 is not defined
#endif
#endif
#endif #endif
#if defined(__hpux) #if defined(__hpux)
@ -70,12 +64,6 @@
#endif #endif
#endif #endif
#if defined(__NeXT__)
#ifndef NEXTSTEP
error - NEXTSTEP is not defined
#endif
#endif
/************************************************************************/ /************************************************************************/
/* Generate cpucfg.h */ /* Generate cpucfg.h */
@ -87,7 +75,7 @@
#define INT64 long #define INT64 long
#endif #endif
#else #else
#if defined(HPUX) || defined(NECSVR4) || defined(SCO) || defined(UNIXWARE) || defined (NCR) #if defined(HPUX) || defined(SCO) || defined(UNIXWARE)
#define INT64 long #define INT64 long
#else #else
#define INT64 long long #define INT64 long long

4
mozilla/nsprpub/pr/include/md/_unixos.h
View File

@ -15,7 +15,7 @@
* not be redefined. * not be redefined.
*/ */
#if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \ #if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \
&& !defined(DARWIN) && !defined(NEXTSTEP) && !defined(DARWIN)
#ifndef FD_SETSIZE #ifndef FD_SETSIZE
#define FD_SETSIZE 4096 #define FD_SETSIZE 4096
#endif #endif
@ -147,7 +147,7 @@ extern void _MD_unix_init_running_cpu(struct _PRCPU *cpu);
#define PROT_NONE 0x0 #define PROT_NONE 0x0
#endif #endif
#if defined(DEBUG) && !defined(DARWIN) && !defined(NEXTSTEP) #if defined(DEBUG) && !defined(DARWIN)
#if !defined(SOLARIS) #if !defined(SOLARIS)
#include <string.h> /* for memset() */ #include <string.h> /* for memset() */
#define _MD_INIT_STACK(ts,REDZONE) \ #define _MD_INIT_STACK(ts,REDZONE) \

1
mozilla/nsprpub/pr/include/private/primpl.h
View File

@ -1826,7 +1826,6 @@ extern void _PR_DestroyZones(void);
&& !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \ && !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \
&& !defined(PURIFY) \ && !defined(PURIFY) \
&& !defined(DARWIN) \ && !defined(DARWIN) \
&& !defined(NEXTSTEP) \
&& !defined(QNX) \ && !defined(QNX) \
&& !(defined (UNIXWARE) && defined (USE_SVR4_THREADS)) && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
#define _PR_OVERRIDE_MALLOC #define _PR_OVERRIDE_MALLOC

8
mozilla/nsprpub/pr/src/Makefile.in
View File

@ -33,9 +33,6 @@ endif
# #
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OS_LIBS = -lm
else # 4.1.3_U1
MAPFILE = $(OBJDIR)/nsprmap.sun MAPFILE = $(OBJDIR)/nsprmap.sun
GARBAGE += $(MAPFILE) GARBAGE += $(MAPFILE)
ifdef NS_USE_GCC ifdef NS_USE_GCC
@ -67,7 +64,6 @@ ifndef USE_64
DSO_LDOPTS += -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so DSO_LDOPTS += -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so
endif endif
endif # sparc endif # sparc
endif # 4.1.3_U1
endif # SunOS endif # SunOS
ifeq ($(OS_ARCH), IRIX) ifeq ($(OS_ARCH), IRIX)
@ -163,10 +159,6 @@ ifeq ($(OS_ARCH),UNIXWARE)
OS_LIBS = -lsocket -lc OS_LIBS = -lsocket -lc
endif endif
ifeq ($(OS_ARCH),NEWS-OS)
OS_LIBS = -lsocket -lnsl -lgen -lresolv
endif
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
ifdef NS_USE_GCC ifdef NS_USE_GCC
OS_LIBS = -ladvapi32 -lwsock32 -lwinmm OS_LIBS = -ladvapi32 -lwsock32 -lwinmm

20
mozilla/nsprpub/pr/src/cplus/tests/Makefile.in
View File

@ -69,13 +69,11 @@ endif
# Solaris # Solaris
ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
else else
LDOPTS += -R $(PWD)/$(dist_libdir) LDOPTS += -R $(PWD)/$(dist_libdir)
endif endif
endif
# SunOS 5.5 needs to link with -lpthread, even though we already # SunOS 5.5 needs to link with -lpthread, even though we already
# linked with this system library when we built libnspr.so. # linked with this system library when we built libnspr.so.
@ -136,24 +134,6 @@ ifeq ($(OS_ARCH), Linux)
endif endif
endif endif
ifeq ($(OS_ARCH), NCR)
# XXX: We see some strange problems when we link with libnspr.so.
# So for now we use static libraries on NCR. The shared library
# stuff below is commented out.
LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
# implicitly by $(CC)) again even though we already linked with these
# system libraries when we built libnspr.so.
#EXTRA_LIBS = -lsocket -lnsl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
endif
ifeq ($(OS_ARCH), SCO_SV) ifeq ($(OS_ARCH), SCO_SV)
# SCO Unix needs to link against -lsocket again even though we # SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so. # already linked with these system libraries when we built libnspr.so.

7
mozilla/nsprpub/pr/src/io/Makefile.in
View File

@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
CSRCS = \ CSRCS = \
prfdcach.c \ prfdcach.c \
prmwait.c \ prmwait.c \

8
mozilla/nsprpub/pr/src/io/prfile.c
View File

@ -365,7 +365,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
{ {
#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX) #if defined(XP_UNIX) && !defined(AIX) && !defined(QNX)
struct rlimit rlim; struct rlimit rlim;
if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) { if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
@ -374,7 +374,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
} }
return rlim.rlim_max; return rlim.rlim_max;
#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX) #elif defined(AIX) || defined(QNX)
return sysconf(_SC_OPEN_MAX); return sysconf(_SC_OPEN_MAX);
#elif defined(WIN32) #elif defined(WIN32)
/* /*
@ -398,7 +398,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void)
PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size) PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size)
{ {
#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX) #if defined(XP_UNIX) && !defined(AIX) && !defined(QNX)
struct rlimit rlim; struct rlimit rlim;
PRInt32 tableMax = PR_GetSysfdTableMax(); PRInt32 tableMax = PR_GetSysfdTableMax();
@ -433,7 +433,7 @@ PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size)
return -1; return -1;
} }
return tableMax; return tableMax;
#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX) \ #elif defined(AIX) || defined(QNX) \
|| defined(WIN32) || defined(WIN16) || defined(XP_BEOS) || defined(WIN32) || defined(WIN16) || defined(XP_BEOS)
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
return -1; return -1;

11
mozilla/nsprpub/pr/src/io/prmapopt.c
View File

@ -33,11 +33,6 @@
#include "primpl.h" #include "primpl.h"
#if defined(NEXTSTEP)
/* NEXTSTEP is special: this must come before netinet/tcp.h. */
#include <netinet/in_systm.h> /* n_short, n_long, n_time */
#endif
#ifdef HAVE_NETINET_TCP_H #ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h> /* TCP_NODELAY, TCP_MAXSEG */ #include <netinet/tcp.h> /* TCP_NODELAY, TCP_MAXSEG */
#endif #endif
@ -359,15 +354,9 @@ PRStatus PR_CALLBACK _PR_SocketSetSocketOption(PRFileDesc *fd, const PRSocketOpt
#error "SO_LINGER is not defined" #error "SO_LINGER is not defined"
#endif #endif
/*
* Some platforms, such as NCR 2.03, don't have TCP_NODELAY defined
* in <netinet/tcp.h>
*/
#if !defined(NCR)
#if !defined(TCP_NODELAY) #if !defined(TCP_NODELAY)
#error "TCP_NODELAY is not defined" #error "TCP_NODELAY is not defined"
#endif #endif
#endif
/* /*
* Make sure the value of _PR_NO_SUCH_SOCKOPT is not * Make sure the value of _PR_NO_SUCH_SOCKOPT is not

7
mozilla/nsprpub/pr/src/linking/Makefile.in
View File

@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
CSRCS = \ CSRCS = \
prlink.c \ prlink.c \
$(NULL) $(NULL)

4
mozilla/nsprpub/pr/src/linking/prlink.c
View File

@ -54,8 +54,8 @@
/* /*
* On these platforms, symbols have a leading '_'. * On these platforms, symbols have a leading '_'.
*/ */
#if defined(SUNOS4) || (defined(DARWIN) && defined(USE_MACH_DYLD)) \ #if (defined(DARWIN) && defined(USE_MACH_DYLD)) \
|| defined(NEXTSTEP) || defined(XP_OS2) \ || defined(XP_OS2) \
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
#define NEED_LEADING_UNDERSCORE #define NEED_LEADING_UNDERSCORE
#endif #endif

7
mozilla/nsprpub/pr/src/malloc/Makefile.in
View File

@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
TARGETS = $(OBJS) TARGETS = $(OBJS)
INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private

2
mozilla/nsprpub/pr/src/md/beos/beos_errors.c
View File

@ -989,7 +989,7 @@ void _MD_unix_map_connect_error(int err)
PR_SetError(PR_INVALID_ARGUMENT_ERROR, err); PR_SetError(PR_INVALID_ARGUMENT_ERROR, err);
break; break;
case EIO: case EIO:
#if defined(UNIXWARE) || defined(SNI) || defined(NEC) #if defined(UNIXWARE)
/* /*
* On some platforms, if we connect to a port on * On some platforms, if we connect to a port on
* the local host (the loopback address) that no * the local host (the loopback address) that no

4
mozilla/nsprpub/pr/src/md/prosdep.c
View File

@ -28,10 +28,10 @@ static void GetPageSize(void)
/* Get page size */ /* Get page size */
#ifdef XP_UNIX #ifdef XP_UNIX
#if defined SUNOS4 || defined BSDI || defined AIX \ #if defined BSDI || defined AIX \
|| defined LINUX || defined __GNU__ || defined __GLIBC__ \ || defined LINUX || defined __GNU__ || defined __GLIBC__ \
|| defined FREEBSD || defined NETBSD || defined OPENBSD \ || defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined DARWIN || defined NEXTSTEP || defined SYMBIAN || defined DARWIN || defined SYMBIAN
_pr_pageSize = getpagesize(); _pr_pageSize = getpagesize();
#elif defined(HPUX) #elif defined(HPUX)
/* I have no idea. Don't get me started. --Rob */ /* I have no idea. Don't get me started. --Rob */

4
mozilla/nsprpub/pr/src/md/unix/Makefile.in
View File

@ -36,7 +36,6 @@ ASFILES += $(PR_MD_ASFILES)
TARGETS = $(OBJS) TARGETS = $(OBJS)
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(CPU_ARCH),sparc) ifeq ($(CPU_ARCH),sparc)
ifdef USE_64 ifdef USE_64
ULTRASPARC_ASFILES = os_SunOS_sparcv9.s ULTRASPARC_ASFILES = os_SunOS_sparcv9.s
@ -52,7 +51,6 @@ ifeq ($(OS_ARCH),SunOS)
lib_subdir = cpu/sparcv8plus lib_subdir = cpu/sparcv8plus
endif endif
endif endif
endif
endif endif
INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
@ -64,7 +62,6 @@ include $(topsrcdir)/config/rules.mk
export:: $(TARGETS) export:: $(TARGETS)
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(CPU_ARCH),sparc) ifeq ($(CPU_ARCH),sparc)
ifdef USE_64 ifdef USE_64
@ -100,4 +97,3 @@ endif
endif endif
endif endif
endif

96
mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
View File

@ -1,96 +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/. */
/* We want position independent code */
#define PIC
#include <sys/asm.h>
#include <sys/regdef.h>
#include <sys/syscall.h>
.file 1 "os_ReliantUNIX.s"
.option pic2
.text
.align 2
.globl getcxt
.ent getcxt
getcxt:
.frame sp,0,$31 # vars= 0, regs= 0/0, args= 0, extra= 0
# saved integer regs
sw ra,180(a0) # gpregs[CXT_EPC]
sw gp,152(a0) # gpregs[CXT_GP]
sw sp,156(a0) # gpregs[CXT_SP]
sw s8,160(a0) # gpregs[CXT_S8]
sw s0,104(a0) # gpregs[CXT_S0]
sw s1,108(a0) # gpregs[CXT_S1]
sw s2,112(a0) # gpregs[CXT_S2]
sw s3,116(a0) # gpregs[CXT_S3]
sw s4,120(a0) # gpregs[CXT_S4]
sw s5,124(a0) # gpregs[CXT_S5]
sw s6,128(a0) # gpregs[CXT_S6]
sw s7,132(a0) # gpregs[CXT_S7]
# csr
cfc1 v0,$31
# saved float regs
s.d $f20,264(a0) # fpregs.fp_r.fp_dregs[10]
s.d $f22,272(a0) # fpregs.fp_r.fp_dregs[11]
s.d $f24,280(a0) # fpregs.fp_r.fp_dregs[12]
s.d $f26,288(a0) # fpregs.fp_r.fp_dregs[13]
s.d $f28,296(a0) # fpregs.fp_r.fp_dregs[14]
s.d $f30,304(a0) # fpregs.fp_r.fp_dregs[15]
sw v0,312(a0) # fpregs.fp_csr
# give no illusions about the contents
li v0,0x0c # UC_CPU | UC_MAU
sw v0,0(a0) # uc_flags
move v0,zero
j ra
.end getcxt
.align 2
.globl setcxt
.ent setcxt
setcxt:
.frame sp,0,$31 # vars= 0, regs= 0/0, args= 0, extra= 0
lw v0,312(a0) # fpregs.fp_csr
li v1,0xfffc0fff # mask out exception cause bits
and v0,v0,v1
# saved integer regs
lw t9,180(a0) # gpregs[CXT_EPC]
lw ra,180(a0) # gpregs[CXT_EPC]
lw gp,152(a0) # gpregs[CXT_GP]
lw sp,156(a0) # gpregs[CXT_SP]
ctc1 v0,$31 # fp_csr
lw s8,160(a0) # gpregs[CXT_S8]
lw s0,104(a0) # gpregs[CXT_S0]
lw s1,108(a0) # gpregs[CXT_S1]
lw s2,112(a0) # gpregs[CXT_S2]
lw s3,116(a0) # gpregs[CXT_S3]
lw s4,120(a0) # gpregs[CXT_S4]
lw s5,124(a0) # gpregs[CXT_S5]
lw s6,128(a0) # gpregs[CXT_S6]
lw s7,132(a0) # gpregs[CXT_S7]
# saved float regs
l.d $f20,264(a0) # fpregs.fp_r.fp_dregs[10]
l.d $f22,272(a0) # fpregs.fp_r.fp_dregs[11]
l.d $f24,280(a0) # fpregs.fp_r.fp_dregs[12]
l.d $f26,288(a0) # fpregs.fp_r.fp_dregs[13]
l.d $f28,296(a0) # fpregs.fp_r.fp_dregs[14]
l.d $f30,304(a0) # fpregs.fp_r.fp_dregs[15]
# load these, too
# they were not saved, but maybe the user modified them...
lw v0,48(a0)
lw v1,52(a0)
lw a1,60(a0)
lw a2,64(a0)
lw a3,68(a0)
lw a0,56(a0) # there is no way back
j ra
.end setcxt

19
mozilla/nsprpub/pr/src/md/unix/unix.c
View File

@ -22,8 +22,7 @@
#endif #endif
/* To get FIONREAD */ /* To get FIONREAD */
#if defined(NCR) || defined(UNIXWARE) || defined(NEC) || defined(SNI) \ #if defined(UNIXWARE)
|| defined(SONY)
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif
@ -39,10 +38,10 @@
|| (defined(__GLIBC__) && __GLIBC__ >= 2) || (defined(__GLIBC__) && __GLIBC__ >= 2)
#define _PRSockLen_t socklen_t #define _PRSockLen_t socklen_t
#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
|| defined(AIX4_1) || defined(LINUX) || defined(SONY) \ || defined(AIX4_1) || defined(LINUX) \
|| defined(BSDI) || defined(SCO) || defined(NEC) || defined(SNI) \ || defined(BSDI) || defined(SCO) \
|| defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ || defined(DARWIN) \
|| defined(NEXTSTEP) || defined(QNX) || defined(QNX)
#define _PRSockLen_t int #define _PRSockLen_t int
#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
@ -768,7 +767,7 @@ PRInt32 _MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount,
* from socketpairs. As long as we don't use flags on socketpairs, this * from socketpairs. As long as we don't use flags on socketpairs, this
* is a decent fix. - mikep * is a decent fix. - mikep
*/ */
#if defined(UNIXWARE) || defined(SOLARIS) || defined(NCR) #if defined(UNIXWARE) || defined(SOLARIS)
while ((rv = read(osfd,buf,amount)) == -1) { while ((rv = read(osfd,buf,amount)) == -1) {
#else #else
while ((rv = recv(osfd,buf,amount,flags)) == -1) { while ((rv = recv(osfd,buf,amount,flags)) == -1) {
@ -2177,11 +2176,7 @@ void _MD_MakeNonblock(PRFileDesc *fd)
* otherwise connect() still blocks and can be interrupted by SIGALRM. * otherwise connect() still blocks and can be interrupted by SIGALRM.
*/ */
#ifdef SUNOS4
fcntl(osfd, F_SETFL, flags | FNDELAY);
#else
fcntl(osfd, F_SETFL, flags | O_NONBLOCK); fcntl(osfd, F_SETFL, flags | O_NONBLOCK);
#endif
} }
PRInt32 _MD_open(const char *name, PRIntn flags, PRIntn mode) PRInt32 _MD_open(const char *name, PRIntn flags, PRIntn mode)
@ -3322,7 +3317,7 @@ int _MD_unix_get_nonblocking_connect_error(int osfd)
} else { } else {
return ECONNREFUSED; return ECONNREFUSED;
} }
#elif defined(NCR) || defined(UNIXWARE) || defined(SNI) || defined(NEC) #elif defined(UNIXWARE)
/* /*
* getsockopt() fails with EPIPE, so use getmsg() instead. * getsockopt() fails with EPIPE, so use getmsg() instead.
*/ */

2
mozilla/nsprpub/pr/src/md/unix/unix_errors.c
View File

@ -531,7 +531,7 @@ void _MD_unix_map_connect_error(int err)
case EACCES: case EACCES:
prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; prError = PR_ADDRESS_NOT_SUPPORTED_ERROR;
break; break;
#if defined(UNIXWARE) || defined(SNI) || defined(NEC) #if defined(UNIXWARE)
/* /*
* On some platforms, if we connect to a port on the local host * On some platforms, if we connect to a port on the local host
* (the loopback address) that no process is listening on, we get * (the loopback address) that no process is listening on, we get

9
mozilla/nsprpub/pr/src/md/unix/uxproces.c
View File

@ -711,11 +711,6 @@ static PRStatus _MD_InitProcesses(void)
int rv; int rv;
int flags; int flags;
#endif #endif
#ifdef SUNOS4
#define _PR_NBIO_FLAG FNDELAY
#else
#define _PR_NBIO_FLAG O_NONBLOCK
#endif
#ifdef AIX #ifdef AIX
{ {
@ -739,9 +734,9 @@ static PRStatus _MD_InitProcesses(void)
rv = pipe(pr_wp.pipefd); rv = pipe(pr_wp.pipefd);
PR_ASSERT(0 == rv); PR_ASSERT(0 == rv);
flags = fcntl(pr_wp.pipefd[0], F_GETFL, 0); flags = fcntl(pr_wp.pipefd[0], F_GETFL, 0);
fcntl(pr_wp.pipefd[0], F_SETFL, flags | _PR_NBIO_FLAG); fcntl(pr_wp.pipefd[0], F_SETFL, flags | O_NONBLOCK);
flags = fcntl(pr_wp.pipefd[1], F_GETFL, 0); flags = fcntl(pr_wp.pipefd[1], F_GETFL, 0);
fcntl(pr_wp.pipefd[1], F_SETFL, flags | _PR_NBIO_FLAG); fcntl(pr_wp.pipefd[1], F_SETFL, flags | O_NONBLOCK);
#ifndef _PR_SHARE_CLONES #ifndef _PR_SHARE_CLONES
pr_InstallSigchldHandler(); pr_InstallSigchldHandler();

44
mozilla/nsprpub/pr/src/md/unix/uxrng.c
View File

@ -25,14 +25,6 @@ GetHighResClock(void *buf, size_t maxbytes)
return 0; return 0;
} }
#elif defined(SUNOS4)
static size_t
GetHighResClock(void *buf, size_t maxbytes)
{
return 0;
}
#elif defined(HPUX) #elif defined(HPUX)
#ifdef __ia64 #ifdef __ia64
@ -134,14 +126,6 @@ GetHighResClock(void *buf, size_t maxbytes)
return(GetDevURandom( buf, maxbytes )); return(GetDevURandom( buf, maxbytes ));
} }
#elif defined(NCR)
static size_t
GetHighResClock(void *buf, size_t maxbytes)
{
return 0;
}
#elif defined(IRIX) #elif defined(IRIX)
#include <fcntl.h> #include <fcntl.h>
#undef PRIVATE #undef PRIVATE
@ -225,34 +209,6 @@ static size_t GetHighResClock(void *buf, size_t maxbuf)
return _pr_CopyLowBits(buf, maxbuf, &s0, cntr_size); return _pr_CopyLowBits(buf, maxbuf, &s0, cntr_size);
} }
#elif defined(SONY)
static size_t
GetHighResClock(void *buf, size_t maxbytes)
{
return 0;
}
#elif defined(SNI)
#include <sys/times.h>
static size_t
GetHighResClock(void *buf, size_t maxbytes)
{
int ticks;
struct tms buffer;
ticks=times(&buffer);
return _pr_CopyLowBits(buf, maxbytes, &ticks, sizeof(ticks));
}
#elif defined(NEC)
static size_t
GetHighResClock(void *buf, size_t maxbytes)
{
return 0;
}
#elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \ #elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \
|| defined(QNX) || defined(DARWIN) || defined(RISCOS) || defined(QNX) || defined(DARWIN) || defined(RISCOS)
#include <sys/times.h> #include <sys/times.h>

5
mozilla/nsprpub/pr/src/md/unix/uxwrap.c
View File

@ -70,9 +70,6 @@ void PR_SetXtHackOkayToReleaseXLockFn(int (*fn)(void))
#if defined(HPUX9) #if defined(HPUX9)
int select(size_t width, int *rl, int *wl, int *el, const struct timeval *tv) int select(size_t width, int *rl, int *wl, int *el, const struct timeval *tv)
#elif defined(NEXTSTEP)
int wrap_select(int width, fd_set *rd, fd_set *wr, fd_set *ex,
const struct timeval *tv)
#elif defined(AIX_RENAME_SELECT) #elif defined(AIX_RENAME_SELECT)
int wrap_select(unsigned long width, void *rl, void *wl, void *el, int wrap_select(unsigned long width, void *rl, void *wl, void *el,
struct timeval *tv) struct timeval *tv)
@ -258,7 +255,7 @@ int select(int width, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *tv)
nbits++; nbits++;
} }
PR_ASSERT(nbits > 0); PR_ASSERT(nbits > 0);
#if defined(HPUX) || defined(SOLARIS) || defined(SUNOS4) || defined(OSF1) || defined(AIX) #if defined(HPUX) || defined(SOLARIS) || defined(OSF1) || defined(AIX)
retVal += nbits; retVal += nbits;
#else /* IRIX */ #else /* IRIX */
retVal += 1; retVal += 1;

2
mozilla/nsprpub/pr/src/misc/prtime.c
View File

@ -1695,7 +1695,7 @@ PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm)
* additional fields: tm_zone and tm_gmtoff. * additional fields: tm_zone and tm_gmtoff.
*/ */
#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ #if (__GLIBC__ >= 2) || defined(XP_BEOS) \
|| defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \
|| defined(DARWIN) || defined(SYMBIAN) || defined(ANDROID) || defined(DARWIN) || defined(SYMBIAN) || defined(ANDROID)
a.tm_zone = NULL; a.tm_zone = NULL;

7
mozilla/nsprpub/pr/src/pthreads/Makefile.in
View File

@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
CSRCS = \ CSRCS = \
ptio.c \ ptio.c \
ptsynch.c \ ptsynch.c \

2
mozilla/nsprpub/pr/src/pthreads/ptio.c
View File

@ -4850,7 +4850,7 @@ PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PRInt32 fd, PR_fd_set *set)
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#if !defined(SUNOS4) && !defined(HPUX) \ #if !defined(HPUX) \
&& !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)
#include <sys/select.h> #include <sys/select.h>
#endif #endif

7
mozilla/nsprpub/pr/src/threads/combined/Makefile.in
View File

@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
ifdef USE_PTHREADS ifdef USE_PTHREADS
CSRCS = \ CSRCS = \
$(NULL) $(NULL)

47
mozilla/nsprpub/pr/tests/Makefile.in
View File

@ -296,7 +296,6 @@ endif
# Solaris # Solaris
ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(ABSOLUTE_LIB_DIR) LDOPTS += -Xlinker -R -Xlinker $(ABSOLUTE_LIB_DIR)
else else
@ -305,48 +304,12 @@ ifeq ($(OS_ARCH), SunOS)
endif endif
LDOPTS += -R $(ABSOLUTE_LIB_DIR) LDOPTS += -R $(ABSOLUTE_LIB_DIR)
endif endif
endif
ifdef USE_PTHREADS ifdef USE_PTHREADS
EXTRA_LIBS = -lpthread EXTRA_LIBS = -lpthread
endif endif
endif # SunOS endif # SunOS
ifeq ($(OS_ARCH), NEC)
EXTRA_LIBS = $(OS_LIBS)
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
ifeq ($(OS_ARCH), NCR)
# NCR needs to link against -lsocket -lnsl -ldl (and -lc, which is
# linked implicitly by $(CC)). Note that we did not link with these
# system libraries when we built libnspr.so.
EXTRA_LIBS = -lsocket -lnsl -ldl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
ifeq ($(OS_ARCH), NEXTSTEP)
# balazs.pataki@sztaki.hu: linkage is done in a different pass in the `tests'
# modeul, so we have to pass the `-posix' flag by "hand" to `ld'
LDOPTS += -posix
endif
ifeq ($(OS_ARCH), NEWS-OS)
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
endif
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
ifeq ($(USE_PTHREADS),1) ifeq ($(USE_PTHREADS),1)
@ -364,14 +327,6 @@ EXTRA_LIBS = -lsocket
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif endif
ifeq ($(OS_ARCH),SINIX)
EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
ifeq ($(OS_ARCH),OpenUNIX) ifeq ($(OS_ARCH),OpenUNIX)
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
ifeq ($(USE_PTHREADS),1) ifeq ($(USE_PTHREADS),1)
@ -484,7 +439,6 @@ clean::
# The following tests call BSD socket functions, so they need to link # The following tests call BSD socket functions, so they need to link
# with -lsocket on some platforms. # with -lsocket on some platforms.
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(USE_IPV6),1) ifeq ($(USE_IPV6),1)
$(OBJDIR)/gethost: $(OBJDIR)/gethost.o $(OBJDIR)/gethost: $(OBJDIR)/gethost.o
$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
@ -492,7 +446,6 @@ endif
$(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o $(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o
$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
endif endif
endif
ifeq ($(USE_PTHREADS), 1) ifeq ($(USE_PTHREADS), 1)
$(OBJDIR)/attach: $(OBJDIR)/attach.o $(OBJDIR)/attach: $(OBJDIR)/attach.o

7
mozilla/nsprpub/pr/tests/dll/Makefile.in
View File

@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
CSRCS = mygetval.c mysetval.c CSRCS = mygetval.c mysetval.c
INCLUDES = -I$(dist_includedir) INCLUDES = -I$(dist_includedir)

20
mozilla/nsprpub/tools/Makefile.in
View File

@ -86,13 +86,11 @@ endif
# Solaris # Solaris
ifeq ($(OS_ARCH), SunOS) ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
else else
LDOPTS += -R $(PWD)/$(dist_libdir) LDOPTS += -R $(PWD)/$(dist_libdir)
endif endif
endif
# SunOS 5.5 needs to link with -lpthread, even though we already # SunOS 5.5 needs to link with -lpthread, even though we already
# linked with this system library when we built libnspr.so. # linked with this system library when we built libnspr.so.
@ -103,24 +101,6 @@ endif
endif endif
endif # SunOS endif # SunOS
ifeq ($(OS_ARCH), NCR)
# XXX: We see some strange problems when we link with libnspr.so.
# So for now we use static libraries on NCR. The shared library
# stuff below is commented out.
LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a
LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
# implicitly by $(CC)) again even though we already linked with these
# system libraries when we built libnspr.so.
#EXTRA_LIBS = -lsocket -lnsl
# This hardcodes in the executable programs the directory to find
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
endif
ifeq ($(OS_ARCH), SCOOS) ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we # SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so. # already linked with these system libraries when we built libnspr.so.