From nobody Tue Jan 25 01:40:13 2022 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 E10551973283; Tue, 25 Jan 2022 01:40:16 +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 4JjV0b0VwMz4Zl0; Tue, 25 Jan 2022 01:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074815; 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=Vo3fLzYOfZ0elNHavm+1u9ilpeQbpQRUGOFOa6HPFM8=; b=oEVLOkszQZyKCyWnUwK3hYepXj1R4jIsWSAcvDG3oMyQi9LaksRbarkbdEfW+q+LZX+oG4 8js6Ub+bvT7ivIau10yG2qydnvFgc21yfOnq3Yfh96RS9Y4ZgnLvKRbc5KN6ptbHeAckoX WPdIGAp0ME/8WXMNekyODbROEfseDQp3GqL7ItFi9SB2RfMfevFwBiFgmWB36UrH5jZ2Ky 78QDdvM7v4e2yiavi1aD2hRaNFBG8sA7XIR2UoEdZC/fc9orzi5DYhIHDWCvQ/NVMmd3Kv OUhobOZi2rzLMsBjjz5yrZWx04iziWMIznhrZlWP3lPqy5ztvWFCFJVVuwGpTA== 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 DD1B7209EF; Tue, 25 Jan 2022 01:40:13 +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 20P1eDXt047753; Tue, 25 Jan 2022 01:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1eDSk047751; Tue, 25 Jan 2022 01:40:13 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:13 GMT Message-Id: <202201250140.20P1eDSk047751@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: 62b958cb94ea - stable/13 - cross-build: Add comment missing from 9e5b0d9eac5b 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 62b958cb94ea6e8b5549d902ffb95cb8bdeda262 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074815; 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=Vo3fLzYOfZ0elNHavm+1u9ilpeQbpQRUGOFOa6HPFM8=; b=sGIhf7Yo0lttZFGdWHfxS4HkX0Op8K72LOxCOtrLilv8IxHU0+bi13T8Orw5ih1lTO2GOD O15ENbmUqoH9DetGN/g7MN3TDMVYkfoXk8xg1XUkF7LsaaVL0F1bObj6UkJUO2PUStuaMb lr65qur0dy1+EuXtWPi8TLQOvifZEgSv1Z8R8lVjwYMvXrAt36qiXXu7KnnUDdhz3VmqXl da9XX+Aw2hSeExvXK9i+x+1zljakdrbk2m1+JJi9dhc0cQPuIjmG+DxtPQVnwa8ixEujJB qDZEwXcKA5CYybVQJvwDWkPcqNZX+qs256HWt5OnNsYehpvgoy8Gl1aDBpO7PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074815; a=rsa-sha256; cv=none; b=yL3xGFgzUbkiHqJoraX3QbG6OFrzkm6ofmLacuAK+8S258ldp/de9ViCoRLUFZnK3Prqy/ Wrp5MgtfTlNtxHvcPcjvjJOFWJ0TAnUVUBVeZ8PBRBko3+R7Cx7VA68tqgW7jG2xOyk7gt 6wmpvSWhmbxBVNtWJfWu4qBjkIkJKBRWt2uiONbzpSW/D2mTW1c1Wa30rkMicMLFcR9Cpu Uoy7gmh+bB9+MJV9ZTaASeOKhL0itQFEDQ5E9b0j60nqFI6nBZIhlgCFPq2oycPyD2clRH UpvHtQsLAKs1pbGQ/WWq1r6BFFptt6X8RZtCQXXdZ9x9+PboQK47TAH+UZVaYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=62b958cb94ea6e8b5549d902ffb95cb8bdeda262 commit 62b958cb94ea6e8b5549d902ffb95cb8bdeda262 Author: Jessica Clarke AuthorDate: 2021-12-15 19:45:31 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:44 +0000 cross-build: Add comment missing from 9e5b0d9eac5b Whilst the commit message documented some of the details, I had intended to include this comment in the actual header, but failed to amend the commit properly. Fixes: 9e5b0d9eac5b ("cross-build: Fix bmake bootstrap with glibc 2.34") MFC after: 1 week (cherry picked from commit aee99ab4fe38bdc1dd1be88755d99ff4ee78ec09) --- tools/build/cross-build/include/linux/sys/wait.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/build/cross-build/include/linux/sys/wait.h b/tools/build/cross-build/include/linux/sys/wait.h index 2721218a83d4..ca17bfae9b8a 100644 --- a/tools/build/cross-build/include/linux/sys/wait.h +++ b/tools/build/cross-build/include/linux/sys/wait.h @@ -27,5 +27,21 @@ #pragma once +/* + * glibc's sys/wait.h and stdlib.h both define various wait-related constants, + * depending on __USE_XOPEN(2K8) and if the other header has been included. + * Since they each probe the other's include guard to determine that, there is + * a window between a header defining its include guard and checking for the + * other's within which, if the other is included for the first time, they both + * believe the other has already defined the relevant macros etc, and so + * neither ends up doing so. This was not previously hit, and is still not hit + * when using glibc normally (though seems extremely fragile). However, as of + * glibc 2.34, signal.h, included by sys/wait, includes a new bits/sigstksz, + * which in turn includes unistd.h (when _SC_SIGSTKSZ_SOURCE is defined, which + * is implied by _GNU_SOURCE), which we wrap and include stdlib.h from, + * creating the exact aforementioned situation that breaks. Thus, forcefully + * include stdlib.h first whenever sys/wait.h is as a workaround, since that + * way round still works. + */ #include #include_next