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.

diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index fff065b0052c9247067317b0daa9d21ce2662c3d..e4dd3a751b562b2d28ad225da17cba151f8909fa 100644 (file)
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 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 d3d4bb55a85c44fe7fdc8b6697c65c1fbf47fe3d..e48b37f485f7907efc1ddacda568531650272c4b 100644 (file)
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -69,7 +69,7 @@ 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_gendis_LDADD = $(libeu) -lm $(libmudflap)

diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y
index 9b2ab33e2795df235219e3b24d0fa277aac72ec1..ceeb12ad0e78fc6d0ac18939021691b381d33827 100644 (file)
--- 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)
 {