From 41de941212692bc834baf1bf1e17464cbe599016 Mon Sep 17 00:00:00 2001
From: "fur%netscape.com"
 <fur%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 27 Apr 1999 06:41:08 +0000
Subject: [PATCH] Merged in a bunch of minor changes from the trunk.  These
 changes should never have been put into the trunk without also putting them
 into the branch, but some people are stupider than others.

git-svn-id: svn://10.0.0.236/branches/SpiderMonkey140_BRANCH@29416 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/Makefile             | 267 ----------------------------
 mozilla/js/src/Makefile.in          |  93 +++++-----
 mozilla/js/src/config/SunOS5.5.1.mk |  44 +----
 mozilla/js/src/config/WINNT4.0.mk   |   2 +-
 mozilla/js/src/fdlibm/Makefile      | 112 ------------
 mozilla/js/src/fdlibm/Makefile.in   |   1 +
 mozilla/js/src/jsapi.c              |   3 +-
 mozilla/js/src/jslibmath.h          |   3 +
 mozilla/js/src/jslock.c             |   2 +-
 mozilla/js/src/jsosdep.h            |   6 +-
 mozilla/js/src/jspubtd.h            |   2 +-
 mozilla/js/src/jstypes.h            |   2 +-
 mozilla/js/src/macbuild/JSRef.mcp   | Bin 37692 -> 46536 bytes
 mozilla/js/src/makefile.win         |   7 +-
 14 files changed, 72 insertions(+), 472 deletions(-)
 delete mode 100644 mozilla/js/src/Makefile
 delete mode 100644 mozilla/js/src/fdlibm/Makefile

diff --git a/mozilla/js/src/Makefile b/mozilla/js/src/Makefile
deleted file mode 100644
index c243a39371a..00000000000
--- a/mozilla/js/src/Makefile
+++ /dev/null
@@ -1,267 +0,0 @@
-#! gmake
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH		= ../..
-
-include $(DEPTH)/config/config.mk
-
-ifdef MOZ_OJI
-DIRS = liveconnect
-endif
-
-LIBRARY_NAME	= js
-
-ifeq ($(subst /,_,$(shell uname -s)),OS2)
-ifndef XCFLAGS
-OS2_IMPLIB=1
-LIBRARY	= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
-DEF_FILE	= jsos2$(VERSION_NUMBER).def
-EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA)
-else
-EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
-endif
-endif
-
-MODULE		= js
-
-CSRCS		= 	jsapi.c		\
-			jsarena.c	\
-			jsarray.c	\
-			jsatom.c	\
-			jsbool.c	\
-			jscntxt.c	\
-			jsdate.c	\
-			jsdbgapi.c	\
-			jsdtoa.c	\
-			jsemit.c	\
-			jsexn.c		\
-			jsfun.c		\
-			jsgc.c		\
-			jshash.c	\
-			jsinterp.c	\
-			jslock.c	\
-			jslog2.c	\
-			jslong.c	\
-			jsmath.c	\
-			jsnum.c		\
-			jsobj.c		\
-			jsopcode.c      \
-			jsparse.c	\
-			jsprf.c		\
-			jsregexp.c	\
-			jsscan.c	\
-			jsscope.c	\
-			jsscript.c	\
-			jsstr.c		\
-			jsutil.c        \
-			jsxdrapi.c	\
-			prmjtime.c	\
-			$(NULL)
-
-EXPORTS		= js.msg \
-		  jsapi.h \
-		  jsarray.h \
-		  jsarena.h \
-		  jsatom.h \
-		  jsbit.h \
-		  jsbool.h \
-		  jsclist.h \
-		  jscntxt.h \
-		  jscompat.h \
-		  jsconfig.h \
-		  jsdate.h \
-		  jsdbgapi.h \
-		  jsemit.h \
-		  jsfun.h \
-		  jsgc.h \
-	          jshash.h \
-		  jsinterp.h \
-		  jslock.h \
-		  jslong.h \
-		  jsmath.h \
-		  jsnum.h \
-		  jsobj.h \
-		  jsopcode.tbl \
-		  jsopcode.h \
-		  jsosdep.h \
-		  jsotypes.h \
-		  jsparse.h \
-		  jsprf.h \
-		  jsprvtd.h \
-		  jspubtd.h \
-		  jsregexp.h \
-		  jsscan.h \
-		  jsscope.h \
-		  jsscript.h \
-		  jsstr.h \
-		  jstypes.h \
-		  jsutil.h \
-		  jsxdrapi.h \
-		  $(NULL)
-
-# when using gcc the assembly is inlined in the C-file (see jslock.c)
-ifdef NS_USE_NATIVE
-ASFILES = $(wildcard *_$(OS_ARCH).s)
-endif
-
-JS_SAFE_ARENA = 1
-
-ifdef JS_SAFE_ARENA
-DEFINES += -DJS_USE_SAFE_ARENA
-endif
-
-include $(DEPTH)/config/rules.mk
-
-ifndef BUILD_OPT
-MOCHAFILE	= 1
-endif
-
-ifdef JSFILE
-DEFINES		+= -DJSFILE
-endif
-
-ifdef JS_THREADSAFE
-DEFINES += -DJS_THREADSAFE
-endif
-
-ifdef JS_NO_THIN_LOCKS
-DEFINES += -DJS_USE_ONLY_NSPR_LOCKS
-endif
-
-ifdef JS_VERSION
-DEFINES += -DJS_VERSION=$(JS_VERSION)
-endif
-
-ifeq ($(CPU_ARCH),sparc)
-
-ifndef JS_NO_ULTRA
-ULTRA_OPTIONS := -xarch=v8plus,-DULTRA_SPARC
-ULTRA_OPTIONSCC := -DULTRA_SPARC
-else
-ULTRA_OPTIONS := -xarch=v8
-ULTRA_OPTIONSCC :=
-endif
-
-ifeq ($(shell uname -m),sun4u)
-ASFLAGS	+= -Wa,$(ULTRA_OPTIONS),-P,-L,-D_ASM,-D__STDC__=0 $(ULTRA_OPTIONSCC)
-else
-ASFLAGS	+= -Wa,-xarch=v8,-P,-L,-D_ASM,-D__STDC__=0
-endif
-
-endif # sparc
-
-INCLUDES	+= -I. 
-
-ifndef NSBUILDROOT
-JSJAVA_STUBHEADERS = -I$(DEPTH)/sun-java/include/_gen \
-		     -I$(DEPTH)/sun-java/netscape/javascript/_jri \
-		     -I$(DEPTH)/sun-java/netscape/security/_jri
-else
-JSJAVA_STUBHEADERS = -I$(JRI_GEN_DIR) -I$(JDK_GEN_DIR)
-endif
-
-JSJAVA_CFLAGS	= -I$(DEPTH)/sun-java/md-include \
-		  -I$(DEPTH)/sun-java/include \
-		  $(JSJAVA_STUBHEADERS)
-
-# LIBNSPR abstracts nspr version, etc. nicely.
-LDFLAGS 	= $(LIBNSPR) -lm
-
-ifeq ($(OS_ARCH), OSF1)
-LDFLAGS += -lc_r
-endif
-ifeq ($(OS_ARCH), SunOS)
-LDFLAGS += -lposix4 -ldl -lnsl -lsocket
-endif
-ifeq ($(OS_ARCH), Linux)
-LDFLAGS += -ldl
-endif
-
-FDLIBM_LIBRARY	= fdlibm/$(OBJDIR)/libfdm.a
-JSMATH_PRELINK	= $(OBJDIR)/jsmathtemp.o
-
-# special rule for jsmath.o since we want to incrementally link
-# against fdlibm to pull in only what is needed
-$(OBJDIR)/jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
-	@$(MAKE_OBJDIR)
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
-	ld -r -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
-else
-	ld -r -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
-endif
-
-$(JSMATH_PRELINK): jsmath.c jslibmath.h
-	@$(MAKE_OBJDIR)
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
-	$(CC) -Fo$@ -c $(CFLAGS) $<
-else
-	$(CC) -o $@ -c $(CFLAGS) $<
-endif
-
-$(FDLIBM_LIBRARY):
-	cd fdlibm; $(MAKE)
-
-# this requires clobbering and recompiling with XCFLAGS=-DJSFILE
-js:
-	$(MAKE) clobber
-	$(MAKE) XCFLAGS=-DJSFILE $(OBJDIR)/js$(BIN_SUFFIX)
-
-.PHONY: js$(BIN_SUFFIX)
-
-ifneq ($(OS_ARCH),OS2)
-$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
-	    @$(MAKE_OBJDIR)
-	    $(CC) -o $@ $(OBJDIR)/js.o $(LIBRARY) $(LDFLAGS)
-else
-OS_CFLAGS += -tm-
-$(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
-	    @$(MAKE_OBJDIR)
-	    $(LINK_EXE) -OUT:$@ $(OBJDIR)/js.o  $(LIBRARIES) $(EXTRA_LIBS)
-endif
-
-# hardwire dependencies on jsopcode.tbl
-jsopcode.h jsopcode.c: jsopcode.tbl
-
-# Generate jsautocfg.h header
-$(OBJDIR)/jsautocfg.h: $(OBJDIR)/jscpucfg
-	rm -f $@
-	$(OBJDIR)/jscpucfg > $@
-
-$(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
-	$(CC) -o $@ $(OBJDIR)/jscpucfg.o
-
-export:: $(OBJDIR)/jsautocfg.h
-	$(INSTALL) -m 444 $(OBJDIR)/jsautocfg.h $(DIST)/include
-
-# Add to TARGETS so clobber rule works
-TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg $(OBJDIR)/jscpucfg.o
-
-# this section was put in the merged by danda into the
-# JAVA_*_MERGE section and normally would have
-# been removed.  However it looks like it shouldn't have
-# been put there in the first place, so we're leaving it
-# here until danda can confirm (we don't have OS/2 machines
-# to build on) - hshaw/sudu
-#
-ifeq ($(OS_ARCH),OS2)
-$(OBJDIR)/js.o: js.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(CFLAGS) $(JSJAVA_CFLAGS) js.c
-endif
-
-clobber::
-	rm -f $(OBJDIR)/jscpucfg $(OBJDIR)/jscpucfg.h
-
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index b5264e80b05..d6a9733f3ec 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -16,65 +16,69 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+include $(topsrcdir)/config/config.mk
+
 ifdef MOZ_OJI
 DIRS = liveconnect
 endif
 
 DIRS	+=	fdlibm
 
-LIBRARY_NAME	= js
+DIRS 	+=	xpconnect
+
+LIBRARY_NAME	= $(MOZ_LIB_JS_PREFIX)js
 
 ifeq ($(subst /,_,$(shell uname -s)),OS2)
 ifndef XCFLAGS
 OS2_IMPLIB=1
 LIBRARY	= js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
 DEF_FILE	= jsos2$(VERSION_NUMBER).def
-EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA)
+EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA)
 else
-EXTRA_LIBS	= $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
+EXTRA_LIBS	= $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
 endif
 endif
 
 MODULE		= js
 
-CSRCS		= jsapi.c	\
-		  jsarena.c	\
-		  jsarray.c	\
-		  jsatom.c	\
-		  jsbool.c	\
-		  jscntxt.c	\
-		  jsdate.c	\
-		  jsdbgapi.c	\
-		  jsdtoa.c	\
-		  jsemit.c	\
-		  jsexn.c	\
-		  jsfun.c	\
-		  jsgc.c	\
-		  jshash.c	\
-		  jsinterp.c	\
-		  jslock.c	\
-		  jslog2.c	\
-		  jslong.c	\
-		  jsmath.c	\
-		  jsnum.c	\
-		  jsobj.c	\
-		  jsopcode.c    \
-		  jsparse.c	\
-		  jsprf.c	\
-		  jsregexp.c	\
-		  jsscan.c	\
-		  jsscope.c	\
-		  jsscript.c	\
-		  jsstr.c	\
-		  jsutil.c      \
-		  jsxdrapi.c	\
-		  prmjtime.c	\
-		  $(NULL)
+CSRCS		= 	jsapi.c		\
+			jsarena.c	\
+			jsarray.c	\
+			jsatom.c	\
+			jsbool.c	\
+			jscntxt.c	\
+			jsdate.c	\
+			jsdbgapi.c	\
+			jsdtoa.c	\
+			jsemit.c	\
+			jsexn.c		\
+			jsfun.c		\
+			jsgc.c		\
+			jshash.c	\
+			jsinterp.c	\
+			jslock.c	\
+			jslog2.c	\
+			jslong.c	\
+			jsmath.c	\
+			jsnum.c		\
+			jsobj.c		\
+			jsopcode.c      \
+			jsparse.c	\
+			jsprf.c		\
+			jsregexp.c	\
+			jsscan.c	\
+			jsscope.c	\
+			jsscript.c	\
+			jsstr.c		\
+			jsutil.c        \
+			jsxdrapi.c	\
+			prmjtime.c	\
+			$(NULL)
 
 EXPORTS		= js.msg \
 		  jsapi.h \
@@ -92,7 +96,7 @@ EXPORTS		= js.msg \
 		  jsemit.h \
 		  jsfun.h \
 		  jsgc.h \
-	          jshash.h \
+		  jshash.h \
 		  jsinterp.h \
 		  jslock.h \
 		  jslong.h \
@@ -115,13 +119,14 @@ EXPORTS		= js.msg \
 		  jstypes.h \
 		  jsutil.h \
 		  jsxdrapi.h \
+		  jsstddef.h \
 		  $(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 # when using gcc the assembly is inlined in the C-file (see jslock.c)
 ifdef NS_USE_NATIVE
-ASFILES = $(wildcard $(srcdir)/*_$(OS_ARCH).s)
+ASFILES = $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s))
 endif
 
 JS_SAFE_ARENA = 1
@@ -180,8 +185,8 @@ JSJAVA_CFLAGS	= -I$(topsrcdir)/sun-java/md-include \
 		  -I$(topsrcdir)/sun-java/include \
 		  $(JSJAVA_STUBHEADERS)
 
-# LIBNSPR abstracts nspr version, etc. nicely.
-LDFLAGS 	= $(LIBNSPR) -lm
+# NSPR_LIBS abstracts nspr version, etc. nicely.
+LDFLAGS 	= $(NSPR_LIBS) -lm
 
 ifeq ($(OS_ARCH), OSF1)
 LDFLAGS += -lc_r
@@ -202,9 +207,13 @@ jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
 	@$(MAKE_OBJDIR)
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	ld -r -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
+else
+ifeq ($(OS_ARCH), IRIX)
+	ld -n32 -r -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
 else
 	ld -r -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
 endif
+endif
 
 $(JSMATH_PRELINK): jsmath.c
 	@$(MAKE_OBJDIR)
diff --git a/mozilla/js/src/config/SunOS5.5.1.mk b/mozilla/js/src/config/SunOS5.5.1.mk
index 89eaead5eb7..c8df5be0f3b 100644
--- a/mozilla/js/src/config/SunOS5.5.1.mk
+++ b/mozilla/js/src/config/SunOS5.5.1.mk
@@ -16,47 +16,7 @@
 #
 
 #
-# Config stuff for SunOS5.5
+# Config stuff for SunOS5.5.1
 #
 
-AS = as
-ifndef NS_USE_NATIVE
-CC = gcc
-CCC = g++
-CFLAGS +=  -Wall -Wno-format
-else
-CC = cc
-CCC = CC
-endif
-
-RANLIB = echo
-
-#.c.o:
-#	$(CC) -c -MD $*.d $(CFLAGS) $<
-
-CPU_ARCH = sparc
-GFX_ARCH = x
-
-OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS
-OS_LIBS = -lsocket -lnsl -ldl
-
-ASFLAGS	        += -P -L -K PIC -D_ASM -D__STDC__=0
-
-HAVE_PURIFY = 1
-
-NOSUCHFILE = /solaris-rm-f-sucks
-
-ifeq ($(OS_CPUARCH),sun4u)	# ultra sparc?
-ifeq ($(CC),gcc)		# using gcc?
-ifndef JS_NO_ULTRA		# do we want ultra?
-ifdef JS_THREADSAFE		# only in thread-safe mode
-DEFINES 	+= -DULTRA_SPARC
-DEFINES         += -Wa,-xarch=v8plus,-DULTRA_SPARC
-else
-ASFLAGS         += -xarch=v8plus -DULTRA_SPARC
-endif
-endif
-endif
-endif
-
-MKSHLIB = $(LD) -G
+include $(DEPTH)/config/SunOS5.5.mk
diff --git a/mozilla/js/src/config/WINNT4.0.mk b/mozilla/js/src/config/WINNT4.0.mk
index 90575a47664..67e46dab98b 100644
--- a/mozilla/js/src/config/WINNT4.0.mk
+++ b/mozilla/js/src/config/WINNT4.0.mk
@@ -48,7 +48,7 @@ WIN_IDG_CFLAGS = /MDd /Od /Z7
 WIN_DEBUG_CFLAGS = /MD /Od /Z7 
 
 # MSVC compiler options for release (optimized) builds
-# /MD      - link with MSVCRT.LIB (Dynamically-linked, multi-threaded, debug C-runtime)
+# /MD      - link with MSVCRT.LIB (Dynamically-linked, multi-threaded, C-runtime)
 # /O2      - Optimize for speed
 # /G5      - Optimize for Pentium
 WIN_OPT_CFLAGS = /MD /O2
diff --git a/mozilla/js/src/fdlibm/Makefile b/mozilla/js/src/fdlibm/Makefile
deleted file mode 100644
index 05a5e8a2080..00000000000
--- a/mozilla/js/src/fdlibm/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Sun Microsystems,
-# Inc.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-#
-#  @(#)Makefile 1.4 95/01/18 
-# 
-#  ====================================================
-#  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-# 
-#  Developed at SunSoft, a Sun Microsystems, Inc. business.
-#  Permission to use, copy, modify, and distribute this
-#  software is freely granted, provided that this notice 
-#  is preserved.
-#  ====================================================
-# 
-# 
-
-DEPTH           = ../../..
-
-include $(DEPTH)/config/config.mk
-
-#
-# Default IEEE libm
-#
-CFLAGS          += -D_IEEE_LIBM
-
-LIBRARY_NAME	= fdm
-
-MODULE		= js
-
-CSRCS		=	\
-	e_acos.c	\
-	e_asin.c	\
-	e_atan2.c	\
-	e_exp.c		\
-	e_fmod.c	\
-	e_log.c		\
-	e_pow.c		\
-	e_rem_pio2.c	\
-	s_scalbn.c	\
-	e_sqrt.c 	\
-	k_cos.c		\
-	k_sin.c		\
-	k_rem_pio2.c	\
-	k_tan.c 	\
-	s_atan.c	\
-	s_ceil.c	\
-	s_copysign.c	\
-	s_cos.c		\
-	s_fabs.c	\
-	s_finite.c	\
-	s_floor.c	\
-	s_isnan.c	\
-	s_lib_version.c	\
-	s_sin.c		\
-	s_tan.c		\
-	w_acos.c	\
-	w_asin.c	\
-	w_atan2.c	\
-	w_exp.c		\
-	w_fmod.c	\
-	w_log.c		\
-	w_pow.c		\
-	w_sqrt.c	\
-	$(NULL)
-
-EXPORTS	= fdlibm.h
-
-include $(DEPTH)/config/rules.mk
-
-# from mozilla/js/src/Makefile
-ifeq ($(CPU_ARCH),sparc)
-
-ifndef JS_NO_ULTRA
-ULTRA_OPTIONS := -xarch=v8plus,-DULTRA_SPARC
-ULTRA_OPTIONSCC := -DULTRA_SPARC
-else
-ULTRA_OPTIONS := -xarch=v8
-ULTRA_OPTIONSCC :=
-endif
-
-ifeq ($(shell uname -m),sun4u)
-ASFLAGS	+= -Wa,$(ULTRA_OPTIONS),-P,-L,-D_ASM,-D__STDC__=0 $(ULTRA_OPTIONSCC)
-else
-ASFLAGS	+= -Wa,-xarch=v8,-P,-L,-D_ASM,-D__STDC__=0
-endif
-
-endif # sparc
-
-ifeq ($(OS_ARCH), OSF1)
-LDFLAGS += -lc_r
-endif
-ifeq ($(OS_ARCH), SunOS)
-LDFLAGS += -lposix4 -ldl -lnsl -lsocket
-endif
-ifeq ($(OS_ARCH), Linux)
-LDFLAGS += -ldl
-endif
-# end from mozilla/js/src/Makefile
diff --git a/mozilla/js/src/fdlibm/Makefile.in b/mozilla/js/src/fdlibm/Makefile.in
index 53c3670cabf..b14f65630dc 100644
--- a/mozilla/js/src/fdlibm/Makefile.in
+++ b/mozilla/js/src/fdlibm/Makefile.in
@@ -23,6 +23,7 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+include $(topsrcdir)/config/config.mk
 #
 # Default IEEE libm
 #
diff --git a/mozilla/js/src/jsapi.c b/mozilla/js/src/jsapi.c
index bf5b5ad6765..6e07ea48b27 100644
--- a/mozilla/js/src/jsapi.c
+++ b/mozilla/js/src/jsapi.c
@@ -2125,7 +2125,8 @@ JS_NewScriptObject(JSContext *cx, JSScript *script)
     if (!obj)
 	return NULL;
     if (script) {
-	JS_SetPrivate(cx, obj, script);
+	if (!JS_SetPrivate(cx, obj, script))
+	    return NULL;
 	script->object = obj;
     }
     return obj;
diff --git a/mozilla/js/src/jslibmath.h b/mozilla/js/src/jslibmath.h
index b1645414ead..d2c99fe506f 100644
--- a/mozilla/js/src/jslibmath.h
+++ b/mozilla/js/src/jslibmath.h
@@ -26,6 +26,9 @@
 
 #include <math.h>
 #include "jsconfig.h"
+#ifdef MOZILLA_CLIENT
+#include "platform.h"
+#endif
 
 /*
  * Define which platforms on which to use fdlibm.  Not used
diff --git a/mozilla/js/src/jslock.c b/mozilla/js/src/jslock.c
index e458869e3b1..7a182ef4e8f 100644
--- a/mozilla/js/src/jslock.c
+++ b/mozilla/js/src/jslock.c
@@ -152,7 +152,7 @@ mov 0,%0\n\
 JS_INLINE int
 js_CompareAndSwap(jsword *w, jsword ov, jsword nv)
 {
-    return !_check_lock(w,ov,nv);
+    return !_check_lock((atomic_p)w,ov,nv);
 }
 
 #else
diff --git a/mozilla/js/src/jsosdep.h b/mozilla/js/src/jsosdep.h
index 787b36d3fb9..d7071040d61 100644
--- a/mozilla/js/src/jsosdep.h
+++ b/mozilla/js/src/jsosdep.h
@@ -22,6 +22,10 @@
  * OS (and machine, and compiler XXX) dependent information.
  */
 
+#ifdef MOZILLA_CLIENT
+#include "platform.h"
+#endif
+
 #ifdef XP_PC
 
 #ifdef _WIN32
@@ -50,7 +54,7 @@ JS_END_EXTERN_C
 /*
  * Get OS specific header information.
  */
-#if defined(AIXV3)
+#if defined(AIXV3) || defined(AIX)
 #define JS_HAVE_LONG_LONG
 
 #elif defined(BSDI)
diff --git a/mozilla/js/src/jspubtd.h b/mozilla/js/src/jspubtd.h
index 8aa5bc779ef..3f06c37f280 100644
--- a/mozilla/js/src/jspubtd.h
+++ b/mozilla/js/src/jspubtd.h
@@ -231,7 +231,7 @@ typedef void
 
 typedef struct JSErrorFormatString {
     const char *format;
-    const uintN argCount;
+    uintN argCount;
 } JSErrorFormatString;
 
 typedef const JSErrorFormatString *
diff --git a/mozilla/js/src/jstypes.h b/mozilla/js/src/jstypes.h
index c4ca36e037f..bafa86c3e4f 100644
--- a/mozilla/js/src/jstypes.h
+++ b/mozilla/js/src/jstypes.h
@@ -195,7 +195,7 @@
 
 #if defined(XP_MAC) || defined(XP_PC)
 #    include "jscpucfg.h"        /* Use standard Mac or Windows configuration */
-#elif XP_UNIX
+#elif defined(XP_UNIX)
 #    include "jsautocfg.h"       /* Use auto-detected configuration */
 #else
 #    error "Must define one of XP_PC, XP_MAC or XP_UNIX"
diff --git a/mozilla/js/src/macbuild/JSRef.mcp b/mozilla/js/src/macbuild/JSRef.mcp
index 97f7bd3d86a58d7c55a1e07f92fcb32bec166c40..70dfe93353e547f4ec6149d92e6575fd7ae40965 100644
GIT binary patch
delta 1298
zcmZ`(U1(HC6h3!$vzwoLlOW-?*<9S4xNFkd-3|V1)M~SvY-&id^<pVfT0+v0*wt*a
zCc&RPm{fuYqUP?YSo)BPiej;qX6S=$mGq?sq|jC$ENK%<DJe=Jfj$VO=$Sj$Q2aSC
zGv9pQnRCvZxx3$9U^Dlb(K9g64*(tjr4HbWGXPg+0DMG2;!EQ{pVju}j^4h_@r~`~
zw*G<ly8F%Tx#3JUGtxT<QnIY(=Sc@P#-Ebx<hyt!RLFnud)P|PJCr9Pl2Hl!Xo@-z
zJT|Q{J9(?fPoR*-EBJl!kP^XoNlX(?K^i8FRdzCk*Gn$pNi|UJS3n_d+3=cblxi-g
zI^|+QGti^0hyxTTWI}Y#6fnY1oEN$zABV-D_Exc9v`d)64{0A3R6MH#{HLQ89$vO<
z*6Z`mlWT@2^(uwWuD2BBeXNUr&h4575C3`16vNS2n1Ny^leiRnLt&VxZ%@bQOoEzn
z8Nf>r#J&ki1%zf`&YGe*Lt~75{*i5R_M1U;4d7MRZwt<?>#2Br1)+$Jc1K4t_+3*H
zEqxBlyS)5dZP?4dsaF}jkCAWp;{5)#K~1<rBNRAm%3WLBo@TK1KqDWIHZbgo8B-05
z3cs;-1>=<;Oe)n@*}|W9_b8%%e^=SPJN@aMO*`Duipmy#vFv1;?jD+IFd47bb1Hvn
zlj_5R-G+bfOe4VHS9~e{uY#w0N{MI%*!ngRI>XNGKD^sp%d4#2Tlt2@mKr>Ayepua
z;=9cb4b%7R`O7KSnG7?3Vt-{H;XrP%w-3^_w+YMpz@|E!IH9+#H0d$@j@<F^Ws+qB
zK^-GpA&-q%ghk`X)Q@N?mi(uu2p0*K_(@!(aKTy%=aX{bJ>p9o6;ygncun$`FA9H`
z7e1wuKRicRb{)(JS|_hF^#PVo=mAZ5yGebcgkPXRR^!J6$u&1A>5DSR+0TftbW~XN
z2j)l)9iwg3kvo>I5w4Q*nj3g#BFaKn@kfzkh*<Z+x9<}UO0Upwd0P*J2WZzOQ;dE>
zxLT?$A7j0(v*Y8~YVTv=t2j;0?dJiQksaRk#CxQtagpTpcc|QHt7B*w(%!QaCnRHq
ze@8Rl$yOKPSpIcZ|259!qbza@ALOH*k-y1jJlmb4kpDMLr=9B5mHL$vcK=dV?^)(s
Vva^KUznAFVWj-~(g|PT_!6O*t89V?0

delta 1042
zcmZXST}V_x6vxlK``PZ?FjF&Ib=@|!+;&9-5iB#bAXhNMqKIhQ)Py!ycSG^Ptx)hG
zqiqc73&E&NjMA$RQDPuyLJxtUPu7D_=#$S8_Me@Vq7K}1{_{I$X3pH1`E~XEbJY=S
zZM{lF1|p?^==OP{{vIOJTd+gpj$h{Z(J@}(wCbNN29=lQY?v&_Sowl2!ka@W{G{E%
z+w8URI>x8%FHaL)LHY)f@hhqz#W<qSc=<CAMH8`*t}9}@*rrJT=go@1u&oHi<IIuH
zl7yW&Ro~d;4YxNowRG}IEuAm1RGU$Oi3)}1Y7I7nnjDhet=%;7;9$1?t<Pl8_m_p4
zo|p68U=`g3yj?APN4%2HC@VbWqEUaEzt5<NsgzjFqA2moBYKUiRn>dErK&z($W(o<
zI91j29Q6wC$R3T?rSO=~JyGgZ^#|3=toQa;yY#Mr-NQe<4rDcB8#9F>QT$}XkHo<e
zu4I{4z3GVE!5~W<g=+H`p-r+P!%4)#lGkK`nI(7KMPrr(_ir8m6PE#FBXF6rzN-#e
z91g~2;B1l)-G|<W55^YYwujr#iH)N}7}x|R+B=91%yNQt4Zxnj#Fi1uB_DeM%_P^-
z5V4S0=hh0eCb|0w9~hsGX%P(5WcpDMIzy%l=Ma;9nPbqqlKczeY@*)(^9*#R<R0{{
zB+oZI3btGFgRc-r<oZj;p~b&~c^iZa?-YIcH$GsnM_{6&cYJli8}oHTyX8FXEOd@Y
z68VPVl6@_%L+1(#J_dJB*1K1so%moyhv8009(xF#Cn!-_0j`Wm{;?OpmB3U{0$CO2
zalP$QQ6E?VUPg<|ZTUbak?IIVoBw$+!2xhjC>%lk-!JJJ{*f|M=Z{3G)+qXS%avFY
mzdU(C^-l5G$zy8!8fQ~p)mO~Rr@R>*;yNFP0%7d&$9@Bv|J9TL

diff --git a/mozilla/js/src/makefile.win b/mozilla/js/src/makefile.win
index 80c99b06d09..c017399bad2 100644
--- a/mozilla/js/src/makefile.win
+++ b/mozilla/js/src/makefile.win
@@ -26,7 +26,7 @@ include <$(DEPTH)\config\config.mak>
 DIRS = liveconnect
 !endif
 
-DIRS = $(DIRS) fdlibm
+DIRS = $(DIRS) fdlibm xpconnect
 
 #//------------------------------------------------------------------------
 #//
@@ -140,7 +140,7 @@ INSTALL_FILE_LIST=	\
 	jsosdep.h	\
 	jsotypes.h	\
 	jsparse.h	\
-        jsprf.h         \
+	jsprf.h		\
 	jsprvtd.h	\
 	jspubtd.h	\
 	jsregexp.h	\
@@ -149,8 +149,9 @@ INSTALL_FILE_LIST=	\
 	jsscript.h	\
 	jsstr.h		\
 	jstypes.h	\
-        jsutil.h        \
+	jsutil.h	\
 	jsxdrapi.h	\
+	jsstddef.h \
 	$(NULL)
 
 #//------------------------------------------------------------------------