From nobody Wed Feb 02 21:28:52 2022 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 A154C19B8594; Wed, 2 Feb 2022 21:28:52 +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 4Jpw0N2Y0Zz4pGy; Wed, 2 Feb 2022 21:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643837332; 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=c2knCvETVF5auEFhXt3qXYBsgwZmq4Ie2eMwnMKgapo=; b=Fj4GtxTkgLuBJRKdVrETPNIbcyiS3qYNQ4o/T8qd29TYdQ4e3qBJU00f9igYIUI/kdqjXk Sh+evbqGEeVs/dqv1AiDNwBimsQM31avDrFa8ID+zKX8JVw/UtenoMeSkS6T124yAY0XB2 VDl9wRPnSvufgc56f8V39n0IMwINtaZLePpCTwWyZ0jqj7oIU2lWGabaTIdPG4J7YJnRmp FSCl1HGcEzdDqN/ZNNwbherOC7V4cryn5ROGYIPv4yf6HqmXlpqmyEFltqus57q5pjA4/x vPgz+LgQ9pe6tFiTIkW36Ls12v7mvtanBML+m5u9cfNDGOwgn/lNDR92+2Ljjw== 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 3609034B6; Wed, 2 Feb 2022 21:28:52 +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 212LSq4f060003; Wed, 2 Feb 2022 21:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212LSqmL060002; Wed, 2 Feb 2022 21:28:52 GMT (envelope-from git) Date: Wed, 2 Feb 2022 21:28:52 GMT Message-Id: <202202022128.212LSqmL060002@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: 034755623d3d - main - stand: Fix kboot issue on powerpc64 with MK_LIB32=yes 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 034755623d3d211a82084aca3215dc1e6d103bfc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643837332; 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=c2knCvETVF5auEFhXt3qXYBsgwZmq4Ie2eMwnMKgapo=; b=Kju/8vDaBkLCCDgr8Ce8XEcQw2djX/kQejKjbt4YJeOWkO5HkwG/zPHQoSF3AUU1hju7cP Mm8ecOfbNKvJIJ01Cshal8l9xn1Zi34JE0IP95mvFjZZJ/sQNDzQgOOZE9PYVl1BVOB0ck RUFjhUNvRYTF8BJdMROb23ZgL46kzxHiN2QDI6XGBCytkJ9py1VHk0wcKvEccx6OFJNJ+Q Ae7a5L7TvEs1IKs7pMonHAnCCQ2EHaiFwXNyVTCfa6kMdWqQM0BhNyX3ijSS8VRZg+RyFX soqECEhG+wBGxPJZj5uTRTqE3nJZ5TaTW6ewlvyseP+rg1pWSgeTup1zzVGOfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643837332; a=rsa-sha256; cv=none; b=O9nKLdQCWSUD6p4SY2p6kluEilfI8+QdpUZqQNLOUlcwL4cW25DSIrfsrN1oGKCl0EyQoh i2vKYQk7UD7ts2CIfPN6IYXIM38FMdduzcxgG4halKhLF728r26B0MvH+ab79Qqihp8OZS 83PdfVv42PkRrRJYPIkevQ4Jv/sXtWYrKpqWljafGlekNI756Y5a7vdbvHW9/QyiGfNX4A wI6R6GF7g4+jqaYIRlX0elxmvr4kZjoHSDazmZtaeMTFfJu6IeOCzkSXT3bmarEqXGiMpF YxwFcDWLSG44Dw8NP3Tg/HXjx3Fn2nv3JQVi0Jo3J4dMxoZDRteV9FiEkV5RWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=034755623d3d211a82084aca3215dc1e6d103bfc commit 034755623d3d211a82084aca3215dc1e6d103bfc Author: Warner Losh AuthorDate: 2022-02-02 21:27:56 +0000 Commit: Warner Losh CommitDate: 2022-02-02 21:27:56 +0000 stand: Fix kboot issue on powerpc64 with MK_LIB32=yes When MK_LIB32 is true, we descend into stand for make includes, make clean, etc. We shouldn't do this, so set MK_BOOT=no when we're building includes. Fixes: 6497250f6f7f PR: 261497 Sponsored by: Netflix Reviewed by: emaste, brooks (he suggested this) Differential Revision: https://reviews.freebsd.org/D34141 --- Makefile.libcompat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 872541188cef..76ad72483cbf 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -27,7 +27,8 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ -DNO_CPU_CFLAGS \ MK_CTF=no \ -DNO_LINT \ - MK_TESTS=no + MK_TESTS=no \ + MK_BOOT=no LIBCOMPATWMAKE+= ${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ OBJTOP=${LIBCOMPAT_OBJTOP} \ OBJROOT='$${OBJTOP}/' \