Merge r324772 into the 6.0 branch : [X86][MC] Fix assembling rip-relative addressing + immediate displacements

[francisvm]

Bugzilla Link	36330
Resolution	FIXED
Resolved on	Feb 12, 2018 02:14
Version	6.0
OS	All
Blocks	#35152
CC	@zmodem
Fixed by commit(s)	r324772

Extended Description

Is it OK to merge the following revision(s) to the 6.0 branch?

[francisvm]

https://reviews.llvm.org/rL324772

[zmodem]

Sounds good to me. Merged in r324875.