aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-11-26 10:46:15 +0000
committerBill Wendling <isanbard@gmail.com>2013-11-26 10:46:15 +0000
commit9ed81d16f71b60c246a7b8e9ed4fdd58a48ce4b9 (patch)
tree91c9441f2fe1f5445800c27781ad81dd48738f2e /lib
parentd1b770d24dea3dc93a7c0f75cf61e3400cde73b0 (diff)
downloadexternal_llvm-9ed81d16f71b60c246a7b8e9ed4fdd58a48ce4b9.zip
external_llvm-9ed81d16f71b60c246a7b8e9ed4fdd58a48ce4b9.tar.gz
external_llvm-9ed81d16f71b60c246a7b8e9ed4fdd58a48ce4b9.tar.bz2
Merging r195679:
------------------------------------------------------------------------ r195679 | rafael | 2013-11-25 12:15:14 -0800 (Mon, 25 Nov 2013) | 12 lines Don't use nopl in cpus that don't support it. Patch by Mikulas Patocka. I added the test. I checked that for cpu names that gas knows about, it also doesn't generate nopl. The modified cpus: i686 - there are i686-class CPUs that don't have nopl: Via c3, Transmeta Crusoe, Microsoft VirtualBox - see https://bbs.archlinux.org/viewtopic.php?pid=775414 k6, k6-2, k6-3, winchip-c6, winchip2 - these are 586-class CPUs via c3 c3-2 - see https://bugs.archlinux.org/task/19733 as a proof that Via c3 and c3-Nehemiah don't have nopl ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195730 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index c1a710b..1c6f071 100644
--- a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -309,8 +309,12 @@ bool X86AsmBackend::writeNopData(uint64_t Count, MCObjectWriter *OW) const {
// This CPU doesnt support long nops. If needed add more.
// FIXME: Can we get this from the subtarget somehow?
+ // FIXME: We could generated something better than plain 0x90.
if (CPU == "generic" || CPU == "i386" || CPU == "i486" || CPU == "i586" ||
- CPU == "pentium" || CPU == "pentium-mmx" || CPU == "geode") {
+ CPU == "pentium" || CPU == "pentium-mmx" || CPU == "i686" ||
+ CPU == "k6" || CPU == "k6-2" || CPU == "k6-3" || CPU == "geode" ||
+ CPU == "winchip-c6" || CPU == "winchip2" || CPU == "c3" ||
+ CPU == "c3-2") {
for (uint64_t i = 0; i < Count; ++i)
OW->Write8(0x90);
return true;