x86: Also pass -P to $(CPP) when processing i386-opc.tbl

Since i386-opc.tbl contains '\' to avoid very long lines and i386-gen
requires that each instruction must be in one line, also pass -P to
$(CPP) to inhibit generation of linemarkers in the output from the
preprocessor to support i386-gen.

	* Makefile.am ($(srcdir)/i386-init.h): Also pass -P to $(CPP).
	* Makefile.in: Regenerated.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 47a6372d710080ff3a661c94ecfa12f03095f0c8..62a843a548395d7d4832f586a2fa4571247a1fcd 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am ($(srcdir)/i386-init.h): Also pass -P to $(CPP).
+       * Makefile.in: Regenerated.
+
 2020-03-09  Jan Beulich  <jbeulich@suse.com>
 
        * i386-opc.tbl (avx_irel): New. Use is for AVX512 vpcmp*

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 4f06074a85f74243526e8425756bd7502ad60612..7318bf04a8be839ead9e5562fecb009f0feddbe8 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -561,7 +561,7 @@ $(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h
        @echo $@
 
 $(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl i386-opc.h
-       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \
+       $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \
                < $(srcdir)/i386-opc.tbl \
                | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
 

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 8564803fc7a59615145af86306188dae238ea288..ddb93464bc6d322d8d10998e0a2628b4d623f05f 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1535,7 +1535,7 @@ $(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h
        @echo $@
 
 $(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl i386-opc.h
-       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \
+       $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - \
                < $(srcdir)/i386-opc.tbl \
                | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)