diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-01-22 05:59:26 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2008-01-22 05:59:26 +0000 |
commit | c911d5c907edcaf80792be1abac0262439fd9082 (patch) | |
tree | 08c44e8f01ee30192ca34338211119909a4d9293 /libcpu | |
parent | a9f3660eb17167f57ab308ec54a4e8d4c902858a (diff) | |
download | elfutils-c911d5c907edcaf80792be1abac0262439fd9082.tar.gz |
merge of '33d6cda327b8cb82fe8be29c24addb2bdf40acff'
and '4f7c8e6f95ff49761dd62bf932f09597f5838ab8'
Diffstat (limited to 'libcpu')
-rw-r--r-- | libcpu/ChangeLog | 7 | ||||
-rw-r--r-- | libcpu/Makefile.am | 6 | ||||
-rw-r--r-- | libcpu/i386_parse.y | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index fff065b0..4b225af8 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,10 @@ +2008-01-21 Roland McGrath <roland@redhat.com> + + * i386_parse.y: Add sanity check for NMNES macro value. + * Makefile.am (i386_parse.o): Fix target in dependency rule. + (i386_parse.h): New target with empty commands. + (i386_lex.o): Depend on it in place of i386_parse.c. + 2008-01-21 Ulrich Drepper <drepper@redhat.com> * Makefile.am (EXTRA_DIST): Remove defs/x86_64. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index d3d4bb55..51817c1e 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -69,11 +69,13 @@ i386_lex_no_Werror = yes libeu = ../lib/libeu.a i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare -i386_gendis.o: i386_parse.c i386.mnemonics +i386_parse.o: i386_parse.c i386.mnemonics i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics) -i386_lex.o: i386_parse.c +i386_lex.o: i386_parse.h i386_gendis_LDADD = $(libeu) -lm $(libmudflap) +i386_parse.h: i386_parse.c ; + noinst_HEADERS = memory-access.h i386_parse.h i386_data.h EXTRA_DIST = defs/i386 diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y index 9b2ab33e..ceeb12ad 100644 --- a/libcpu/i386_parse.y +++ b/libcpu/i386_parse.y @@ -1090,6 +1090,10 @@ print_op_fct (const void *nodep, VISIT value, } +#if NMNES < 2 +# error "bogus NMNES value" +#endif + static void instrtable_out (void) { |