nodejs
diff --git a/Collapse file
‎common.gypi‎
Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎common.gypi‎
Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h‎
Copy file name to clipboardExpand all lines: deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h‎
Copy file name to clipboardExpand all lines: deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎deps/v8/src/wasm/baseline/liftoff-compiler.cc‎
Copy file name to clipboardExpand all lines: deps/v8/src/wasm/baseline/liftoff-compiler.cc
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎deps/v8/src/wasm/baseline/liftoff-compiler.cc‎
Copy file name to clipboardExpand all lines: deps/v8/src/wasm/baseline/liftoff-compiler.cc
+7Lines changed: 7 additions & 0 deletions
@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.12',
+    'v8_embedder_string': '-node.13',
 
     ##### V8 defaults for Node.js #####
 
 
@@ -438,7 +438,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 
 int LiftoffAssembler::PrepareStackFrame() {
   if (!CpuFeatures::IsSupported(ARMv7)) {
-    bailout(kUnsupportedArchitecture, "Armv6 not supported");
+    bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");
     return 0;
   }
   uint32_t offset = static_cast<uint32_t>(pc_offset());
 
@@ -310,6 +310,13 @@ void CheckBailoutAllowed(LiftoffBailoutReason reason, const char* detail,
   return;
 #endif
 
+#if V8_TARGET_ARCH_ARM
+  // Allow bailout for missing ARMv7 support.
+  if (!CpuFeatures::IsSupported(ARMv7) && reason == kUnsupportedArchitecture) {
+    return;
+  }
+#endif
+
 #define LIST_FEATURE(name, ...) kFeature_##name,
   constexpr WasmFeatures kExperimentalFeatures{
       FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(LIST_FEATURE)};
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ inline void EmitAnyTrue(LiftoffAssembler* assm, LiftoffRegister dst,`
`438`	`438`
`439`	`439`	`int LiftoffAssembler::PrepareStackFrame() {`
`440`	`440`	`if (!CpuFeatures::IsSupported(ARMv7)) {`
`441`		`- bailout(kUnsupportedArchitecture, "Armv6 not supported");`
	`441`	`+ bailout(kUnsupportedArchitecture, "Liftoff needs ARMv7");`
`442`	`442`	`return 0;`
`443`	`443`	`}`
`444`	`444`	`uint32_t offset = static_cast<uint32_t>(pc_offset());`