Backed out 6 changesets (bug 1478499) for failing spidermonkey pkg

Backed out changeset 9dee6a08a2dd (bug 1478499)
Backed out changeset 3982c14a834e (bug 1478499)
Backed out changeset 6f6e562e2013 (bug 1478499)
Backed out changeset 03f68a47b89e (bug 1478499)
Backed out changeset 237dc169f486 (bug 1478499)
Backed out changeset 3f72358d338a (bug 1478499)

config/system-headers.mozbuild

@@ -1296,6 +1296,11 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
         'SelectSingleContentItemPage.h',
     ]
 
+if not CONFIG['MOZ_TREE_PIXMAN']:
+    system_headers += [
+        'pixman.h',
+    ]
+
 if CONFIG['MOZ_SYSTEM_LIBVPX']:
     system_headers += [
         'vpx_mem/vpx_mem.h',

js/src/build/Makefile.in

@@ -4,6 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Ensure symbol versions of shared library on Linux do not conflict
+# with those in libxul.
+ifeq (Linux,$(OS_TARGET))
+
+symverscript: symverscript.in
+	$(call py_action,preprocessor, \
+		-DVERSION='$(subst -,_,$(LIBRARY_NAME))' $< -o $@)
+
+EXTRA_DEPS += symverscript
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 # check_vanilla_allocations.py is tailored to Linux, so only run it there.

js/src/build/moz.build

@@ -23,17 +23,6 @@ if not CONFIG['JS_STANDALONE']:
 if CONFIG['JS_SHARED_LIBRARY']:
     GeckoSharedLibrary('js', linkage=None)
     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-
-    # Ensure symbol versions of shared library on Linux do not conflict
-    # with those in libxul.
-    if CONFIG['OS_TARGET'] == 'Linux':
-        GENERATED_FILES += ['symverscript']
-        GENERATED_FILES['symverscript'].script = '/toolkit/library/gen_symverscript.py'
-        GENERATED_FILES['symverscript'].inputs = ['symverscript.in']
-        GENERATED_FILES['symverscript'].flags = [
-            CONFIG['JS_LIBRARY_NAME'].replace('-', '_'),
-        ]
-        SYMBOLS_FILE = '!symverscript'
 else:
     Library('js')
 
@@ -87,6 +76,11 @@ NO_EXPAND_LIBS = True
 
 DIST_INSTALL = True
 
+# Ensure symbol versions of shared library on Linux do not conflict
+# with those in libxul.
+if CONFIG['OS_TARGET'] == 'Linux':
+    LDFLAGS += ['-Wl,-version-script,symverscript']
+
 # Run SpiderMonkey style checker after linking the static library. This avoids
 # running the script for no-op builds.
 GENERATED_FILES += ['spidermonkey_checks']

js/src/old-configure.in

@@ -1819,8 +1819,6 @@ AC_SUBST(HOST_BIN_SUFFIX)
 
 AC_SUBST(TARGET_XPCOM_ABI)
 
-AC_SUBST(GCC_USE_GNU_LD)
-
 AC_SUBST(MKSHLIB)
 AC_SUBST(MKCSHLIB)
 AC_SUBST_LIST(DSO_CFLAGS)

python/mozbuild/mozbuild/backend/tup.py

@@ -379,9 +379,9 @@ class TupBackend(CommonBackend):
             static_libs += rust_linked
 
         symbols_file = []
-        if (shlib.symbols_file and
-            backend_file.environment.substs.get('GCC_USE_GNU_LD')):
+        if shlib.symbols_file:
             inputs.append(shlib.symbols_file)
+            # TODO: Assumes GNU LD
             symbols_file = ['-Wl,--version-script,%s' % shlib.symbols_file]
 
         cmd = (
@@ -941,22 +941,9 @@ class TupBackend(CommonBackend):
             if not path:
                 raise Exception("Cannot install to " + target)
 
-        js_shell = self.environment.substs.get('JS_SHELL_NAME')
-        if js_shell:
-            js_shell = '%s%s' % (js_shell,
-                                 self.environment.substs['BIN_SUFFIX'])
-
         for path, files in obj.files.walk():
             self._add_features(target, path)
             for f in files:
-
-                if (js_shell and isinstance(obj, ObjdirFiles) and
-                    f.endswith(js_shell)):
-                    # Skip this convenience install for now. Accessing
-                    # !/js/src/js when trying to find headers creates
-                    # an error for tup when !/js/src/js is also a target.
-                    continue
-
                 output_group = None
                 if any(mozpath.match(mozpath.basename(f), p)
                        for p in self._compile_env_files):

toolkit/library/gen_symverscript.py

@@ -8,10 +8,10 @@ import sys
 import buildconfig
 from mozbuild.preprocessor import Preprocessor
 
-def main(output, input_file, version=None):
+def main(output, input_file):
     pp = Preprocessor()
     pp.context.update({
-        'VERSION': version,
+        'VERSION': 'xul%s' % buildconfig.substs['MOZILLA_SYMBOLVERSION'],
     })
     pp.out = output
     pp.do_include(input_file)

toolkit/library/moz.build

@@ -345,9 +345,6 @@ if CONFIG['COMPILE_ENVIRONMENT']:
         GENERATED_FILES += ['symverscript']
         GENERATED_FILES['symverscript'].script = 'gen_symverscript.py'
         GENERATED_FILES['symverscript'].inputs = ['symverscript.in']
-        GENERATED_FILES['symverscript'].flags = [
-            'xul%s' % CONFIG['MOZILLA_SYMBOLVERSION']
-        ]
         SYMBOLS_FILE = '!symverscript'
 
 # This library is entirely composed of Rust code, and needs to come after