From ec13658ab9384260fe4e05ab14c4a73ef9a2f5a5 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 3 Nov 2020 16:11:37 -0500
Subject: Issue #80 - De-unify js/src

Three debug sources are producing link warnings and will be solved as Issue #1676 progresses.

This does not include JS Testing sources.
Specifically: js/src/gdb or js/src/jsapi-tests
---
 js/src/editline/moz.build |  2 +-
 js/src/moz.build          | 30 +++++++++++++++---------------
 js/src/shell/moz.build    |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/js/src/editline/moz.build b/js/src/editline/moz.build
index 420c98df2e..1213854c1a 100644
--- a/js/src/editline/moz.build
+++ b/js/src/editline/moz.build
@@ -5,7 +5,7 @@
 
 Library('editline')
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'editline.c',
     'sysunix.c',
 ]
diff --git a/js/src/moz.build b/js/src/moz.build
index 144f21aebf..25773b3b2e 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -111,7 +111,7 @@ EXPORTS.js += [
     '../public/WeakMapPtr.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'builtin/AtomicsObject.cpp',
     'builtin/Eval.cpp',
     'builtin/Intl.cpp',
@@ -368,7 +368,7 @@ SOURCES += [
 ]
 
 if CONFIG['JS_POSIX_NSPR']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'vm/PosixNSPR.cpp',
     ]
 
@@ -385,11 +385,11 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
     ]
 
 if not CONFIG['ENABLE_ION']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'jit/none/Trampoline-none.cpp'
     ]
 elif CONFIG['JS_CODEGEN_X86'] or CONFIG['JS_CODEGEN_X64']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'jit/x86-shared/Architecture-x86-shared.cpp',
         'jit/x86-shared/Assembler-x86-shared.cpp',
         'jit/x86-shared/AssemblerBuffer-x86-shared.cpp',
@@ -404,7 +404,7 @@ elif CONFIG['JS_CODEGEN_X86'] or CONFIG['JS_CODEGEN_X64']:
         'jit/x86-shared/Disassembler-x86-shared.cpp',  # using namespace js::jit::X86Encoding;
     ]
     if CONFIG['JS_CODEGEN_X64']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/x64/Assembler-x64.cpp',
             'jit/x64/Bailouts-x64.cpp',
             'jit/x64/BaselineCompiler-x64.cpp',
@@ -416,7 +416,7 @@ elif CONFIG['JS_CODEGEN_X86'] or CONFIG['JS_CODEGEN_X64']:
             'jit/x64/Trampoline-x64.cpp',
         ]
     else:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/x86/Assembler-x86.cpp',
             'jit/x86/Bailouts-x86.cpp',
             'jit/x86/BaselineCompiler-x86.cpp',
@@ -428,7 +428,7 @@ elif CONFIG['JS_CODEGEN_X86'] or CONFIG['JS_CODEGEN_X64']:
             'jit/x86/Trampoline-x86.cpp',
         ]
 elif CONFIG['JS_CODEGEN_ARM']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'jit/arm/Architecture-arm.cpp',
         'jit/arm/Assembler-arm.cpp',
         'jit/arm/Bailouts-arm.cpp',
@@ -444,7 +444,7 @@ elif CONFIG['JS_CODEGEN_ARM']:
         'jit/arm/Trampoline-arm.cpp',
     ]
     if CONFIG['JS_SIMULATOR_ARM']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/arm/Simulator-arm.cpp'
         ]
     elif CONFIG['OS_ARCH'] == 'Darwin':
@@ -453,7 +453,7 @@ elif CONFIG['JS_CODEGEN_ARM']:
             'jit/arm/llvm-compiler-rt/arm/aeabi_uidivmod.S',
         ]
 elif CONFIG['JS_CODEGEN_ARM64']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'jit/arm64/Architecture-arm64.cpp',
         'jit/arm64/Assembler-arm64.cpp',
         'jit/arm64/Bailouts-arm64.cpp',
@@ -476,14 +476,14 @@ elif CONFIG['JS_CODEGEN_ARM64']:
         'jit/arm64/vixl/Utils-vixl.cpp'
     ]
     if CONFIG['JS_SIMULATOR_ARM64']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/arm64/vixl/Debugger-vixl.cpp',
             'jit/arm64/vixl/Logic-vixl.cpp',
             'jit/arm64/vixl/MozSimulator-vixl.cpp',
             'jit/arm64/vixl/Simulator-vixl.cpp'
         ]
 elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'jit/mips-shared/Architecture-mips-shared.cpp',
         'jit/mips-shared/Assembler-mips-shared.cpp',
         'jit/mips-shared/Bailouts-mips-shared.cpp',
@@ -495,7 +495,7 @@ elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
         'jit/mips-shared/MoveEmitter-mips-shared.cpp',
     ]
     if CONFIG['JS_CODEGEN_MIPS32']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/mips32/Architecture-mips32.cpp',
             'jit/mips32/Assembler-mips32.cpp',
             'jit/mips32/Bailouts-mips32.cpp',
@@ -509,11 +509,11 @@ elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
             'jit/mips32/Trampoline-mips32.cpp',
         ]
         if CONFIG['JS_SIMULATOR_MIPS32']:
-            UNIFIED_SOURCES += [
+            SOURCES += [
                 'jit/mips32/Simulator-mips32.cpp'
             ]
     elif CONFIG['JS_CODEGEN_MIPS64']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'jit/mips64/Architecture-mips64.cpp',
             'jit/mips64/Assembler-mips64.cpp',
             'jit/mips64/Bailouts-mips64.cpp',
@@ -527,7 +527,7 @@ elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
             'jit/mips64/Trampoline-mips64.cpp',
         ]
         if CONFIG['JS_SIMULATOR_MIPS64']:
-            UNIFIED_SOURCES += [
+            SOURCES += [
                 'jit/mips64/Simulator-mips64.cpp'
             ]
 
diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
index 4f04be73c0..7c861fb0d6 100644
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@@ -9,7 +9,7 @@ if CONFIG['JS_SHELL_NAME']:
         USE_LIBS += ['editline']
     USE_LIBS += ['static:js']
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'js.cpp',
     'jsoptparse.cpp',
     'jsshell.cpp',
-- 
cgit v1.2.3