diff options
| author | Mark Wielaard <[email protected]> | 2017-05-31 17:24:14 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2017-05-31 18:10:22 +0200 |
| commit | 13c3e00ba629586ae42c316ae4ed6c3f04282a82 (patch) | |
| tree | c71ef64f8ce1f72151044e69e7f01bb29d3ca235 /libcpu | |
| parent | 8581fde6f7401a5db1e9a4757d748c5ad7bd2142 (diff) | |
| parent | 6358858c4d65e8fb12a112198ee1d4bcab0be876 (diff) | |
Merge tag 'elfutils-0.169' into mjw/RH-DTSdts-0.169
elfutils 0.169 release
Conflicts:
ChangeLog
tests/run-elflint-test.sh
tests/run-readelf-A.sh
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 8 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 6 | ||||
| -rw-r--r-- | libcpu/i386_parse.y | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 79110c22..22bec9b3 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,11 @@ +2017-04-20 Ulf Hermann <[email protected]> + + * Makefile.am: Add EXEEXT to gendis. + +2017-04-20 Ulf Hermann <[email protected]> + + * i386_parse.y: Eliminate comparison_fn_t. + 2016-11-02 Mark Wielaard <[email protected]> * i386_disasm.c (i386_disasm): Add fallthrough comment. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 260ed80c..33c30a90 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -62,10 +62,10 @@ endif if MAINTAINER_MODE noinst_HEADERS = memory-access.h i386_parse.h i386_data.h -noinst_PROGRAMS = i386_gendis +noinst_PROGRAMS = i386_gendis$(EXEEXT) -$(srcdir)/%_dis.h: %_defs i386_gendis - $(AM_V_GEN)./i386_gendis $< > $@T +$(srcdir)/%_dis.h: %_defs i386_gendis$(EXEEXT) + $(AM_V_GEN)./i386_gendis$(EXEEXT) $< > $@T $(AM_V_at)mv -f $@T $@ else diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y index 15a72b1f..5fc06825 100644 --- a/libcpu/i386_parse.y +++ b/libcpu/i386_parse.y @@ -309,10 +309,10 @@ instr: bytes ':' bitfieldopt kID bitfieldopt optargs newp->mnemonic = $4; if (newp->mnemonic != (void *) -1l && tfind ($4, &mnemonics, - (comparison_fn_t) strcmp) == NULL) + (int (*)(const void *, const void *)) strcmp) == NULL) { if (tsearch ($4, &mnemonics, - (comparison_fn_t) strcmp) == NULL) + (int (*)(const void *, const void *)) strcmp) == NULL) error (EXIT_FAILURE, errno, "tsearch"); ++nmnemonics; } |