From nobody Mon Dec 06 16:33:22 2021 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 7371118B3D01; Mon, 6 Dec 2021 16:33:27 +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 4J78BC5wvSz3CCT; Mon, 6 Dec 2021 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EFDD87244; Mon, 6 Dec 2021 16:33:22 +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 1B6GXMZ7087612; Mon, 6 Dec 2021 16:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6GXMm3087611; Mon, 6 Dec 2021 16:33:22 GMT (envelope-from git) Date: Mon, 6 Dec 2021 16:33:22 GMT Message-Id: <202112061633.1B6GXMm3087611@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: e881c55cdc08 - stable/13 - Stop clang 13 from defining conflicting macros on PowerPC 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e881c55cdc08098dd988e907af750516b597a3c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638808405; 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=x3J95gRt7ZFW74vbGEqR74c4pNUzev00apxnkvEidUw=; b=dfTfU+p6sGnSm34yoX3LHMR5PhG/pbrBHaR0EslTgyvEPcHYbUD1JM9jzAkEjZRmpekiMd n8MwB2VYlFn2I8aONxDT5FqxciTA3AnbNC5sIiBrRblTOTprQjnifwx16IJ86ozlgfUK6O y+9Kn1f/Fy+d/H6QqCm2SeKM3G43xpObFz2ekem5H0s0RzpTiSKFsUrZMbABE/3F8xW0Gd /1OLpuBo6Tsw6pX/T94E4rMd/R2GXRftRFNnHwKJj9IvUs3rxqinAB7zBlVp0pCJ1Jqodp kKv+RsnSg1r8Y805Xb1vy6vuljTZZh7vT5RSTni70tSqpApYJHp3nQIA+OJ1ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638808405; a=rsa-sha256; cv=none; b=O/IIThd/TGOFZDBfuHczaQtQ0voGk++vslKEECTot+AB1zLnvs4TkaFhidIwajXKvYyfAu /jiHxN7W5typ6u2XfY3EghrPMWZ9GhgFcE3z1dpLZkYgIsMSn1kMpnhhTAzlvFJsAeBlna 1+MdDfxRroiEtRMiQGOs1NFzw1bT/UxbI+yMzZLMXJ1p+nFcKs2vqMJFtymOzwDOIe9hIL SF5yAIIhmOvlmmsLhjyzLp7oDZ011pfsekHv5tHfxiMU5zkoIFUevCg3ZtuM8IMR8nIA2s IFsWzIC69TToJAXGGDUgtM0kqGBUNVwjYX5I2A1jE+SAu2bAtRkh0n4oZNLX3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e881c55cdc08098dd988e907af750516b597a3c8 commit e881c55cdc08098dd988e907af750516b597a3c8 Author: Dimitry Andric AuthorDate: 2021-10-01 19:43:21 +0000 Commit: Dimitry Andric CommitDate: 2021-12-06 16:30:08 +0000 Stop clang 13 from defining conflicting macros on PowerPC Merge commit c9539f957f57 from llvm git (by Nemanja Ivanovic): [PowerPC] Define XL-compatible macros only for AIX and Linux Since XLC only ever shipped on PowerPC AIX and Linux, it is not reasonable to provide the compatibility macros on any target other than those two. This patch restricts those macros to AIX/Linux. Differential revision: https://reviews.llvm.org/D110213 PR: 258209 (cherry picked from commit 39dadd0628cd1f28be39a3ab35969545b7401623) --- contrib/llvm-project/clang/lib/Basic/Targets/PPC.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/PPC.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/PPC.cpp index 59656888e25f..ecfbe284fb2e 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/PPC.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/PPC.cpp @@ -243,7 +243,10 @@ static void defineXLCompatMacros(MacroBuilder &Builder) { void PPCTargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { - defineXLCompatMacros(Builder); + // We define the XLC compatibility macros only on AIX and Linux since XLC + // was never available on any other platforms. + if (getTriple().isOSAIX() || getTriple().isOSLinux()) + defineXLCompatMacros(Builder); // Target identification. Builder.defineMacro("__ppc__");