From 38c0eb538d0fd390c6cb9ce9ae9894153f6e8ef5 Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Thu, 9 Feb 2017 18:18:04 -0500 Subject: SERVER-28004 Add build system support for iOS-related Darwin variants Use a SCons invocation like the following to attach to the correct SDK and targeting options. // macOS native build: > python buildscripts/scons.py CCFLAGS="-isysroot `xcrun --sdk macosx --show-sdk-path` -mmacosx-version-min=10.10" LINKFLAGS="-Wl,-syslibroot,`xcrun --sdk macosx --show-sdk-path` -mmacosx-version-min=10.10" CC=`xcrun -f --sdk macosx clang` CXX=`xcrun -f --sdk macosx clang++`all // iOS Cross: > python buildscripts/scons.py CCFLAGS="-arch arm64 -isysroot `xcrun --sdk iphoneos --show-sdk-path` -miphoneos-version-min=10.2" LINKFLAGS="-arch arm64 -Wl,-syslibroot,`xcrun --sdk iphoneos --show-sdk-path` -miphoneos-version-min=10.2" CC=`xcrun -f --sdk iphoneos clang` CXX=`xcrun -f --sdk iphoneos clang++` TARGET_OS=iOS TARGET_ARCH=aarch64 all // iOS Simulator Cross: > python buildscripts/scons.py CCFLAGS="-isysroot `xcrun --sdk iphonesimulator --show-sdk-path` -miphoneos-version-min=10.2" LINKFLAGS="-Wl,-syslibroot,`xcrun --sdk iphonesimulator --show-sdk-path` -miphoneos-version-min=10.2" CC=`xcrun -f --sdk iphonesimulator clang` CXX=`xcrun -f --sdk iphonesimulator clang++` TARGET_OS=iOS-sim all // tvOS Cross: > python buildscripts/scons.py CCFLAGS="-arch arm64 -isysroot `xcrun --sdk appletvos --show-sdk-path` -mtvos-version-min=10.1" LINKFLAGS="-arch arm64 -Wl,-syslibroot,`xcrun --sdk appletvos --show-sdk-path` -mtvos-version-min=10.1" CC=`xcrun -f --sdk appletvos clang` CXX=`xcrun -f --sdk appletvos clang++` TARGET_OS=tvOS TARGET_ARCH=aarch64 all // tvOS Simulator Cross: > python buildscripts/scons.py CCFLAGS="-isysroot `xcrun --sdk appletvsimulator --show-sdk-path` -mtvos-version-min=10.1" LINKFLAGS="-Wl,-syslibroot,`xcrun --sdk appletvsimulator --show-sdk-path` -mtvos-version-min=10.1" CC=`xcrun -f --sdk appletvsimulator clang` CXX=`xcrun -f --sdk appletvsimulator clang++` TARGET_OS=tvOS-sim To run the resulting binaries under the simulator, boot a particular target machine with 'xcrun simctl': > xcrun simctl boot 'Apple TV 1080p' Find the ID of the instance that was booted: > xcrun simctl list | grep 'Apple TV 1080p' And then spawn the intended binary inside the simulator with that ID: > xcrun simctl spawn CEEC6346-6D21-4092-A091-E5A3862A357F build/opt/mongo/mongod --dbpath=tmp --- .../LIBRARY/float128/dpml_exception.c | 1 + src/third_party/IntelRDFPMathLib20U1/SConscript | 3 +- .../x86_64/macOS/build/Unified_cpp_js_src0.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src1.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src10.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src11.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src12.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src13.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src14.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src15.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src16.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src17.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src18.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src19.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src2.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src20.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src21.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src22.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src23.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src24.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src25.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src26.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src27.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src28.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src29.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src3.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src30.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src31.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src32.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src33.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src34.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src35.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src36.cpp | 19 +++++ .../x86_64/macOS/build/Unified_cpp_js_src4.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src5.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src6.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src7.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src8.cpp | 55 ++++++++++++++ .../x86_64/macOS/build/Unified_cpp_js_src9.cpp | 55 ++++++++++++++ .../platform/x86_64/macOS/build/js-confdefs.h | 86 ++++++++++++++++++++++ .../platform/x86_64/macOS/include/js-config.h | 59 +++++++++++++++ .../x86_64/osx/build/Unified_cpp_js_src0.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src1.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src10.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src11.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src12.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src13.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src14.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src15.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src16.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src17.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src18.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src19.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src2.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src20.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src21.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src22.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src23.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src24.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src25.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src26.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src27.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src28.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src29.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src3.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src30.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src31.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src32.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src33.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src34.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src35.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src36.cpp | 19 ----- .../x86_64/osx/build/Unified_cpp_js_src4.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src5.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src6.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src7.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src8.cpp | 55 -------------- .../x86_64/osx/build/Unified_cpp_js_src9.cpp | 55 -------------- .../platform/x86_64/osx/build/js-confdefs.h | 86 ---------------------- .../platform/x86_64/osx/include/js-config.h | 59 --------------- src/third_party/s2/base/port.h | 5 +- src/third_party/s2/s1angle.cc | 2 +- src/third_party/s2/s1interval.cc | 8 +- src/third_party/s2/s2cap.cc | 4 +- src/third_party/s2/s2cellid_test.cc | 4 +- src/third_party/s2/s2latlng.cc | 4 +- src/third_party/s2/s2latlngrect.cc | 2 +- src/third_party/s2/s2latlngrect_test.cc | 2 +- .../s2/util/math/exactfloat/exactfloat.h | 2 +- src/third_party/wiredtiger/SConscript | 3 +- 90 files changed, 2164 insertions(+), 2164 deletions(-) create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src0.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src1.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src10.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src11.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src12.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src13.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src14.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src15.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src16.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src17.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src18.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src19.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src2.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src20.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src21.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src22.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src23.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src24.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src25.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src26.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src27.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src28.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src29.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src3.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src30.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src31.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src32.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src33.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src34.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src35.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src36.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src4.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src5.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src6.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src7.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src8.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src9.cpp create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/build/js-confdefs.h create mode 100644 src/third_party/mozjs-45/platform/x86_64/macOS/include/js-config.h delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src0.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src1.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src10.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src11.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src12.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src13.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src14.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src15.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src16.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src17.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src18.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src19.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src2.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src20.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src21.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src22.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src23.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src24.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src25.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src26.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src27.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src28.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src29.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src3.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src30.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src31.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src32.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src33.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src34.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src35.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src36.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src4.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src5.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src6.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src7.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src8.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src9.cpp delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/build/js-confdefs.h delete mode 100644 src/third_party/mozjs-45/platform/x86_64/osx/include/js-config.h (limited to 'src/third_party') diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/dpml_exception.c b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/dpml_exception.c index 30ff38b21e5..1b045566e4b 100755 --- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/dpml_exception.c +++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/dpml_exception.c @@ -131,6 +131,7 @@ #if !defined(DPML_SIGNAL) && !defined(MINIMAL_SILENT_MODE_EXCEPTION_HANDLER) && \ !defined(wnt) +# include # include # define DPML_SIGNAL(p) raise(SIGFPE) diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript index ef5ae63e90e..61b3d8f92c6 100644 --- a/src/third_party/IntelRDFPMathLib20U1/SConscript +++ b/src/third_party/IntelRDFPMathLib20U1/SConscript @@ -275,7 +275,7 @@ def float53_object(target, source, extra_defines=None): return obj_env.LibraryObject(target, source) # Set OS Defines -if env.TargetOSIs('osx'): +if env.TargetOSIs('darwin'): cpp_defines['LINUX'] = '1' cpp_defines['mach'] = '1' extra_objects = [ @@ -339,4 +339,3 @@ env.Library( source=source_files, LIBS=libs, ) - diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src0.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src0.cpp new file mode 100644 index 00000000000..4977ac22e2b --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src0.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src1.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src1.cpp new file mode 100644 index 00000000000..357bfee0fe4 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src1.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src10.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src10.cpp new file mode 100644 index 00000000000..dfb25f2f4fc --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src10.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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src11.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src11.cpp new file mode 100644 index 00000000000..4bcd8b7137a --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src11.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/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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src12.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src12.cpp new file mode 100644 index 00000000000..efdac432b22 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src12.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src13.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src13.cpp new file mode 100644 index 00000000000..d056c598a3c --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src13.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src14.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src14.cpp new file mode 100644 index 00000000000..30f023f0799 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src14.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src15.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src15.cpp new file mode 100644 index 00000000000..b45eb4a1828 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src15.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src16.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src16.cpp new file mode 100644 index 00000000000..da4ec4f94ff --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src16.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src17.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src17.cpp new file mode 100644 index 00000000000..5b2fc0ad522 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src17.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src18.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src18.cpp new file mode 100644 index 00000000000..3ec2977897d --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src18.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src19.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src19.cpp new file mode 100644 index 00000000000..d82016152f0 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src19.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src2.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src2.cpp new file mode 100644 index 00000000000..7840a1ef2ac --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src2.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src20.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src20.cpp new file mode 100644 index 00000000000..50193166401 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src20.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src21.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src21.cpp new file mode 100644 index 00000000000..2b5f0d0b7d9 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src21.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src22.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src22.cpp new file mode 100644 index 00000000000..3c46c888e30 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src22.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src23.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src23.cpp new file mode 100644 index 00000000000..d507b4488f0 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src23.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src24.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src24.cpp new file mode 100644 index 00000000000..b823d8f06f7 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src24.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src25.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src25.cpp new file mode 100644 index 00000000000..19499050779 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src25.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src26.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src26.cpp new file mode 100644 index 00000000000..981462b444a --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src26.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/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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src27.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src27.cpp new file mode 100644 index 00000000000..d2f11b90332 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src27.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src28.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src28.cpp new file mode 100644 index 00000000000..6ca82175450 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src28.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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src29.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src29.cpp new file mode 100644 index 00000000000..530bf83df53 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src29.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src3.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src3.cpp new file mode 100644 index 00000000000..7012a578ee9 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src3.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src30.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src30.cpp new file mode 100644 index 00000000000..41685b5b247 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src30.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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 +#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src31.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src31.cpp new file mode 100644 index 00000000000..cac686f6638 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src31.cpp @@ -0,0 +1,55 @@ +#define MOZ_UNIFIED_BUILD +#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/PosixNSPR.cpp" +#ifdef PL_ARENA_CONST_ALIGN_MASK +#error "vm/PosixNSPR.cpp 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/PosixNSPR.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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src32.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src32.cpp new file mode 100644 index 00000000000..54a391f2a55 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src32.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src33.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src33.cpp new file mode 100644 index 00000000000..e17b0aefb86 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src33.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src34.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src34.cpp new file mode 100644 index 00000000000..10e2ce73fa1 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src34.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src35.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src35.cpp new file mode 100644 index 00000000000..a40fa7f1b32 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src35.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src36.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src36.cpp new file mode 100644 index 00000000000..643d64facab --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src36.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src4.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src4.cpp new file mode 100644 index 00000000000..377ed745a83 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src4.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src5.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src5.cpp new file mode 100644 index 00000000000..1b3fd6ebe20 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src5.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src6.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src6.cpp new file mode 100644 index 00000000000..9ecdbf94ad4 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src6.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src7.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src7.cpp new file mode 100644 index 00000000000..24077fbdbfe --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src7.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src8.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src8.cpp new file mode 100644 index 00000000000..bc5c13d1a11 --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src8.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src9.cpp b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src9.cpp new file mode 100644 index 00000000000..a003cf6d56d --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/Unified_cpp_js_src9.cpp @@ -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 diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/build/js-confdefs.h b/src/third_party/mozjs-45/platform/x86_64/macOS/build/js-confdefs.h new file mode 100644 index 00000000000..c4ff9c6d80b --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/build/js-confdefs.h @@ -0,0 +1,86 @@ +/* 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 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_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_EXPM1 1 +#define HAVE_GETC_UNLOCKED 1 +#define HAVE_GETOPT_H 1 +#define HAVE_GMTIME_R 1 +#define HAVE_I18N_LC_MESSAGES 1 +#define HAVE_LANGINFO_CODESET 1 +#define HAVE_LIBM 1 +#define HAVE_LOCALECONV 1 +#define HAVE_LOCALECONV 1 +#define HAVE_LOCALTIME_R 1 +#define HAVE_LOG1P 1 +#define HAVE_LOG2 1 +#define HAVE_MACHINE_ENDIAN_H 1 +#define HAVE_MBRTOWC 1 +#define HAVE_MEMORY_H 1 +#define HAVE_NL_TYPES_H 1 +#define HAVE_POSIX_MEMALIGN 1 +#define HAVE_SETLOCALE 1 +#define HAVE_SSIZE_T 1 +#define HAVE_STRNDUP 1 +#define HAVE_SYS_CDEFS_H 1 +#define HAVE_SYS_MOUNT_H 1 +#define HAVE_SYS_STATVFS_H 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___CXA_DEMANGLE 1 +#define JS_CODEGEN_X64 1 +#define JS_CPU_X64 1 +#define JS_DEFAULT_JITREPORT_GRANULARITY 3 +#define JS_HAVE_MACHINE_ENDIAN_H 1 +#define JS_POSIX_NSPR 1 +#define JS_PUNBOX64 1 +#define JS_STANDALONE 1 +#define MALLOC_H +#define MALLOC_USABLE_SIZE_CONST_PTR const +#define MOZILLA_UAVERSION "45.0" +#define MOZILLA_VERSION "45.5.0" +#define MOZILLA_VERSION_U 45.5.0 +#define MOZJS_MAJOR_VERSION 45 +#define MOZJS_MINOR_VERSION 5 +#define MOZ_DEBUG_SYMBOLS 1 +#define MOZ_DLL_SUFFIX ".dylib" +#define MOZ_MEMORY 1 +#define MOZ_MEMORY_DARWIN 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_DARWIN 1 +#define XP_DARWIN 1 +#define XP_MACOSX 1 +#define XP_UNIX 1 +#define X_DISPLAY_MISSING 1 + +#include "js/RequiredDefines.h" + +#endif /* js_confdefs_h */ diff --git a/src/third_party/mozjs-45/platform/x86_64/macOS/include/js-config.h b/src/third_party/mozjs-45/platform/x86_64/macOS/include/js-config.h new file mode 100644 index 00000000000..e4175f7d74d --- /dev/null +++ b/src/third_party/mozjs-45/platform/x86_64/macOS/include/js-config.h @@ -0,0 +1,59 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * vim: set ts=8 sw=4 et tw=78: + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef js_config_h +#define js_config_h + +/* Definitions set at build time that affect SpiderMonkey's public API. + This header file is generated by the SpiderMonkey configure script, + and installed along with jsapi.h. */ + +/* Define to 1 if SpiderMonkey is in debug mode. */ +/* #undef JS_DEBUG */ + +/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */ +/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */ + +/* Define to 1 if SpiderMonkey should support multi-threaded clients. */ +/* #undef JS_THREADSAFE */ + +/* Define to 1 if SpiderMonkey should include ctypes support. */ +/* #undef JS_HAS_CTYPES */ + +/* Define to 1 if SpiderMonkey should support the ability to perform + entirely too much GC. */ +/* #undef JS_GC_ZEAL */ + +/* Define to 1 if SpiderMonkey should use small chunks. */ +/* #undef JS_GC_SMALL_CHUNK_SIZE */ + +/* Define to 1 to perform extra assertions and heap poisoning. */ +/* #undef JS_CRASH_DIAGNOSTICS */ + +/* Define to 1 if the header is present and + useable. See jscpucfg.h. */ +/* #undef JS_HAVE_ENDIAN_H */ + +/* Define to 1 if the header is present and + useable. See jscpucfg.h. */ +#define JS_HAVE_MACHINE_ENDIAN_H 1 + +/* Define to 1 if the header is present and + useable. See jscpucfg.h. */ +/* #undef JS_HAVE_SYS_ISA_DEFS_H */ + +/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */ +/* #undef JS_NUNBOX32 */ + +/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */ +#define JS_PUNBOX64 1 + +/* MOZILLA JSAPI version number components */ +#define MOZJS_MAJOR_VERSION 45 +#define MOZJS_MINOR_VERSION 5 + +#endif /* js_config_h */ diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src0.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src0.cpp deleted file mode 100644 index 4977ac22e2b..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src0.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src1.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src1.cpp deleted file mode 100644 index 357bfee0fe4..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src1.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src10.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src10.cpp deleted file mode 100644 index dfb25f2f4fc..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src10.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src11.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src11.cpp deleted file mode 100644 index 4bcd8b7137a..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src11.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src12.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src12.cpp deleted file mode 100644 index efdac432b22..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src12.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src13.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src13.cpp deleted file mode 100644 index d056c598a3c..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src13.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src14.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src14.cpp deleted file mode 100644 index 30f023f0799..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src14.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src15.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src15.cpp deleted file mode 100644 index b45eb4a1828..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src15.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src16.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src16.cpp deleted file mode 100644 index da4ec4f94ff..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src16.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src17.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src17.cpp deleted file mode 100644 index 5b2fc0ad522..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src17.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src18.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src18.cpp deleted file mode 100644 index 3ec2977897d..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src18.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src19.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src19.cpp deleted file mode 100644 index d82016152f0..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src19.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src2.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src2.cpp deleted file mode 100644 index 7840a1ef2ac..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src2.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src20.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src20.cpp deleted file mode 100644 index 50193166401..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src20.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src21.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src21.cpp deleted file mode 100644 index 2b5f0d0b7d9..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src21.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src22.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src22.cpp deleted file mode 100644 index 3c46c888e30..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src22.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src23.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src23.cpp deleted file mode 100644 index d507b4488f0..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src23.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src24.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src24.cpp deleted file mode 100644 index b823d8f06f7..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src24.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src25.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src25.cpp deleted file mode 100644 index 19499050779..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src25.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src26.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src26.cpp deleted file mode 100644 index 981462b444a..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src26.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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/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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src27.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src27.cpp deleted file mode 100644 index d2f11b90332..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src27.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src28.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src28.cpp deleted file mode 100644 index 6ca82175450..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src28.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src29.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src29.cpp deleted file mode 100644 index 530bf83df53..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src29.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src3.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src3.cpp deleted file mode 100644 index 7012a578ee9..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src3.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src30.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src30.cpp deleted file mode 100644 index 41685b5b247..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src30.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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 -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src31.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src31.cpp deleted file mode 100644 index cac686f6638..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src31.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#define MOZ_UNIFIED_BUILD -#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/PosixNSPR.cpp" -#ifdef PL_ARENA_CONST_ALIGN_MASK -#error "vm/PosixNSPR.cpp 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/PosixNSPR.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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src32.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src32.cpp deleted file mode 100644 index 54a391f2a55..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src32.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src33.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src33.cpp deleted file mode 100644 index e17b0aefb86..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src33.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src34.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src34.cpp deleted file mode 100644 index 10e2ce73fa1..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src34.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src35.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src35.cpp deleted file mode 100644 index a40fa7f1b32..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src35.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src36.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src36.cpp deleted file mode 100644 index 643d64facab..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src36.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src4.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src4.cpp deleted file mode 100644 index 377ed745a83..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src4.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src5.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src5.cpp deleted file mode 100644 index 1b3fd6ebe20..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src5.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src6.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src6.cpp deleted file mode 100644 index 9ecdbf94ad4..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src6.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src7.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src7.cpp deleted file mode 100644 index 24077fbdbfe..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src7.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src8.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src8.cpp deleted file mode 100644 index bc5c13d1a11..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src8.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src9.cpp b/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src9.cpp deleted file mode 100644 index a003cf6d56d..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/Unified_cpp_js_src9.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#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 diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/build/js-confdefs.h b/src/third_party/mozjs-45/platform/x86_64/osx/build/js-confdefs.h deleted file mode 100644 index c4ff9c6d80b..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/build/js-confdefs.h +++ /dev/null @@ -1,86 +0,0 @@ -/* 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 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_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_EXPM1 1 -#define HAVE_GETC_UNLOCKED 1 -#define HAVE_GETOPT_H 1 -#define HAVE_GMTIME_R 1 -#define HAVE_I18N_LC_MESSAGES 1 -#define HAVE_LANGINFO_CODESET 1 -#define HAVE_LIBM 1 -#define HAVE_LOCALECONV 1 -#define HAVE_LOCALECONV 1 -#define HAVE_LOCALTIME_R 1 -#define HAVE_LOG1P 1 -#define HAVE_LOG2 1 -#define HAVE_MACHINE_ENDIAN_H 1 -#define HAVE_MBRTOWC 1 -#define HAVE_MEMORY_H 1 -#define HAVE_NL_TYPES_H 1 -#define HAVE_POSIX_MEMALIGN 1 -#define HAVE_SETLOCALE 1 -#define HAVE_SSIZE_T 1 -#define HAVE_STRNDUP 1 -#define HAVE_SYS_CDEFS_H 1 -#define HAVE_SYS_MOUNT_H 1 -#define HAVE_SYS_STATVFS_H 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___CXA_DEMANGLE 1 -#define JS_CODEGEN_X64 1 -#define JS_CPU_X64 1 -#define JS_DEFAULT_JITREPORT_GRANULARITY 3 -#define JS_HAVE_MACHINE_ENDIAN_H 1 -#define JS_POSIX_NSPR 1 -#define JS_PUNBOX64 1 -#define JS_STANDALONE 1 -#define MALLOC_H -#define MALLOC_USABLE_SIZE_CONST_PTR const -#define MOZILLA_UAVERSION "45.0" -#define MOZILLA_VERSION "45.5.0" -#define MOZILLA_VERSION_U 45.5.0 -#define MOZJS_MAJOR_VERSION 45 -#define MOZJS_MINOR_VERSION 5 -#define MOZ_DEBUG_SYMBOLS 1 -#define MOZ_DLL_SUFFIX ".dylib" -#define MOZ_MEMORY 1 -#define MOZ_MEMORY_DARWIN 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_DARWIN 1 -#define XP_DARWIN 1 -#define XP_MACOSX 1 -#define XP_UNIX 1 -#define X_DISPLAY_MISSING 1 - -#include "js/RequiredDefines.h" - -#endif /* js_confdefs_h */ diff --git a/src/third_party/mozjs-45/platform/x86_64/osx/include/js-config.h b/src/third_party/mozjs-45/platform/x86_64/osx/include/js-config.h deleted file mode 100644 index e4175f7d74d..00000000000 --- a/src/third_party/mozjs-45/platform/x86_64/osx/include/js-config.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set ts=8 sw=4 et tw=78: - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef js_config_h -#define js_config_h - -/* Definitions set at build time that affect SpiderMonkey's public API. - This header file is generated by the SpiderMonkey configure script, - and installed along with jsapi.h. */ - -/* Define to 1 if SpiderMonkey is in debug mode. */ -/* #undef JS_DEBUG */ - -/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */ -/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */ - -/* Define to 1 if SpiderMonkey should support multi-threaded clients. */ -/* #undef JS_THREADSAFE */ - -/* Define to 1 if SpiderMonkey should include ctypes support. */ -/* #undef JS_HAS_CTYPES */ - -/* Define to 1 if SpiderMonkey should support the ability to perform - entirely too much GC. */ -/* #undef JS_GC_ZEAL */ - -/* Define to 1 if SpiderMonkey should use small chunks. */ -/* #undef JS_GC_SMALL_CHUNK_SIZE */ - -/* Define to 1 to perform extra assertions and heap poisoning. */ -/* #undef JS_CRASH_DIAGNOSTICS */ - -/* Define to 1 if the header is present and - useable. See jscpucfg.h. */ -/* #undef JS_HAVE_ENDIAN_H */ - -/* Define to 1 if the header is present and - useable. See jscpucfg.h. */ -#define JS_HAVE_MACHINE_ENDIAN_H 1 - -/* Define to 1 if the header is present and - useable. See jscpucfg.h. */ -/* #undef JS_HAVE_SYS_ISA_DEFS_H */ - -/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */ -/* #undef JS_NUNBOX32 */ - -/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */ -#define JS_PUNBOX64 1 - -/* MOZILLA JSAPI version number components */ -#define MOZJS_MAJOR_VERSION 45 -#define MOZJS_MINOR_VERSION 5 - -#endif /* js_config_h */ diff --git a/src/third_party/s2/base/port.h b/src/third_party/s2/base/port.h index 25d3d2fcf3c..82e8a7dee56 100644 --- a/src/third_party/s2/base/port.h +++ b/src/third_party/s2/base/port.h @@ -685,8 +685,9 @@ extern inline void prefetch(const char *x) {} #endif // !HAVE_ATTRIBUTE_SECTION -#if defined __sun || defined _WIN32 -inline double drem(double x, double y) { +// MongoDB modification: All of our target platforms define the C99 remainder function. +#if 0 +inline double remainder(double x, double y) { double quot = x/y; int iquot; // If quot is slightly less than 0.5, we round down explicitly. We have to diff --git a/src/third_party/s2/s1angle.cc b/src/third_party/s2/s1angle.cc index e299344fb59..650ce1f709c 100644 --- a/src/third_party/s2/s1angle.cc +++ b/src/third_party/s2/s1angle.cc @@ -25,7 +25,7 @@ S1Angle S1Angle::Normalized() const { } void S1Angle::Normalize() { - radians_ = drem(radians_, 2.0 * M_PI); + radians_ = remainder(radians_, 2.0 * M_PI); if (radians_ <= -M_PI) radians_ = M_PI; } diff --git a/src/third_party/s2/s1interval.cc b/src/third_party/s2/s1interval.cc index bf676e96482..33af6a00f5b 100644 --- a/src/third_party/s2/s1interval.cc +++ b/src/third_party/s2/s1interval.cc @@ -110,7 +110,7 @@ bool S1Interval::InteriorIntersects(S1Interval const& y) const { inline static double PositiveDistance(double a, double b) { // Compute the distance from "a" to "b" in the range [0, 2*Pi). - // This is equivalent to (drem(b - a - M_PI, 2 * M_PI) + M_PI), + // This is equivalent to (remainder(b - a - M_PI, 2 * M_PI) + M_PI), // except that it is more numerically stable (it does not lose // precision for very small positive distances). double d = b - a; @@ -180,7 +180,7 @@ S1Interval S1Interval::Expanded(double radius) const { // for a 1-bit rounding error when computing each endpoint. if (GetLength() + 2 * radius >= 2 * M_PI - 1e-15) return Full(); - S1Interval result(drem(lo() - radius, 2*M_PI), drem(hi() + radius, 2*M_PI)); + S1Interval result(remainder(lo() - radius, 2*M_PI), remainder(hi() + radius, 2*M_PI)); if (result.lo() <= -M_PI) result.set_lo(M_PI); return result; } @@ -245,6 +245,6 @@ S1Interval S1Interval::Intersection(S1Interval const& y) const { bool S1Interval::ApproxEquals(S1Interval const& y, double max_error) const { if (is_empty()) return y.GetLength() <= max_error; if (y.is_empty()) return GetLength() <= max_error; - return (fabs(drem(y.lo() - lo(), 2 * M_PI)) + - fabs(drem(y.hi() - hi(), 2 * M_PI))) <= max_error; + return (fabs(remainder(y.lo() - lo(), 2 * M_PI)) + + fabs(remainder(y.hi() - hi(), 2 * M_PI))) <= max_error; } diff --git a/src/third_party/s2/s2cap.cc b/src/third_party/s2/s2cap.cc index edfde6e20de..0b44cdb8d5a 100644 --- a/src/third_party/s2/s2cap.cc +++ b/src/third_party/s2/s2cap.cc @@ -153,8 +153,8 @@ S2LatLngRect S2Cap::GetRectBound() const { double sin_c = cos(axis_ll.lat().radians()); if (sin_a <= sin_c) { double angle_A = asin(sin_a / sin_c); - lng[0] = drem(axis_ll.lng().radians() - angle_A, 2 * M_PI); - lng[1] = drem(axis_ll.lng().radians() + angle_A, 2 * M_PI); + lng[0] = remainder(axis_ll.lng().radians() - angle_A, 2 * M_PI); + lng[1] = remainder(axis_ll.lng().radians() + angle_A, 2 * M_PI); } } return S2LatLngRect(R1Interval(lat[0], lat[1]), diff --git a/src/third_party/s2/s2cellid_test.cc b/src/third_party/s2/s2cellid_test.cc index cd0695f904d..9f82e84035c 100644 --- a/src/third_party/s2/s2cellid_test.cc +++ b/src/third_party/s2/s2cellid_test.cc @@ -237,8 +237,8 @@ TEST(S2CellId, Continuity) { double u, v; S2::XYZtoFaceUV(id.ToPointRaw(), &u, &v); static double const kCellSize = 1.0 / (1 << kMaxWalkLevel); - EXPECT_NEAR(drem(S2::UVtoST(u), 0.5 * kCellSize), 0.0, 1e-15); - EXPECT_NEAR(drem(S2::UVtoST(v), 0.5 * kCellSize), 0.0, 1e-15); + EXPECT_NEAR(remainder(S2::UVtoST(u), 0.5 * kCellSize), 0.0, 1e-15); + EXPECT_NEAR(remainder(S2::UVtoST(v), 0.5 * kCellSize), 0.0, 1e-15); } } diff --git a/src/third_party/s2/s2latlng.cc b/src/third_party/s2/s2latlng.cc index d0fab58668e..dbe3748a33b 100644 --- a/src/third_party/s2/s2latlng.cc +++ b/src/third_party/s2/s2latlng.cc @@ -5,10 +5,10 @@ #include "s2latlng.h" S2LatLng S2LatLng::Normalized() const { - // drem(x, 2 * M_PI) reduces its argument to the range [-M_PI, M_PI] + // remainder(x, 2 * M_PI) reduces its argument to the range [-M_PI, M_PI] // inclusive, which is what we want here. return S2LatLng(max(-M_PI_2, min(M_PI_2, lat().radians())), - drem(lng().radians(), 2 * M_PI)); + remainder(lng().radians(), 2 * M_PI)); } S2Point S2LatLng::ToPoint() const { diff --git a/src/third_party/s2/s2latlngrect.cc b/src/third_party/s2/s2latlngrect.cc index 26e34bb14a8..b0c87080eab 100644 --- a/src/third_party/s2/s2latlngrect.cc +++ b/src/third_party/s2/s2latlngrect.cc @@ -171,7 +171,7 @@ S2Cap S2LatLngRect::GetCapBound() const { // rectangles that are larger than 180 degrees, we punt and always return a // bounding cap centered at one of the two poles. double lng_span = lng_.hi() - lng_.lo(); - if (drem(lng_span, 2 * M_PI) >= 0) { + if (remainder(lng_span, 2 * M_PI) >= 0) { if (lng_span < 2 * M_PI) { S2Cap mid_cap = S2Cap::FromAxisAngle(GetCenter().ToPoint(), S1Angle::Radians(0)); diff --git a/src/third_party/s2/s2latlngrect_test.cc b/src/third_party/s2/s2latlngrect_test.cc index 33408944a00..f64981cf694 100644 --- a/src/third_party/s2/s2latlngrect_test.cc +++ b/src/third_party/s2/s2latlngrect_test.cc @@ -99,7 +99,7 @@ TEST(S2LatLngRect, GetVertex) { double lat = M_PI_4 * (i - 2); double lng = M_PI_2 * (i - 2) + 0.2; S2LatLngRect r(R1Interval(lat, lat + M_PI_4), - S1Interval(drem(lng, 2*M_PI), drem(lng + M_PI_2, 2*M_PI))); + S1Interval(remainder(lng, 2*M_PI), remainder(lng + M_PI_2, 2*M_PI))); for (int k = 0; k < 4; ++k) { EXPECT_TRUE(S2::SimpleCCW(r.GetVertex((k - 1) & 3).ToPoint(), r.GetVertex(k).ToPoint(), diff --git a/src/third_party/s2/util/math/exactfloat/exactfloat.h b/src/third_party/s2/util/math/exactfloat/exactfloat.h index b6af9a89489..5e9044bcc72 100755 --- a/src/third_party/s2/util/math/exactfloat/exactfloat.h +++ b/src/third_party/s2/util/math/exactfloat/exactfloat.h @@ -436,7 +436,7 @@ class ExactFloat { } // A synonym for remainder(). - friend ExactFloat drem(const ExactFloat& a, const ExactFloat& b) { + friend ExactFloat remainder(const ExactFloat& a, const ExactFloat& b) { return remainder(a, b); } diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index 2d371526c55..be506d1eb38 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -50,7 +50,7 @@ if env.TargetOSIs('windows'): if env['MONGO_ALLOCATOR'] == 'tcmalloc': env.InjectThirdPartyIncludePaths(libraries=['gperftools']) env.Append(CPPDEFINES=['HAVE_LIBTCMALLOC']) -elif env.TargetOSIs('osx'): +elif env.TargetOSIs('darwin'): env.Append(CPPPATH=["build_darwin"]) elif env.TargetOSIs('solaris'): env.Append(CPPPATH=["build_solaris"]) @@ -177,4 +177,3 @@ wtlib = env.Library( ) env.Depends(wtlib, [filelistfile, version_file]) - -- cgit v1.2.1