From df4883a62cd340045dff88e9b108f5845f45b161 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 3 May 2000 22:45:31 +0000 Subject: [PATCH] * Makefile.in (WARN_CFLAGS): Add -pedantic -Wno-long-long. (LOOSE_CFLAGS): New: CFLAGS without -pedantic and -Wtraditional. (GCC_CFLAGS): Use it. (LANG_FLAGS_TO_PASS): New: SUBDIR_FLAGS_TO_PASS with LOOSE_CFLAGS. * cp/Make-lang.in, java/Make-lang.in, f/Make-lang.in, ch/Make-lang.in, objc/Make-lang.in: Use it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33648 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 16 +++++++++------- gcc/Makefile.in | 12 +++++++++--- gcc/ch/Make-lang.in | 4 ++-- gcc/cp/Make-lang.in | 6 +++--- gcc/f/Make-lang.in | 4 ++-- gcc/java/Make-lang.in | 12 ++++++------ gcc/objc/Make-lang.in | 2 +- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 69ba0f9..e8ac8f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2000-05-03 Jason Merrill + + * Makefile.in (WARN_CFLAGS): Add -pedantic -Wno-long-long. + (LOOSE_CFLAGS): New: CFLAGS without -pedantic and -Wtraditional. + (GCC_CFLAGS): Use it. + (LANG_FLAGS_TO_PASS): New: SUBDIR_FLAGS_TO_PASS with LOOSE_CFLAGS. + * cp/Make-lang.in, java/Make-lang.in, f/Make-lang.in, ch/Make-lang.in, + objc/Make-lang.in: Use it. + 2000-05-03 Jason R Thorpe * config/i386/i386.md (lshrqi2_cmpno): Use q not r in constraint. @@ -204,13 +213,6 @@ Tue May 2 17:06:53 2000 Jason Eckhardt 2000-05-02 Jason Merrill - * Makefile.in (WARN_CFLAGS): Add -pedantic -Wno-long-long. - (LOOSE_CFLAGS): New: CFLAGS without -pedantic and -Wtraditional. - (GCC_CFLAGS): Use it. - (LANG_FLAGS_TO_PASS): New: SUBDIR_FLAGS_TO_PASS with LOOSE_CFLAGS. - * cp/Make-lang.in, java/Make-lang.in, f/Make-lang.in, ch/Make-lang.in, - objc/Make-lang.in: Use it. - * toplev.c (debug_ignore_block): Return int. * dwarf2out.c (dwarf2out_ignore_block): Likewise. * toplev.h, dwarf2out.h: Adjust. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 0deb2c5..b0a9444 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -68,13 +68,16 @@ ALLOCA_FINISH = true # separate from BOOT_CFLAGS because people tend to override optimization # flags and we'd like them to still have warnings turned on. They are free # to explicitly turn warnings off if they wish. +# LOOSE_CFLAGS are the CFLAGS to use when compiling something which is only +# compiled with gcc, such as libgcc and the frontends other than C. # XCFLAGS is used for most compilations but not when using the GCC just built. # TCFLAGS is used for compilations with the GCC just built. XCFLAGS = TCFLAGS = CFLAGS = -g @stage1_warn_cflags@ BOOT_CFLAGS = -O2 $(CFLAGS) -WARN_CFLAGS = -W -Wall -Wtraditional +WARN_CFLAGS = -pipe -W -Wall -Wtraditional -pedantic -Wno-long-long +LOOSE_CFLAGS = `echo $(CFLAGS) | sed -e 's/-pedantic//' -e 's/-Wtraditional//'` # These exists to be overridden by the x-* and t-* files, respectively. X_CFLAGS = T_CFLAGS = @@ -164,7 +167,7 @@ GCC_FOR_TARGET = ./xgcc -B$(build_tooldir)/bin/ -B./ -isystem $(build_tooldir)/i # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET. # It omits XCFLAGS, and specifies -B./. # It also specifies -isystem ./include to find, e.g., stddef.h. -GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) -isystem ./include $(TCFLAGS) +GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_CFLAGS) -isystem ./include $(TCFLAGS) # Specify the abi to use when building the c++ runtime GXX_ABI_FLAG=@GXX_ABI_FLAG@ @@ -664,7 +667,10 @@ PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \ -e 's|%% *|../|g' \ -e 's|%||g' SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \ - "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" + "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" +# Flags to pass when recursing into a frontend subdirectory. +LANG_FLAGS_TO_PASS = $(SUBDIR_FLAGS_TO_PASS) \ + "CFLAGS=$(LOOSE_CFLAGS)" # # Lists of files for various purposes. diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in index 5ac4748..f964125 100644 --- a/gcc/ch/Make-lang.in +++ b/gcc/ch/Make-lang.in @@ -97,7 +97,7 @@ cc1chill$(exeext): $(P) $(CHILL_SRCS) $(LIBDEPS) stamp-objlist \ insn-config.h insn-flags.h insn-attr.h insn-codes.h \ c-typeck.o c-aux-info.o c-common.o c-iterate.o \ ggc-callbacks.o - cd ch; $(MAKE) $(FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) ../cc1chill$(exeext) + cd ch; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) ../cc1chill$(exeext) # # Build hooks: @@ -191,7 +191,7 @@ CHILL.stage4: stage4-start # distribution anyway. It then copies the files to the distdir directory. CHILL.distdir: mkdir tmp/ch - cd ch ; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) hash.h + cd ch ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) hash.h cd ch; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/ch >/dev/null 2>&1 || cp $$file ../tmp/ch; \ diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index fe8eb4a..b25d6e2 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -84,7 +84,7 @@ $(srcdir)/cp/parse.c: $(srcdir)/cp/parse.y @cp_srcdir=`sed -n 's/^srcdir[ ]*=[ ]*//p' cp/Makefile` && \ echo "cd cp && $(MAKE) $$cp_srcdir/parse.c" && \ cd cp && \ - $(MAKE) $(SUBDIR_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) \ + $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) \ $$cp_srcdir/parse.c # Create the compiler driver for g++. @@ -124,7 +124,7 @@ CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/class.c $(srcdir)/cp/cp-tree.def \ cc1plus$(exeext): $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o \ c-pragma.o $(srcdir)/cp/cp-tree.h $(srcdir)/cp/cp-tree.def \ $(srcdir)/cp/gxx.gperf $(srcdir)/cp/cfns.gperf hash.o - cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus$(exeext) + cd cp; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus$(exeext) # # Build hooks: @@ -304,7 +304,7 @@ c++.stage4: stage4-start c++.distdir: mkdir tmp/cp mkdir tmp/cp/inc - cd cp ; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) parse.c hash.h + cd cp ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) parse.c hash.h cd cp; \ for file in *[0-9a-zA-Z+]; do \ $(LN) $$file ../tmp/cp; \ diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index af6b4d7..f46793c 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -1,5 +1,5 @@ # Top level makefile fragment for GNU Fortran. -*-makefile-*- -# Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. #This file is part of GNU Fortran. @@ -202,7 +202,7 @@ F77_SRCS = \ f771$(exeext): $(P) $(F77_SRCS) $(LIBDEPS) stamp-objlist touch lang-f77 - cd f; $(MAKE) $(FLAGS_TO_PASS) \ + cd f; $(MAKE) $(LANG_FLAGS_TO_PASS) \ HOST_CC="`case '$(HOST_CC)' in stage*) echo '$(HOST_CC)' | sed -e 's|stage|../stage|g';; *) echo '$(HOST_CC)';; esac`" \ HOST_CFLAGS="$(HOST_CFLAGS)" HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \ ../f771$(exeext) diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index af72aa5..7e72c9e 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -78,7 +78,7 @@ JAVA_SRCS = $(srcdir)/java/parse.y $(srcdir)/java/class.c \ $(srcdir)/java/jcf-depend.c $(srcdir)/java/jcf-path.c jc1$(exeext): $(P) $(JAVA_SRCS) $(LIBDEPS) stamp-objlist ggc-callbacks.o - cd java; $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jc1$(exeext) + cd java; $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jc1$(exeext) jvspec.o: $(srcdir)/java/jvspec.c system.h $(GCC_H) $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ @@ -98,7 +98,7 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) # Dependencies here must be kept in sync with dependencies in Makefile.in. jvgenmain$(exeext): $(srcdir)/java/jvgenmain.c $(srcdir)/java/mangle.c \ $(LIBDEPS) $(TREE_H) - cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jvgenmain$(exeext) + cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jvgenmain$(exeext) # This must be kept in sync with dependencies in Makefile.in. GCJH_SOURCES = $(srcdir)/java/gjavah.c $(srcdir)/java/jcf-io.c \ @@ -108,21 +108,21 @@ GCJH_SOURCES = $(srcdir)/java/gjavah.c $(srcdir)/java/jcf-io.c \ $(srcdir)/java/jcf-path.c gcjh$(exeext): $(GCJH_SOURCES) $(LIBDEPS) $(TREE_H) - cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../gcjh$(exeext) + cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../gcjh$(exeext) # This must be kept in sync with dependencies in Makefile.in. JV_SCAN_SOURCES = $(srcdir)/java/parse-scan.y $(srcdir)/java/lex.c \ $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c jv-scan$(exeext): $(JV_SCAN_SOURCES) stamp-objlist $(LIBDEPS) - cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jv-scan$(exeext) + cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jv-scan$(exeext) # This must be kept in sync with dependencies in Makefile.in. JCF_DUMP_SOURCES = $(srcdir)/java/jcf-dump.c $(srcdir)/java/jcf-io.c \ $(srcdir)/java/zextract.c $(TREE_H) jcf-dump$(exeext): $(JCF_DUMP_SOURCES) - cd java && $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jcf-dump$(exeext) + cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jcf-dump$(exeext) # # Build hooks: @@ -203,7 +203,7 @@ java.stage4: stage4-start # distribution anyway. It then copies the files to the distdir directory. java.distdir: mkdir tmp/java - cd java ; $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) parse.c hash.h + cd java ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) parse.c hash.h cd java; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/java >/dev/null 2>&1 || cp $$file ../tmp/java; \ diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index f4ae491..089f714 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -160,7 +160,7 @@ objc.stage4: stage4-start # the build in the inner directory. objc.distdir: $(srcdir)/objc/objc-parse.c mkdir tmp/objc -# cd objc ; $(MAKE) $(FLAGS_TO_PASS) objc-parse.c +# cd objc ; $(MAKE) $(LANG_FLAGS_TO_PASS) objc-parse.c cd objc; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \ -- 2.7.4