diff options
author | Joel Brobecker <brobecker@adacore.com> | 2014-05-19 14:46:01 -0700 |
---|---|---|
committer | Joel Brobecker <brobecker@adacore.com> | 2014-06-05 05:47:29 -0700 |
commit | 270c9937446ca5273caf7fb102bcdba9ed7cff41 (patch) | |
tree | 95ce40cb57984c812efb1197ac89aeb806610824 /gprof | |
parent | a872e241e2c2d23f3b14bc122cea6adc05a40d25 (diff) | |
download | fsf-binutils-gdb-270c9937446ca5273caf7fb102bcdba9ed7cff41.zip fsf-binutils-gdb-270c9937446ca5273caf7fb102bcdba9ed7cff41.tar.gz fsf-binutils-gdb-270c9937446ca5273caf7fb102bcdba9ed7cff41.tar.bz2 |
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.
Diffstat (limited to 'gprof')
-rw-r--r-- | gprof/ChangeLog | 6 | ||||
-rw-r--r-- | gprof/Makefile.am | 3 | ||||
-rw-r--r-- | gprof/Makefile.in | 4 | ||||
-rwxr-xr-x | gprof/configure | 7 |
4 files changed, 16 insertions, 4 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index a26f9b9..bfb9edf 100644 --- 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 1db6951..2daefac 100644 --- 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 3af41e8..1706ba7 100644 --- 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 5a9c81e..3d6b415 100755 --- 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 |