diff options
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 8 | ||||
| -rw-r--r-- | libcpu/i386_disasm.c | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index adebbef8..8c85e7a3 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2017-02-21 Ulf Hermann <[email protected]> + + * Makefile.am: Link gendis agaist libgnu.a if requested. + 2018-11-04 Mark Wielaard <[email protected]> * bpf_disasm.c (bpf_disasm): Recognize BPF_JLT, BPF_JLE, BPF_JSLT diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 4c8778d1..b1a20496 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -78,11 +78,17 @@ i386_lex_no_Werror = yes libeu = ../lib/libeu.a +if USE_GNULIB +libgnu = ../libgnu/libgnu.a +else +libgnu = +endif + i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare i386_parse.o: i386_parse.c i386.mnemonics i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`" i386_lex.o: i386_parse.h -i386_gendis_LDADD = $(libeu) -lm +i386_gendis_LDADD = $(libeu) $(libgnu) $(intl_LDADD) -lm i386_parse.h: i386_parse.c ; diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c index a7e03f95..b14bcb79 100644 --- a/libcpu/i386_disasm.c +++ b/libcpu/i386_disasm.c @@ -821,6 +821,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)), } FALLTHROUGH; default: + str = "invalid"; assert (! "INVALID not handled"); } } |