From: Tom Tromey <tom@tromey.com>
Date: Sat, 1 Sep 2018 16:28:34 +0000 (-0600)
Subject: Simplify ada-exp.o rule
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8dc9fd87b0965f24e21922f295c4af9c3f624985;p=binutils-gdb.git

Simplify ada-exp.o rule

The ada-exp.o rule no longer needs to pass -Wno-old-style-definition
to the compiler, as this option has no meaning in C++.  So, This patch
simplifies the explicit ada-exp.o rule in the Makefile.  The rule is
still needed because, according to the comment, ada-exp.c may appear
in the srcdir.

gdb/ChangeLog
2018-09-04  Tom Tromey  <tom@tromey.com>

	* Makefile.in (GDB_WARN_CFLAGS_NO_DEFS): Remove.
	(ada-exp.o): Update.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5aafde6ae27..8e6e3617848 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-04  Tom Tromey  <tom@tromey.com>
+
+	* Makefile.in (GDB_WARN_CFLAGS_NO_DEFS): Remove.
+	(ada-exp.o): Update.
+
 2018-09-04  Tom Tromey  <tom@tromey.com>
 
 	* Makefile.in (printcmd.o, target-float.o): Remove.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 16aac9dadf2..c76a4e4394c 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -199,9 +199,6 @@ WERROR_CFLAGS = @WERROR_CFLAGS@
 GDB_WARN_CFLAGS = $(WARN_CFLAGS)
 GDB_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
-GDB_WARN_CFLAGS_NO_DEFS = `echo " $(GDB_WARN_CFLAGS) " \
-		   | sed "s/ -Wold-style-definition / -Wno-old-style-definition /g"`
-
 RDYNAMIC = @RDYNAMIC@
 
 # Where is the INTL library?  Typically in ../intl.
@@ -2385,11 +2382,8 @@ ALLDEPFILES = \
 # development builds.
 ADA_EXP_C = `if test -f ada-exp.c; then echo ada-exp.c; else echo $(srcdir)/ada-exp.c; fi`
 
-# Some versions of flex give output that triggers
-# -Wold-style-definition.
 ada-exp.o: ada-exp.c
-	$(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) \
-		$(GDB_WARN_CFLAGS_NO_DEFS) $(COMPILE.post) $(ADA_EXP_C)
+	$(COMPILE) $(ADA_EXP_C)
 	$(POSTCOMPILE)
 
 # Message files.  Based on code in gcc/Makefile.in.