Merge 1c4cb510b4daccc0f4763958567affc2b442f317 into release/12.x

[nathanchance]

Bugzilla Link	50252
Resolution	FIXED
Resolved on	May 10, 2021 17:49
Version	12.0
OS	All
Blocks	#48661
CC	@nickdesaulniers,@tstellar,@uweigand
Fixed by commit(s)	1c4cb51 067c06d

Extended Description

1c4cb51

This will fix a build error seen with the Linux kernel in certain s390 configurations, including Fedora. It should be relatively safe, I have verified that it merges cleanly, passes all tests, and builds a kernel properly.

[tstellar]

Hi Ulrich,

What is your opinion on backporting this?

https://reviews.llvm.org/rG1c4cb510b4daccc0f4763958567affc2b442f317

[tstellar]

Acked here: ClangBuiltLinux/linux#1370 (comment)

[tstellar]

Merged: 067c06d