From nobody Thu May 02 20:12:14 2024 X-Original-To: dev-commits-src-branches@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 4VVlTW0q79z5JyRF; Thu, 2 May 2024 20:12:15 +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 4VVlTV5PzCz4td2; Thu, 2 May 2024 20:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680734; 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=trQgC0ZbmlbcMDw+6vEN8p2bYmchYe/xWtQN5qrEtjY=; b=T/bh69qfMwpYEa97jtb5WITL7H36ahljZTSv9jrhHtuvo8Z5RU+j4XMVafjDBQeHHCgDEx qTW0cqmYrrvqDvHq0bbS5LcJsbc8ZYp627jd82m7ILLhUD30e76m+v5GECxva4l/eRvTBp 5oa+11j/Iw9vJnTLJ8uswloOyynQZmpFNAjMZCbXUYx+YaIkthNXesAGZIMOYFs3QhDWuv Cr7uFkxbLzG/TgDoJzYZi/87DWt7hfz4LeqEmH5f/5hXBc6xuwWXF6niSL1wctFd0mwgkP gWpQoXNEX1nuV+SkGtmj/+8rHj7/82qFWtHtN2aci0S179ZblbJNaEwR4LhJFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714680734; a=rsa-sha256; cv=none; b=RZNJ4+FjobXfz5XPrTQXtY7bL+a5nS3t0SXpXyvILj5coJT6NUZmd/p4DcdzZ34aHnChMd o9VrLLN50o1U4vjyCW0Yu96imHkoxa9Q+V49Zz69KfNUBb/RcNwwSJao5cBqical2Mr49R OdkaurhALTUYedTd5j8MUdx6eoNGro3nqKCLioNuVrsz1myvOAhmiRfDWBJnlMinH7o9j7 Lf66OFRFOJ6o/WOmvBDW3m+S9s3Uy+nSRIIfLlc/fjjQl+zbGc0pNWRSABdAjXSvsRXCRw Vt25lO/R0H5Qydo5WVqILiwpBPXKfw+MbX20C2WEvM1w1jR5TFj8E8ITaPHMVg== 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=1714680734; 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=trQgC0ZbmlbcMDw+6vEN8p2bYmchYe/xWtQN5qrEtjY=; b=nZf2ZKzp7cgVH/gTbm0gh7CqChrq5DdCFH+k741wEisTic5oNzZDKxJVlirjiur1wR+WbA JWCzJjVUTrTwRA75QmAkT413ILzIn8GUe3QG3XJYWPWCNjjZphuuFpI/B0/nhHJ1jkHlAO QHOWcNLFsDNGz//sOGYppRfmIyfEifo7zKmf7U/0EMKk3sy8KeONkW6Zck7+hONW5Z+MKN lXFy2G4ttcpwypyb7UM4nRUanLf0gyevc0nTO0QPnw1wx6iAf0TyGLyyh7XQO9Kcn3+9YK vwxGgrd3uVC0ms93bfM5LVLBcD/RcIymZuvjYD5S5AjBDeGCYue+b6mZ38s6RQ== 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 4VVlTV4yRzzHF3; Thu, 2 May 2024 20:12:14 +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 442KCEms072579; Thu, 2 May 2024 20:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442KCEwW072576; Thu, 2 May 2024 20:12:14 GMT (envelope-from git) Date: Thu, 2 May 2024 20:12:14 GMT Message-Id: <202405022012.442KCEwW072576@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: 91e0b44c159f - stable/13 - kldxref: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 91e0b44c159f71ea3d27297b250bdcd318c0fe89 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=91e0b44c159f71ea3d27297b250bdcd318c0fe89 commit 91e0b44c159f71ea3d27297b250bdcd318c0fe89 Author: Jessica Clarke AuthorDate: 2024-03-16 01:50:21 +0000 Commit: Jessica Clarke CommitDate: 2024-05-02 20:11:52 +0000 kldxref: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15 macOS, like Linux, does not include an outer const qualifier for its fts_open callback arguments, so -Wincompatible-function-pointer-types also picks this up and breaks the build now Clang 16 makes it an error by default. Extend the existing Linux support to fix this. MFC after: 1 week (cherry picked from commit 75464941dc17876af2e99ea90c687bd7df873d73) --- usr.sbin/kldxref/kldxref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index c4e65b7e679b..c044b92c7423 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -748,7 +748,7 @@ usage(void) } static int -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__APPLE__) compare(const FTSENT **a, const FTSENT **b) #else compare(const FTSENT *const *a, const FTSENT *const *b)