From nobody Mon Apr 04 18:43:57 2022 X-Original-To: dev-commits-ports-main@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 EBA341A9B38F; Mon, 4 Apr 2022 18:43:57 +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 4KXKRx6GNBz3nYk; Mon, 4 Apr 2022 18:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649097837; 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=zKWAYydOkwN+oBfMWhcgagk1NT5ME/GoGse6Cyfu7vw=; b=lD5Fnsq/Sin/HqHuJ156MMmCnI4YjsqbBsjb5+vcHZby5WZecxcVPBhUlLuAAtv0/27qNm IHhhg5/4azRtqAc+vmLir7QNmU12myAFtpSE6xhADkRwXis8+ZarX3u9B58zb4rIvLf4gf YLTjqAF0jmL4HLMqZuafbrKXESdshCDi60Yx87M+wWgSxNYrwahiQvbmdpUuop7w/NkGXt 2pVI9sL4V5HyEB9bl2aFWDp/To87ZekAJqkOwg2Ji6CYepITSa4IRWpQ/LQTa6tWneK5q2 eg/dR1iUawNLfLgjUPA0s7WEJ3aTeMZyuO3LXmBFuj011kZ4F0HWSnSNLAGk+w== 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 B76D6172DE; Mon, 4 Apr 2022 18:43:57 +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 234IhvD0011708; Mon, 4 Apr 2022 18:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234Ihv2W011707; Mon, 4 Apr 2022 18:43:57 GMT (envelope-from git) Date: Mon, 4 Apr 2022 18:43:57 GMT Message-Id: <202204041843.234Ihv2W011707@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 4a4ffa51d5f0 - main - www/firefox: try to fix build on diverse CPUs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a4ffa51d5f0f57bd4047b04fe348594a89fdd0d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649097837; 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=zKWAYydOkwN+oBfMWhcgagk1NT5ME/GoGse6Cyfu7vw=; b=iLQzbLQgfii6og/6yLJITYj+XIzArf1w1M8uffPm9EhdYojRUJMDm4U9IyXIRAV6DkzIWr 9pqe2BJu8JmuKCbJfuM/19w11oyMu9uLzhyRU07Q4MOPJcnJNG9mFJdp2gX0L4pZqHgL4K DidqqrDO1vBkhQE8mZiAijXiSQcrGHRVACF/tHZpSzORvcjQJgS60KOAHsHScXWMAwAV0w aiXa/B/aWHCRFwhLvwaaIdsKujsGLW3hLELgHtYpdMPq143Q4movAC6ftKZV/qTQ4RCEWf bJXAubKclm8YJCdMtiSd0TiuvMYpQshkjzrmgNOxt3wgA20GDh2MkRq2HG4hNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649097837; a=rsa-sha256; cv=none; b=GBq+L/I8R0HZLf9aaFZLn+9RzylTGgwdzZga36MIvFaVbJuln2epETS/t74zzFIoT4SfMO XO93UN/xokD9wkDP6HXo9llrVL4Yc/Pbvn3tOh5Ak4FE3uFF7e3UGOULy+wfPS2AMm/IaL lqkdFjpxtVxGhl2190HJkCUSiBOS8CDxjnD5EUfmXCTNWE+ff/urk3T6bkkjh2Tv7t8s7I ToBDptNyrfxFvYjBtqWmrfkhQ00j1UcZq9xuIf+olWlJnBbYkUxrFiuXvTclR8NiGKjtHF skfqrIEgcLjGfwmVm6nLli4Z5iHhcEHYeT4bQdkTdZy+pL5+mkiv/xfUgUIKhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a4ffa51d5f0f57bd4047b04fe348594a89fdd0d commit 4a4ffa51d5f0f57bd4047b04fe348594a89fdd0d Author: Christoph Moench-Tegeder AuthorDate: 2022-04-04 18:41:45 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-04-04 18:41:45 +0000 www/firefox: try to fix build on diverse CPUs the cpuid.h header errors out on anythinbg non-x86, as per http://ampere1.nyi.freebsd.org/data/123arm64-quarterly/5889de908603/logs/firefox-99.0_1,2.log limit the include to x86 - the actual use of that was already limited to amd64, everything else gets the fallthrough --- www/firefox/files/patch-tools_profiler_core_patform.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/www/firefox/files/patch-tools_profiler_core_patform.cpp b/www/firefox/files/patch-tools_profiler_core_patform.cpp index e07969fa8f41..905e6d7bbe49 100644 --- a/www/firefox/files/patch-tools_profiler_core_patform.cpp +++ b/www/firefox/files/patch-tools_profiler_core_patform.cpp @@ -1,14 +1,14 @@ -commit 913cfc8ce77818fa44f9086ee44538337930a9ef +commit 45a7951cb6a9b1735b9b6cec89db69b5933715c7 Author: Christoph Moench-Tegeder Date: Mon Mar 28 21:54:35 2022 +0200 FreeBSD can use sched_getcpu() from 1400046/1300524 on diff --git tools/profiler/core/platform.cpp tools/profiler/core/platform.cpp -index 92bcc1100687..77285f67b62c 100644 +index 92bcc1100687..2f17a88942a8 100644 --- tools/profiler/core/platform.cpp +++ tools/profiler/core/platform.cpp -@@ -111,6 +111,17 @@ +@@ -111,6 +111,20 @@ # include #endif @@ -18,15 +18,18 @@ index 92bcc1100687..77285f67b62c 100644 +# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000) +# include +# else ++# if __x86_64__ || __i386__ +// similar cpuid_count() trick as on Darwin, using LLVM -+# include ++// but not for all CPUs ++# include ++# endif +# endif +#endif + #if defined(GP_OS_windows) # include -@@ -6368,6 +6379,19 @@ void profiler_mark_thread_awake() { +@@ -6368,6 +6382,19 @@ void profiler_mark_thread_awake() { cpuId = ebx >> 24; } # endif