Bug 11893. r=shaver
authorcls%seawood.org
Sun, 17 Oct 1999 15:12:41 +0000
changeset 882 58f9dce4d606ebdd9cb5fb3a235d6ca45c28f9ce
parent 881 f910db68b1b676587bf66699f0687eab98eaf422
child 883 2640740ce7cb95b23454fd76085d727f1a15ba4e
push idunknown
push userunknown
push dateunknown
reviewersshaver
bugs11893
Bug 11893. r=shaver Sync the autoconf Makefile.ins.
lib/ds/Makefile.in
lib/libc/src/Makefile.in
lib/prstreams/Makefile.in
pr/include/md/Makefile.in
pr/src/Makefile.in
pr/src/md/unix/Makefile.in
pr/src/md/windows/Makefile.in
pr/src/memory/Makefile.in
pr/src/misc/Makefile.in
pr/src/pthreads/Makefile.in
pr/tests/Makefile.in
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -167,18 +167,26 @@ endif
 # The Client build wants the shared libraries in $(DIST)/bin,
 # so we also install them there.
 #
 
 export:: $(TARGETS)
 	$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
 	$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
 ifdef SHARED_LIBRARY
+ifeq ($(OS_ARCH),HP-UX)
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
+else
 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
 endif
+ifeq ($(OS_ARCH), OpenVMS)
+	$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
+endif
+endif
 ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif
 
 install:: export
 
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -163,16 +163,24 @@ endif
 #
 # The Client build wants the shared libraries in $(DIST)/bin,
 # so we also install them there.
 #
 
 export:: $(TARGETS)
 	$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
 ifdef SHARED_LIBRARY
+ifeq ($(OS_ARCH),HP-UX)
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
+else
 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
 endif
+ifeq ($(OS_ARCH), OpenVMS)
+	$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
+endif
+endif
 ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif
 
 install:: export
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -25,30 +25,37 @@ VPATH		= @srcdir@
 include $(MOD_DEPTH)/config/autoconf.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 =
+    else
+	# The C++ compiler in Workshop 5.0 uses standard
+	# iostreams as default.  -library=iostream will
+	# allow Workshop 5.0 to work with classic iostreams.
+	ifndef NS_USE_GCC
+	CCC_VERSION := $(shell $(CCC) -V 2>&1)
+	ifneq (,$(findstring 5.0,$(CCC_VERSION)))
+	CCC_ONLY_FLAGS += -library=iostream
+	endif
+	endif
     endif
 endif
 
 ifeq ($(OS_ARCH), IRIX)
-    CFLAGS += -KPIC
     ifneq ($(OS_RELEASE),5.3)
-        CFLAGS += -exceptions
+	CCC_ONLY_FLAGS += -exceptions
     endif
 endif
 
-ifeq ($(OS_ARCH),HP-UX)
-    ifeq (($USE_64),1)
-        CCCFLAGS += +DA2.0W
-    endif
+ifeq ($(OS_ARCH), BeOS)
+    CFLAGS += -frtti -fexceptions
 endif
 
 INCLUDES = -I$(DIST)/include
 
 HEADERS = *.h
 
 CSRCS = \
 	plvrsion.c \
@@ -105,16 +112,19 @@ endif
 # complain, but we would run into weird problems at run-time.
 # Therefore on these platforms, we link just the object files.
 ifeq ($(OS_ARCH),NCR)
     EXTRA_LIBS =
 endif
 ifeq ($(OS_ARCH),SCOOS)
     EXTRA_LIBS =
 endif
+ifeq ($(OS_ARCH),BeOS)
+    EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION)
+endif
 
 ifeq ($(OS_ARCH), UNIXWARE)
     OS_LIBS += -lC
 endif
 
 LIBRARY_NAME    = prstrms
 LIBRARY_VERSION = $(MOD_VERSION)
 
@@ -167,10 +177,21 @@ else
 endif
 #
 # Version information generation (end)
 #
 
 export:: $(TARGETS) $(HEADERS)
 	$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
 	$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+ifeq ($(OS_ARCH),HP-UX)
+ifdef SHARED_LIBRARY
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
+endif
+endif
+ifeq ($(OS_ARCH),OpenVMS)
+	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
+ifdef SHARED_LIBRARY
+	$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
+endif
+endif
 
 install:: export
--- a/pr/include/md/Makefile.in
+++ b/pr/include/md/Makefile.in
@@ -54,19 +54,23 @@ endif
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH),AIX)
 ifeq ($(USE_64),1)
 MDCPUCFG_H = _aix64.cfg
 else
+ifeq ($(USE_IPV6),1)
+MDCPUCFG_H = _aix32in6.cfg
+else
 MDCPUCFG_H = _aix32.cfg
 endif
 endif
+endif
 
 ifeq ($(OS_ARCH),BSD_OS)
 MDCPUCFG_H = _bsdi.cfg
 endif
 
 ifeq ($(OS_ARCH),FreeBSD)
 MDCPUCFG_H = _freebsd.cfg
 endif
@@ -98,17 +102,21 @@ endif
 ifeq ($(OS_ARCH),OSF1)
 MDCPUCFG_H = _osf1.cfg
 endif
 
 ifeq ($(OS_ARCH),SunOS)
 ifeq ($(OS_RELEASE),4.1.3_U1)
 MDCPUCFG_H = _sunos4.cfg
 else
-MDCPUCFG_H = _solaris.cfg
+ifeq ($(USE_64),1)
+MDCPUCFG_H = _solaris64.cfg
+else
+MDCPUCFG_H = _solaris32.cfg
+endif
 endif
 endif
 
 ifeq ($(OS_ARCH),SINIX)
 MDCPUCFG_H = _reliantunix.cfg
 endif
 
 ifeq ($(OS_ARCH),Rhapsody)
@@ -142,44 +150,36 @@ endif
 ifeq ($(OS_ARCH),DGUX)
 MDCPUCFG_H = _dgux.cfg
 endif
 
 ifeq ($(OS_ARCH),QNX)
 MDCPUCFG_H = _qnx.cfg
 endif
 
+ifeq ($(OS_TARGET),NTO)
+MDCPUCFG_H = _nto.cfg
+endif
+
 ifeq ($(OS_ARCH),BeOS)
 MDCPUCFG_H = _beos.cfg
 endif
 
 endif # ! USE_AUTOCONF
 
-export:: #$(MDCPUCFG_H)
+export:: $(MDCPUCFG_H)
 	$(INSTALL) -m 444 $(CONFIGS) $(DIST)/include/md
-#ifeq ($(MOZ_BITS),16)
-#	cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
-#	$(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL)
-#	mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
-#else
-	@if cmp -s $(srcdir)/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h; then \
-	  echo $(DIST)/include/prcpucfg.h unchanged; \
-	else \
-	  echo cp -f $(srcdir)/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h; \
-	  cp -f $(srcdir)/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h; \
-	fi
-#endif
-ifeq ($(OS_ARCH),OpenVMS)
-# mv'ing a link causes the file itself to move, not the link, so fix it.
+	$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(DIST)/include
+ifneq ($(OS_ARCH),OpenVMS)
+	mv -f $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
+else
+# mv'ing a link causes the file itself to move, not the link.
 	rm -f $(DIST)/include/$(MDCPUCFG_H)
-	if [ ! -L $(DIST)/include/prcpucfg.h ]; then \
-	  mv -f $(DIST)/include/prcpucfg.h $(MDCPUCFG_H); \
-	  ln -fs ../../../nsprpub/pr/include/md/$(MDCPUCFG_H) \
-	    $(DIST)/include/prcpucfg.h; \
-	fi
+	rm -f $(DIST)/include/prcpucfg.h
+	ln -fs `pwd`/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
 endif
 
 release:: export
 	@echo "Copying machine-dependent prcpucfg.h"
 	@if test -z "$(BUILD_NUMBER)"; then \
 		echo "BUILD_NUMBER must be defined"; \
 		false; \
 	fi
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -93,30 +93,23 @@ ifeq ($(OS_ARCH),AIX)
 ifneq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
 ifneq ($(USE_PTHREADS),1)
 BUILD_AIX_RTL_LIBC = 1
 AIX_RTL_LIBC	= $(OBJDIR)/libc.a
 endif
 endif
 endif
 
-ifeq ($(OS_ARCH),OpenVMS)
-OS_LIBS		= -lvms_jackets
-endif
-
 ifeq ($(OS_ARCH),OSF1)
 ifeq ($(USE_PTHREADS), 1)
 OS_LIBS 	= -lpthread -lrt
 endif
 ifneq ($(OS_RELEASE),V2.0)
 OS_LIBS		+= -lc_r
 endif
-ifeq ($(USE_IPV6), 1)
-OS_LIBS		+= -lip6
-endif
 endif
 
 ifeq ($(OS_ARCH),Linux)
 ifeq ($(USE_PTHREADS), 1)
 OS_LIBS		= -lpthread -ldl -lc
 else
 OS_LIBS		= -ldl -lc
 endif
@@ -126,17 +119,17 @@ ifeq ($(OS_ARCH),HP-UX)
 ifeq ($(USE_PTHREADS), 1)
 ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
 OS_LIBS 	= -ldce
 else
 OS_LIBS 	= -lpthread
 endif
 endif
 ifeq ($(PTHREADS_USER), 1)
-OS_LIBS 	= -lpthread
+OS_LIBS 	= -lpthread -lrt
 endif
 ifeq ($(basename $(OS_RELEASE)),A.09)
 OS_LIBS		+= -ldld -L/lib/pa1.1 -lm
 else
 OS_LIBS		+= -ldld -lm -lc
 endif
 endif
 
@@ -178,27 +171,30 @@ OBJS = \
     io/$(OBJDIR)/prstdio.$(OBJ_SUFFIX) \
     threads/$(OBJDIR)/prcmon.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \
     linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \
     malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) \
     malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \
     md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \
+    memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \
+    memory/$(OBJDIR)/prshma.$(OBJ_SUFFIX) \
     memory/$(OBJDIR)/prseg.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/pralarm.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/pratom.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prcountr.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prdtoa.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prenv.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prerr.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prerror.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prerrortable.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prinit.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prinrval.$(OBJ_SUFFIX) \
+    misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX)	 \
     misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \
     misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX)
@@ -209,17 +205,18 @@ OBJS += \
     pthreads/$(OBJDIR)/ptio.$(OBJ_SUFFIX) \
     pthreads/$(OBJDIR)/ptthread.$(OBJ_SUFFIX) \
     pthreads/$(OBJDIR)/ptmisc.$(OBJ_SUFFIX)
 else
 OBJS += \
     io/$(OBJDIR)/prdir.$(OBJ_SUFFIX) \
     io/$(OBJDIR)/prfile.$(OBJ_SUFFIX) \
     io/$(OBJDIR)/prio.$(OBJ_SUFFIX) \
-    io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX)
+    io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX) \
+    misc/$(OBJDIR)/pripcsem.$(OBJ_SUFFIX)
 
 ifndef USE_BTHREADS
 OBJS += \
 	threads/$(OBJDIR)/prcthr.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prdump.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prmon.$(OBJ_SUFFIX) \
 	threads/$(OBJDIR)/prsem.$(OBJ_SUFFIX) \
 	threads/combined/$(OBJDIR)/prucpu.$(OBJ_SUFFIX) \
@@ -296,17 +293,19 @@ OBJS +=	md/windows/$(OBJDIR)/w95io.$(OBJ
 	md/windows/$(OBJDIR)/w95sock.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/w95thred.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/w95cv.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX)	\
 	md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
+        md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX)    \
 	md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX)	\
+        md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX)       \
 	md/windows/$(OBJDIR)/w95dllmain.$(OBJ_SUFFIX)
 else
 ifeq ($(OS_TARGET),OS2)
 OBJS +=	md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \
 	md/os2/$(OBJDIR)/os2sock.$(OBJ_SUFFIX) \
 	md/os2/$(OBJDIR)/os2thred.$(OBJ_SUFFIX) \
 	md/os2/$(OBJDIR)/os2cv.$(OBJ_SUFFIX) \
 	md/os2/$(OBJDIR)/os2gc.$(OBJ_SUFFIX) \
@@ -319,16 +318,18 @@ else
 OBJS +=	md/windows/$(OBJDIR)/ntdllmn.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntio.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntthread.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \
 	md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX)	\
 	md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
+        md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \
+        md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX)       \
 	md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX)
 endif
 endif
 endif
 
 else
 
 ifeq ($(OS_ARCH), BeOS)
@@ -341,18 +342,16 @@ endif
 endif
 endif # !USE_AUTOCONF
 
 LIBRARY_NAME = nspr
 LIBRARY_VERSION = $(MOD_VERSION)
 
 RELEASE_LIBS = $(TARGETS)
 
-GARBAGE += $(TINC)
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(BUILD_AIX_RTL_LIBC),1)
 TARGETS		+= $(AIX_RTL_LIBC)
 # XXX is this a shared library?
 endif
 
 #
@@ -405,18 +404,26 @@ endif
 #
 # The Client build wants the shared libraries in $(DIST)/bin,
 # so we also install them there.
 #
 
 export:: $(TARGETS)
 	$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
 ifdef SHARED_LIBRARY
+ifeq ($(OS_ARCH),HP-UX)
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
+	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
+else
 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
 endif
+ifeq ($(OS_ARCH), OpenVMS)
+	$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
+endif
+endif
 ifeq ($(MOZ_BITS),16)
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
 	$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
 endif
 
 ifeq ($(BUILD_AIX_RTL_LIBC),1)
 $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 	rtl_enable -o $@ $<
--- a/pr/src/md/unix/Makefile.in
+++ b/pr/src/md/unix/Makefile.in
@@ -36,16 +36,17 @@ endif
 endif # ! USE_AUTOCONF
 
 CSRCS =          \
 	unix.c    \
 	unix_errors.c    \
 	uxproces.c \
 	uxwrap.c \
 	uxpoll.c \
+	uxshm.c \
 	$(NULL)
 
 PTH_USER_CSRCS =          \
 	pthreads_user.c \
 	$(NULL)
 
 ifndef USE_AUTOCONF
 
@@ -131,16 +132,21 @@ SCOOS_CSRCS = \
 
 DGUX_CSRCS = \
 	dgux.c \
 	$(NULL)
 
 QNX_CSRCS = \
 	qnx.c \
 	$(NULL)
+
+NTO_CSRCS = \
+	nto.c \
+	$(NULL)
+
 endif # !USE_AUTOCONF
 
 ifeq ($(PTHREADS_USER),1)
 CSRCS += $(PTH_USER_CSRCS)
 endif
 
 ifndef USE_AUTOCONF
 
@@ -206,18 +212,22 @@ CSRCS += $(NCR_CSRCS)
 endif
 ifeq ($(OS_ARCH),SCOOS)
 CSRCS += $(SCOOS_CSRCS)
 endif
 ifeq ($(OS_ARCH),DGUX)
 CSRCS += $(DGUX_CSRCS)
 endif
 ifeq ($(OS_ARCH),QNX)
+ifeq ($(OS_TARGET),NTO)
+CSRCS += $(NTO_CSRCS)
+else
 CSRCS += $(QNX_CSRCS)
 endif
+endif
 
 #
 # Some Unix platforms have an assembly language file.
 # E.g., AIX 3.2, Solaris (both sparc and x86).
 #
 ifeq ($(OS_ARCH), AIX)
     ifeq ($(OS_RELEASE), 3.2)
 	ASFILES   = os_$(OS_ARCH).s
@@ -226,16 +236,19 @@ endif
 
 ifeq ($(OS_ARCH),SunOS)
     ifeq ($(CPU_ARCH),x86)
 	ASFILES = os_$(OS_ARCH)_x86.s
     else
 	ifneq ($(OS_RELEASE),4.1.3_U1)
 	ifneq ($(LOCAL_THREADS_ONLY),1)
 		ASFILES = os_$(OS_ARCH).s
+		ifneq ($(USE_64),1)
+		ASFILES += os_$(OS_ARCH)_32.s
+		endif
 	endif
 	endif
     endif
 endif
 
 ifeq ($(OS_ARCH), SINIX)
     ifeq ($(CPU_ARCH),mips)
         ASFILES   = os_ReliantUNIX.s
@@ -299,14 +312,18 @@ ifndef USE_AUTOCONF
 ifeq ($(OS_ARCH),SunOS)
 ifneq ($(OS_RELEASE),4.1.3_U1)
 ifeq ($(OS_TEST),sun4u)
 $(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
 	$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
 
 $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
+ifeq ($(USE_64),1)
+	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v9 $<
+else
 	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $<
 endif
 endif
 endif
+endif
 endif #!USE_AUTOCONF
 install:: export
--- a/pr/src/md/windows/Makefile.in
+++ b/pr/src/md/windows/Makefile.in
@@ -52,30 +52,34 @@ CSRCS =          \
     ntsem.c   \
     ntinrval.c \
     ntgc.c \
 	w95thred.c \
 	w95io.c \
 	w95cv.c \
 	w95sock.c \
 	win32_errors.c \
+    w32ipcsem.c \
     w32poll.c \
+    w32shm.c \
     w95dllmain.c \
     $(NULL)
 else
 CSRCS =          \
     ntdllmn.c \
     ntmisc.c \
     ntsem.c   \
     ntinrval.c \
     ntgc.c \
     ntthread.c \
     ntio.c    \
 	win32_errors.c \
+    w32ipcsem.c \
     w32poll.c \
+    w32shm.c \
     $(NULL)
 endif
 endif
 
 TARGETS	= $(OBJS)
 
 INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
--- a/pr/src/memory/Makefile.in
+++ b/pr/src/memory/Makefile.in
@@ -30,17 +30,17 @@ ifndef USE_AUTOCONF
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
 ifeq ($(OS_RELEASE),4.1.3_U1)
 OPTIMIZER =
 endif
 endif
 endif #!USE_AUTOCONF
 
-CSRCS = prseg.c
+CSRCS = prseg.c prshm.c prshma.c
 
 TARGETS	= $(OBJS)
 
 INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
 include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
--- a/pr/src/misc/Makefile.in
+++ b/pr/src/misc/Makefile.in
@@ -41,26 +41,33 @@ CSRCS = \
 	prcountr.c \
 	prdtoa.c   \
 	prenv.c    \
 	prerr.c  \
 	prerror.c  \
 	prerrortable.c  \
 	prinit.c   \
 	prinrval.c \
+	pripc.c \
 	prlog2.c   \
 	prlong.c   \
 	prnetdb.c  \
 	prolock.c  \
 	prsystem.c \
 	prtime.c   \
 	prthinfo.c \
 	prtrace.c  \
 	$(NULL)
 
+ifndef USE_PTHREADS
+CSRCS += \
+	pripcsem.c \
+	$(NULL)
+endif
+
 TARGETS	= $(OBJS)
 
 INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
 RELEASE_BINS = compile-et.pl prerr.properties
 
 include $(topsrcdir)/config/rules.mk
 
--- a/pr/src/pthreads/Makefile.in
+++ b/pr/src/pthreads/Makefile.in
@@ -21,16 +21,23 @@ MOD_DEPTH	= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(MOD_DEPTH)/config/autoconf.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 = \
 	ptio.c \
 	ptsynch.c \
 	ptthread.c \
 	ptmisc.c \
 	$(NULL)
 
 TARGETS	= $(OBJS)
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -39,17 +39,19 @@ endif
 
 ifeq ($(OS_TARGET),OS2)
 OS_CFLAGS = $(OS_EXE_CFLAGS)
 endif
 
 CSRCS =             \
 	accept.c		\
 	acceptread.c	\
+	affinity.c		\
 	alarm.c			\
+	anonfm.c		\
 	atomic.c		\
 	attach.c		\
 	bigfile.c		\
 	bigfile2.c		\
 	bigfile3.c		\
 	cleanup.c		\
 	cltsrv.c		\
 	concur.c	    \
@@ -59,16 +61,17 @@ CSRCS =             \
 	dlltest.c		\
 	dtoa.c			\
 	errcodes.c		\
 	exit.c  		\
 	fileio.c		\
 	foreign.c	    \
 	forktest.c	    \
 	fsync.c	        \
+	gethost.c		\
 	getproto.c		\
 	i2l.c		    \
 	initclk.c		\
 	inrval.c		\
 	instrumt.c      \
 	intrupt.c       \
 	io_timeout.c    \
 	ioconthr.c      \
@@ -82,16 +85,17 @@ CSRCS =             \
 	lazyinit.c		\
 	lltest.c        \
 	lock.c          \
 	lockfile.c      \
 	logger.c		\
 	multiacc.c		\
 	multiwait.c		\
 	many_cv.c		\
+	nameshm1.c		\
 	nbconn.c		\
 	nblayer.c		\
 	nonblock.c		\
 	op_2long.c      \
 	op_filnf.c		\
 	op_filok.c		\
 	op_noacc.c		\
 	op_nofil.c		\
@@ -113,16 +117,21 @@ CSRCS =             \
 	ranfile.c       \
 	rwlocktest.c    \
 	sel_spd.c  		\
 	selct_er.c	    \
 	selct_nm.c	    \
 	selct_to.c	    \
 	select2.c  		\
 	sem.c 	  		\
+	sema.c			\
+	semaerr.c		\
+	semaerr1.c		\
+	semaping.c		\
+	semapong.c		\
 	server_test.c	\
 	servr_kk.c		\
 	servr_ku.c		\
 	servr_uk.c		\
 	servr_uu.c		\
 	short_thread.c	\
 	sigpipe.c		\
 	socket.c		\
@@ -148,16 +157,17 @@ CSRCS =             \
 	tmocon.c        \
 	tpd.c			\
 	vercheck.c		\
 	version.c	    \
 	udpsrv.c	    \
 	writev.c        \
 	xnotify.c       \
 	y2k.c           \
+	y2ktmo.c	\
 	$(NULL)
 
 ifeq ($(OS_TARGET),OS2)
 CSRCS +=            \
 	sleep.c			\
 	stat.c		    \
 	yield.c         \
 	$(NULL)
@@ -417,26 +427,17 @@ endif # !USE_AUTOCONF
 #####################################################
 #
 # The rules
 #
 #####################################################
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef USE_AUTOCONF
-
-# Cancel this rule (force implicit)
-%: %.c
-
-%: %.$(OBJ_SUFFIX)
-	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
-
-else # !USE_AUTOCONF
-
+ifndef USE_AUTOCONF
 AIX_PRE_4_2 = 0
 ifeq ($(OS_ARCH),AIX)
 ifeq ($(OS_RELEASE),4.1)
 ifneq ($(USE_PTHREADS), 1)
 #AIX_PRE_4_2 = 1
 endif
 endif
 endif
@@ -479,17 +480,17 @@ ifeq ($(OS_TARGET),WIN16)
 	echo $(LIBPR),	     >>w16link
 	echo $(LIBPLC),		 >>w16link
 	echo winsock.lib     >>w16link
 	wlink @w16link.
 else
 ifeq ($(OS_TARGET),OS2)
 	$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
 else
-	link $(LDOPTS) $< $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
+	link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) wsock32.lib -out:$@
 endif
 endif
 else
 	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
 endif
 
 endif