From 211a024b7a4304f8184bb77ff9432dc0e54393fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sat, 24 Aug 2024 10:28:01 +0200 Subject: [PATCH] build: remove support for ppc 32-bit V8 removed support for it. Refs: https://github.com/v8/v8/commit/643753953ac1653a7e74786d1ee2b5b9f2ecb296 --- Makefile | 8 -------- common.gypi | 10 +--------- configure.py | 2 +- doc/api/os.md | 2 +- doc/api/process.md | 2 +- test/parallel/test-navigator.js | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 7a9e0a2425c..c24acf3f7d0 100644 --- a/Makefile +++ b/Makefile @@ -909,9 +909,6 @@ else ifeq ($(findstring ppc64,$(UNAME_M)),ppc64) DESTCPU ?= ppc64 else -ifeq ($(findstring ppc,$(UNAME_M)),ppc) -DESTCPU ?= ppc -else ifeq ($(findstring s390x,$(UNAME_M)),s390x) DESTCPU ?= s390x else @@ -948,7 +945,6 @@ endif endif endif endif -endif ifeq ($(DESTCPU),x64) ARCH=x64 else @@ -961,9 +957,6 @@ else ifeq ($(DESTCPU),ppc64) ARCH=ppc64 else -ifeq ($(DESTCPU),ppc) -ARCH=ppc -else ifeq ($(DESTCPU),s390) ARCH=s390 else @@ -981,7 +974,6 @@ endif endif endif endif -endif # node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32'). # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU. diff --git a/common.gypi b/common.gypi index af2f3d9cb1a..89e3c950979 100644 --- a/common.gypi +++ b/common.gypi @@ -110,7 +110,7 @@ 'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a', }], # V8 pointer compression only supports 64bit architectures. - ['target_arch in "arm ia32 mips mipsel ppc"', { + ['target_arch in "arm ia32 mips mipsel"', { 'v8_enable_pointer_compression': 0, 'v8_enable_31bit_smis_on_64bit_arch': 0, 'v8_enable_sandbox': 0 @@ -516,10 +516,6 @@ 'cflags': [ '-m64' ], 'ldflags': [ '-m64' ], }], - [ 'host_arch=="ppc" and OS not in "aix os400"', { - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ], - }], [ 'host_arch=="ppc64" and OS not in "aix os400"', { 'cflags': [ '-m64', '-mminimal-toc' ], 'ldflags': [ '-m64' ], @@ -540,10 +536,6 @@ 'cflags': [ '-m64' ], 'ldflags': [ '-m64' ], }], - [ 'target_arch=="ppc" and OS not in "aix os400"', { - 'cflags': [ '-m32' ], - 'ldflags': [ '-m32' ], - }], [ 'target_arch=="ppc64" and OS not in "aix os400"', { 'cflags': [ '-m64', '-mminimal-toc' ], 'ldflags': [ '-m64' ], diff --git a/configure.py b/configure.py index 8b78eb006ec..e9424cc8451 100755 --- a/configure.py +++ b/configure.py @@ -47,7 +47,7 @@ valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', 'android', 'aix', 'cloudabi', 'os400', 'ios') -valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', +valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64') valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') diff --git a/doc/api/os.md b/doc/api/os.md index 01496812d7f..edbfe50116b 100644 --- a/doc/api/os.md +++ b/doc/api/os.md @@ -55,7 +55,7 @@ added: v0.5.0 Returns the operating system CPU architecture for which the Node.js binary was compiled. Possible values are `'arm'`, `'arm64'`, `'ia32'`, `'loong64'`, -`'mips'`, `'mipsel'`, `'ppc'`, `'ppc64'`, `'riscv64'`, `'s390'`, `'s390x'`, +`'mips'`, `'mipsel'`, `'ppc64'`, `'riscv64'`, `'s390'`, `'s390x'`, and `'x64'`. The return value is equivalent to [`process.arch`][]. diff --git a/doc/api/process.md b/doc/api/process.md index fef00460391..f1b3c26e281 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -892,7 +892,7 @@ added: v0.5.0 The operating system CPU architecture for which the Node.js binary was compiled. Possible values are: `'arm'`, `'arm64'`, `'ia32'`, `'loong64'`, `'mips'`, -`'mipsel'`, `'ppc'`, `'ppc64'`, `'riscv64'`, `'s390'`, `'s390x'`, and `'x64'`. +`'mipsel'`, `'ppc64'`, `'riscv64'`, `'s390'`, `'s390x'`, and `'x64'`. ```mjs import { arch } from 'node:process'; diff --git a/test/parallel/test-navigator.js b/test/parallel/test-navigator.js index ebd1f67760b..dd2b050935b 100644 --- a/test/parallel/test-navigator.js +++ b/test/parallel/test-navigator.js @@ -100,7 +100,7 @@ assert.strictEqual(getNavigatorPlatform('x64', 'openbsd'), 'OpenBSD amd64'); assert.strictEqual(getNavigatorPlatform('arm64', 'openbsd'), 'OpenBSD arm64'); assert.strictEqual(getNavigatorPlatform('ia32', 'sunos'), 'SunOS i86pc'); assert.strictEqual(getNavigatorPlatform('x64', 'sunos'), 'SunOS x64'); -assert.strictEqual(getNavigatorPlatform('ppc', 'aix'), 'AIX'); +assert.strictEqual(getNavigatorPlatform('ppc64', 'aix'), 'AIX'); assert.strictEqual(getNavigatorPlatform('x64', 'reactos'), 'Reactos x64'); assert.strictEqual(typeof navigator.language, 'string');