From 7cb9fd07fe867fd0f29c1b2ff1142fa6c750d73a Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 11 Jan 2013 11:46:21 +0000 Subject: [PATCH] Makefile.tpl (BOOT_ADAFLAGS): Remove -gnata. * Makefile.tpl (BOOT_ADAFLAGS): Remove -gnata. * Makefile.in: Regenerate. gcc/ * configure.ac (Tree checking): Set TREECHECKING to yes if enabled. Substitute TREECHECKING. * configure: Regenerate. * Makefile.in (TREECHECKING): New. gcc/ada/ * gcc-interface/Make-lang.in (COMMON_ADAFLAGS): Remove -gnata. (CHECKING_ADAFLAGS): New. (ALL_ADAFLAGS): Include CHECKING_ADAFLAGS. From-SVN: r195104 --- ChangeLog | 5 +++++ Makefile.in | 2 +- Makefile.tpl | 2 +- gcc/ChangeLog | 7 +++++++ gcc/Makefile.in | 4 ++++ gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/Make-lang.in | 10 ++++++++-- gcc/configure | 7 +++++-- gcc/configure.ac | 2 ++ 9 files changed, 39 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 718b0fc7527..db450e820bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-11 Eric Botcazou + + * Makefile.tpl (BOOT_ADAFLAGS): Remove -gnata. + * Makefile.in: Regenerate. + 2013-01-10 Joern Rennecke * MAINTAINERS (arc): Add new port maintainership for myself. diff --git a/Makefile.in b/Makefile.in index 843250f40b1..a2ce3545ec0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -364,7 +364,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 BOOT_LDFLAGS= -BOOT_ADAFLAGS=-gnatpg -gnata +BOOT_ADAFLAGS= -gnatpg AWK = @AWK@ SED = @SED@ diff --git a/Makefile.tpl b/Makefile.tpl index 5cdc119d9b1..3233a788d8d 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -367,7 +367,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 BOOT_LDFLAGS= -BOOT_ADAFLAGS=-gnatpg -gnata +BOOT_ADAFLAGS= -gnatpg AWK = @AWK@ SED = @SED@ diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9cbce45312b..c33dba77249 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2013-01-11 Eric Botcazou + + * configure.ac (Tree checking): Set TREECHECKING to yes if enabled. + Substitute TREECHECKING. + * configure: Regenerate. + * Makefile.in (TREECHECKING): New. + 2012-01-11 Richard Guenther PR tree-optimization/44061 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f150c189f60..1ef6ee11025 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1487,6 +1487,10 @@ ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS) BACKEND = libbackend.a main.o @TREEBROWSER@ libcommon-target.a libcommon.a \ $(CPPLIB) $(LIBDECNUMBER) +# This is defined to "yes" if Tree checking is enabled, which roughly means +# front-end checking. +TREECHECKING = @TREECHECKING@ + MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \ insn-output.c insn-recog.c insn-emit.c insn-extract.c insn-peep.c \ insn-attr.h insn-attr-common.h insn-attrtab.c insn-dfatab.c \ diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d6df2d1ca4d..daf50efd5e4 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2013-01-11 Eric Botcazou + + * gcc-interface/Make-lang.in (COMMON_ADAFLAGS): Remove -gnata. + (CHECKING_ADAFLAGS): New. + (ALL_ADAFLAGS): Include CHECKING_ADAFLAGS. + 2013-01-10 Eric Botcazou * gcc-interface/config-lang.in (boot_language_boot_flags): Delete. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 66fa1ddb2cd..72c0f5d8490 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -45,7 +45,12 @@ RMDIR = rm -rf # Extra flags to pass to recursive makes. -COMMON_ADAFLAGS= -gnatpg -gnata +COMMON_ADAFLAGS= -gnatpg +ifeq ($(TREECHECKING),) +CHECKING_ADAFLAGS= +else +CHECKING_ADAFLAGS= -gnata +endif WARN_ADAFLAGS= -W -Wall # For native builds, the base compiler might be old and we need to arrange for @@ -59,7 +64,8 @@ else ADAFLAGS= $(COMMON_ADAFLAGS) endif -ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(WARN_ADAFLAGS) +ALL_ADAFLAGS = \ + $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(CHECKING_ADAFLAGS) $(WARN_ADAFLAGS) FORCE_DEBUG_ADAFLAGS = -g ADA_CFLAGS = ADA_INCLUDES = -nostdinc -I- -I. -Iada -I$(srcdir)/ada -I$(srcdir)/ada/gcc-interface diff --git a/gcc/configure b/gcc/configure index f9cc8f41cf4..10ff5aeb433 100755 --- a/gcc/configure +++ b/gcc/configure @@ -773,6 +773,7 @@ coverage_flags valgrind_command valgrind_path_defines valgrind_path +TREECHECKING TREEBROWSER nocommon_flag noexception_flags @@ -6786,6 +6787,7 @@ if test x$ac_tree_checking != x ; then $as_echo "#define ENABLE_TREE_CHECKING 1" >>confdefs.h TREEBROWSER=tree-browser.o + TREECHECKING=yes fi if test x$ac_types_checking != x ; then @@ -6793,6 +6795,7 @@ $as_echo "#define ENABLE_TYPES_CHECKING 1" >>confdefs.h fi + if test x$ac_rtl_checking != x ; then $as_echo "#define ENABLE_RTL_CHECKING 1" >>confdefs.h @@ -17822,7 +17825,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17825 "configure" +#line 17828 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17928,7 +17931,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17931 "configure" +#line 17934 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index fab2bf333b6..3703a20b075 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -470,6 +470,7 @@ if test x$ac_tree_checking != x ; then routines will also be enabled by this option. ]) TREEBROWSER=tree-browser.o + TREECHECKING=yes fi if test x$ac_types_checking != x ; then AC_DEFINE(ENABLE_TYPES_CHECKING, 1, @@ -478,6 +479,7 @@ if test x$ac_types_checking != x ; then ]) fi AC_SUBST(TREEBROWSER) +AC_SUBST(TREECHECKING) if test x$ac_rtl_checking != x ; then AC_DEFINE(ENABLE_RTL_CHECKING, 1, [Define if you want all operations on RTL (the basic data structure