Change the /nop directive for the BPF port of the assembler to use the encoding expec...

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d66be0a46a1971ab34b5cba2dd936504d803e1ab..633967d3068e4529d137e239b1e56088c783ad9d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+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-14  Nick Clifton  <nickc@redhat.com>
 
        * read.c (s_nop): New function.  Handles the .nop directive.

diff --git a/gas/config/tc-bpf.h b/gas/config/tc-bpf.h
index cb02d6c13383250d6fcd50ab6239608a4665ef4a..e7e505cfaa59bd815a9dded1f1e868e119c35fef 100644 (file)
--- 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"