From e17072f3ef49089bad2aed71daa04ab6adca787d Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Mon, 5 Sep 2022 13:13:49 +0000
Subject: Revert "Issue #1676 - Part 15: Split threading sources out of
 js/src/moz.build"

This reverts commit 2f50f543a245a559a277505dfa6906f1888ef0d9.
---
 js/src/moz.build           | 17 +++++++++++++++--
 js/src/threading/moz.build | 30 ------------------------------
 2 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 js/src/threading/moz.build

diff --git a/js/src/moz.build b/js/src/moz.build
index db1b9ba2c9..a46f9a0086 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -11,7 +11,6 @@ CONFIGURE_SUBST_FILES += [
     'js-config',
     'js.pc',
 ]
-
 CONFIGURE_DEFINE_FILES += [
     'js-confdefs.h',
 ]
@@ -112,7 +111,6 @@ DIRS += [
     'jit',
     'perf',
     'proxy',
-    'threading',
 ]
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -146,6 +144,7 @@ SOURCES += [
     'jsscript.cpp',
     'jsstr.cpp',
     'jsweakmap.cpp',
+    'threading/Mutex.cpp',
     'vm/ArgumentsObject.cpp',
     'vm/ArrayBufferObject.cpp',
     'vm/AsyncFunction.cpp',
@@ -260,6 +259,20 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
         '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']:
     SOURCES += [
         'ctypes/CTypes.cpp',
diff --git a/js/src/threading/moz.build b/js/src/threading/moz.build
deleted file mode 100644
index 97673d0c62..0000000000
--- a/js/src/threading/moz.build
+++ /dev/null
@@ -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',
-    ]
\ No newline at end of file
-- 
cgit v1.2.3