diff options
| author | Mark Wielaard <[email protected]> | 2017-08-03 12:37:37 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2017-08-03 14:21:08 +0200 |
| commit | 766df1e15c1e8f8bc9890e7538eb2ef15a6516dc (patch) | |
| tree | 45ae9d0ac821a15fbb9336909671e18efc15f6e8 /libcpu | |
| parent | 13c3e00ba629586ae42c316ae4ed6c3f04282a82 (diff) | |
| parent | 54ba4ce2973113d8f4315d4fc90e16a9b4476ea6 (diff) | |
Merge tag 'elfutils-0.170' into mjw/RH-DTSdts-0.170
elfutils 0.170 release
Conflicts:
libcpu/Makefile.am
libdw/Makefile.am
tests/Makefile.am
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 2 | ||||
| -rw-r--r-- | libcpu/bpf_disasm.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 22bec9b3..28b220fc 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,9 @@ +2017-07-18 Mark Wielaard <[email protected]> + + * Makefile.am: Don't check HAVE_LINUX_BPF_H, just define libcpu_bpf. + * bpf_disasm.c: Include bpf.h instead of linux/bpf.h. Don't define + BPF_PSEUDO_MAP_FD. + 2017-04-20 Ulf Hermann <[email protected]> * Makefile.am: Add EXEEXT to gendis. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 33c30a90..d16ba69b 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -47,13 +47,11 @@ i386_gendis_SOURCES = i386_gendis.c i386_lex.l i386_parse.y i386_disasm.o: i386.mnemonics $(srcdir)/i386_dis.h x86_64_disasm.o: x86_64.mnemonics $(srcdir)/x86_64_dis.h -if HAVE_LINUX_BPF_H noinst_LIBRARIES += libcpu_bpf.a libcpu_bpf_a_SOURCES = bpf_disasm.c libcpu_bpf_a_CFLAGS = $(AM_CFLAGS) -Wno-format-nonliteral libcpu_static_pic_a_SOURCES += $(libcpu_bpf_a_SOURCES) bpf_disasm_CFLAGS = -fPIC -Wno-format-nonliteral -endif %_defs: $(srcdir)/defs/i386 $(AM_V_GEN)m4 -D$* -DDISASSEMBLER $< > $@T diff --git a/libcpu/bpf_disasm.c b/libcpu/bpf_disasm.c index e4bbae4a..054aba2b 100644 --- a/libcpu/bpf_disasm.c +++ b/libcpu/bpf_disasm.c @@ -35,16 +35,11 @@ #include <stdio.h> #include <gelf.h> #include <inttypes.h> -#include <linux/bpf.h> +#include "bpf.h" #include "../libelf/common.h" #include "../libebl/libeblP.h" -/* BPF_PSEUDO_MAP_FD was only introduced in linux 3.20. */ -#ifndef BPF_PSEUDO_MAP_FD - #define BPF_PSEUDO_MAP_FD 1 -#endif - static const char class_string[8][8] = { [BPF_LD] = "ld", [BPF_LDX] = "ldx", |