From: David Faust <david.faust@oracle.com>
Date: Thu, 17 Sep 2020 09:42:57 +0000 (+0100)
Subject: Use the correct no-op ocode for the BPF assembler.
X-Git-Tag: binutils-2_35_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=538c131ec2d588e685e3eb6c94dbe3be84ef75dd;p=thirdparty%2Fbinutils-gdb.git

Use the correct no-op ocode for the BPF assembler.

	* config/tc-bpf.h (md_single_noop_insn): Use 'ja 0' for no-op.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ded38623435..ec4bea89dcc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-15  Nick Clifton  <nickc@redhat.com>
+
+	Import from mainline:
+	2020-09-15  David Faust  <david.faust@oracle.com>
+
+	* config/tc-bpf.h (md_single_noop_insn): Use 'ja 0' for no-op.
+
 2020-09-15  Nick Clifton  <nickc@redhat.com>
 
 	Import from mainline:
diff --git a/gas/config/tc-bpf.h b/gas/config/tc-bpf.h
index cb02d6c1338..e7e505cfaa5 100644
--- a/gas/config/tc-bpf.h
+++ b/gas/config/tc-bpf.h
@@ -48,4 +48,6 @@
 /* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_single_noop_insn "mov %r1,%r1"
+/* The Linux kernel verifier expects NOPs to be encoded in this way;
+   a jump to offset 0 means jump to the next instruction.  */
+#define md_single_noop_insn "ja 0"