From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 16 Nov 2017 19:22:17 +0000 (+0100)
Subject: i386.c (x86_print_call_or_nop): Emit 5 byte nop explicitly as a stream of bytes.
X-Git-Tag: releases/gcc-6.5.0~676
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=404e211e6f5e0c4810bfe87152582bae24c12da1;p=thirdparty%2Fgcc.git

i386.c (x86_print_call_or_nop): Emit 5 byte nop explicitly as a stream of bytes.

	* config/i386/i386.c (x86_print_call_or_nop): Emit 5 byte nop
	explicitly as a stream of bytes.

From-SVN: r254842
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 809adfcd9158..c44e8ce5cb94 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-16  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (x86_print_call_or_nop): Emit 5 byte nop
+	explicitly as a stream of bytes.
+
 2017-11-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	Backport from mainline
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 2f313bd64646..7449f39729cd 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -45211,7 +45211,8 @@ static void
 x86_print_call_or_nop (FILE *file, const char *target)
 {
   if (flag_nop_mcount)
-    fprintf (file, "1:\tnopl 0x00(%%eax,%%eax,1)\n"); /* 5 byte nop.  */
+    /* 5 byte nop: nopl 0(%[re]ax,%[re]ax,1) */
+    fprintf (file, "1:" ASM_BYTE "0x0f, 0x1f, 0x44, 0x00, 0x00\n");
   else
     fprintf (file, "1:\tcall\t%s\n", target);
 }