From 6a6e7e2f617a263369c0d6188f0fdf7913b83253 Mon Sep 17 00:00:00 2001
From: bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 11 Jan 2007 14:11:32 +0000
Subject: [PATCH] config: 2007-01-11 Paolo Bonzini <bonzini@gnu.org>
* config/warnings.m4: Add second parameter with name of variable.
Always append to the variable if it exists.
libcpp:
2007-01-11 Paolo Bonzini <bonzini@gnu.org>
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120673 138bc75d-0d04-0410-961f-82ee72b054a4
---
config/ChangeLog | 5 +++++
config/warnings.m4 | 26 +++++++++++++++-----------
libcpp/ChangeLog | 4 ++++
libcpp/configure | 2 +-
4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/config/ChangeLog b/config/ChangeLog
index f61cff82e0be..8b0aa1d429f4 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-11 Paolo Bonzini <bonzini@gnu.org>
+
+ * config/warnings.m4: Add second parameter with name of variable.
+ Always append to the variable if it exists.
+
2007-01-01 Mike Stump <mrs@apple.com>
* mh-ppc-darwin: Remove support for building with Apple's gcc-3.1.
diff --git a/config/warnings.m4 b/config/warnings.m4
index 8b832382bea6..af99ffec0834 100644
--- a/config/warnings.m4
+++ b/config/warnings.m4
@@ -1,6 +1,6 @@
# Autoconf include file defining macros related to compile-time warnings.
-# Copyright 2004, 2005 Free Software Foundation, Inc.
+# Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
#This file is part of GCC.
@@ -19,13 +19,14 @@
#Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#02110-1301, USA.
-# ACX_PROG_CC_WARNING_OPTS([-Wfoo -Wbar -Wbaz])
-# Sets @WARN_CFLAGS@ to the subset of the given options which the
+# ACX_PROG_CC_WARNING_OPTS(WARNINGS, [VARIABLE = WARN_CFLAGS@)
+# Sets @VARIABLE@ to the subset of the given options which the
# compiler accepts.
AC_DEFUN([ACX_PROG_CC_WARNING_OPTS],
[AC_REQUIRE([AC_PROG_CC])dnl
-AC_SUBST([WARN_CFLAGS])dnl
-WARN_CFLAGS=
+m4_pushdef([acx_Var], [m4_default([$2], [WARN_CFLAGS])])dnl
+AC_SUBST(acx_Var)dnl
+acx_Var=
save_CFLAGS="$CFLAGS"
for option in $1; do
AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option])
@@ -36,20 +37,22 @@ for option in $1; do
[AS_VAR_SET(acx_Woption, no)])
])
AS_IF([test AS_VAR_GET(acx_Woption) = yes],
- [WARN_CFLAGS="$WARN_CFLAGS${WARN_CFLAGS:+ }$option"])
+ [acx_Var="$acx_Var${acx_Var:+ }$option"])
AS_VAR_POPDEF([acx_Woption])dnl
done
CFLAGS="$save_CFLAGS"
+m4_popdef([acx_Var])dnl
])# ACX_PROG_CC_WARNING_OPTS
-# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC([-Wno-long-long ...])
-# Sets WARN_PEDANTIC to "-pedantic" + the argument, if the compiler is GCC
+# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC(WARNINGS, [VARIABLE = WARN_PEDANTIC)
+# Append to VARIABLE "-pedantic" + the argument, if the compiler is GCC
# and accepts all of those options simultaneously, otherwise to nothing.
AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
[AC_REQUIRE([AC_PROG_CC])dnl
-AC_SUBST([WARN_PEDANTIC])dnl
+m4_pushdef([acx_Var], [m4_default([$2], [WARN_PEDANTIC])])dnl
+AC_SUBST(acx_Var)dnl
AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
-WARN_PEDANTIC=
+acx_Var=
AS_IF([test "$GCC" = yes],
[AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
[save_CFLAGS="$CFLAGS"
@@ -59,9 +62,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
[AS_VAR_SET(acx_Pedantic, no)])
CFLAGS="$save_CFLAGS"])
AS_IF([test AS_VAR_GET(acx_Pedantic) = yes],
- [WARN_PEDANTIC="-pedantic $1"])
+ [acx_Var="$acx_Var${acx_Var:+ }-pedantic $1"])
])
AS_VAR_POPDEF([acx_Pedantic])dnl
+m4_popdef([acx_Var])dnl
])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC
# ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z])
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 072c6aadbb99..11a165f853a8 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-11 Paolo Bonzini <bonzini@gnu.org>
+
+ * configure: Regenerate.
+
2007-01-04 Tom Tromey <tromey@redhat.com>
PR preprocessor/28165:
diff --git a/libcpp/configure b/libcpp/configure
index 783cb7cccfb6..26ed11015ba5 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -2816,7 +2816,7 @@ fi
echo "$as_me:$LINENO: result: $acx_cv_prog_cc_pedantic__Wno_long_long" >&5
echo "${ECHO_T}$acx_cv_prog_cc_pedantic__Wno_long_long" >&6
if test $acx_cv_prog_cc_pedantic__Wno_long_long = yes; then
- WARN_PEDANTIC="-pedantic -Wno-long-long"
+ WARN_PEDANTIC="$WARN_PEDANTIC${WARN_PEDANTIC:+ }-pedantic -Wno-long-long"
fi
--
GitLab