Merge remote-tracking branch 'origin/tracking' into custom

js/src/gc/Barrier.cpp

@@ -182,6 +182,7 @@ MovableCellHasher<T>::match(const Key& k, const Lookup& l)
 #endif // JS_BROKEN_GCC_ATTRIBUTE_WARNING
 
 template struct JS_PUBLIC_API(MovableCellHasher<JSObject*>);
+template struct JS_PUBLIC_API(MovableCellHasher<JS::Heap<JSObject*>>);
 template struct JS_PUBLIC_API(MovableCellHasher<GlobalObject*>);
 template struct JS_PUBLIC_API(MovableCellHasher<SavedFrame*>);
 template struct JS_PUBLIC_API(MovableCellHasher<EnvironmentObject*>);

js/src/jsapi.h

@@ -5440,7 +5440,7 @@ class JSErrorBase
 /**
  * Notes associated with JSErrorReport.
  */
-class JSErrorNotes
+class JS_PUBLIC_API(JSErrorNotes)
 {
   public:
     class Note : public JSErrorBase

js/src/moz.build

@@ -611,23 +611,21 @@ if CONFIG['JS_SHARED_LIBRARY']:
     GeckoSharedLibrary('js', linkage=None)
     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
     SDK_LIBRARY = True
-else:
-    Library('js')
-
-FORCE_STATIC_LIB = True
-STATIC_LIBRARY_NAME = 'js_static'
-
-if not CONFIG['MOZ_ICU_DATA_ARCHIVE']:
     USE_LIBS += [
         'icu',
     ]
 else:
-    # Linking 'icu' will pull in the stubdata library,
-    # which the shell doesn't want, so link the other bits.
-    USE_LIBS += [
-        'icui18n',
-        'icuuc',
-    ]
+    Library('js')
+    FORCE_STATIC_LIB = True
+    STATIC_LIBRARY_NAME = 'js_static'
+    NO_EXPAND_LIBS = True
+    if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+        # Linking 'icu' will pull in the stubdata library,
+        # which the shell doesn't want, so link the other bits.
+        USE_LIBS += [
+            'icui18n',
+            'icuuc',
+        ]
 
 USE_LIBS += [
     'nspr',
@@ -660,8 +658,6 @@ if CONFIG['OS_ARCH'] == 'SunOS':
 
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
-NO_EXPAND_LIBS = True
-
 DIST_INSTALL = True
 
 # Prepare self-hosted JS code for embedding

js/src/old-configure.in

@@ -2128,15 +2128,6 @@ AC_SUBST(MOZ_PKG_SPECIAL)
 AC_SUBST(MOZILLA_OFFICIAL)
 AC_SUBST(MC_OFFICIAL)
 
-dnl ========================================================
-dnl ECMAScript Internationalization API Support (uses ICU)
-dnl ========================================================
-
-dnl top-level configure may override this with --without-intl-api
-_INTL_API=yes
-
-MOZ_CONFIG_ICU()
-
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \