RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-Jul-2017 15:38:15
Branch: rpm-5_4 Handle: 2017070813381302
Added files: (Branch: rpm-5_4)
rpm/js/src .cvsignore Makefile.am Unified_cpp_js_src0.cpp
Unified_cpp_js_src1.cpp Unified_cpp_js_src10.cpp
Unified_cpp_js_src11.cpp Unified_cpp_js_src12.cpp
Unified_cpp_js_src13.cpp Unified_cpp_js_src14.cpp
Unified_cpp_js_src15.cpp Unified_cpp_js_src16.cpp
Unified_cpp_js_src17.cpp Unified_cpp_js_src18.cpp
Unified_cpp_js_src19.cpp Unified_cpp_js_src2.cpp
Unified_cpp_js_src20.cpp Unified_cpp_js_src21.cpp
Unified_cpp_js_src22.cpp Unified_cpp_js_src23.cpp
Unified_cpp_js_src24.cpp Unified_cpp_js_src25.cpp
Unified_cpp_js_src26.cpp Unified_cpp_js_src27.cpp
Unified_cpp_js_src28.cpp Unified_cpp_js_src29.cpp
Unified_cpp_js_src3.cpp Unified_cpp_js_src30.cpp
Unified_cpp_js_src31.cpp Unified_cpp_js_src32.cpp
Unified_cpp_js_src33.cpp Unified_cpp_js_src34.cpp
Unified_cpp_js_src35.cpp Unified_cpp_js_src36.cpp
Unified_cpp_js_src4.cpp Unified_cpp_js_src5.cpp
Unified_cpp_js_src6.cpp Unified_cpp_js_src7.cpp
Unified_cpp_js_src8.cpp Unified_cpp_js_src9.cpp
js-confdefs.h rpmjs45shim.cpp
rpm/js/src/shell .cvsignore Unified_cpp_js_src_shell0.cpp
Log:
- rpmjss: capture gen-conf.sh output.
Summary:
Revision Changes Path
1.1.2.1 +12 -0 rpm/js/src/.cvsignore
1.1.2.1 +227 -0 rpm/js/src/Makefile.am
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src0.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src1.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src10.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src11.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src12.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src13.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src14.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src15.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src16.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src17.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src18.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src19.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src2.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src20.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src21.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src22.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src23.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src24.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src25.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src26.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src27.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src28.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src29.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src3.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src30.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src31.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src32.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src33.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src34.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src35.cpp
1.1.2.1 +19 -0 rpm/js/src/Unified_cpp_js_src36.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src4.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src5.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src6.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src7.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src8.cpp
1.1.2.1 +55 -0 rpm/js/src/Unified_cpp_js_src9.cpp
1.1.2.1 +104 -0 rpm/js/src/js-confdefs.h
1.1.2.1 +14 -0 rpm/js/src/rpmjs45shim.cpp
1.1.2.1 +9 -0 rpm/js/src/shell/.cvsignore
1.1.2.1 +28 -0 rpm/js/src/shell/Unified_cpp_js_src_shell0.cpp
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/src/.cvsignore
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 .cvsignore
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ .cvsignore 2017-07-08 15:38:14.839941252 +0200
@@ -0,0 +1,12 @@
+.deps
+.dirstamp
+Makefile
+Makefile.in
+.libs
+*.gcda
+*.gcno
+*.la
+*.lo
+rpmjs45
+js
+rpmjss.inp
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Makefile.am
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Makefile.am 2017-07-08 15:38:14.850941220 +0200
@@ -0,0 +1,227 @@
+# Makefile for rpm library.
+
+export ASAN_OPTIONS=alloc_dealloc_mismatch=0
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+EXTRA_DIST =
+
+AM_CPPFLAGS = -I. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/build \
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/rpmdb \
+ -I$(top_srcdir)/rpmio \
+ -I$(top_srcdir)/misc \
+ @WITH_BEECRYPT_CPPFLAGS@ \
+ @WITH_DB_CPPFLAGS@ \
+ @WITH_FILE_CPPFLAGS@ \
+ @WITH_GPSEE_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
+ @WITH_MOZJS185_CPPFLAGS@ \
+ @WITH_NEON_CPPFLAGS@ \
+ @WITH_POPT_CPPFLAGS@ \
+ @WITH_SYCK_CPPFLAGS@ \
+ @WITH_XAR_CPPFLAGS@ \
+ @WITH_ZLIB_CPPFLAGS@
+
+AM_CFLAGS = $(OPENMP_CFLAGS)
+
+RPMMISC_LDADD_COMMON = \
+ $(top_builddir)/misc/librpmmisc.la \
+ @LTLIBINTL@
+
+RPMIO_LDADD_COMMON = \
+ $(top_builddir)/rpmio/librpmio.la \
+ $(RPMMISC_LDADD_COMMON)
+
+RPMDB_LDADD_COMMON = \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(RPMIO_LDADD_COMMON)
+
+RPM_LDADD_COMMON = \
+ $(top_builddir)/lib/librpm.la \
+ $(RPMDB_LDADD_COMMON)
+
+RPMBUILD_LDADD_COMMON = \
+ $(top_builddir)/build/librpmbuild.la \
+ $(RPM_LDADD_COMMON)
+
+EXTRA_PROGRAMS = rpmjs45
+noinst_PROGRAMS =
+
+moz_srcdir = ${top_srcdir}/js/mozilla-release/js/src
+
+# mozilla-release/memory/build/mozmemory_wrap.c \
+# mozilla-release/mozglue/misc/TimeStamp.cpp \
+# mozilla-release/mozglue/misc/TimeStamp_posix.cpp \
+# ${moz_srcdir}/memory/mozalloc/Unified_cpp_memory_mozalloc0.cpp \
+# mozilla-release/mfbt/decimal/Decimal.cpp \
+# ${moz_srcdir}/mfbt/Unified_cpp_mfbt0.cpp \
+# ${moz_srcdir}/jsarray.cpp \
+# ${moz_srcdir}/jsatom.cpp \
+# ${moz_srcdir}/jsmath.cpp \
+# ${moz_srcdir}/builtin/RegExp.cpp \
+# ${moz_srcdir}/ctypes/CTypes.cpp \
+# ${moz_srcdir}/ctypes/Library.cpp \
+# ${moz_srcdir}/frontend/Parser.cpp \
+# ${moz_srcdir}/gc/StoreBuffer.cpp \
+# ${moz_srcdir}/jit/x86-shared/Disassembler-x86-shared.cpp \
+# ${moz_srcdir}/perf/pm_linux.cpp \
+# ${moz_srcdir}/vm/Initialization.cpp \
+# ${moz_srcdir}/vm/TraceLogging.cpp \
+# ${moz_srcdir}/vm/TraceLoggingGraph.cpp
+
+MOZ_SOURCES = \
+ Unified_cpp_js_src0.cpp \
+ Unified_cpp_js_src1.cpp \
+ Unified_cpp_js_src2.cpp \
+ Unified_cpp_js_src3.cpp \
+ Unified_cpp_js_src4.cpp \
+ Unified_cpp_js_src5.cpp \
+ Unified_cpp_js_src6.cpp \
+ Unified_cpp_js_src7.cpp \
+ Unified_cpp_js_src8.cpp \
+ Unified_cpp_js_src9.cpp \
+ Unified_cpp_js_src10.cpp \
+ Unified_cpp_js_src11.cpp \
+ Unified_cpp_js_src12.cpp \
+ Unified_cpp_js_src13.cpp \
+ Unified_cpp_js_src14.cpp \
+ Unified_cpp_js_src15.cpp \
+ Unified_cpp_js_src16.cpp \
+ Unified_cpp_js_src17.cpp \
+ Unified_cpp_js_src18.cpp \
+ Unified_cpp_js_src19.cpp \
+ Unified_cpp_js_src20.cpp \
+ Unified_cpp_js_src21.cpp \
+ Unified_cpp_js_src22.cpp \
+ Unified_cpp_js_src23.cpp \
+ Unified_cpp_js_src24.cpp \
+ Unified_cpp_js_src25.cpp \
+ Unified_cpp_js_src26.cpp \
+ Unified_cpp_js_src27.cpp \
+ Unified_cpp_js_src28.cpp \
+ Unified_cpp_js_src29.cpp \
+ Unified_cpp_js_src30.cpp \
+ Unified_cpp_js_src31.cpp \
+ Unified_cpp_js_src32.cpp \
+ Unified_cpp_js_src33.cpp \
+ Unified_cpp_js_src34.cpp \
+ Unified_cpp_js_src35.cpp \
+ Unified_cpp_js_src36.cpp
+
+MOZ_CPPFLAGS = \
+ -DEXPORT_JS_API \
+ -DJS_HAS_CTYPES \
+ -DDLL_PREFIX='"lib"' -DDLL_SUFFIX='".so"' \
+ -fPIC \
+ -DMOZILLA_CLIENT \
+ -D'moz_xmalloc(_len)=malloc(_len)' \
+ -I${moz_srcdir}/js/src/shell \
+ -I${moz_srcdir}/js/src \
+ -I${moz_srcdir}/dist/include \
+ -I${moz_srcdir}/shell \
+ -I${moz_srcdir} \
+ -I${moz_builddir} \
+ -I${top_srcdir}/js/include \
+ -I${srcdir} \
+ -I${builddir} \
+ -include ${top_srcdir}/config.h \
+ -include js-confdefs.h \
+ -include js/RequiredDefines.h \
+ -fno-tree-vrp \
+ -fno-strict-aliasing \
+ -fno-delete-null-pointer-checks \
+ -Wsign-compare \
+ -Wtype-limits \
+ -Wcast-align \
+ -Wno-invalid-offsetof \
+ -ffunction-sections \
+ -fdata-sections \
+ -fno-exceptions \
+ -fno-math-errno \
+ -pthread \
+ -DNDEBUG \
+ -DTRIMMER \
+ -freorder-blocks \
+ -O3 \
+ -fomit-frame-pointer
+MOZ_CXXFLAGS = \
+ -std=gnu++0x \
+ -fno-rtti
+
+pkglibdir = @USRLIBRPM@/lib
+pkgbindir = @USRLIBRPM@/bin
+
+noinst_LTLIBRARIES = libmozjs.la
+
+noinst_HEADERS = \
+ js-confdefs.h
+
+libmozjs_la_SOURCES = $(MOZ_SOURCES)
+libmozjs_la_CPPFLAGS = $(MOZ_CPPFLAGS)
+libmozjs_la_CXXFLAGS = $(MOZ_CXXFLAGS)
+libmozjs_la_LIBADD = \
+ -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
+ -lmozglue -lmemory \
+ -lm -ldl -lffi -licui18n -licuuc -licudata
+libmozjs_la_LDFLAGS =
+
+rpmjs45_SOURCES = \
+ $(MOZ_SOURCES) \
+ ../rpmjs45shim.cpp \
+ shell/Unified_cpp_js_src_shell0.cpp
+rpmjs45_CPPFLAGS = $(MOZ_CPPFLAGS)
+rpmjs45_CXXFLAGS = $(MOZ_CXXFLAGS)
+rpmjs45_LDADD = \
+ -L${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib \
+ -lmozglue -lmemory \
+ -lm -ldl -lffi -licui18n -licuuc -licudata \
+ $(RPMIO_LDADD_COMMON)
+rpmjs45_LDFLAGS = \
+ -R${abs_top_builddir}/js/mozilla-release/js/src/dist/sdk/lib
+
+js rpmjss.inp:
+ [ ! -e $@ ] && ln -s ../$@
+
+test: js rpmjss.inp rpmjs45
+ ./rpmjs45 -f rpmjss.inp
+
+vg = $(abs_top_builddir)/libtool --mode=execute \
+ valgrind -v --tool=memcheck \
+ --leak-check=full --show-reachable=yes --track-origins=yes \
+ --suppressions="$(abs_top_builddir)/js/.gsr_suppress" \
+ --gen-suppressions=all
+
+.PHONY: lcov-reset # run lcov from scratch, always
+lcov-reset:
+ make lcov-run
+ make lcov-report
+
+# run lcov from scratch if the dir is not there
+lcov:
+ make lcov-reset
+
+.PHONY: lcov-run # reset run coverage tests
+lcov-run:
+ @-rm -rf lcov
+ find .. -name "*.gcda" -exec rm {} \;
+ make check
+
+.PHONY: lcov-report # generate report based on current coverage data
+lcov-report:
+ mkdir lcov
+ -lcov -d ./src -d . --capture --output-file lcov/lcov.info
+ lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d:
-f1 > lcov/remove
+ lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
+ rm lcov/remove
+ mv lcov/lcov.cleaned.info lcov/lcov.info
+ genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
+
+.PHONY: lcov-upload
+lcov-upload: lcov
+ mkdir -p /var/ftp/pub/jbj/rpm-$(VERSION)-lcov
+ tar -C lcov -cf - . | (cd /var/ftp/pub/jbj/rpm-$(VERSION)-lcov; tar xf
-)
+# rsync -rvz -e ssh --delete lcov/* ???
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src0.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src0.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src0.cpp 2017-07-08 15:38:14.859942680 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "asmjs/AsmJSFrameIterator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/AsmJSLink.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/AsmJSModule.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/AsmJSSignalHandlers.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/AsmJSValidate.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/WasmGenerator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src1.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src1.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src1.cpp 2017-07-08 15:38:14.869941261 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "asmjs/WasmIonCompile.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "asmjs/WasmStubs.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/AtomicsObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/Eval.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "builtin/Intl.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "builtin/MapObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src10.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src10.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src10.cpp 2017-07-08 15:38:14.878941379 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/BaselineFrameInfo.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineIC.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineInspector.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineJIT.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BitSet.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/BytecodeAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src11.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src11.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src11.cpp 2017-07-08 15:38:14.888941379 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/C1Spewer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/CodeGenerator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/CompileWrappers.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/Disassembler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/EagerSimdUnbox.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/EdgeCaseAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src12.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src12.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src12.cpp 2017-07-08 15:38:14.897941030 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/EffectiveAddressAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so
it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/ExecutableAllocator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/InstructionReordering.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/Ion.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/IonAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/IonBuilder.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src13.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src13.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src13.cpp 2017-07-08 15:38:14.907941220 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/IonCaches.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/IonOptimizationLevels.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/JSONSpewer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/JitFrames.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/JitOptions.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/JitSpewer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src14.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src14.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src14.cpp 2017-07-08 15:38:14.916941219 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/JitcodeMap.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/LICM.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/LIR.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/LoopUnroller.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/Lowering.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/MCallOptimize.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src15.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src15.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src15.cpp 2017-07-08 15:38:14.925941369 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/MIR.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/MIRGraph.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/MacroAssembler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/MoveResolver.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/OptimizationTracking.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/PerfSpewer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src16.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src16.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src16.cpp 2017-07-08 15:38:14.935941323 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/ProcessExecutableMemory.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so
it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/RangeAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/Recover.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/RegisterAllocator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/RematerializedFrame.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/Safepoints.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src17.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src17.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src17.cpp 2017-07-08 15:38:14.944941554 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/ScalarReplacement.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/SharedIC.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/Sink.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/Snapshots.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/StupidAllocator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/TypePolicy.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src18.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src18.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src18.cpp 2017-07-08 15:38:14.954941187 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/TypedObjectPrediction.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/VMFunctions.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/ValueNumbering.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/shared/BaselineCompiler-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/shared/BaselineCompiler-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/shared/CodeGenerator-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK,
so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot
be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/shared/Lowering-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src19.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src19.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src19.cpp 2017-07-08 15:38:14.963941169 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/x64/Assembler-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/Assembler-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/Assembler-x64.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/Bailouts-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/Bailouts-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/Bailouts-x64.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/BaselineCompiler-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/BaselineCompiler-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so
it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/BaselineCompiler-x64.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/BaselineIC-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/BaselineIC-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/BaselineIC-x64.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/CodeGenerator-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/CodeGenerator-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/CodeGenerator-x64.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/Lowering-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/Lowering-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/Lowering-x64.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src2.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src2.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src2.cpp 2017-07-08 15:38:14.973941191 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "builtin/ModuleObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/Object.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/Profilers.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/Reflect.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/ReflectParse.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/SIMD.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src20.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src20.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src20.cpp 2017-07-08 15:38:14.982941142 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/x64/MacroAssembler-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/MacroAssembler-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/MacroAssembler-x64.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/SharedIC-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/SharedIC-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/SharedIC-x64.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/x64/Trampoline-x64.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x64/Trampoline-x64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x64/Trampoline-x64.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/Architecture-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/Architecture-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/Architecture-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/Assembler-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/Assembler-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/Assembler-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/AssemblerBuffer-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/AssemblerBuffer-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/AssemblerBuffer-x86-shared.cpp defines INITGUID, so
it cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src21.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src21.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src21.cpp 2017-07-08 15:38:14.992941222 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/x86-shared/BaselineCompiler-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/BaselineCompiler-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/BaselineCompiler-x86-shared.cpp defines INITGUID, so
it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/BaselineIC-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/BaselineIC-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/BaselineIC-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/CodeGenerator-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/CodeGenerator-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/CodeGenerator-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/Lowering-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/Lowering-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/Lowering-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/MacroAssembler-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/MacroAssembler-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/MacroAssembler-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/x86-shared/MoveEmitter-x86-shared.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/x86-shared/MoveEmitter-x86-shared.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/x86-shared/MoveEmitter-x86-shared.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src22.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src22.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src22.cpp 2017-07-08 15:38:15.001941253 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jsalloc.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsapi.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsbool.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jscntxt.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jscompartment.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsdate.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src23.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src23.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src23.cpp 2017-07-08 15:38:15.011941177 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jsdtoa.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsexn.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsfriendapi.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsfun.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsgc.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsiter.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src24.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src24.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src24.cpp 2017-07-08 15:38:15.020941188 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jsnativestack.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsnum.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsobj.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "json.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jsopcode.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsprf.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src25.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src25.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src25.cpp 2017-07-08 15:38:15.030941595 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jspropertytree.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jsscript.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsstr.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "jswatchpoint.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jsweakmap.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "perf/jsperf.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src26.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src26.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src26.cpp 2017-07-08 15:38:15.039941498 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "proxy/BaseProxyHandler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/CrossCompartmentWrapper.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so
it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/DeadObjectProxy.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "proxy/DirectProxyHandler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/Proxy.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src27.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src27.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src27.cpp 2017-07-08 15:38:15.049941089 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "proxy/ScriptedDirectProxyHandler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK,
so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot
be built in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/ScriptedIndirectProxyHandler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/ScriptedIndirectProxyHandler.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "proxy/SecurityWrapper.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "proxy/Wrapper.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/ArgumentsObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/ArrayBufferObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src28.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src28.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src28.cpp 2017-07-08 15:38:15.058941156 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/CallNonGenericMethod.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "vm/CharacterEncoding.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/CodeCoverage.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Compression.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/DateTime.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/Debugger.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src29.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src29.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src29.cpp 2017-07-08 15:38:15.067941377 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/DebuggerMemory.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/ErrorObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/ForOfIterator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/GeneratorObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/GlobalObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/HelperThreads.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src3.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src3.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src3.cpp 2017-07-08 15:38:15.077941210 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "builtin/SymbolObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/TestingFunctions.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "builtin/TypedObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/WeakMapObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "builtin/WeakSetObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "devtools/sharkctl.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src30.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src30.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src30.cpp 2017-07-08 15:38:15.086941380 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/Id.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "vm/Interpreter.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/JSONParser.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/MemoryMetrics.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Monitor.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/NativeObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src31.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src31.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src31.cpp 2017-07-08 15:38:15.096941692 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/ObjectGroup.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/PIC.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "vm/Printer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/Probes.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/ProxyObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/ReceiverGuard.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src32.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src32.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src32.cpp 2017-07-08 15:38:15.105941349 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/RegExpObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/RegExpStatics.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Runtime.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/SPSProfiler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/SavedStacks.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/ScopeObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src33.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src33.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src33.cpp 2017-07-08 15:38:15.115941351 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/SelfHosting.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Shape.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/SharedArrayObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Stack.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/Stopwatch.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/String.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src34.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src34.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src34.cpp 2017-07-08 15:38:15.124941219 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/StringBuffer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/StructuredClone.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Symbol.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/TaggedProto.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Time.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "vm/TypeInference.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src35.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src35.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src35.cpp 2017-07-08 15:38:15.133941350 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/TypedArrayObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/UbiNode.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/UbiNodeCensus.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/UnboxedObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "vm/Unicode.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/Value.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src36.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src36.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src36.cpp 2017-07-08 15:38:15.143941442 +0200
@@ -0,0 +1,19 @@
+#define MOZ_UNIFIED_BUILD
+#include "vm/WeakMapPtr.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "vm/Xdr.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src4.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src4.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src4.cpp 2017-07-08 15:38:15.152941303 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "ds/LifoAlloc.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "frontend/BytecodeCompiler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "frontend/BytecodeEmitter.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "frontend/FoldConstants.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "frontend/NameFunctions.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "frontend/ParseMaps.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src5.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src5.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src5.cpp 2017-07-08 15:38:15.162941251 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "frontend/ParseNode.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "frontend/TokenStream.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "gc/Allocator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/Barrier.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/GCTrace.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/Iteration.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src6.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src6.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src6.cpp 2017-07-08 15:38:15.171941273 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "gc/Marking.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/Memory.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/MemoryProfiler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "gc/Nursery.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/RootMarking.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "gc/Statistics.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src7.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src7.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src7.cpp 2017-07-08 15:38:15.181941215 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "gc/Tracer.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/Verifier.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "gc/Zone.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in
unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/NativeRegExpMacroAssembler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/NativeRegExpMacroAssembler.cpp uses
PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it
cannot be built in unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/RegExpAST.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/RegExpEngine.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src8.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src8.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src8.cpp 2017-07-08 15:38:15.190941381 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "irregexp/RegExpInterpreter.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/RegExpMacroAssembler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so
it cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/RegExpParser.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "irregexp/RegExpStack.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/AliasAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/AlignmentMaskAnalysis.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/Unified_cpp_js_src9.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src9.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src9.cpp 2017-07-08 15:38:15.200941265 +0200
@@ -0,0 +1,55 @@
+#define MOZ_UNIFIED_BUILD
+#include "jit/BacktrackingAllocator.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be
built in unified mode."
+#undef INITGUID
+#endif
+#include "jit/Bailouts.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineBailouts.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineCompiler.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineDebugModeOSR.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it
cannot be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built
in unified mode."
+#undef INITGUID
+#endif
+#include "jit/BaselineFrame.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot
be built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/js-confdefs.h
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 js-confdefs.h
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ js-confdefs.h 2017-07-08 15:38:15.209941181 +0200
@@ -0,0 +1,104 @@
+/* List of defines generated by configure. Included with preprocessor flag,
+ * -include, to avoid long list of -D defines on the compile command-line.
+ * Do not edit.
+ */
+
+#ifndef js_confdefs_h
+#define js_confdefs_h
+
+#define ASMJS_MAY_USE_SIGNAL_HANDLERS_FOR_OOB 1
+#define CPP_THROW_NEW throw()
+#define D_INO d_ino
+#define EDITLINE 1
+#define ENABLE_INTL_API 1
+#define EXPOSE_INTL_API 1
+#define HAVE_64BIT_BUILD 1
+#define HAVE_ACOSH 1
+#define HAVE_ALLOCA_H 1
+#define HAVE_ASINH 1
+#define HAVE_ATANH 1
+#define HAVE_CBRT 1
+#define HAVE_CLOCK_MONOTONIC 1
+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
+#define HAVE_CPUID_H 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DLOPEN 1
+#define HAVE_ENDIAN_H 1
+#define HAVE_EXPM1 1
+#define HAVE_GETC_UNLOCKED 1
+#define HAVE_GETOPT_H 1
+#define HAVE_GMTIME_R 1
+#define HAVE_GNU_LIBC_VERSION_H 1
+#define HAVE_I18N_LC_MESSAGES 1
+#define HAVE_LANGINFO_CODESET 1
+#define HAVE_LIBM 1
+#define HAVE_LINUX_QUOTA_H 1
+#define HAVE_LOCALECONV 1
+#define HAVE_LOCALECONV 1
+#define HAVE_LOCALTIME_R 1
+#define HAVE_LOG1P 1
+#define HAVE_LOG2 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MALLOC_USABLE_SIZE 1
+#define HAVE_MBRTOWC 1
+#define HAVE_MEMALIGN 1
+#define HAVE_MEMORY_H 1
+#define HAVE_NL_TYPES_H 1
+#define HAVE_POSIX_FADVISE 1
+#define HAVE_POSIX_FALLOCATE 1
+#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_RES_NINIT 1
+#define HAVE_SETLOCALE 1
+#define HAVE_SSIZE_T 1
+#define HAVE_STRNDUP 1
+#define HAVE_SYS_BITYPES_H 1
+#define HAVE_SYS_CDEFS_H 1
+#define HAVE_SYS_MOUNT_H 1
+#define HAVE_SYS_QUOTA_H 1
+#define HAVE_SYS_STATFS_H 1
+#define HAVE_SYS_STATVFS_H 1
+#define HAVE_SYS_VFS_H 1
+#define HAVE_THREAD_TLS_KEYWORD 1
+#define HAVE_TM_ZONE_TM_GMTOFF 1
+#define HAVE_UNISTD_H 1
+#define HAVE_VALLOC 1
+#define HAVE_VA_COPY 1
+#define HAVE_VA_LIST_AS_ARRAY 1
+#define HAVE_VISIBILITY_ATTRIBUTE 1
+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
+#define HAVE_WCRTOMB 1
+#define HAVE_X11_XKBLIB_H 1
+#define HAVE___CXA_DEMANGLE 1
+#define JS_CODEGEN_X64 1
+#define JS_CPU_X64 1
+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
+#define JS_HAS_CTYPES 1
+#define JS_HAVE_ENDIAN_H 1
+#define JS_PUNBOX64 1
+#define JS_STANDALONE 1
+#define JS_TRACE_LOGGING 1
+#define MALLOC_H <malloc.h>
+#define MALLOC_USABLE_SIZE_CONST_PTR
+#define MOZILLA_UAVERSION "45.0"
+#define MOZILLA_VERSION "45.9.0"
+#define MOZILLA_VERSION_U 45.9.0
+#define MOZJS_MAJOR_VERSION 45
+#define MOZJS_MINOR_VERSION 9
+#define MOZ_DEBUG_SYMBOLS 1
+#define MOZ_DLL_SUFFIX ".so"
+#define MOZ_GLUE_IN_PROGRAM 1
+#define MOZ_MEMORY 1
+#define MOZ_MEMORY_LINUX 1
+#define MOZ_UPDATE_CHANNEL default
+#define NO_NSPR_10_SUPPORT 1
+#define RELEASE_BUILD 1
+#define STDC_HEADERS 1
+#define VA_COPY va_copy
+#define XP_UNIX 1
+#define _REENTRANT 1
+
+#include "js/RequiredDefines.h"
+
+#endif /* js_confdefs_h */
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/rpmjs45shim.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 rpmjs45shim.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ rpmjs45shim.cpp 2017-07-08 15:38:15.219941411 +0200
@@ -0,0 +1,14 @@
+#include "mfbt/Unified_cpp_mfbt0.cpp"
+#include "jsarray.cpp"
+#include "jsatom.cpp"
+#include "jsmath.cpp"
+#include "builtin/RegExp.cpp"
+#include "ctypes/CTypes.cpp"
+#include "ctypes/Library.cpp"
+#include "frontend/Parser.cpp"
+#include "gc/StoreBuffer.cpp"
+#include "jit/x86-shared/Disassembler-x86-shared.cpp"
+#include "perf/pm_linux.cpp"
+#include "vm/Initialization.cpp"
+#include "vm/TraceLogging.cpp"
+#include "vm/TraceLoggingGraph.cpp"
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/shell/.cvsignore
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 .cvsignore
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ .cvsignore 2017-07-08 15:38:15.429941185 +0200
@@ -0,0 +1,9 @@
+.deps
+.dirstamp
+Makefile
+Makefile.in
+.libs
+*.gcda
+*.gcno
+*.la
+*.lo
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/src/shell/Unified_cpp_js_src_shell0.cpp
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 Unified_cpp_js_src_shell0.cpp
--- /dev/null 2017-07-08 15:35:23.000000000 +0200
+++ Unified_cpp_js_src_shell0.cpp 2017-07-08 15:38:15.439941292 +0200
@@ -0,0 +1,28 @@
+#define MOZ_UNIFIED_BUILD
+#include "shell/OSObject.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "shell/OSObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "shell/OSObject.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
+#include "shell/js.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "shell/js.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built
in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "shell/js.cpp defines INITGUID, so it cannot be built in unified
mode."
+#undef INITGUID
+#endif
+#include "shell/jsoptparse.cpp"
+#ifdef PL_ARENA_CONST_ALIGN_MASK
+#error "shell/jsoptparse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be
built in unified mode."
+#undef PL_ARENA_CONST_ALIGN_MASK
+#endif
+#ifdef INITGUID
+#error "shell/jsoptparse.cpp defines INITGUID, so it cannot be built in
unified mode."
+#undef INITGUID
+#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
