From nobody Sat Dec 25 11:56:24 2021 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 C254818F3F8C; Sat, 25 Dec 2021 11:56:26 +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 4JLj7r32Ykz4lbQ; Sat, 25 Dec 2021 11:56:24 +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 263CA16E35; Sat, 25 Dec 2021 11:56:24 +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 1BPBuOaW007435; Sat, 25 Dec 2021 11:56:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBuOjV007434; Sat, 25 Dec 2021 11:56:24 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:56:24 GMT Message-Id: <202112251156.1BPBuOjV007434@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: c0c181405379 - stable/12 - Stop clang 13 from defining conflicting macros on PowerPC 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c0c181405379add206c7db9e50bad4ed61cb549c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433385; 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=+6ZJm8R0iWOIULUYS6KsUhtHg96zgNLT4KHTkXioomg=; b=PNW6AhLBXZq8t/biGNgXNBNAq61+AfCndATFHVJNqKeqtOwwQFz49acwwx60rQMNWjSjUV O8/RYMc3Hvi+Ho7ly2f3umQCSsB2NTB96U8J/ex2rorFN3u/qtkBQso731tyziy9+EawIS kC+No63jH9UpO/ugsjeuy89TtItQMbrfYgW4FGrPkTcQpb2sJVRW0AsghyXvXYaJrzRk2y X1SgAFBOaS1au1hdp2cpfza5HgVX9a4osS3RTxJiSr07H9QVVU1DIf8x6DdT49E/pwMEeF I0TkaVTFRd06qccF0mYxGwnFvHZGWa4oj5ugoVdPf8JW21wCKeW+vMAlx3pAug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433385; a=rsa-sha256; cv=none; b=q3teLCNKhE9ZJfPjDmkOjwOhOlzJ5cuLnjOTeUrMSblRPsn7NWw2BU4I+NoJuDxRii+4/w HCnZ27DmIkpQKGy6pNm1/80SHprelA6ySvIRTDEVF5x/RDbsBj6AX/+wXjOd6w6hNy/bZy E2i9/Vv/O9ch72juzKgQwOwFke4hazAeuIgsgYPJ1QSILWapVSKmKHofbNEB9dQsOH3PU/ GxgKy+lYQeJtP5M1sR3/iZ9hb4JHwpy9NMpVqTNngWaCJg23kREW97DyQmOG2kCVTc7RH3 fsyJ9mT8TnQPUTH4ij2nbnHaTwHeJkKgnFJYhp6dFke33r0xsw3M+hIdqQFg5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c0c181405379add206c7db9e50bad4ed61cb549c commit c0c181405379add206c7db9e50bad4ed61cb549c Author: Dimitry Andric AuthorDate: 2021-10-01 19:43:21 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:38 +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__");