From nobody Tue Apr 19 17:01:45 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5964D11C925F; Tue, 19 Apr 2022 17:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjVT60Wt8z3mH5; Tue, 19 Apr 2022 17:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650387706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV8OZ3ZqvRkkXdLf+sazam0Ys+SqoqF6prDjz6H9W4k=; b=amk3+ETtkNjWYPzq9zxFBSBDGr1lzxBSYyoqPhnCkCojQO0y03OLkbs4mniB583OKdSgcD 3beTS87M/2gDRoJz2EQlSw5XwRbt7fVkKbWUbqfUxQfYELMaXK2GtKgcb0j0+AB8nLm5Co VgOT8tvcARQqO1Y5jvUWvUbpgcc2G+EkE0/wxxwdXqlJcu6qb7c1v24HvID0BxVoS3N+Uf BPPEXIAkq0MX3T6vNhfRA9E5Gon51+Uvku2T1xSgxfnwjVTvN49O9rgqy4CAFtJGVGUi/A UCGAq6xshmArtKj+ciVLm+eZAz8X/JDNTtBoFN7qBw9aYdKdmaA4mgycC6aFyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB8DA2B1E6; Tue, 19 Apr 2022 17:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23JH1jv2084042; Tue, 19 Apr 2022 17:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JH1jbq084041; Tue, 19 Apr 2022 17:01:45 GMT (envelope-from git) Date: Tue, 19 Apr 2022 17:01:45 GMT Message-Id: <202204191701.23JH1jbq084041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: dc11ba0ae68b - 2022Q2 - www/node: Fix build on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: dc11ba0ae68be80ab0bdbd8b215cb8834d1a9d88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650387706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV8OZ3ZqvRkkXdLf+sazam0Ys+SqoqF6prDjz6H9W4k=; b=i8boSIBuO+QYiLQLXJB1i3V549JPvwvm1qi+yBTCE9WtNWYhW4iB7ku5RIDrQ9s1odVPB5 p8PpfR2MGyDzVEQgkaExFJpWtILEHdH0EdxZhDcY82seqh7nJ9JWUYghCRwlG3mmN129hs jiQrAU6WTXDN2sAFU1AYiNBWaKpMDr8sRqvMF1HnJeeyPmvvYxgRxFq0W9W9+VOY++Lhqh 3ewy+aBhx+XfIfCe72mJ5SPtY4u1T5jP7HEdF+90D/c2u0iw7Uw3HtpmKt3lTjNufUy7pZ EDOVx0WxULiyXAuzWrpwsu1nerMPAFSPS5hv8Z1GtOumpcdUva6bqZAi+4+uhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650387706; a=rsa-sha256; cv=none; b=QGghBBZxqd8T5IVqSin57d1j3ULW5rMf6vW3uZ3jPmHLJKI7qgFiPPOnWFOQnQLeu5dDN+ 62Zygo7UOq+XBa+5bFCOtveOrdDZ1xQSKwCad262y3l9LA1RB014cjSeEpOI3fpLd+tL+m cDGq3FCbK6mDlTqwZepH9RWxozrAW1kvG2KzSYX0VoG56a4o8baZh5UJk4BRxCskO/DilA 9Q2n5KwASv8iDgWMdJYKZk31DgbIeq5ue4LHtb/ZwOF9UqKueLr+rDC0+lnDoEUdw0RQ8d 56n6/yLjyTbGsETBf9ecT9K5xo6szLzgkptn8YLYQ2zwxniCmECE8Y+a+c3OIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc11ba0ae68be80ab0bdbd8b215cb8834d1a9d88 commit dc11ba0ae68be80ab0bdbd8b215cb8834d1a9d88 Author: Mikael Urankar AuthorDate: 2022-04-19 16:22:38 +0000 Commit: Mikael Urankar CommitDate: 2022-04-19 16:44:28 +0000 www/node: Fix build on armv7 PR: 260651 Approved by: portmgr (build fix blanket) (cherry picked from commit 02c4b2720bb1b5a0c0af5617b1e1dfd2e040f60d) --- ...h-deps_v8_src_base_platform_platform-freebsd.cc | 49 ---------------------- .../files/patch-deps_v8_src_codegen_arm_cpu-arm.cc | 18 ++++++++ 2 files changed, 18 insertions(+), 49 deletions(-) diff --git a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc index c504d7134dd4..3e173b2811f3 100644 --- a/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc +++ b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc @@ -11,52 +11,3 @@ } start += ssize; -@@ -94,6 +94,48 @@ std::vector OS::GetSharedLib - } - - void OS::SignalCodeMovingGC() {} -+ -+#ifdef __arm__ -+ -+bool OS::ArmUsingHardFloat() { -+// GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify -+// the Floating Point ABI used (PCS stands for Procedure Call Standard). -+// We use these as well as a couple of other defines to statically determine -+// what FP ABI used. -+// GCC versions 4.4 and below don't support hard-fp. -+// GCC versions 4.5 may support hard-fp without defining __ARM_PCS or -+// __ARM_PCS_VFP. -+ -+#define GCC_VERSION \ -+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -+#if GCC_VERSION >= 40600 && !defined(__clang__) -+#if defined(__ARM_PCS_VFP) -+ return true; -+#else -+ return false; -+#endif -+ -+#elif GCC_VERSION < 40500 && !defined(__clang__) -+ return false; -+ -+#else -+#if defined(__ARM_PCS_VFP) -+ return true; -+#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \ -+ !defined(__VFP_FP__) -+ return false; -+#else -+#error \ -+ "Your version of compiler does not report the FP ABI compiled for." \ -+ "Please report it on this issue" \ -+ "http://code.google.com/p/v8/issues/detail?id=2140" -+ -+#endif -+#endif -+#undef GCC_VERSION -+} -+ -+#endif // def __arm__ - - void OS::AdjustSchedulingParams() {} - diff --git a/www/node/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc b/www/node/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc new file mode 100644 index 000000000000..4bbfd3df2781 --- /dev/null +++ b/www/node/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc @@ -0,0 +1,18 @@ +--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2022-04-19 16:03:40 UTC ++++ deps/v8/src/codegen/arm/cpu-arm.cc +@@ -2,12 +2,15 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include "include/v8config.h" ++ + // CPU specific code for arm independent of OS goes here. + #ifdef __arm__ + #ifdef __QNXNTO__ + #include // for cache flushing. + #undef MAP_TYPE + #elif V8_OS_FREEBSD ++#include + #include // for cache flushing + #include + #elif V8_OS_STARBOARD