Syncing Makefile.ins with srinivas' previous checkin.

r=shaver

nsprpub/config/Makefile.in

@@ -39,7 +39,6 @@ else
 PROG_SUFFIX =
 endif
 
-ifdef notdef
 # Temporary workaround to disable the generation of
 # library build time because now.c uses the 'long long'
 # data type that's not available on some platforms.
@@ -66,7 +65,7 @@ endif
 
 ifeq ($(OS_ARCH), HP-UX)
     ifeq ($(USE_64),1)
-        XLDOPTS += +DD64
+        XLDOPTS += +DA2.0W
     endif
 endif
 
@@ -79,7 +78,6 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 OS_CFLAGS = $(OS_EXE_CFLAGS)
 endif
 
-endif # notdef
 include $(topsrcdir)/config/rules.mk
 
 PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
@@ -109,4 +107,4 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LINK) $(EXEFLAGS) $<
 else
 	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
-endif
+endif

nsprpub/pr/src/md/unix/Makefile.in

@@ -39,11 +39,14 @@ CSRCS =          \
 	unix.c    \
 	unix_errors.c    \
 	uxproces.c \
-	uxwrap.c \
-	uxpoll.c \
 	uxshm.c \
+	uxwrap.c \
 	$(NULL)
 
+ifneq ($(USE_PTHREADS),1)
+CSRCS += uxpoll.c
+endif
+
 PTH_USER_CSRCS =          \
 	pthreads_user.c \
 	$(NULL)
@@ -322,6 +325,9 @@ ifeq ($(USE_64),1)
 else
 	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $<
 endif
+
+clean::
+	rm -rf $(ULTRASPARC_ASOBJS)
 endif
 endif
 endif

nsprpub/pr/tests/Makefile.in

@@ -62,6 +62,7 @@ CSRCS =             \
 	dtoa.c			\
 	errcodes.c		\
 	exit.c  		\
+	fdcach.c		\
 	fileio.c		\
 	foreign.c	    \
 	forktest.c	    \
@@ -90,7 +91,7 @@ CSRCS =             \
 	multiacc.c		\
 	multiwait.c		\
 	many_cv.c		\
-	nameshm1.c		\
+	nameshm1.c	\
 	nbconn.c		\
 	nblayer.c		\
 	nonblock.c		\
@@ -274,7 +275,8 @@ endif
 ifeq ($(OS_ARCH), HP-UX)
     LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR)
     ifeq ($(USE_64),1)
-        LDOPTS += -L/usr/lib/pa20_64 -lpthread +DD64
+	LDOPTS += +DA2.0W
+	EXTRA_LIBS = -lpthread
     endif
 endif