This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
I just noticed that -Wall is set in libgfortran/configure - but the files itself are not using -Wall. The problem is that FCFLAGS is passed from the top-level directory and therefore this is preferred to the define in libgfortran/Makefile. FCFLAGS/CFLAGS are the wrong variable to use - we should use AM_FCFLAGS/AM_CFLAGS. Ok to commit the appended patch if everything passes to both 4.0 and mainline? I did some local tests with it but will do a fresh complete build / regression first. Andreas 2005-05-14 Andreas Jaeger <aj@suse.de> * Makefile.am: Remove AM_CFLAGS here. * configure.ac: Define AM_CFLAGS and AM_FCFLAGS so that warnings are set. * Makefile.in: Regenerated * configure: Regenerated. ============================================================ Index: libgfortran/Makefile.am --- libgfortran/Makefile.am 10 May 2005 22:06:54 -0000 1.33 +++ libgfortran/Makefile.am 14 May 2005 21:42:54 -0000 @@ -1,8 +1,6 @@ ## Process this file with automake to produce Makefile.in -## We like to use C99 routines when available. This makes sure that -## __STDC_VERSION__ is set such that libc includes make them available. -AM_CFLAGS = -std=gnu99 + ACLOCAL_AMFLAGS = -I ../config ## May be used by toolexeclibdir. @@ -193,7 +191,7 @@ i_dotprod_c= \ generated/dotprod_i4.c \ generated/dotprod_i8.c \ generated/dotprod_r4.c \ -generated/dotprod_r8.c +generated/dotprod_r8.c i_dotprodl_c= \ generated/dotprod_l4.c \ @@ -530,4 +528,3 @@ $(gfor_built_specific2_src): m4/specific endif EXTRA_DIST = $(m4_files) - ============================================================ Index: libgfortran/configure.ac --- libgfortran/configure.ac 29 Apr 2005 14:24:02 -0000 1.24 +++ libgfortran/configure.ac 14 May 2005 21:42:54 -0000 @@ -109,12 +109,15 @@ m4_define([_AC_ARG_VAR_PRECIOUS],[]) AC_PROG_CC m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -AC_SUBST(CFLAGS) - # Add -Wall if we are using GCC. if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall" + AM_FCFLAGS="-Wall" + ## We like to use C99 routines when available. This makes sure that + ## __STDC_VERSION__ is set such that libc includes make them available. + AM_CFLAGS="-std=gnu99 -Wall" fi +AC_SUBST(AM_FCFLAGS) +AC_SUBST(AM_CFLAGS) # Find other programs we need. AC_CHECK_TOOL(AS, as) ============================================================ Index: libgfortran/aclocal.m4 --- libgfortran/aclocal.m4 10 May 2005 22:06:55 -0000 1.9 +++ libgfortran/aclocal.m4 14 May 2005 21:42:54 -0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# generated automatically by aclocal 1.9.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.2])]) + [AM_AUTOMAKE_VERSION([1.9.3])]) # AM_AUX_DIR_EXPAND ============================================================ Index: libgfortran/Makefile.in --- libgfortran/Makefile.in 10 May 2005 22:06:54 -0000 1.34 +++ libgfortran/Makefile.in 14 May 2005 21:42:55 -0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -206,6 +206,8 @@ distuninstallcheck_listfiles = find . -t distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_FCFLAGS = @AM_FCFLAGS@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -213,7 +215,6 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ -CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -300,7 +301,6 @@ target_os = @target_os@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ -AM_CFLAGS = -std=gnu99 ACLOCAL_AMFLAGS = -I ../config gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la ============================================================ Index: libgfortran/configure --- libgfortran/configure 10 May 2005 01:35:57 -0000 1.33 +++ libgfortran/configure 14 May 2005 21:46:27 -0000 @@ -308,7 +308,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT AM_FCFLAGS AM_CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC extra_ldflags_libgfortran CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2932,13 +2932,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Add -Wall if we are using GCC. if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall" + AM_FCFLAGS="-Wall" + ## We like to use C99 routines when available. This makes sure that + ## __STDC_VERSION__ is set such that libc includes make them available. + AM_CFLAGS="-std=gnu99 -Wall" fi + + # Find other programs we need. if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. @@ -4086,7 +4089,7 @@ test x"$pic_mode" = xno && libtool_flags case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4089 "configure"' > conftest.$ac_ext + echo '#line 4092 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4472,7 +4475,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4475:" \ +echo "$as_me:4478:" \ "checking for Fortran compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -12201,7 +12204,8 @@ s,@CC@,$CC,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t -s,@CFLAGS@,$CFLAGS,;t t +s,@AM_FCFLAGS@,$AM_FCFLAGS,;t t +s,@AM_CFLAGS@,$AM_CFLAGS,;t t s,@AS@,$AS,;t t s,@ac_ct_AS@,$ac_ct_AS,;t t s,@AR@,$AR,;t t -- Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
Attachment:
pgp00000.pgp
Description: PGP signature
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |