diff options
| author | Omar Sandoval <osandov@fb.com> | 2019-08-26 10:51:44 -0700 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2019-08-28 21:29:18 +0200 |
| commit | 4fcb7ec9d788d09f1525a506e1cbe8a39fc1b8eb (patch) | |
| tree | e148e7f62ceb2b792d668c43023f211dda2bc142 /libcpu | |
| parent | 3a409a89fd0f4e2e125dc8dba73757928087252c (diff) | |
| download | elfutils-4fcb7ec9d788d09f1525a506e1cbe8a39fc1b8eb.tar.gz | |
libcpu: merge libcpu_{i386,x86_64,bpf} into one library
In preparation for combining the libebl backend modules, combine all of
the libcpu backends into libcpu.a.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index adebbef8..c0ea72ec 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2019-07-05 Omar Sandoval <osandov@fb.com> + + * Makefile.am: Combine libcpu_{i386,x86_64,bpf}.a into libcpu.a. + 2018-11-04 Mark Wielaard <mark@klomp.org> * bpf_disasm.c (bpf_disasm): Recognize BPF_JLT, BPF_JLE, BPF_JSLT diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 4c8778d1..a7d9f6fd 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -35,20 +35,16 @@ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=) LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) -noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a +noinst_LIBRARIES = libcpu.a -libcpu_i386_a_SOURCES = i386_disasm.c i386_dis.h -libcpu_x86_64_a_SOURCES = x86_64_disasm.c x86_64_dis.h +libcpu_a_SOURCES = i386_disasm.c i386_dis.h x86_64_disasm.c x86_64_dis.h \ + bpf_disasm.c 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 -noinst_LIBRARIES += libcpu_bpf.a -libcpu_bpf_a_SOURCES = bpf_disasm.c -libcpu_bpf_a_CFLAGS = $(AM_CFLAGS) -Wno-format-nonliteral - %_defs: $(srcdir)/defs/i386 $(AM_V_GEN)m4 -D$* -DDISASSEMBLER $< > $@T $(AM_V_at)mv -f $@T $@ @@ -86,6 +82,8 @@ i386_gendis_LDADD = $(libeu) -lm i386_parse.h: i386_parse.c ; +bpf_disasm_CFLAGS = -Wno-format-nonliteral + EXTRA_DIST = defs/i386 CLEANFILES += $(foreach P,i386 x86_64,$P_defs $P.mnemonics) |