diff options
author | David Faust <david.faust@oracle.com> | 2020-09-15 10:33:49 +0100 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2020-09-15 10:33:49 +0100 |
commit | 6db9990640cdf7bc0880149f2707904506518fb8 (patch) | |
tree | 69d57fa90e8c42660fca1bd4f48534435247fb7e | |
parent | d2b31b672955162463cd47bdb28baf2687bebe28 (diff) | |
download | fsf-binutils-gdb-6db9990640cdf7bc0880149f2707904506518fb8.zip fsf-binutils-gdb-6db9990640cdf7bc0880149f2707904506518fb8.tar.gz fsf-binutils-gdb-6db9990640cdf7bc0880149f2707904506518fb8.tar.bz2 |
Change the /nop directive for the BPF port of the assembler to use the encoding expected by the kernel.
* config/tc-bpf.h (md_single_noop_insn): Use 'ja 0' for no-op.
-rw-r--r-- | gas/ChangeLog | 4 | ||||
-rw-r--r-- | gas/config/tc-bpf.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index d66be0a..633967d 100644 --- 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 cb02d6c..e7e505c 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" |