jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nodejs-lts: drop patch hunks that break x86 builds

Browse source 
These only affect ppc64 ELFv1 that we don't use anyway.
This commit is contained in:
q66 2022-03-01 00:36:02 +01:00
parent ddd51127af
commit 0d70f0d2e2
1 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
srcpkgs/nodejs-lts/patches/ppc-fixes-for-older-models.patch
View file

@ -845,46 +845,3 @@ This patch also fixes ppc64 big-endian ELFv1 builds (not needed for Void).
}
// static
--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2022-02-01 10:53:09.000000000 -0800
+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2022-02-17 21:04:38.616793354 -0800
@@ -1026,13 +1026,13 @@
Label start_call;
bool isWasmCapiFunction =
linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
-#if defined(_AIX)
+ if (ABI_USES_FUNCTION_DESCRIPTORS) {
// AIX/PPC64BE Linux uses a function descriptor
- int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
- num_parameters = kNumParametersMask & misc_field;
- has_function_descriptor =
- (misc_field & kHasFunctionDescriptorBitMask) != 0;
-#endif
+ int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
+ num_parameters = kNumParametersMask & misc_field;
+ has_function_descriptor =
+ (misc_field & kHasFunctionDescriptorBitMask) != 0;
+ }
constexpr int offset = 9 * kInstrSize;
if (isWasmCapiFunction) {
__ mflr(r0);
--- a/deps/v8/src/compiler/backend/instruction-selector.cc 2022-02-17 21:33:26.468975694 -0800
+++ b/deps/v8/src/compiler/backend/instruction-selector.cc 2022-02-17 21:36:05.465044628 -0800
@@ -2788,12 +2788,12 @@
switch (call_descriptor->kind()) {
case CallDescriptor::kCallAddress: {
int misc_field = static_cast<int>(call_descriptor->ParameterCount());
-#if defined(_AIX)
- // Highest misc_field bit is used on AIX to indicate if a CFunction call
- // has function descriptor or not.
- misc_field |= call_descriptor->HasFunctionDescriptor()
- << kHasFunctionDescriptorBitShift;
-#endif
+ if (ABI_USES_FUNCTION_DESCRIPTORS) {
+ // Highest misc_field bit is used on AIX and PPC64BE ELFv1 Linux
+ // to indicate if a CFunction call has function descriptor or not.
+ misc_field |= call_descriptor->HasFunctionDescriptor()
+ << kHasFunctionDescriptorBitShift;
+ }
opcode = kArchCallCFunction | MiscField::encode(misc_field);
break;
}