diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-11-20 12:37:11 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-11-20 12:37:11 -0500 |
| commit | a8a397fbceb78d2338e214e583be4f02797637d1 (patch) | |
| tree | d5022470e07e20160618ffaf12320c8bdab772e5 /js/src/moz.build | |
| parent | a89597b5db753b369347a3ad4e3e8f6216b1c3ac (diff) | |
| download | uxp-a8a397fbceb78d2338e214e583be4f02797637d1.tar.gz | |
Issue #1676 - Follow-up: Put js/src (including vm), jit, and wasm back into unified sources.
Function template inflation in intermediate code. The linker problem we hit with the corrupt file was because there were too many function descriptors and relation in the .lib
Diffstat (limited to 'js/src/moz.build')
| -rw-r--r-- | js/src/moz.build | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index a6ee7b7375..9cad8e52e1 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -131,22 +131,18 @@ if not CONFIG['JS_DISABLE_SHELL']: if CONFIG['MOZ_VTUNE']: DIRS += ['vtune'] -SOURCES += [ +UNIFIED_SOURCES += [ 'jsalloc.cpp', 'jsapi.cpp', - 'jsarray.cpp', - 'jsatom.cpp', 'jsbool.cpp', 'jscntxt.cpp', 'jscompartment.cpp', 'jsdate.cpp', - 'jsdtoa.cpp', 'jsexn.cpp', 'jsfriendapi.cpp', 'jsfun.cpp', 'jsgc.cpp', 'jsiter.cpp', - 'jsmath.cpp', 'jsnativestack.cpp', 'jsnum.cpp', 'jsobj.cpp', @@ -156,16 +152,24 @@ SOURCES += [ 'jspropertytree.cpp', 'jsscript.cpp', 'jsstr.cpp', - 'jsutil.cpp', 'jsweakmap.cpp', ] +# Can't be built unified +SOURCES += [ + 'jsarray.cpp', + 'jsatom.cpp', + 'jsdtoa.cpp', + 'jsmath.cpp', + 'jsutil.cpp', +] + # Suppress warnings in third-party code. # We are keeping this in the main moz.build because it is file specific if CONFIG['CLANG_CXX'] or CONFIG['GNU_CXX']: SOURCES['jsdtoa.cpp'].flags += ['-Wno-implicit-fallthrough'] -SOURCES += [ +UNIFIED_SOURCES += [ 'vm/ArgumentsObject.cpp', 'vm/ArrayBufferObject.cpp', 'vm/AsyncFunction.cpp', @@ -185,7 +189,6 @@ SOURCES += [ 'vm/GlobalObject.cpp', 'vm/HelperThreads.cpp', 'vm/Id.cpp', - 'vm/Initialization.cpp', 'vm/Interpreter.cpp', 'vm/JSONParser.cpp', 'vm/MemoryMetrics.cpp', @@ -227,12 +230,18 @@ SOURCES += [ 'vm/Xdr.cpp', ] +# Can't be built unified +SOURCES += [ + 'vm/Initialization.cpp', +] + if CONFIG['JS_POSIX_NSPR']: - SOURCES += [ + UNIFIED_SOURCES += [ 'vm/PosixNSPR.cpp', ] if CONFIG['ENABLE_TRACE_LOGGING']: + # Can't be built unified SOURCES += [ 'vm/TraceLogging.cpp', 'vm/TraceLoggingGraph.cpp', |