fixup node-12 riscv64 support

Change-Id: I059bd5af5a2279f8c0040055a290fc02e0861fe7

2 files changed, 118 insertions, 57 deletions

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index edaaa74993b..e672c5b01c3 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -398,6 +398,7 @@ devices.")
              "--shared-openssl"
              "--shared-zlib"
              "--verbose"
+             "--ninja"
              "--without-snapshot"
              "--without-inspector"      ; build without llhttp
              "--with-intl=system-icu")
@@ -534,59 +535,39 @@ devices.")
                 (delete-file "test/parallel/test-worker-nearheaplimit-deadlock.js"))
                (,(target-aarch64?)
                 ;; These tests timeout even with an extended timeout.
-                (with-directory-excursion "test/parallel"
+                (with-directory-excursion "test"
                   (for-each
                     delete-file
-                    '(
-                      "test-async-hooks-worker-asyncfn-terminate-1.js"
-                      "test-async-hooks-worker-asyncfn-terminate-2.js"
-                      "test-async-hooks-worker-asyncfn-terminate-3.js"
-                      "test-async-hooks-worker-asyncfn-terminate-4.js"
-                      "test-cli-node-options.js"
-                      "test-crypto-key-objects-messageport.js"
-                      "test-crypto-worker-thread.js"
-                      "test-disable-proto-delete.js"
-                      "test-disable-proto-throw.js"
-                      "test-performance-eventlooputil.js"
-                      "test-preload.js"
-                      "test-process-exec-argv.js"
-                      "test-require-symlink.js"
-                      "test-trace-events-api-worker-disabled.js"
-                      "test-trace-events-async-hooks-worker.js"
-                      "test-trace-events-worker-metadata.js"
-                      "test-trace-exit.js"
-                      "test-worker.js"
-                      "test-worker-abort-on-uncaught-exception.js"
-                      "test-worker-abort-on-uncaught-exception-terminate.js"
-                      "test-worker-arraybuffer-zerofill.js"
-                      "test-worker-cjs-workerdata.js"
-                      "test-worker-cleanexit-with-js.js"
-                      "test-worker-cleanexit-with-moduleload.js"
-                      "test-worker-cleanup-handles.js"
-                      "test-worker-console-listeners.js"
-                      "test-worker-crypto-sign-transfer-result.js"
-                      "test-worker-dns-terminate.js"
-                      "test-worker-dns-terminate-during-query.js"
-                      "test-worker-error-stack-getter-throws.js"
-                      "test-worker-esm-exit.js"
-                      "test-worker-esm-missing-main.js"
-                      "test-worker-esmodule.js"
-                      "test-worker-eventlooputil.js"
-                      "test-worker-execargv.js"
-                      "test-worker-exit-code.js"
-                      "test-worker-exit-event-error.js"
-                      "test-worker-exit-from-uncaught-exception.js"
-                      "test-worker-fs-stat-watcher.js"
-                      "test-worker-heapdump-failure.js"
-                      "test-worker-http2-generic-streams-terminate.js"
-                      "test-worker-init-failure.js"
-                      "test-worker-memory.js"
-                      "test-worker-message-channel.js"
-                      "test-worker-message-channel-sharedarraybuffer.js"
-                      "test-worker-message-not-serializable.js"
-                      "test-worker-message-port-drain.js"
-                      "test-worker-message-port-message-before-close.js"
-                      ))))
+                    (cons*
+                      "parellel/test-async-hooks-worker-asyncfn-terminate-1.js"
+                      "parellel/test-async-hooks-worker-asyncfn-terminate-2.js"
+                      "parellel/test-async-hooks-worker-asyncfn-terminate-3.js"
+                      "parellel/test-async-hooks-worker-asyncfn-terminate-4.js"
+                      "parellel/test-cli-node-options.js"
+                      "parellel/test-crypto-key-objects-messageport.js"
+                      "parellel/test-crypto-worker-thread.js"
+                      "parellel/test-disable-proto-delete.js"
+                      "parellel/test-disable-proto-throw.js"
+                      "parellel/test-performance-eventlooputil.js"
+                      "parellel/test-preload.js"
+                      "parellel/test-process-exec-argv.js"
+                      "parellel/test-require-symlink.js"
+                      "parellel/test-trace-events-api-worker-disabled.js"
+                      "parellel/test-trace-events-async-hooks-worker.js"
+                      "parellel/test-trace-events-worker-metadata.js"
+                      "parellel/test-trace-exit.js"
+                      "wasi/test-wasi-worker-terminate.js"
+                      "wpt/test-console.js"
+                      "wpt/test-encoding.js"
+                      "wpt/test-hr-time.js"
+                      "wpt/test-microtask-queuing.js"
+                      "wpt/test-timers.js"
+                      "wpt/test-url.js"
+                      "report/test-report-worker.js"
+                      "es-module/test-esm-loader-side-effect.js"
+                      "sequential/test-worker-prof.js"
+                      "abort/test-worker-abort-uncaught-exception.js"
+                      (find-files "parallel" "^test-worker")))))
                (else #t))
 
              ;; These tests have an expiry date: they depend on the validity of
@@ -716,6 +697,7 @@ devices.")
            http-parser
            icu4c
            libuv
+           (@ (gnu packages ninja) ninja)
            `(,nghttp2 "lib")
            openssl-1.1
            zlib
diff --git a/gnu/packages/patches/node-12-riscv64-support.patch b/gnu/packages/patches/node-12-riscv64-support.patch
index d977fb6a14c..493ce45f8ca 100644
--- a/gnu/packages/patches/node-12-riscv64-support.patch
+++ b/gnu/packages/patches/node-12-riscv64-support.patch
@@ -483,10 +483,10 @@ index 8ae89187ecb..aa74f6d4aac 100644
  }  // namespace internal
 diff --git a/deps/v8/src/builtins/riscv64/builtins-riscv64.cc b/deps/v8/src/builtins/riscv64/builtins-riscv64.cc
 new file mode 100644
-index 00000000000..685f575598f
+index 00000000000..ebdf1d46ba1
 --- /dev/null
 +++ b/deps/v8/src/builtins/riscv64/builtins-riscv64.cc
-@@ -0,0 +1,3316 @@
+@@ -0,0 +1,3320 @@
 +// Copyright 2021 the V8 project authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -1266,6 +1266,7 @@ index 00000000000..685f575598f
 +  __ Lw(params_size,
 +        FieldMemOperand(params_size, BytecodeArray::kParameterSizeOffset));
 +
++  /*
 +  Register actual_params_size = scratch2;
 +  Label L1;
 +  // Compute the size of the actual parameters + receiver (in bytes).
@@ -1279,6 +1280,7 @@ index 00000000000..685f575598f
 +  __ Branch(&L1, le, actual_params_size, Operand(params_size));
 +  __ Move(params_size, actual_params_size);
 +  __ bind(&L1);
++  */
 +
 +  // Leave the frame (also dropping the register file).
 +  __ LeaveFrame(StackFrame::INTERPRETED);
@@ -1293,7 +1295,7 @@ index 00000000000..685f575598f
 +                                          OptimizationMarker expected_marker,
 +                                          Runtime::FunctionId function_id) {
 +  Label no_match;
-+  __ Branch(&no_match, ne, actual_marker, Operand(expected_marker));
++  __ Branch(&no_match, ne, actual_marker, Operand(Smi::FromEnum(expected_marker)));
 +  GenerateTailCallToReturnedCode(masm, function_id);
 +  __ bind(&no_match);
 +}
@@ -1339,7 +1341,7 @@ index 00000000000..685f575598f
 +  // optimized code marker isn't updated. Evict the code, update the marker
 +  // and re-enter the closure's code.
 +  __ bind(&heal_optimized_code_slot);
-+  GenerateTailCallToReturnedCode(masm, Runtime::kHealOptimizedCodeSlot);
++  GenerateTailCallToReturnedCode(masm, Runtime::kEvictOptimizedCodeSlot);
 +}
 +
 +static void MaybeOptimizeCode(MacroAssembler* masm, Register feedback_vector,
@@ -1503,13 +1505,13 @@ index 00000000000..685f575598f
 +  // is optimized code or an optimization marker, call that instead.
 +  Register optimization_state = a4;
 +  __ Lw(optimization_state,
-+        FieldMemOperand(feedback_vector, FeedbackVector::kFlagsOffset));
++        FieldMemOperand(feedback_vector, FeedbackVector::kInvocationCountOffset));
 +
 +  // Check if the optimized code slot is not empty or has a optimization marker.
 +  Label has_optimized_code_or_marker;
 +
 +  __ And(t0, optimization_state,
-+         FeedbackVector::kHasOptimizedCodeOrCompileOptimizedMarkerMask);
++         FeedbackVector::kOptimizedCodeWeakOrSmiOffset);
 +  __ Branch(&has_optimized_code_or_marker, ne, t0, Operand(zero_reg));
 +
 +  Label not_optimized;
@@ -1634,6 +1636,7 @@ index 00000000000..685f575598f
 +  LeaveInterpreterFrame(masm, t0, t1);
 +  __ Jump(ra);
 +
++  /*
 +  __ bind(&stack_check_interrupt);
 +  // Modify the bytecode offset in the stack to be kFunctionEntryBytecodeOffset
 +  // for the call to the StackGuard.
@@ -1677,6 +1680,7 @@ index 00000000000..685f575598f
 +                        FeedbackVector::kMaybeOptimizedCodeOffset));
 +
 +  TailCallOptimizedCodeSlot(masm, optimized_code_entry, t4, a5);
++  */
 +
 +  __ bind(&compile_lazy);
 +  GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
@@ -24789,6 +24793,53 @@ index 00000000000..b2923001509
 +}  // namespace v8
 +
 +#endif  // V8_TARGET_ARCH_RISCV64
+diff --git a/deps/v8/src/deoptimizer/riscv64/deoptimizer-riscv64.cc b/deps/v8/src/deoptimizer/riscv64/deoptimizer-riscv64.cc
+new file mode 100644
+index 00000000000..1cbe85ba5df
+--- /dev/null
++++ b/deps/v8/src/deoptimizer/riscv64/deoptimizer-riscv64.cc
+@@ -0,0 +1,41 @@
++// Copyright 2021 the V8 project authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "src/deoptimizer/deoptimizer.h"
++
++namespace v8 {
++namespace internal {
++
++const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
++const int Deoptimizer::kNonLazyDeoptExitSize = 5 * kInstrSize;
++const int Deoptimizer::kLazyDeoptExitSize = 5 * kInstrSize;
++const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 6 * kInstrSize;
++const int Deoptimizer::kEagerWithResumeDeoptExitSize =
++    kEagerWithResumeBeforeArgsSize + 4 * kInstrSize;
++const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = kInstrSize;
++const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
++    kInstrSize + kSystemPointerSize;
++
++Float32 RegisterValues::GetFloatRegister(unsigned n) const {
++  return Float32::FromBits(
++      static_cast<uint32_t>(double_registers_[n].get_bits()));
++}
++
++void FrameDescription::SetCallerPc(unsigned offset, intptr_t value) {
++  SetFrameSlot(offset, value);
++}
++
++void FrameDescription::SetCallerFp(unsigned offset, intptr_t value) {
++  SetFrameSlot(offset, value);
++}
++
++void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
++  // No embedded constant pool support.
++  UNREACHABLE();
++}
++
++void FrameDescription::SetPc(intptr_t pc) { pc_ = pc; }
++
++}  // namespace internal
++}  // namespace v8
 diff --git a/deps/v8/src/diagnostics/perf-jit.h b/deps/v8/src/diagnostics/perf-jit.h
 index 36ab8441100..e3a28ce65b9 100644
 --- a/deps/v8/src/diagnostics/perf-jit.h
@@ -36074,3 +36125,31 @@ index 0876b16b46a..df96d605d41 100644
        ['v8_target_arch=="s390x"', {
          'defines': [
            'V8_TARGET_ARCH_S390',
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index 26b8e56e834..2e36827d412 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -364,6 +364,11 @@
+             '<(V8_ROOT)/src/builtins/ppc/builtins-ppc.cc',
+           ],
+         }],
++        ['v8_target_arch=="riscv64"', {
++          'sources': [
++            '<(V8_ROOT)/src/builtins/riscv64/builtins-riscv64.cc',
++          ],
++        }],
+         ['v8_target_arch=="s390x"', {
+           'sources': [
+             '<(V8_ROOT)/src/builtins/s390/builtins-s390.cc',
+@@ -749,6 +754,11 @@
+             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"ppc.*?sources \+= ")',
+           ],
+         }],
++        ['v8_target_arch=="riscv64"', {
++          'sources': [  ### gcmole(arch:riscv64) ###
++            '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"riscv64.*?sources \+= ")',
++          ],
++        }],
+         ['v8_target_arch=="s390x"', {
+           'sources': [  ### gcmole(arch:s390) ###
+             '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_current_cpu == \\"s390.*?sources \+= ")',