From nobody Sat Apr 20 10:34:52 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 4VM7Ds2XHrz5HWgT; Sat, 20 Apr 2024 10:34:53 +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 4VM7Dr1Wzzz4T69; Sat, 20 Apr 2024 10:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609292; 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=s3WfJvKK2W40GR9lY4fjecAUUalaeaeNKN+yfgdTVdo=; b=OJl/F7Hd2874CwGLbVSSxonf3Yd5ViiHb/mN6YWSvwvNzYdkrr59HAa7Bw2lWtI+n5THoo HzSPxHsjOgJ+avIUDEspJScxRDa4IB6c71BaIn/OycORcJOn90DeALXqTSFEZTHc6VPMBC 7SChGdRbnRJfeXuAOiGMnSt0MPQ0/34uyMOxefwfXYHvPt1vFgIiUcfqy0W6tnKopK+rMK aThDa1A5xJvlqDybp979vmKB8D7XYszC/Lx4M4K5gOuyMZEVPFs3+xgWuC+WWZyDWKjNei Slksy5bjNESxYS3WLsw9d5l1eE115nP4KQZSP9oW0doBBZjqNXXRRtrUBTLapA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609292; a=rsa-sha256; cv=none; b=mrWJ8GjDHMH0TXJouns/upEwfMj72KLU5Z14qUv0TKOJl2QcL0unQhKsO7VxJwHsj7KuCL UjU98birO9Uay1uhZtbLYAxsCYI0uHb7K88ZNNHARURERypdh8N2nskThbFZ9vUbwYeQME 0sOAuIQKGqHoiXlc19EFnsO1pNsKAL6yhTqSIZGbJaWbc8qGk1EhURaRiIpjtDBT+sIFkx OkvAyE6/xHpm/OGWNONuTFvd3q1MoHtQU6fKMGmsXIkX7qxvDNYtuaLs3UuJ+35Mws6cDm /cKzbYsMFfRXMWThy9tKfV1Pb7uuKTwVnq/7+3a4R6Bfni7uvjkxu6F9kYr6Ag== 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=1713609292; 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=s3WfJvKK2W40GR9lY4fjecAUUalaeaeNKN+yfgdTVdo=; b=GMHsSwibmmeLFgFzNRzzoPKD7Pc3xU15U+TtNzWIz2q8htqLclLTpijk19F2L7k8GD7Stj BAZOJwEojkkmWYpLcGt5jCeKLHjWeonaCk+On0b1Ou11svZhlL32p549p1raGJA1nFgtE/ IbIdtB8bDf5G1LTUUExGo07efS3SDNpeyGowdjH1Qgvp89mQIxQ0snjXw+E+AHRZEL1+U1 eUTAX+9PLzAbn8ZIpKdirlVCQeTbJm0hLdFtbg3nJVEzlQmrNPxKsiSTffS5/RaU8IS3q2 xgK3zcbA9C5/UfDOT7n0kBweGhoAwXehIOmNuhRlRPWYWMYio5Zrj9wDwyAgSw== 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 4VM7Dr18KvzZ5r; Sat, 20 Apr 2024 10:34:52 +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 43KAYqkg014505; Sat, 20 Apr 2024 10:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAYq6u014502; Sat, 20 Apr 2024 10:34:52 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:34:52 GMT Message-Id: <202404201034.43KAYq6u014502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7334d08a3ad4 - stable/13 - libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7334d08a3ad434152c451a9dab6c8f7ddb8cf62e Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7334d08a3ad434152c451a9dab6c8f7ddb8cf62e commit 7334d08a3ad434152c451a9dab6c8f7ddb8cf62e Author: Dimitry Andric AuthorDate: 2024-04-07 19:45:51 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:09 +0000 libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build Apparently libgcc_s has always included libcompiler_rt's Makefile.inc without first including bsd.compiler.mk, even though Makefile.inc used COMPILER_TYPE already. It looks like we were just lucky that the expression was not malformed. PR: 276104 Reported by: Herbert J. Skuhra MFC after: 1 month (cherry picked from commit 4c983a2886877a855ac3a2836b15d80356fbb8d4) --- lib/libcompiler_rt/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index a4d0203b8ed3..c0dacb5c9d7e 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -1,3 +1,4 @@ +.include CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/:C/powerpc/ppc/}