From nobody Sat Apr 20 10:32:45 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 4VM7BQ3mpYz5HW1P; Sat, 20 Apr 2024 10:32:46 +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 4VM7BQ1J7hz4Q9k; Sat, 20 Apr 2024 10:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609166; 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=1+XmnVo4qms5G53gkhg1UHGadfxHdiAuiep67oK0jik=; b=r4+Tjzn72YRNQbusWnLKC/4AmD++4bcGqEa3oEjdyww6TFFRt7qb+jWEyeipaCfGgMZXpV NdFqsFUAfDljexvX3jJC9tyPyA5DyUENwBfdp+/XFp+uSjzayApqVv+aZbw5WJItknAim2 QrVLPvk4j/z8SEyV1Pf+r+3xd5bvTbkS2ze2hCpkBaMz5VXlGbgAASEgzapMbaSKjFw46h P4TBhEkmc4Au1VTNWDaSQBNCoVrMNwn7sK2hJ6af/NrDNnZ63Wn7QOJTfpIPBERoDTG98v q9gqpGeSxQ++V0sCWmbicfQmmmnm8vYQUKEFoRhr9KySdKFaZLcwF1ANpMh19g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609166; a=rsa-sha256; cv=none; b=YpjLJrk172+ddbsO1FMo9Jmtt/HKvWIiawZSvksn1EYph/5YqmamqC/RfMI+3mZ/Mfr3vM HoEga0H0M3kemzkLDnH9KtCbUCktuhm76yCe/6fUHPZF2A2os/BbcIJbIWbwLqdxRjZDL5 IRsgrgdb/SIqHpnowO1ARHD3uCISvzpyCezMMHvIi5cxMulXbf2BItgXiI9FfUo9TAboti gxu48rw4gw2R/Jg1DqHW00TxhVrX6cHtZrvLPjHiCQsz8A/Yk/ZKr8kWRI14k3oHix8V3p 0HSdax4C94e4j9H7UVZSGxmIBpWv+etXwsFYBiei0ZbA7XhSu5kDmymtLufSZg== 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=1713609166; 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=1+XmnVo4qms5G53gkhg1UHGadfxHdiAuiep67oK0jik=; b=G6kgszjAgIZWM560MLV/1Ksn+IZu66586LdigVC19UrbROdrh0EjS+ERUdKDhlmWOSsv7r P3KbLCuIewc8g973fb6vI5tjadungtLL5Sd2mvSuhRx+XndgjvlKhHdG966bnvurvbOJrN fsbZS99JfAxM652qUpSrs1PR6y78I6XTUaS881G48ZBNoATuLfdlq6Iayt/twB+G2ZKX/D GcMWQ+nvdRTc+bUBIjRLglK/2nJwC5nxOKeJOjhDAhokDekW/d1ZmMM3ym8CMlWr86/Z3Q hqtwTtkzA3HJuxYDnteN01OiM1I61LNVaoiP0LfOt0kucm1Phrk5e13yfm0wHQ== 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 4VM7BQ01VdzYqG; Sat, 20 Apr 2024 10:32:46 +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 43KAWjNc011831; Sat, 20 Apr 2024 10:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAWj8H011828; Sat, 20 Apr 2024 10:32:45 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:32:45 GMT Message-Id: <202404201032.43KAWj8H011828@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: 89ef2b34ab73 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 89ef2b34ab7333699641b7f8763633a51ee166a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=89ef2b34ab7333699641b7f8763633a51ee166a0 commit 89ef2b34ab7333699641b7f8763633a51ee166a0 Author: Dimitry Andric AuthorDate: 2024-04-07 19:45:51 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:03:25 +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 2c756f4ad21f..47d87b71ea77 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/}