# $FreeBSD: head/databases/mongodb40/Makefile 507372 2019-07-26 20:46:53Z gerald $

PORTNAME=	mongodb

DISTVERSIONPREFIX=	r

DISTVERSION=	4.2.1

CATEGORIES=	databases net

MASTER_SITES=	https://fastdl.mongodb.org/src/ \

		http://fastdl.mongodb.org/src/ \

		http://download.mongodb.org/src/

PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}

DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}

MAINTAINER=	ronald-lists@klop.ws

COMMENT=	Distributed document-oriented "NoSQL" database

# mongodb is AGPLv3, C++ driver is APACHE20

LICENSE=	AGPLv3 APACHE20

LICENSE_COMB=	multi

ONLY_FOR_ARCHS=	aarch64 amd64

ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"

#GCC_VER=	9

#LLVM_VER=	60

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \

		${PY_TYPING} \

		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \

		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \

		${LOCALBASE}/bin/gcc:lang/gcc \

		${LOCALBASE}/bin/ar:devel/binutils

LIB_DEPENDS=	libboost_system.so:devel/boost-libs \

		libpcre.so:devel/pcre \

		libcurl.so:ftp/curl \

		libsnappy.so>=1.1.7:archivers/snappy

#USES=		compiler:c++17-lang cpe python:3.5+,build scons:py36 shebangfix

USES=		cpe python:3.5+,build scons:py36 shebangfix

USE_RC_SUBR=	mongod

USE_GCC=	yes

CONFLICTS_BUILD=	mongo-cxx-driver

CONFLICTS_INSTALL=	mongodb3[46] mongodb40

# clang 7.0 or newer is expected (or some gcc, didn't test that)

#CC=		clang${LLVM_VER}

#CXX=		clang++${LLVM_VER}

CC=		${LOCALBASE}/gcc

CCX=		${LOCALBASE}/g++

SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in

python_OLD_CMD=	@python_interpreter@

MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \

		--use-system-pcre --use-system-snappy \

		--use-system-boost --use-system-zlib \

		--cxx-std=17 \

		--runtime-hardening=on \

		-j ${MAKE_JOBS_NUMBER} \

		--disable-warnings-as-errors \

		VERBOSE=on AR=${PREFIX}/bin/ar

#		--libc++ \

USERS=		mongodb

GROUPS=		mongodb

OPTIONS_DEFINE=		SASL SSL

OPTIONS_DEFAULT=	SASL SSL

SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2

SASL_MAKE_ARGS=		--use-sasl-client

SSL_USES=	ssl

SSL_MAKE_ARGS=	--ssl

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057

SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""

.else

SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "

.endif

.if ${ARCH} == aarch64

EXTRA_PATCHES=	${FILESDIR}/aarch64

.endif

ALL_TARGET=	core

PORTSCOUT=	limitw:1,even

CPE_PRODUCT=	mongodb

post-install:

.for f in mongo mongod mongos

	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}

.endfor

	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample

.include <bsd.port.mk>

TIMESTAMP = 1571682282

SHA256 (mongodb-src-r4.2.1.tar.gz) = 6d0e82e70b6940698ed464e11894c441db5f07c98a0e16e1607283277553683a

SIZE (mongodb-src-r4.2.1.tar.gz) = 60922510

--- src/third_party/mozjs-60/gen-config.sh.orig	2019-10-11 03:28:57 UTC

+++ src/third_party/mozjs-60/gen-config.sh

@@ -28,6 +28,9 @@ _xcode_setup() {

 }

 case "$_Path" in

+    "platform/aarch64/freebsd")

+        _CONFIG_OPTS="--host=aarch64-freebsd"

+	;;

     "platform/aarch64/linux")

         _CONFIG_OPTS="--host=aarch64-linux"

 	;;

@@ -82,9 +85,9 @@ esac

 cd mozilla-release/js/src

 rm config.cache || true

-PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"

+PYTHON=python2.7 ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"

-make recurse_export

+gmake recurse_export

 cd ../../..

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/DataViewObject.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/DataViewObject.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/DataViewObject.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/JSON.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/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 "builtin/JSON.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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/Promise.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/Promise.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/Promise.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/AliasAnalysisShared.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/AliasAnalysisShared.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/AliasAnalysisShared.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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/BaselineCacheIRCompiler.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/BaselineCacheIRCompiler.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/BaselineCacheIRCompiler.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp

@@ -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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp

@@ -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/CacheIR.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/CacheIR.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/CacheIR.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/CacheIRCompiler.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/CacheIRCompiler.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/CacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/CacheIRSpewer.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/CacheIRSpewer.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/CacheIRSpewer.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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/FlowAliasAnalysis.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/FlowAliasAnalysis.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/FlowAliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/FoldLinearArithConstants.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/FoldLinearArithConstants.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/FoldLinearArithConstants.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

+#include "jit/IonCacheIRCompiler.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/IonCacheIRCompiler.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/IonCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/IonControlFlow.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/IonControlFlow.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/IonControlFlow.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/IonIC.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/IonIC.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/IonIC.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/JSJitFrameIter.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/JSJitFrameIter.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/JSJitFrameIter.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/Jit.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/Jit.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/Jit.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/Linker.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/Linker.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/Linker.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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "builtin/Stream.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/Stream.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/Stream.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/String.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/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 "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/Symbol.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/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 "builtin/Symbol.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/WasmBCE.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/WasmBCE.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/WasmBCE.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/Architecture-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Architecture-arm64.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/arm64/Architecture-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/Assembler-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Assembler-arm64.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/arm64/Assembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/Bailouts-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Bailouts-arm64.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/arm64/Bailouts-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/BaselineIC-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/BaselineIC-arm64.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/arm64/BaselineIC-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/arm64/CodeGenerator-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/CodeGenerator-arm64.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/arm64/CodeGenerator-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/Disassembler-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Disassembler-arm64.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/arm64/Disassembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/Lowering-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Lowering-arm64.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/arm64/Lowering-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/MacroAssembler-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/MacroAssembler-arm64.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/arm64/MacroAssembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/MoveEmitter-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/MoveEmitter-arm64.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/arm64/MoveEmitter-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/SharedIC-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/SharedIC-arm64.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/arm64/SharedIC-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/arm64/Trampoline-arm64.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/Trampoline-arm64.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/arm64/Trampoline-arm64.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Assembler-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Assembler-vixl.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/arm64/vixl/Assembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Cpu-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Cpu-vixl.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/arm64/vixl/Cpu-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Decoder-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Decoder-vixl.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/arm64/vixl/Decoder-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Disasm-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Disasm-vixl.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/arm64/vixl/Disasm-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Instructions-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Instructions-vixl.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/arm64/vixl/Instructions-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "jit/arm64/vixl/Instrument-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Instrument-vixl.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/arm64/vixl/Instrument-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/MacroAssembler-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/MacroAssembler-vixl.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/arm64/vixl/MacroAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/MozAssembler-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/MozAssembler-vixl.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/arm64/vixl/MozAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/MozInstructions-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/MozInstructions-vixl.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/arm64/vixl/MozInstructions-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/arm64/vixl/Utils-vixl.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/arm64/vixl/Utils-vixl.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/arm64/vixl/Utils-vixl.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "jit/shared/Assembler-shared.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/shared/Assembler-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/Assembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/Disassembler-shared.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "jit/shared/Disassembler-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/Disassembler-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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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 "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 "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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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/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

+#include "proxy/ScriptedProxyHandler.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "proxy/ScriptedProxyHandler.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/ScriptedProxyHandler.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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 "threading/Mutex.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "threading/Mutex.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 "threading/Mutex.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "threading/ProtectedData.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "threading/ProtectedData.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 "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "threading/posix/CpuCount.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "threading/posix/CpuCount.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 "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "threading/posix/Thread.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "threading/posix/Thread.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 "threading/posix/Thread.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "util/AllocPolicy.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/AllocPolicy.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 "util/AllocPolicy.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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 "builtin/intl/Collator.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/intl/Collator.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/Collator.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/intl/CommonFunctions.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/intl/CommonFunctions.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/CommonFunctions.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/intl/DateTimeFormat.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/intl/DateTimeFormat.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/DateTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/intl/IntlObject.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/intl/IntlObject.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/IntlObject.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "builtin/intl/NumberFormat.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "builtin/intl/NumberFormat.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/NumberFormat.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "util/NativeStack.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/NativeStack.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 "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "util/Printf.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/Printf.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 "util/Printf.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "util/StringBuffer.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/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 "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "util/Text.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/Text.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 "util/Text.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "util/Unicode.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "util/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 "util/Unicode.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#include "vm/AsyncFunction.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/AsyncFunction.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/AsyncFunction.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "vm/AsyncIteration.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/AsyncIteration.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/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "vm/BytecodeUtil.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/BytecodeUtil.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/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "vm/Caches.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/Caches.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/Caches.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#include "vm/EnvironmentObject.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/EnvironmentObject.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/EnvironmentObject.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/ErrorReporting.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/ErrorReporting.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/ErrorReporting.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/GeckoProfiler.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/GeckoProfiler.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/GeckoProfiler.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

\ No newline at end of file

--- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp.orig	2019-11-14 10:50:10 UTC

+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp

@@ -0,0 +1,55 @@

+#define MOZ_UNIFIED_BUILD

+#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

+#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/Initialization.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/Initialization.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/Initialization.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "vm/Iteration.cpp"

+#ifdef PL_ARENA_CONST_ALIGN_MASK

+#error "vm/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 "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."

+#undef INITGUID

+#endif

+#include "vm/JSCompartment.cpp"