From owner-svn-ports-all@freebsd.org Fri Dec 13 10:19:06 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BB9E1C94F7; Fri, 13 Dec 2019 10:19:06 +0000 (UTC) (envelope-from pkubaj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Z68V0hPzz3M2y; Fri, 13 Dec 2019 10:19:06 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA0F4A9E2; Fri, 13 Dec 2019 10:19:05 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBDAJ5cI037311; Fri, 13 Dec 2019 10:19:05 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBDAJ5xI037310; Fri, 13 Dec 2019 10:19:05 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201912131019.xBDAJ5xI037310@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 13 Dec 2019 10:19:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520012 - head/www/node/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/www/node/files X-SVN-Commit-Revision: 520012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2019 10:19:06 -0000 Author: pkubaj Date: Fri Dec 13 10:19:05 2019 New Revision: 520012 URL: https://svnweb.freebsd.org/changeset/ports/520012 Log: www/node: fix build on powerpc64 elfv1 13.2.0 broke powerpc64 elfv1 (again). The problem are those two commits: https://github.com/nodejs/node/commit/605cb9f0fcd1d334ec15959bb79ba44b0e9f8186 https://github.com/nodejs/node/commit/fe99841c88fdb87959a14c7bca81e4cd4582eba6 They added ifdefs for _AIX, but the code they guard should run on all ppc64 elfv1 (not only on AIX). Widen those ifdefs appriopriately so that node builds again. PR: 242404 Approved by: bhughes (maintainer) Added: head/www/node/files/patch-deps_v8_src_compiler_backend_instruction-selector.cc (contents, props changed) head/www/node/files/patch-deps_v8_src_compiler_backend_ppc_code-generator-ppc.cc (contents, props changed) Added: head/www/node/files/patch-deps_v8_src_compiler_backend_instruction-selector.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_compiler_backend_instruction-selector.cc Fri Dec 13 10:19:05 2019 (r520012) @@ -0,0 +1,11 @@ +--- deps/v8/src/compiler/backend/instruction-selector.cc.orig 2019-12-03 12:54:01 UTC ++++ deps/v8/src/compiler/backend/instruction-selector.cc +@@ -2812,7 +2812,7 @@ void InstructionSelector::VisitCall(Node* node, BasicB + switch (call_descriptor->kind()) { + case CallDescriptor::kCallAddress: { + int misc_field = static_cast(call_descriptor->ParameterCount()); +-#if defined(_AIX) ++#if defined(_AIX) || (V8_TARGET_ARCH_PPC_BE && (!defined(_CALL_ELF) || _CALL_ELF == 1)) + // Highest misc_field bit is used on AIX to indicate if a CFunction call + // has function descriptor or not. + misc_field |= call_descriptor->HasFunctionDescriptor() Added: head/www/node/files/patch-deps_v8_src_compiler_backend_ppc_code-generator-ppc.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_v8_src_compiler_backend_ppc_code-generator-ppc.cc Fri Dec 13 10:19:05 2019 (r520012) @@ -0,0 +1,11 @@ +--- deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc.orig 2019-12-03 11:33:29 UTC ++++ deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc +@@ -1025,7 +1025,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleAr + Label start_call; + bool isWasmCapiFunction = + linkage()->GetIncomingDescriptor()->IsWasmCapiFunction(); +-#if defined(_AIX) ++#if defined(_AIX) || (V8_TARGET_ARCH_PPC_BE && (!defined(_CALL_ELF) || _CALL_ELF == 1)) + // AIX/PPC64BE Linux uses a function descriptor + int kNumParametersMask = kHasFunctionDescriptorBitMask - 1; + num_parameters = kNumParametersMask & misc_field;