wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-30 02:57:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Issue #1676 - Part 15: Split threading sources out of js/src/moz.build"

Browse source 
This reverts commit 2f50f543a245a559a277505dfa6906f1888ef0d9.
This commit is contained in:
Moonchild 2022-09-05 13:13:49 +00:00 • committed by roytam1
commit 14da6dc66d
2 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/src/moz.build
View file

@ -11,7 +11,6 @@ CONFIGURE_SUBST_FILES += [
'js-config', 'js-config',
'js.pc', 'js.pc',
] ]
CONFIGURE_DEFINE_FILES += [ CONFIGURE_DEFINE_FILES += [
'js-confdefs.h', 'js-confdefs.h',
] ]
@ -112,7 +111,6 @@ DIRS += [
'jit', 'jit',
'perf', 'perf',
'proxy', 'proxy',
'threading',
] ]
if CONFIG['JS_BUNDLED_EDITLINE']: if CONFIG['JS_BUNDLED_EDITLINE']:
@ -146,6 +144,7 @@ SOURCES += [
'jsscript.cpp', 'jsscript.cpp',
'jsstr.cpp', 'jsstr.cpp',
'jsweakmap.cpp', 'jsweakmap.cpp',
'threading/Mutex.cpp',
'vm/ArgumentsObject.cpp', 'vm/ArgumentsObject.cpp',
'vm/ArrayBufferObject.cpp', 'vm/ArrayBufferObject.cpp',
'vm/AsyncFunction.cpp', 'vm/AsyncFunction.cpp',
@ -260,6 +259,20 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
'vm/TraceLoggingTypes.cpp', 'vm/TraceLoggingTypes.cpp',
] ]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'threading/windows/ConditionVariable.cpp',
'threading/windows/MutexImpl.cpp',
'threading/windows/Thread.cpp',
]
# _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
else:
SOURCES += [
'threading/posix/ConditionVariable.cpp',
'threading/posix/MutexImpl.cpp',
'threading/posix/Thread.cpp',
]
if CONFIG['JS_HAS_CTYPES']: if CONFIG['JS_HAS_CTYPES']:
SOURCES += [ SOURCES += [
'ctypes/CTypes.cpp', 'ctypes/CTypes.cpp',

30
js/src/threading/moz.build
View file

@ -1,30 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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/.
include('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'Mutex.cpp',
]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'windows/ConditionVariable.cpp',
'windows/MutexImpl.cpp',
'windows/Thread.cpp',
]
# _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
else:
SOURCES += [
'posix/ConditionVariable.cpp',
'posix/MutexImpl.cpp',
'posix/Thread.cpp',
]