From nobody Mon Apr 04 18:44:32 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 237DB1A9B51E; Mon, 4 Apr 2022 18:44:33 +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 4KXKSd0StFz3nr5; Mon, 4 Apr 2022 18:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649097873; 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=oCzrqQ0pk9BYXztn3GjTjBbtQPCDn713yRikfnSiNrU=; b=ucOn9gppzT+hn5Nc/Vkd8tevTNLueUX9XyzL3J6naZG9QF4ssodNfp9hGLM6qzAiGhnTYp 8CLmTxifcV4W6p9irnXYfCa/cVxLGAP2Ui2DAAdNT04ROOoHAp7EYIjJ1+4P26UBqxmme2 1B28FHVufP+U8qtZ6+9JvcnR/empIqNapUdewIQTQsNm1zBtjNH5uwpQpc2ORLpKEoIfW1 9m7FrhiIkiUL2zorsnUQxVX3bjlsRiK0m07B6wmzKcJytvOHxGBZRGXtvLjWSCPjaEdKEf V7XfrOK4U+Mvm9wCcdC1GFj6hwr/kGcCChDHIroO+OHYNpK7Dk7G9wFviJMVYw== 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 E4071174EC; Mon, 4 Apr 2022 18:44:32 +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 234IiWTJ011881; Mon, 4 Apr 2022 18:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234IiWEh011880; Mon, 4 Apr 2022 18:44:32 GMT (envelope-from git) Date: Mon, 4 Apr 2022 18:44:32 GMT Message-Id: <202204041844.234IiWEh011880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 7a28b0b53302 - 2022Q2 - www/firefox: try to fix build on diverse CPUs 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 7a28b0b5330265594250211b71d1731078dce973 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649097873; 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=oCzrqQ0pk9BYXztn3GjTjBbtQPCDn713yRikfnSiNrU=; b=U1KovNOHUq4kT4bfULilrAxyF2UHfKijvY4V8HBI4Qx5RxbrOrvBuNHXdnWdFktpnWSIA+ QTUZp1k6ebodb2MyvlyhySAheuCKJBTYy45oFjA0oH7gJrcGLnIWpksypjPNHmJ+rt+UoQ d2kbfInsQ7GDSd81oEGfKDsW/ON0g3HPgkX79ZEB4JyJElx8L7rSLiqvIg+nyw3t9Iwbvz oq9+G2byQO/tcyu2z50ztzvgDcTIvqijX7Io6/zDhCVFVfkLLUCholwd3CkDB7LlZaT660 k6FK4BI+8xjvmBQ246sHDs48Ui1x6nuCLOCkJm1D2BmqiX34dHBvvxiM6Pxy3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649097873; a=rsa-sha256; cv=none; b=Kx6ZID5OTRUgkka6Es/bRlS67NxvT1AV8FXffxxDiDjCKDoe5UZ2kT33WZFkrzRzG4fLmR 9O+aqv7LjSF5PiiwfFV0jQeNyNM6bXiqIO4cJo9dofZ7agInIjjF4AD7iCHBizVOH/JzeE isFNJV6NCIkCzv/G2x5rvQlxk6Lq+5TUw9eH2pgJFrEB1kqpfaDcqXiSWlKGzwWi3WOGjw xgHEhCde+RYQoCN2PqWzV4UQMiazDOjBp1SQYt6jIe4akT/pPsFFDqOeM6JQGMr7A3UxK3 Fc+7mFvmTt70a3m1rFGu/7R4EB4sBvjzSJihmo15AZ0+bQEommvniFSBtF3UXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a28b0b5330265594250211b71d1731078dce973 commit 7a28b0b5330265594250211b71d1731078dce973 Author: Christoph Moench-Tegeder AuthorDate: 2022-04-04 18:41:45 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-04-04 18:44:21 +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 (cherry picked from commit 4a4ffa51d5f0f57bd4047b04fe348594a89fdd0d) --- 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