fixup

Author: ShogunPanda

configure.py

@@ -2314,7 +2314,7 @@ def bundled_ffi_supported(os_name, target_arch):
     target_arch = 'ia32'
 
   if target_arch in {'arm', 'arm64', 'ia32', 'x64', 'x86_64',
-                     's390x', 'riscv64', 'loong64'}:
+                     'riscv64', 'loong64'}:
     return True
 
   if target_arch in {'mips', 'mipsel', 'mips64el'}:

deps/libffi/generate-headers.py

@@ -41,9 +41,6 @@ def get_target(os_name, target_arch):
     if target_arch == 'x64':
         return ('X86_WIN64' if os_name == 'win' else 'X86_64', 'x86')
 
-    if target_arch == 's390x':
-        return ('S390', 's390')
-
     if target_arch == 'riscv64':
         return ('RISCV', 'riscv')
 
@@ -241,7 +238,6 @@ def detect_target_arch():
         'arm64': 'arm64',
         'aarch64': 'arm64',
         'arm': 'arm',
-        's390x': 's390x',
         'riscv64': 'riscv64',
         'loong64': 'loong64',
         'ppc64': 'ppc64',

deps/libffi/libffi.gyp

@@ -81,14 +81,6 @@
             ],
           },
         }],
-        ['target_arch == "s390x"', {
-          'variables': {
-            'libffi_arch_sources': [
-              'src/s390/ffi.c',
-              'src/s390/sysv.S',
-            ],
-          },
-        }],
         ['target_arch == "riscv64"', {
           'variables': {
             'libffi_arch_sources': [
@@ -192,7 +184,6 @@
             'src/mips/ffitarget.h',
             'src/powerpc/ffitarget.h',
             'src/riscv/ffitarget.h',
-            'src/s390/ffitarget.h',
             'src/x86/ffitarget.h',
           ],
           'outputs': [

deps/libffi/src/s390/sysv.S

@@ -50,11 +50,11 @@ ffi_call_SYSV:
 	st	%r6,44(%r2)			# Save registers
 	stm	%r12,%r14,48(%r2)
 	lr	%r13,%r2			# Install frame pointer
-	.cfi_rel_offset %r6, 44
-	.cfi_rel_offset %r12, 48
-	.cfi_rel_offset %r13, 52
-	.cfi_rel_offset %r14, 56
-	.cfi_def_cfa_register %r13
+	.cfi_rel_offset r6, 44
+	.cfi_rel_offset r12, 48
+	.cfi_rel_offset r13, 52
+	.cfi_rel_offset r14, 56
+	.cfi_def_cfa_register r13
 	st	%r2,0(%r15)			# Set up back chain
 	sla	%r3,3				# ret_type *= 8
 	lr	%r12,%r4			# Save ret_addr
@@ -142,12 +142,12 @@ ffi_closure_SYSV:
 .Ldoclosure:
 	stm	%r12,%r15,48(%r15)		# Save registers
 	lr	%r12,%r15
-	.cfi_def_cfa_register %r12
-	.cfi_rel_offset %r6, 24
-	.cfi_rel_offset %r12, 48
-	.cfi_rel_offset %r13, 52
-	.cfi_rel_offset %r14, 56
-	.cfi_rel_offset %r15, 60
+	.cfi_def_cfa_register r12
+	.cfi_rel_offset r6, 24
+	.cfi_rel_offset r12, 48
+	.cfi_rel_offset r13, 52
+	.cfi_rel_offset r14, 56
+	.cfi_rel_offset r15, 60
 #ifndef HAVE_AS_S390_ZARCH
 	basr	%r13,0				# Set up base register
 .Lcbase:
@@ -170,7 +170,7 @@ ffi_closure_SYSV:
 #endif
 
 	lr	%r15,%r12
-	.cfi_def_cfa_register %r15
+	.cfi_def_cfa_register r15
 	lm	%r12,%r14,48(%r12)		# Restore saved registers
 	l	%r6,24(%r15)
 	ld	%f0,64(%r15)			# Load return registers
@@ -204,11 +204,11 @@ ffi_call_SYSV:
 	stg	%r6,88(%r2)			# Save registers
 	stmg	%r12,%r14,96(%r2)
 	lgr	%r13,%r2			# Install frame pointer
-	.cfi_rel_offset %r6, 88
-	.cfi_rel_offset %r12, 96
-	.cfi_rel_offset %r13, 104
-	.cfi_rel_offset %r14, 112
-	.cfi_def_cfa_register %r13
+	.cfi_rel_offset r6, 88
+	.cfi_rel_offset r12, 96
+	.cfi_rel_offset r13, 104
+	.cfi_rel_offset r14, 112
+	.cfi_def_cfa_register r13
 	stg	%r2,0(%r15)			# Set up back chain
 	larl	%r14,.Ltable			# Set up return address
 	slag	%r3,%r3,3			# ret_type *= 8
@@ -253,10 +253,10 @@ ffi_call_SYSV:
 	lg	%r12,96(%r13)
 	lg	%r6,88(%r13)
 	lg	%r13,104(%r13)
-	.cfi_restore %r14
-	.cfi_restore %r13
-	.cfi_restore %r12
-	.cfi_restore %r6
+	.cfi_restore r14
+	.cfi_restore r13
+	.cfi_restore r12
+	.cfi_restore r6
 	.cfi_def_cfa r15, 160
 	br	%r14
 	.cfi_endproc
@@ -292,11 +292,11 @@ ffi_closure_SYSV:
 .Ldoclosure:
 	stmg	%r13,%r15,104(%r15)		# Save registers
 	lgr	%r13,%r15
-	.cfi_def_cfa_register %r13
-	.cfi_rel_offset %r6, 48
-	.cfi_rel_offset %r13, 104
-	.cfi_rel_offset %r14, 112
-	.cfi_rel_offset %r15, 120
+	.cfi_def_cfa_register r13
+	.cfi_rel_offset r6, 48
+	.cfi_rel_offset r13, 104
+	.cfi_rel_offset r14, 112
+	.cfi_rel_offset r15, 120
 	aghi	%r15,-160-16			# Set up stack frame
 	stg	%r13,0(%r15)			# Set up back chain
 
@@ -311,7 +311,7 @@ ffi_closure_SYSV:
 	brasl	%r14,ffi_closure_helper_SYSV	# Call helper
 
 	lgr	%r15,%r13
-	.cfi_def_cfa_register %r15
+	.cfi_def_cfa_register r15
 	lmg	%r13,%r14,104(%r13)		# Restore saved registers
 	lg	%r6,48(%r15)
 	ld	%f0,128(%r15)			# Load return registers

doc/api/ffi.md

@@ -37,6 +37,7 @@ The unofficial GN build does not support `node:ffi`.
 
 The following targets are not supported by bundled libffi:
 
+* `s390x`.
 * `mips`, `mipsel`, and `mips64el` on targets other than FreeBSD, Linux, and
   OpenBSD.
 * `ppc64` on Android, CloudABI, iOS, OpenHarmony, OS/400, Solaris, and Windows.