Merging r261365:
authorHans Wennborg <hans@hanshq.net>
Fri, 19 Feb 2016 21:28:08 +0000 (21:28 +0000)
committerHans Wennborg <hans@hanshq.net>
Fri, 19 Feb 2016 21:28:08 +0000 (21:28 +0000)
commitfdf40bea4fc416643210790fff4345be98d97245
tree8b9e55778fac95ab02d0afac8d9c3829525f37e9
parent413ee9f101de92d75fc11334ffeb6a054d67a18c
Merging r261365:
------------------------------------------------------------------------
r261365 | hans | 2016-02-19 13:26:31 -0800 (Fri, 19 Feb 2016) | 3 lines

Revert r253557 "Alternative to long nops for X86 CPUs, by Andrey Turetsky"

Turns out the new nop sequences aren't actually nops on x86_64 (PR26554).
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@261366 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
test/MC/X86/x86_nop.s