| Index: gdb/gnulib/import/m4/gnulib-common.m4
|
| diff --git a/gdb/gnulib/m4/gnulib-common.m4 b/gdb/gnulib/import/m4/gnulib-common.m4
|
| similarity index 57%
|
| rename from gdb/gnulib/m4/gnulib-common.m4
|
| rename to gdb/gnulib/import/m4/gnulib-common.m4
|
| index 7b2ce2b39a547f2896e0cda0cc9bc9593fa2ec93..15d2b2b3deaf702385c9a333af5f724768d36aa1 100644
|
| --- a/gdb/gnulib/m4/gnulib-common.m4
|
| +++ b/gdb/gnulib/import/m4/gnulib-common.m4
|
| @@ -1,5 +1,5 @@
|
| -# gnulib-common.m4 serial 20
|
| -dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
|
| +# gnulib-common.m4 serial 33
|
| +dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
|
| dnl This file is free software; the Free Software Foundation
|
| dnl gives unlimited permission to copy and/or distribute it,
|
| dnl with or without modifications, as long as this notice is preserved.
|
| @@ -12,11 +12,25 @@ AC_DEFUN([gl_COMMON], [
|
| AC_REQUIRE([gl_COMMON_BODY])
|
| ])
|
| AC_DEFUN([gl_COMMON_BODY], [
|
| + AH_VERBATIM([_Noreturn],
|
| +[/* The _Noreturn keyword of C11. */
|
| +#if ! (defined _Noreturn \
|
| + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
|
| +# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|
| + || 0x5110 <= __SUNPRO_C)
|
| +# define _Noreturn __attribute__ ((__noreturn__))
|
| +# elif defined _MSC_VER && 1200 <= _MSC_VER
|
| +# define _Noreturn __declspec (noreturn)
|
| +# else
|
| +# define _Noreturn
|
| +# endif
|
| +#endif
|
| +])
|
| AH_VERBATIM([isoc99_inline],
|
| [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
|
| the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
|
| earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
|
| - __APPLE__ && __MACH__ test for MacOS X.
|
| + __APPLE__ && __MACH__ test for Mac OS X.
|
| __APPLE_CC__ tests for the Apple compiler and its version.
|
| __STDC_VERSION__ tests for the C99 mode. */
|
| #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
|
| @@ -34,6 +48,20 @@ AC_DEFUN([gl_COMMON_BODY], [
|
| /* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
|
| is a misnomer outside of parameter lists. */
|
| #define _UNUSED_PARAMETER_ _GL_UNUSED
|
| +
|
| +/* The __pure__ attribute was added in gcc 2.96. */
|
| +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
|
| +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
|
| +#else
|
| +# define _GL_ATTRIBUTE_PURE /* empty */
|
| +#endif
|
| +
|
| +/* The __const__ attribute was added in gcc 2.95. */
|
| +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
|
| +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
|
| +#else
|
| +# define _GL_ATTRIBUTE_CONST /* empty */
|
| +#endif
|
| ])
|
| dnl Preparation for running test programs:
|
| dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
|
| @@ -47,16 +75,49 @@ AC_DEFUN([gl_COMMON_BODY], [
|
| # expands to a C preprocessor expression that evaluates to 1 or 0, depending
|
| # whether a gnulib module that has been requested shall be considered present
|
| # or not.
|
| -AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
|
| +m4_define([gl_MODULE_INDICATOR_CONDITION], [1])
|
|
|
| # gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
|
| # sets the shell variable that indicates the presence of the given module to
|
| # a C preprocessor expression that will evaluate to 1.
|
| AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
|
| [
|
| - GNULIB_[]m4_translit([[$1]],
|
| - [abcdefghijklmnopqrstuvwxyz./-],
|
| - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
|
| + gl_MODULE_INDICATOR_SET_VARIABLE_AUX(
|
| + [GNULIB_[]m4_translit([[$1]],
|
| + [abcdefghijklmnopqrstuvwxyz./-],
|
| + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])],
|
| + [gl_MODULE_INDICATOR_CONDITION])
|
| +])
|
| +
|
| +# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable])
|
| +# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION.
|
| +# The shell variable's value is a C preprocessor expression that evaluates
|
| +# to 0 or 1.
|
| +AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX],
|
| +[
|
| + m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1],
|
| + [
|
| + dnl Simplify the expression VALUE || 1 to 1.
|
| + $1=1
|
| + ],
|
| + [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1],
|
| + [gl_MODULE_INDICATOR_CONDITION])])
|
| +])
|
| +
|
| +# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition])
|
| +# modifies the shell variable to include the given condition. The shell
|
| +# variable's value is a C preprocessor expression that evaluates to 0 or 1.
|
| +AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR],
|
| +[
|
| + dnl Simplify the expression 1 || CONDITION to 1.
|
| + if test "$[]$1" != 1; then
|
| + dnl Simplify the expression 0 || CONDITION to CONDITION.
|
| + if test "$[]$1" = 0; then
|
| + $1=$2
|
| + else
|
| + $1="($[]$1 || $2)"
|
| + fi
|
| + fi
|
| ])
|
|
|
| # gl_MODULE_INDICATOR([modulename])
|
| @@ -102,6 +163,40 @@ AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
|
| [Define to 1 when the gnulib module $1 should be tested.])
|
| ])
|
|
|
| +# gl_ASSERT_NO_GNULIB_POSIXCHECK
|
| +# asserts that there will never be a need to #define GNULIB_POSIXCHECK.
|
| +# and thereby enables an optimization of configure and config.h.
|
| +# Used by Emacs.
|
| +AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK],
|
| +[
|
| + dnl Override gl_WARN_ON_USE_PREPARE.
|
| + dnl But hide this definition from 'aclocal'.
|
| + AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], [])
|
| +])
|
| +
|
| +# gl_ASSERT_NO_GNULIB_TESTS
|
| +# asserts that there will be no gnulib tests in the scope of the configure.ac
|
| +# and thereby enables an optimization of config.h.
|
| +# Used by Emacs.
|
| +AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS],
|
| +[
|
| + dnl Override gl_MODULE_INDICATOR_FOR_TESTS.
|
| + AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [])
|
| +])
|
| +
|
| +# Test whether <features.h> exists.
|
| +# Set HAVE_FEATURES_H.
|
| +AC_DEFUN([gl_FEATURES_H],
|
| +[
|
| + AC_CHECK_HEADERS_ONCE([features.h])
|
| + if test $ac_cv_header_features_h = yes; then
|
| + HAVE_FEATURES_H=1
|
| + else
|
| + HAVE_FEATURES_H=0
|
| + fi
|
| + AC_SUBST([HAVE_FEATURES_H])
|
| +])
|
| +
|
| # m4_foreach_w
|
| # is a backport of autoconf-2.59c's m4_foreach_w.
|
| # Remove this macro when we can assume autoconf >= 2.60.
|
| @@ -117,6 +212,83 @@ m4_ifndef([AS_VAR_IF],
|
| [m4_define([AS_VAR_IF],
|
| [AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
|
|
|
| +# gl_PROG_CC_C99
|
| +# Modifies the value of the shell variable CC in an attempt to make $CC
|
| +# understand ISO C99 source code.
|
| +# This is like AC_PROG_CC_C99, except that
|
| +# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
|
| +# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
|
| +# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
|
| +# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
|
| +# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
|
| +# Remaining problems:
|
| +# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
|
| +# to CC twice
|
| +# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
|
| +# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
|
| +AC_DEFUN([gl_PROG_CC_C99],
|
| +[
|
| + dnl Change that version number to the minimum Autoconf version that supports
|
| + dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls.
|
| + m4_version_prereq([9.0],
|
| + [AC_REQUIRE([AC_PROG_CC_C99])],
|
| + [AC_REQUIRE([AC_PROG_CC_STDC])])
|
| +])
|
| +
|
| +# gl_PROG_AR_RANLIB
|
| +# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler.
|
| +# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override
|
| +# the values.
|
| +AC_DEFUN([gl_PROG_AR_RANLIB],
|
| +[
|
| + dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler
|
| + dnl as "cc", and GCC as "gcc". They have different object file formats and
|
| + dnl library formats. In particular, the GNU binutils programs ar, ranlib
|
| + dnl produce libraries that work only with gcc, not with cc.
|
| + AC_REQUIRE([AC_PROG_CC])
|
| + AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler],
|
| + [
|
| + AC_EGREP_CPP([Amsterdam],
|
| + [
|
| +#ifdef __ACK__
|
| +Amsterdam
|
| +#endif
|
| + ],
|
| + [gl_cv_c_amsterdam_compiler=yes],
|
| + [gl_cv_c_amsterdam_compiler=no])
|
| + ])
|
| + if test -z "$AR"; then
|
| + if test $gl_cv_c_amsterdam_compiler = yes; then
|
| + AR='cc -c.a'
|
| + if test -z "$ARFLAGS"; then
|
| + ARFLAGS='-o'
|
| + fi
|
| + else
|
| + dnl Use the Automake-documented default values for AR and ARFLAGS,
|
| + dnl but prefer ${host}-ar over ar (useful for cross-compiling).
|
| + AC_CHECK_TOOL([AR], [ar], [ar])
|
| + if test -z "$ARFLAGS"; then
|
| + ARFLAGS='cru'
|
| + fi
|
| + fi
|
| + else
|
| + if test -z "$ARFLAGS"; then
|
| + ARFLAGS='cru'
|
| + fi
|
| + fi
|
| + AC_SUBST([AR])
|
| + AC_SUBST([ARFLAGS])
|
| + if test -z "$RANLIB"; then
|
| + if test $gl_cv_c_amsterdam_compiler = yes; then
|
| + RANLIB=':'
|
| + else
|
| + dnl Use the ranlib program if it is available.
|
| + AC_PROG_RANLIB
|
| + fi
|
| + fi
|
| + AC_SUBST([RANLIB])
|
| +])
|
| +
|
| # AC_PROG_MKDIR_P
|
| # is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
|
| # for interoperability with automake-1.9.6 from autoconf-2.62.
|
|
|