Make it easy to make --disable-werror the default for both binutils and gdb

The goal of this patch is to provide an easy way to make
--disable-werror the default when building binutils, or the parts
of binutils that need to get built when building GDB. In development
mode, we want to continue making -Werror the default with GCC.
But, when making releases, I think we want to make it as easy as
possible for regular users to successfully build from sources.

GDB already has this kind of feature to turn -Werror as well as
the use of the libmcheck library. As GDB Release Manager, I take
advantage of it to turn those off after having cut the branch.
I'd like to be able to do the same for the binutils bits. And
perhaps Tristan will want to do the same for his releases too
(not sure, binutils builders might be a little savvier than GDB
builders).

This patch introduces a new file, called development.sh, which
just sets a variable called $development. In our development branches
(Eg. "master"), it's set to true. But setting it to false would allow
us to change the default behavior of various development-related
features to be turned off; in this case, it turns off the use of
-Werror by default (use --enable-werror to turn it back on).

bfd/ChangeLog:

        * development.sh: New file.
        * warning.m4 (AM_BINUTILS_WARNINGS): Source bfd/development.sh.
        Make -Werror the default with GCC only if DEVELOPMENT is true.
        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add
        $(srcdir)/development.sh.
        * Makefile.in, configure: Regenerate.

binutils/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
        bfd's development.sh.
        * Makefile.in, configure: Regenerate.

gas/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
        bfd's development.sh.
        * Makefile.in, configure: Regenerate.

gold/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): New.
        * Makefile.in, configure: Regenerate.

gprof/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
        bfd's development.sh.
        * Makefile.in, configure: Regenerate.

ld/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
        bfd's development.sh.
        * Makefile.in, configure: Regenerate.

opcodes/ChangeLog:

        * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
        bfd's development.sh.
        * Makefile.in, configure: Regenerate.

gdb/ChangeLog:

        * development.sh: Delete.
        * Makefile.in (config.status): Adjust dependency on development.sh.
        * configure.ac: Adjust development.sh source call.
        * configure: Regenerate.

gdb/gdbserver/ChangeLog:

        * configure.ac: Adjust development.sh source call.
        * Makefile.in (config.status): Adjust dependency on development.sh.
        * configure: Regenerate.

Tested on x86_64-linux by building two ways: One with DEVELOPMENT
set to true, and one with DEVELOPMENT set to false. In the first
case, I could see the use of -Werror, while it disappeared in
the second case.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e6b88e321f87774a0fe2b7679756d6667ca072db..1ff9fca4876f5177891baa341f7f04e2bb404968 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * development.sh: New file.
+       * warning.m4 (AM_BINUTILS_WARNINGS): Source bfd/development.sh.
+       Make -Werror the default with GCC only if DEVELOPMENT is true.
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add
+       $(srcdir)/development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-06-04  Will Newton  <will.newton@linaro.org>
 
         * elfnn-aarch64.c (tpoff_base): Make test of tls_sec

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 2ba2180ec86972ffc20ac270f5227fb9e1bb9c66..595c4893d6c2b289bcd79446f0a7515cb426ad3d 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -741,7 +741,8 @@ OPTIONAL_BACKENDS_CFILES = \
 CONFIG_STATUS_DEPENDENCIES = \
        $(srcdir)/configure.in \
        $(srcdir)/config.bfd \
-       $(srcdir)/configure.host
+       $(srcdir)/configure.host \
+       $(srcdir)/development.sh
 
 # These are defined by configure.in:
 WORDSIZE = @wordsize@

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 8a2764d7db53c52cd429816032a9769d2ce040dc..2ea8516501522e1103bd25a03507544a006a3e23 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1045,7 +1045,8 @@ OPTIONAL_BACKENDS_CFILES = \
 CONFIG_STATUS_DEPENDENCIES = \
        $(srcdir)/configure.in \
        $(srcdir)/config.bfd \
-       $(srcdir)/configure.host
+       $(srcdir)/configure.host \
+       $(srcdir)/development.sh
 
 
 # These are defined by configure.in:

diff --git a/bfd/configure b/bfd/configure
index b4f8653efe85bb01eff8b18b7f241e2b4851f938..f3df01c94caf5149ac15e3b1b7d5b12ff8b43851 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -12158,6 +12158,9 @@ fi
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12192,8 +12195,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/bfd/development.sh b/bfd/development.sh
new file mode 100644 (file)
index 0000000..4c0f5b9
--- /dev/null
+++ b/bfd/development.sh
@@ -0,0 +1,19 @@
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+#
+# This file is part of GDB.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Controls whether to enable development-mode features by default.
+development=true

diff --git a/bfd/warning.m4 b/bfd/warning.m4
index 28e9f8ad3fa03e1724dc2ffa93ccab29ab8c2754..b1a8c7b5a37183689564a9ae35408fb78074d50e 100644 (file)
--- a/bfd/warning.m4
+++ b/bfd/warning.m4
@@ -18,6 +18,9 @@ dnl <http://www.gnu.org/licenses/>.
 dnl
 
 AC_DEFUN([AM_BINUTILS_WARNINGS],[
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 AC_EGREP_CPP([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow")
 
@@ -39,8 +42,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 82b8eae9363d108cff065a3a138282418e446415..0dc603acd4afc1ffb1b1cb6e84d8bf9dac3074b3 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
+       bfd's development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-05-16  Jon Turney  <jon.turney@dronecode.org.uk>
 
        * objcopy.c (is_nondebug_keep_contents_section): New function.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 77c99d79824c61afed4be259d2f539f1d05b5de3..aca2610f60307c73b726f7b5efb7cd513041ad0b 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -514,7 +514,8 @@ all: info
 
 # We extract version from bfd/configure.in, make sure to rerun configure
 # when BFD's version changes.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
 
 DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu
 

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 52489f21b689382c5e674f1000ead74895914a88..c9e9e3823928234c90ef2121ca8bc448c17545cb 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -616,7 +616,9 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
 
 # We extract version from bfd/configure.in, make sure to rerun configure
 # when BFD's version changes.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
+
 DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu
 MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \
   binutils.log binutils.sum abcdefgh*

diff --git a/binutils/configure b/binutils/configure
index fcf9784b7508dffbc903e7bafd679f5420c53446..1272e530a9851fa149627931835f45bde7439f60 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -11592,6 +11592,9 @@ _ACEOF
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11626,8 +11629,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 040e5d8f9b924ab82fc54ce55a48edf96fe0fba3..0bb7de0a48c17c1d1c62b9d6f158aa7b6b782026 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
+       bfd's development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-06-03  Nick Clifton  <nickc@redhat.com>
 
        * config/tc-msp430.c (OPTION_WARN_INTR_NOPS): Use y instead of z.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 01731b9a64dbf92e2131a9e46ca3fff51134151c..669ab198285831f7c12955355e8fe89d84da5158 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -693,4 +693,6 @@ de-stage3:
        - (cd stage3 ; rm -f as$(EXEEXT) ; mv -f * ..)
        - rmdir stage3
 
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in $(srcdir)/configure.tgt
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(srcdir)/configure.tgt \
+       $(BFDDIR)/development.sh

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 184a926ee9bfb689b4ea44e8bb28db3818ff9d2f..2ca56df4ad961204d53b5e8e50eaaa5bc9b3891c 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -677,7 +677,10 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \
        testsuite/site.exp site.bak site.exp stage stage1 stage2
 
 against = stage2
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in $(srcdir)/configure.tgt
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(srcdir)/configure.tgt \
+       $(BFDDIR)/development.sh
+
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 

diff --git a/gas/configure b/gas/configure
index 2530377480d55cb6785ce4de917c7fbfd61a1f9e..1e1086f67472fa11b2f7320ac89acaee2644ae17 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -11575,6 +11575,9 @@ fi
 using_cgen=no
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11609,8 +11612,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 719ae72c60cb40d0a85e6c96383ea0599cdf95de..1fd19f679c82fa558e506fa21b39cde05b7bee12 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * development.sh: Delete.
+       * Makefile.in (config.status): Adjust dependency on development.sh.
+       * configure.ac: Adjust development.sh source call.
+       * configure: Regenerate.
+
 2014-06-04  Doug Evans  <xdje42@gmail.com>
 
        * guile/scm-breakpoint.c (struct gdbscm_breakpoint_object): New members

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e6c6c33561e3ddcfe2aa09db4a3eaebbecb66694..ea27cf53aa99deddd9442824ff8bbfc0af2afb3b 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1476,7 +1476,7 @@ stamp-h: $(srcdir)/config.in config.status
          CONFIG_LINKS= \
          $(SHELL) config.status
 
-config.status: $(srcdir)/configure configure.tgt configure.host development.sh
+config.status: $(srcdir)/configure configure.tgt configure.host ../bfd/development.sh
        $(SHELL) config.status --recheck
 
 ACLOCAL = aclocal

diff --git a/gdb/configure b/gdb/configure
index 56c92d3e2ef6ce2e684b0f92d946f798ee073e4d..05ebace030aed899a3a6d5b7690c50dfa5147faf 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -2714,7 +2714,7 @@ fi
 
 
 # Set the 'development' global.
-. $srcdir/development.sh
+. $srcdir/../bfd/development.sh
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

diff --git a/gdb/configure.ac b/gdb/configure.ac
index 903f378e3df0b35eee6607bbc66d2356386b0471..138fc8558736b877732f6f45218a2e3b85da4d09 100644 (file)
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -24,7 +24,7 @@ AC_CONFIG_HEADER(config.h:config.in)
 AM_MAINTAINER_MODE
 
 # Set the 'development' global.
-. $srcdir/development.sh
+. $srcdir/../bfd/development.sh
 
 AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS

diff --git a/gdb/development.sh b/gdb/development.sh
deleted file mode 100644 (file)
index 1c21efa..0000000
--- a/gdb/development.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2012-2014 Free Software Foundation, Inc.
-#
-# This file is part of GDB.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Set to 'true' for development snapshots, 'false' for releases and
-# pre-releases.  When true, provide more thorough testing with
-# -lmcheck.
-development=true

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 02105363de8c5920063284b25fb5436ac097de76..71c7bcbb81a949505b0323b698a92df3934c1c92 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * development.sh: Delete.
+       * Makefile.in (config.status): Adjust dependency on development.sh.
+       * configure.ac: Adjust development.sh source call.
+       * configure: Regenerate.
+
 2014-06-02  Pedro Alves  <palves@redhat.com>
 
        * ax.c (gdb_free_agent_expr): New function.

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index f773fa247454cd63019a870cdd780b20e2a4acb5..b795b385083bbca37ef813fed79ed9314773b761 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -390,7 +390,7 @@ $(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
          CONFIG_LINKS= \
          $(SHELL) config.status
 
-config.status: configure configure.srv $(srcdir)/../development.sh
+config.status: configure configure.srv $(srcdir)/../../bfd/development.sh
        $(SHELL) ./config.status --recheck
 
 # automatic rebuilding in automake-generated Makefiles requires

diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 101062faafebfba1f04f0377afb57b062eda521b..62adc71824852397d3b17f87427a978019fcd228 100755 (executable)
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -4324,7 +4324,7 @@ fi
 
 
 # Set the 'development' global.
-. $srcdir/../development.sh
+. $srcdir/../../bfd/development.sh
 
 # Enable -lmcheck by default (it provides cheap-enough memory
 # mangling), but turn it off for releases.

diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 89a8eeaa1f40aa977c9518bd3a478b56cf83aca3..5a10ee75778bd504e46e0d7e8050a081aa52d3be 100644 (file)
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -41,7 +41,7 @@ AC_HEADER_STDC
 AC_FUNC_ALLOCA
 
 # Set the 'development' global.
-. $srcdir/../development.sh
+. $srcdir/../../bfd/development.sh
 
 # Enable -lmcheck by default (it provides cheap-enough memory
 # mangling), but turn it off for releases.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5e15f5e43713f534a95d06846bce43486cbe9c0b..316e72ed54d6483c6a91fe745e412852ec3f6136 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): New.
+       * Makefile.in, configure: Regenerate.
+
 2014-06-03  Alan Modra  <amodra@gmail.com>
 
        * powerpc.cc (addis_12_2): Define.

diff --git a/gold/Makefile.am b/gold/Makefile.am
index 78f027100bc0709be4b67105275f4124bf5c2955..54393f9a0e3b1cb9464bccfae4580ca74f4e58ad 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -197,6 +197,8 @@ dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADSLIB) \
        $(LIBDL)
 dwp_LDFLAGS = $(GOLD_LDFLAGS)
 
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/../bfd/development.sh
+
 # Use an explicit dependency for the bison generated header file.
 expression.$(OBJEXT): yyscript.h
 script-sections.$(OBJEXT): yyscript.h

diff --git a/gold/Makefile.in b/gold/Makefile.in
index 1ef3cce83fe4c46994d130cab173b49bd67f7563..579505ac6d521024e778b84fd89c7c580bf9d343 100644 (file)
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -564,6 +564,7 @@ dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADSLIB) \
        $(LIBDL)
 
 dwp_LDFLAGS = $(GOLD_LDFLAGS)
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/../bfd/development.sh
 POTFILES = $(CCFILES) $(HFILES) $(TARGETSOURCES)
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_SOURCES = $(sources_var)
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ld1_DEPENDENCIES = $(deps_var) gcctestdir1/ld

diff --git a/gold/configure b/gold/configure
index f61307b0980e9ca19e8026108dfcb9bf5a98720d..6f53b22a05f08729baaa02e6875c01b8de4c6094 100755 (executable)
--- a/gold/configure
+++ b/gold/configure
@@ -6630,6 +6630,9 @@ fi
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6664,8 +6667,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index a26f9b9d8a41bc8d7b647ac793ac73fe52b83709..bfb9edfc42b8e7a16e2d1213722aa651e9fd80e3 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
+       bfd's development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-03-12  Alan Modra  <amodra@gmail.com>
 
        * Makefile.in: Regenerate.

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 1db6951ecea06464a8b910b43fd1a01ffa756289..2daefac2c85580251b9d054f78cd147311ed597c 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -60,7 +60,8 @@ diststuff: $(BUILT_SOURCES) info $(man_MANS)
 
 # We extract version from bfd/configure.in, make sure to rerun configure
 # when BFD's version changes.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
 
 # This empty rule is a hack against gmake patched by Apple.
 %.o:%.m

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 3af41e868fe0de6eac9a64fb9726df2f051de3ac..1706ba703578ae442c8caa1e02e243ab4e96d86f 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -325,7 +325,9 @@ EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS)
 
 # We extract version from bfd/configure.in, make sure to rerun configure
 # when BFD's version changes.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
+
 POTFILES = $(sources) $(noinst_HEADERS)
 MANCONF = -Dman
 TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS)

diff --git a/gprof/configure b/gprof/configure
index 5a9c81e832b7e1f01c786d159ef26e959b35f22d..3d6b415931fa8e60ee9814961a832caa6e6f7717 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -12004,6 +12004,9 @@ fi
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12038,8 +12041,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 

diff --git a/ld/ChangeLog b/ld/ChangeLog
index dc8d5526eff0bf41e07772f022311bac23f56140..c42cdc8adea83f1b3a5aff268e60f75675cce883 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
+       bfd's development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-06-02  Alan Modra  <amodra@gmail.com>
 
        * emulparams/elf32bfin.sh: Rename from bfin.sh.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 24ba3e15cbcc6b6ec87c505fb29b32c54d39dfd0..44e7ca60d87ebb906accdd70828a3e1e51057509 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -2057,7 +2057,8 @@ MAINTAINERCLEANFILES = configdoc.texi ld.1
 # We want to reconfigure if configure.host or configure.tgt changes.  We
 # extract version from bfd/configure.in, so we must depend on that also.
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \
-       $(srcdir)/../bfd/configure.in
+       $(srcdir)/../bfd/configure.in \
+       $(srcdir)/../bfd/development.sh
 
 MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
        ldemul-list.h crtbegin.@OBJEXT@ crtend.@OBJEXT@ ld.log ld.sum

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 9dd4399975ffdee8ae8d65ed86d7e97a326c4000..2582cea33d7988ae037d67d390dff32a1ff8abc5 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -888,7 +888,8 @@ MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info
 # We want to reconfigure if configure.host or configure.tgt changes.  We
 # extract version from bfd/configure.in, so we must depend on that also.
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \
-       $(srcdir)/../bfd/configure.in
+       $(srcdir)/../bfd/configure.in \
+       $(srcdir)/../bfd/development.sh
 
 MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
        ldemul-list.h crtbegin.@OBJEXT@ crtend.@OBJEXT@ ld.log ld.sum

diff --git a/ld/configure b/ld/configure
index b6c324605ee0c9c28a7b1cffb93a47f10599b8c6..6dd7bc6f75a19a61f90784edbf035af32b49c941 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -4642,6 +4642,9 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4676,8 +4679,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi
 
@@ -12193,7 +12196,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12196 "configure"
+#line 12199 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12299,7 +12302,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12302 "configure"
+#line 12305 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ce5a20468f7eb406c2f9d86e509f05bec74aabfd..499ec643ddbb83f27155cc15458e3bca6b51d703 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Joel Brobecker  <brobecker@adacore.com>
+
+       * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on
+       bfd's development.sh.
+       * Makefile.in, configure: Regenerate.
+
 2014-06-03  Nick Clifton  <nickc@redhat.com>
 
        * msp430-dis.c (msp430_doubleoperand): Use extension_word to

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index de98c284f2df50f56a15ea3c6d4e918ed1a94388..9ff6a38da43403852b54f903cfa0c06c7b6cb8ff 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -296,7 +296,8 @@ OFILES = @BFD_MACHINES@
 
 # We should reconfigure whenever bfd/configure.in changes, because
 # that's where the version number in Makefile comes from.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
 
 AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
 

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 5995f1ca49282c8fa0208c1eaf128614ea2f0366..f83f1d968e6723374c6c9a9621e7b8d1cb8f0477 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -569,7 +569,9 @@ OFILES = @BFD_MACHINES@
 
 # We should reconfigure whenever bfd/configure.in changes, because
 # that's where the version number in Makefile comes from.
-CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \
+       $(BFDDIR)/development.sh
+
 AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
 libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c
 # It's desirable to list ../bfd/libbfd.la in DEPENDENCIES and LIBADD.

diff --git a/opcodes/configure b/opcodes/configure
index 9379bbfcb88ea9d5dd57f89304f30126a2f22acb..40a2b858db2c1cf1d7d8488f8bd098703b1c7a68 100755 (executable)
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -11504,6 +11504,9 @@ esac
 fi
 
 
+# Set the 'development' global.
+. $srcdir/../bfd/development.sh
+
 GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11538,8 +11541,8 @@ case "${host}" in
   *) ;;
 esac
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+# Enable -Werror by default when using gcc.  Turn it off for releases.
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" -a "$development" = true ; then
     ERROR_ON_WARNING=yes
 fi