Bug 1031529 part 3 - Step defining JS_THREADSAFE, remove --disable-threadsafe. r=glandium

build/autoconf/nspr-build.m4

@@ -51,16 +51,12 @@ MOZ_ARG_WITH_BOOL(system-nspr,
                           --with-system-nspr.)],
     _USE_SYSTEM_NSPR=1 )
 
-if test -z "$BUILDING_JS"; then
-    JS_THREADSAFE=1
-fi
-
 JS_POSIX_NSPR=unset
 ifdef([CONFIGURING_JS],[
     if test -n "$JS_STANDALONE"; then
       case "$target" in
         *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*)
-          if test -z "$_HAS_NSPR" && test "$JS_THREADSAFE"; then
+          if test -z "$_HAS_NSPR"; then
             JS_POSIX_NSPR_DEFAULT=1
           fi
           ;;
@@ -110,16 +106,12 @@ if test -z "$nspr_opts"; then
     else
       dnl JS configure defaults to emulated NSPR if available, falling back
       dnl to nsprpub.
-      if test -n "$JS_THREADSAFE"; then
-          JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT"
-          if test -z "$JS_POSIX_NSPR"; then
-             MOZ_BUILD_NSPR=1
-             which_nspr="source-tree"
-          else
-             which_nspr="posix-wrapper"
-          fi
+      JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT"
+      if test -z "$JS_POSIX_NSPR"; then
+        MOZ_BUILD_NSPR=1
+        which_nspr="source-tree"
       else
-          which_nspr="none"
+        which_nspr="posix-wrapper"
       fi
    fi
 fi
@@ -164,7 +156,7 @@ if test -n "$MOZ_NATIVE_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
                 ,
                 AC_MSG_ERROR([system NSPR does not support PR_UINT64 or including prtypes.h does not provide it]))
     CFLAGS=$_SAVE_CFLAGS
-elif test -z "$JS_POSIX_NSPR" -a -n "$JS_THREADSAFE"; then
+elif test -z "$JS_POSIX_NSPR"; then
     if test -z "$LIBXUL_SDK"; then
         NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
         if test -n "$GNU_CC"; then

js/src/configure.in

@@ -2752,17 +2752,6 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(External Packages)
 
-JS_THREADSAFE=1
-MOZ_ARG_DISABLE_BOOL(threadsafe,
-[  --disable-threadsafe    Disable support for multiple threads.],
-    JS_THREADSAFE= ,
-    JS_THREADSAFE=1 )
-if test -n "$JS_THREADSAFE"; then
-    AC_DEFINE(JS_THREADSAFE)
-fi
-JS_THREADSAFE_CONFIGURED=$JS_THREADSAFE
-AC_SUBST(JS_THREADSAFE_CONFIGURED)
-
 MOZ_CONFIG_NSPR(js)
 
 dnl ========================================================

js/src/moz.build

@@ -453,14 +453,11 @@ if CONFIG['NIGHTLY_BUILD']:
     DEFINES['ENABLE_PARALLEL_JS'] = True
     DEFINES['ENABLE_BINARYDATA'] = True
     DEFINES['ENABLE_SHARED_ARRAY_BUFFER'] = True
-    if CONFIG['ENABLE_ION'] and CONFIG['JSGC_GENERATIONAL_CONFIGURED'] and CONFIG['JS_THREADSAFE_CONFIGURED']:
+    if CONFIG['ENABLE_ION'] and CONFIG['JSGC_GENERATIONAL_CONFIGURED']:
         DEFINES['JSGC_FJGENERATIONAL'] = True
 
 DEFINES['EXPORT_JS_API'] = True
 
-if CONFIG['JS_THREADSAFE']:
-    DEFINES['JS_THREADSAFE'] = True
-
 if CONFIG['JS_HAS_CTYPES']:
     DEFINES['JS_HAS_CTYPES'] = True
     for var in ('DLL_PREFIX', 'DLL_SUFFIX'):

js/xpconnect/loader/moz.build

@@ -23,8 +23,6 @@ MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
-DEFINES['JS_THREADSAFE'] = True
-
 LOCAL_INCLUDES += [
     '../src',
     '../wrappers',

js/xpconnect/shell/moz.build

@@ -17,8 +17,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'xpcshellMacUtils.mm',
     ]
 
-DEFINES['JS_THREADSAFE'] = True
-
 if CONFIG['MOZ_SHARK']:
     DEFINES['MOZ_SHARK'] = True
 if CONFIG['MOZ_CALLGRIND']:

js/xpconnect/src/moz.build

@@ -69,8 +69,6 @@ GENERATED_FILES = [
     'dom_quickstubs.h',
 ]
 
-DEFINES['JS_THREADSAFE'] = True
-
 LOCAL_INCLUDES += [
     '../loader',
     '../wrappers',

xulrunner/installer/mozilla-js.pc.in

@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
+Cflags: -I${includedir} -DXP_UNIX