diff options
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 10 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 10 | ||||
| -rw-r--r-- | libcpu/i386_disasm.c | 1 | ||||
| -rw-r--r-- | libcpu/memory-access.h | 2 |
4 files changed, 19 insertions, 4 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 22bec9b3..ef5da58f 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,4 +1,12 @@ -2017-04-20 Ulf Hermann <[email protected]> +2017-02-27 Ulf Hermann <[email protected]> + + * Makefile.am: Use fpic_CFLAGS. + +2017-02-21 Ulf Hermann <[email protected]> + + * Makefile.am: Link gendis agaist libgnu.a if requested. + +2017-04-20 Ulf Hermann <[email protected]> * Makefile.am: Add EXEEXT to gendis. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 31fc906b..d2775832 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -30,7 +30,7 @@ include $(top_srcdir)/config/eu.am AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -I$(srcdir)/../libdw -I$(srcdir)/../libasm -AM_CFLAGS += -fPIC -fdollars-in-identifiers +AM_CFLAGS += $(fpic_CFLAGS) -fdollars-in-identifiers LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=) LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) @@ -80,11 +80,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 831afbe2..b48025fb 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"); } } diff --git a/libcpu/memory-access.h b/libcpu/memory-access.h index 44210e2f..779825fa 100644 --- a/libcpu/memory-access.h +++ b/libcpu/memory-access.h @@ -90,7 +90,7 @@ union unaligned int16_t s2; int32_t s4; int64_t s8; - } __attribute__ ((packed)); + } attribute_packed; static inline uint16_t read_2ubyte_unaligned (const void *p) |