[PATCH 0/4] Minor gdb build fixes

[PATCH 0/4] Minor gdb build fixes

[Tom Tromey]

This fixes a few oddities I found in the gdb build system.
Tested by the buildbot.

Let me know what you think.

Tom

[PATCH 1/4] Remove obsolete comments from Makefiles

[Tom Tromey]

This removes an obsolete comment from Makefile.in.  This was copied
into gnulib/Makefile.in, so this removes that comment as well.

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

	* gnulib/Makefile.in: Remove obsolete comment.
	* Makefile.in: Remove obsolete comment.
---
 gdb/ChangeLog          | 5 +++++
 gdb/Makefile.in        | 5 -----
 gdb/gnulib/Makefile.in | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 438379e2ab1..e75ef66a070 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -98,11 +98,6 @@ MSGMERGE = msgmerge
 PACKAGE = @PACKAGE@
 CATALOGS = @CATALOGS@
 
-# If you are compiling with GCC, make sure that either 1) You have the
-# fixed include files where GCC can reach them, or 2) You use the
-# -traditional flag.  Otherwise the ioctl calls in inflow.c
-# will be incorrectly compiled.  The "fixincludes" script in the gcc
-# distribution will fix your include files up.
 CC = @CC@
 CXX = @CXX@
 CXX_DIALECT = @CXX_DIALECT@
diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in
index 1602da54b6c..117831a3d4e 100644
--- a/gdb/gnulib/Makefile.in
+++ b/gdb/gnulib/Makefile.in
@@ -62,11 +62,6 @@ SUBDIRS = import
 CLEANDIRS = $(SUBDIRS)
 REQUIRED_SUBDIRS = $(SUBDIRS)
 
-# If you are compiling with GCC, make sure that either 1) You have the
-# fixed include files where GCC can reach them, or 2) You use the
-# -traditional flag.  Otherwise the ioctl calls in inflow.c
-# will be incorrectly compiled.  The "fixincludes" script in the gcc
-# distribution will fix your include files up.
 CC=@CC@
 
 # Directory containing source files.
-- 
2.13.6

[PATCH 4/4] Remove --enable-multi-ice

[Tom Tromey]

gdb's configure script accepts --enable-multi-ice, but the code this
refers to is long gone.  This patch removes the option entirely.

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

	* configure: Rebuild.
	* configure.ac: Remove multi-ice code.
---
 gdb/ChangeLog    |  5 +++++
 gdb/configure    | 18 ------------------
 gdb/configure.ac | 12 ------------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/gdb/configure b/gdb/configure
index d207c2baf1b..270657103b6 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -892,7 +892,6 @@ with_tcl
 with_tk
 with_x
 enable_sim
-enable_multi_ice
 enable_gdbserver
 with_babeltrace
 with_libbabeltrace_prefix
@@ -916,7 +915,6 @@ YFLAGS
 XMKMF'
 ac_subdirs_all='testsuite
 gdbtk
-multi-ice
 gdbserver'
 
 # Initialize some variables set by options.
@@ -1559,7 +1557,6 @@ Optional Features:
                           enable GDB specific build-time compiler warnings if
                           gcc is used
   --enable-sim            link gdb with simulator
-  --enable-multi-ice      build the multi-ice-gdb-server
   --enable-gdbserver      automatically build gdbserver (yes/no/auto, default
                           is auto)
 
@@ -17089,21 +17086,6 @@ _ACEOF
 
 fi
 
-# Enable multi-ice-gdb-server.
-# Check whether --enable-multi-ice was given.
-if test "${enable_multi_ice+set}" = set; then :
-  enableval=$enable_multi_ice; case $enableval in
-    yes | no)
-      ;;
-    *) as_fn_error $? "bad value $enableval for --enable-multi-ice" "$LINENO" 5 ;;
-  esac
-fi
-
-if test "x$enable_multi_ice" = xyes; then
-   subdirs="$subdirs multi-ice"
-
-fi
-
 # Check whether --enable-gdbserver was given.
 if test "${enable_gdbserver+set}" = set; then :
   enableval=$enable_gdbserver; case "${enableval}" in
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 13bc5f9a8f2..e38604cb656 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2160,18 +2160,6 @@ if test x"${gdb_osabi}" != x ; then
 		       [Define to the default OS ABI for this configuration.])
 fi
 
-# Enable multi-ice-gdb-server.
-AC_ARG_ENABLE(multi-ice,
-AS_HELP_STRING([--enable-multi-ice], [build the multi-ice-gdb-server]),
-  [case $enableval in
-    yes | no)
-      ;;
-    *) AC_MSG_ERROR([bad value $enableval for --enable-multi-ice]) ;;
-  esac])
-if test "x$enable_multi_ice" = xyes; then
-   AC_CONFIG_SUBDIRS(multi-ice)
-fi
-
 AC_ARG_ENABLE(gdbserver,
 AS_HELP_STRING([--enable-gdbserver],
                [automatically build gdbserver (yes/no/auto, default is auto)]),
-- 
2.13.6

[PATCH 3/4] Simplify ada-exp.o rule

[Tom Tromey]

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-03  Tom Tromey  <tom@tromey.com>

	* Makefile.in (GDB_WARN_CFLAGS_NO_DEFS): Remove.
	(ada-exp.o): Update.
---
 gdb/ChangeLog   | 5 +++++
 gdb/Makefile.in | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)

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.
-- 
2.13.6

Re: [PATCH 3/4] Simplify ada-exp.o rule

[Joel Brobecker]

> 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.

For the record, this is correct; in particular, the source packages
we produce (nightly and releases) include them. I believe this helps
avoid a dependency on bison (and flex for ada-lex.[lc]) for users
building from source packages rather than from git sources.

-- 
Joel

[PATCH 2/4] Remove unneeded explicit .o targets

[Tom Tromey]

Makefile.in had special cases to compile printcmd.o and target-float.o
with a different set of warnings.  However, this is no longer
required, so this patch removes those rules.

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

	* Makefile.in (printcmd.o, target-float.o): Remove.
	(GDB_WARN_CFLAGS_NO_FORMAT): Remove.
---
 gdb/ChangeLog   |  5 +++++
 gdb/Makefile.in | 16 ----------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e75ef66a070..16aac9dadf2 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -199,8 +199,6 @@ WERROR_CFLAGS = @WERROR_CFLAGS@
 GDB_WARN_CFLAGS = $(WARN_CFLAGS)
 GDB_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
-GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " \
-		   | sed "s/ -Wformat-nonliteral / -Wno-format-nonliteral /g"`
 GDB_WARN_CFLAGS_NO_DEFS = `echo " $(GDB_WARN_CFLAGS) " \
 		   | sed "s/ -Wold-style-definition / -Wno-old-style-definition /g"`
 
@@ -2383,20 +2381,6 @@ ALLDEPFILES = \
 # Some files need explicit build rules (due to -Werror problems) or due
 # to sub-directory fun 'n' games.
 
-# Do not try to build "printcmd.c" with -Wformat-nonliteral.  It manually
-# checks format strings.
-printcmd.o: $(srcdir)/printcmd.c
-	$(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) \
-		$(GDB_WARN_CFLAGS_NO_FORMAT) $(COMPILE.post) \
-		$(srcdir)/printcmd.c
-	$(POSTCOMPILE)
-
-# Same for "target-float.c".
-target-float.o: $(srcdir)/target-float.c
-	$(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) \
-		$(GDB_WARN_CFLAGS_NO_FORMAT) $(COMPILE.post) \
-		$(srcdir)/target-float.c
-
 # ada-exp.c can appear in srcdir, for releases; or in ., for
 # development builds.
 ADA_EXP_C = `if test -f ada-exp.c; then echo ada-exp.c; else echo $(srcdir)/ada-exp.c; fi`
-- 
2.13.6

Re: [PATCH 0/4] Minor gdb build fixes

[Joel Brobecker]

Hi Tom,

> This fixes a few oddities I found in the gdb build system.
> Tested by the buildbot.

Thanks for doing that. I looked at the patches, and they look good to me.

-- 
Joel

Re: [PATCH 0/4] Minor gdb build fixes

[Kevin Buettner]

On Mon,  3 Sep 2018 13:03:55 -0600
Tom Tromey <tom@tromey.com> wrote:

> This fixes a few oddities I found in the gdb build system.
> Tested by the buildbot.
> 
> Let me know what you think.

LGTM too.

Kevin