From nobody Thu Jul 25 02:47:01 2024 X-Original-To: dev-commits-src-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 4WTwJj4vwRz5RX6N; Thu, 25 Jul 2024 02:47:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WTwJj4C7nz4FNC; Thu, 25 Jul 2024 02:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721875621; 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=+HPB+pAuXpR6QWGHCQiyrDPiBrocKcxPwAeT1bXqSKc=; b=Fsyy+yrQ9D0ozeNhGJEjG+RIkj+DgIf8Z+jvcCpDmYaqcFd+ROtKxXvYdjQy498UpvV16J TORoVhS1wZdfshmqtDPySWt2epuanuykUTE1c+Gg/InT4M1bw8oa1sA9bnXuQaJV9Sy37b 3+6fWCTKv96+jKRju+URW9DXYURrbDTpwLroGciXc5NJ3uHbYGLkaZlD5Vq1wf2EClpuL/ bbXXP+I3IPdf03RbgyDCdLkgEN41gGMmcGHsGCFSDeENEMYbg56w0Rut/yEXSpHTDdyRwT KSIbPSAMGrR/UsbTOuIMHA9/RZ3AwF2pVXSy8xxBtQmxyx6AiM/3fjAfDGYnqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721875621; a=rsa-sha256; cv=none; b=mQ/GdPJbOZNpvRoZBybzEbRJAOzZUL7k6Nn2gGJmML54r0hNfoK6iloeJUsQIifZ+/FHVz fkkIHwKc85DiSWknMcbGil5/b8fR5IhndIzozdmqa9lRCwxs80UyhJSRI1/TXhNup3UGNJ JSQQSyxXQU1Vq2D8ipYpyi2bsDP3hQboyiVvi/fUToAd1kp8K5zTRVKXesca8vmvz6+nGd zS7xLWEZyhKGqhosDr5hq1AZQ4eoGBRvSjjT+eQaNCwbCQTwZWR7932jivNNPKC4FbPlNz bSBfErYhE0Y36kYC6AktxnMWQ9RF/CFUR4ymqMPl/K8V5NxTkEvaAUNOCX/NJg== 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=1721875621; 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=+HPB+pAuXpR6QWGHCQiyrDPiBrocKcxPwAeT1bXqSKc=; b=kgLVqQQdEZtsmfoEi4vvWYTFLKyf96xGqMinQvL6lj95MTJmGLR2ftoZf0iu2rIapBqlYg C0AG7VhmYDx218vVKu0pYmzQqponpT9NGuC2eZAmf3+T5+vrAPKkBoY2l/oLB/18tRxQrK R7z9Sica7i49JOJhAFXCltmey7zr4PICO6hTtDlUXzBF/MF8Bhb+GRU1VdMxeyVTsgvVF/ pi9LUcPphIZWnmnSjKqJe4qxsEVB5xItDIbQF28DEF+ZOpJEUrzM3LbIkQscq6bzX9Rwo3 4JoDcNCB4D76IRWCBjjHpMFzhZZzyhU6SEj+AiF47ZpKo74iiupS+mpvY7tUjg== 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 4WTwJj3p88zd20; Thu, 25 Jul 2024 02:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46P2l1pE025032; Thu, 25 Jul 2024 02:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46P2l1PY025029; Thu, 25 Jul 2024 02:47:01 GMT (envelope-from git) Date: Thu, 25 Jul 2024 02:47:01 GMT Message-Id: <202407250247.46P2l1PY025029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4a0b7955fd72 - main - cross-build: Move fcntl.h workaround to Linux specific file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a0b7955fd727754b853f6a346b8379e21bcb81f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4a0b7955fd727754b853f6a346b8379e21bcb81f commit 4a0b7955fd727754b853f6a346b8379e21bcb81f Author: Warner Losh AuthorDate: 2024-07-25 02:46:35 +0000 Commit: Warner Losh CommitDate: 2024-07-25 02:47:26 +0000 cross-build: Move fcntl.h workaround to Linux specific file Move the cdefs.h inclusion to the Linux specific file. Either place will work, but it makes more sense to do it in the Linux specific file since it's a Linux specific workaround. Fixes: 4300e053618f Suggested by: arichards, jrtc27 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D45373 --- tools/build/cross-build/include/linux/fcntl.h | 7 +++++++ tools/build/fcntl.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/build/cross-build/include/linux/fcntl.h b/tools/build/cross-build/include/linux/fcntl.h index aafcfe43a325..e5718ce5e3ed 100644 --- a/tools/build/cross-build/include/linux/fcntl.h +++ b/tools/build/cross-build/include/linux/fcntl.h @@ -44,3 +44,10 @@ #include "__unused_workaround_end.h" #include + +/* + * On FreeBSD fcntl.h indirectly brings in cdefs.h. On Linux with musl, it does + * not. It's needed in our fcntl.h for the cross build since we use + * __BEGIN_DECLS and __END_DECLS from it there. + */ +#include diff --git a/tools/build/fcntl.h b/tools/build/fcntl.h index f59f5f7fb20a..6aaf3eef2804 100644 --- a/tools/build/fcntl.h +++ b/tools/build/fcntl.h @@ -29,13 +29,6 @@ #include_next -/* - * On FreeBSD fcntl.h indirectly brings in cdefs.h. On Linux with musl, it does - * not. Unconditionally inlude it here since there's no harm in including it - * multiple times since we use __BEGIN_DECLS and __END_DECLS from it below. - */ -#include - struct spacectl_range { off_t r_offset; off_t r_len;