Merge r325653, r325651, r325657, r325713 into the 6.0.1 release

[llvmbot]

Bugzilla Link	36664
Resolution	FIXED
Resolved on	Apr 11, 2018 06:06
Version	6.0
OS	All
Blocks	#35997
Reporter	LLVM Bugzilla Contributor
CC	@tstellar
Fixed by commit(s)	r329798 r329799 r329800

Extended Description

All three patches are for spectre variant two mitigation, and are titled "[mips] Spectre variant two mitigation for MIPSR2". The last addresses' a post commit review.

[llvmbot]

The LLVM part needs a patch on top of it.

[llvmbot]

Patch for test failures when applying the Spectre patch.
The LLVM patch requires this to pass the LLVM test-suite.

[tstellar]

Did you mean to include r325657 or was that a typo?

[llvmbot]

Yes, r325657 was a typo. It should have been: r325657.

(https://reviews.llvm.org/rL325647) [mips][lld] Spectre variant two mitigation for MIPSR2

Thanks for catching this.

[llvmbot]

Yes, r325657 was a typo. It should have been: r325657.

(https://reviews.llvm.org/rL325647) [mips][lld] Spectre variant two
mitigation for MIPSR2

Thanks for catching this.

Yes, I made the typo again. r325647 instead of r325657. The link and patch title point to the correct patch.

[tstellar]

These all look fine, go ahead and merge.

[llvmbot]

All patches merged. I've squashed the patch attached to this report into the LLVM patch, and the post commit change for LLD into the LLD patch.

Thanks,
Simon