From nobody Thu May 02 20:12:11 2024 X-Original-To: dev-commits-src-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 4VVlTR2mGVz5JyL3; Thu, 2 May 2024 20:12:11 +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 4VVlTR2Dspz4tG9; Thu, 2 May 2024 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680731; 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=O3+t3LcCec4bwFdhBOWbWpvABZMdSiyzdrV6wOrhe8w=; b=P/GCKUC2OCScG6IsEcyF/TWseMDjnQS74mqdnnwbbkLTN2W/lQgnbwI0uCPcYmkuuPTkqP 51Ls3XnasT6O4silIGua93Kk133JJiGR2bZK1BbnS+mBcZO5ziW9kyQuWU01tQgc9U/lQr SIpJczvyHF2goegxrmJ7rQzqKGmram2AusrPt1GZN+lrS1pU3+PGNaEreqbF9Ssc2t6hMR tQHoy3gsH4DszfD4hnG4CBL998Gt+GUCFm/1DeO8JoKC8B1Dy12xbXI59Hp1eN4DF6umU3 LLNdHDt1xr0e0Y7oF/5RMiBqDp3tYsjjqlYGcqDD6k2+QIH37YVafTnrnmql9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714680731; a=rsa-sha256; cv=none; b=PBwquleL8P5ZDWqCNAmVROjXpN0DrvHFrNbZJ5aOgFVRfZWR+bGBPv0qn60f210eTV8472 j/IF5HLXSzk8ZTOIgaqx716TBW698uxYWuMCSSZTajOshaC2Bt8dze8PfyH8SyKKlCsB5/ sEwYdvtihj3x6P9fy0GVqPN+n6i2WdcIAdOhLRblfBsRiUl/mz0Olbx+OAF358o6yhu7Pt RM1elqqbMm+IPyqCuk0ig+6I3dShtkVD05SadkVNaq1C5o71xlsorF3FdUWmcU8tMdhE7F pjxA0tWm2v5dEjDcPvXFs3HsDz9LjvHe+yRQj9mVdXZrifMWTxOmKR+vcJxyMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680731; 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=O3+t3LcCec4bwFdhBOWbWpvABZMdSiyzdrV6wOrhe8w=; b=PwzB5JN1mScGrVLPboAvefAfXTBi/8H+dBPskopzN4cnv31fJVFYn1FDq+hXmc3MmC0z89 7BPM8DaCsNRf5Vg1/cxTJuoSUBx338rNQ51EfMlBjWmU0RITcPi3MwEyDoExflMtBr5eLT wHf7J6rCR+6wkjEsmKVS8O39UT6Y+C/6lorg0fNeZ3dxVWBII8w7cKjxPt1X/R0C0GyzuX /fKc8k9lhWDgJa4ZRu1XUdF9h3k2A4EZB985TwlqU5wiO4+nx74ViaFPfnpnA1lnE+4nR0 hYrE63z2w8BsumCxPh8aOMYaoagcwRKTArNpZEsBztQLqq2/oPQfqim8GOSHkA== 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 4VVlTR1qsYzH6F; Thu, 2 May 2024 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442KCBk7072390; Thu, 2 May 2024 20:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442KCBWo072387; Thu, 2 May 2024 20:12:11 GMT (envelope-from git) Date: Thu, 2 May 2024 20:12:11 GMT Message-Id: <202405022012.442KCBWo072387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: f16e205c6fb9 - stable/13 - jevents: fix bootstrapping on Linux with Clang 16 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f16e205c6fb913b4bca4495bde46a1bdf6339a8c Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f16e205c6fb913b4bca4495bde46a1bdf6339a8c commit f16e205c6fb913b4bca4495bde46a1bdf6339a8c Author: Alex Richardson AuthorDate: 2023-12-12 05:10:14 +0000 Commit: Jessica Clarke CommitDate: 2024-05-02 20:11:52 +0000 jevents: fix bootstrapping on Linux with Clang 16 The glibc fts_open() callback type does not have the second const qualifier and it appears that Clang 16 errors by default for mismatched function pointer types. Add an ifdef to handle this case. Reviewed By: imp, emaste Differential Revision: https://reviews.freebsd.org/D43000 (cherry picked from commit 60e845ceef25533bfb60450549bea56a17b1e467) --- lib/libpmc/pmu-events/jevents.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index ff7d3b226932..590b465af400 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -1355,7 +1355,11 @@ err_out: #include static int +#ifdef __GLIBC__ +fts_compare(const FTSENT **a, const FTSENT **b) +#else fts_compare(const FTSENT * const *a, const FTSENT * const *b) +#endif { return (strcmp((*a)->fts_name, (*b)->fts_name)); }