From 384f368958f2a5bb083660e58e5f8a010e6ad429 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 9 Mar 2020 08:23:46 -0700 Subject: [PATCH] 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. --- opcodes/ChangeLog | 5 +++++ opcodes/Makefile.am | 2 +- opcodes/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 47a6372d71..62a843a548 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2020-03-09 H.J. Lu + + * Makefile.am ($(srcdir)/i386-init.h): Also pass -P to $(CPP). + * Makefile.in: Regenerated. + 2020-03-09 Jan Beulich * i386-opc.tbl (avx_irel): New. Use is for AVX512 vpcmp* diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 4f06074a85..7318bf04a8 100644 --- 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 8564803fc7..ddb93464bc 100644 --- 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) -- 2.34.1