X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Facinclude.m4;h=95ff2b6f35e12fa3a4ed1153e73bdc5322000197;hb=3c4e2282566d54b974f6929ee5c1270fb3cea4e5;hp=4b3f7fcf95eb96c774aad9f7dfc6760ac4f6dd23;hpb=cf6de44d75082116865a85cbf94db2632b679361;p=binutils-gdb.git diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 4b3f7fcf95e..95ff2b6f35e 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -4,177 +4,55 @@ dnl major rewriting for Tcl 7.5 by Don Libes # Keep these includes in sync with the aclocal_m4_deps list in # Makefile.in. -sinclude(acx_configure_dir.m4) +dnl NB: When possible, try to avoid explicit includes of ../config/ files. +dnl They're normally found by aclocal automatically and recorded in aclocal.m4. +dnl However, some are kept here explicitly to silence harmless warnings from +dnl aclocal when it finds AM_xxx macros via local search paths instead of +dnl system search paths. -# This gets GDB_AC_LIBMCHECK. -sinclude(libmcheck.m4) +m4_include(acx_configure_dir.m4) # This gets GDB_AC_TRANSFORM. -sinclude(transform.m4) +m4_include(transform.m4) -# This gets AM_GDB_WARNINGS. -sinclude(warning.m4) - -dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. -sinclude(../bfd/bfd.m4) - -dnl This gets the standard macros. -sinclude(../config/acinclude.m4) - -dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. -sinclude(../config/plugins.m4) - -dnl For ACX_LARGEFILE. -sinclude(../config/largefile.m4) - -dnl For AM_SET_LEADING_DOT. -sinclude(../config/lead-dot.m4) - -dnl This gets autoconf bugfixes. -sinclude(../config/override.m4) - -dnl For ZW_GNU_GETTEXT_SISTER_DIR. -sinclude(../config/gettext-sister.m4) +# This get AM_GDB_COMPILER_TYPE. +m4_include(../gdbsupport/compiler-type.m4) -dnl For AC_LIB_HAVE_LINKFLAGS. -sinclude(../config/lib-ld.m4) -sinclude(../config/lib-prefix.m4) -sinclude(../config/lib-link.m4) +# This gets AM_GDB_WARNINGS. +m4_include(../gdbsupport/warning.m4) -dnl For ACX_PKGVERSION and ACX_BUGURL. -sinclude(../config/acx.m4) +# AM_GDB_UBSAN +m4_include(sanitize.m4) -dnl for TCL definitions -sinclude(../config/tcl.m4) +# This gets GDB_AC_SELFTEST. +m4_include(../gdbsupport/selftest.m4) -dnl For dependency tracking macros. -sinclude([../config/depstand.m4]) +dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. +m4_include(../bfd/bfd.m4) dnl For AM_LC_MESSAGES -sinclude([../config/lcmessage.m4]) +m4_include([../config/lcmessage.m4]) dnl For AM_LANGINFO_CODESET. -sinclude([../config/codeset.m4]) +m4_include([../config/codeset.m4]) -sinclude([../config/iconv.m4]) +dnl We need to explicitly include these before iconv.m4 to avoid warnings. +m4_include([../config/lib-ld.m4]) +m4_include([../config/lib-prefix.m4]) +m4_include([../config/lib-link.m4]) +m4_include([../config/iconv.m4]) -sinclude([../config/zlib.m4]) +m4_include([../config/zlib.m4]) -m4_include([common/common.m4]) +m4_include([../gdbsupport/common.m4]) dnl For libiberty_INIT. m4_include(libiberty.m4) dnl For GDB_AC_PTRACE. -m4_include(ptrace.m4) - -## ----------------------------------------- ## -## ANSIfy the C compiler whenever possible. ## -## From Franc,ois Pinard ## -## ----------------------------------------- ## - -# Copyright (C) 1996-2016 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . - -# serial 1 - -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - -AC_DEFUN([AM_PROG_CC_STDC], -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require -dnl a magic option to avoid problems with ANSI preprocessor commands -dnl like #elif. -dnl FIXME: can't do this because then AC_AIX won't work due to a -dnl circular dependency. -dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -], [ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" -]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT([$am_cv_prog_cc_stdc]) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac -]) +m4_include(../gdbsupport/ptrace.m4) + +m4_include(ax_cxx_compile_stdcxx.m4) dnl written by Guido Draheim , original by Alexandre Oliva dnl Version 1.3 (2001/03/02) @@ -196,13 +74,22 @@ dnl to use a different cache variable name in this macro if it is invoked dnl in a different context somewhere else. dnl gcc_AC_CHECK_DECL(SYMBOL, dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, INCLUDES]]]) -AC_DEFUN([gcc_AC_CHECK_DECL], -[AC_MSG_CHECKING([whether $1 is declared]) -AC_CACHE_VAL(gcc_cv_have_decl_$1, -[AC_TRY_COMPILE([$4], -[#ifndef $1 -char *(*pfn) = (char *(*)) $1 ; -#endif], eval "gcc_cv_have_decl_$1=yes", eval "gcc_cv_have_decl_$1=no")]) +AC_DEFUN( + [gcc_AC_CHECK_DECL], + [AC_MSG_CHECKING([whether $1 is declared]) + AC_CACHE_VAL( + [gcc_cv_have_decl_$1], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [$4], + [#ifndef $1 + char *(*pfn) = (char *(*)) $1 ; + #endif] + )], + [eval "gcc_cv_have_decl_$1=yes"], + [eval "gcc_cv_have_decl_$1=no"] + )] + ) if eval "test \"`echo '$gcc_cv_have_decl_'$1`\" = yes"; then AC_MSG_RESULT(yes) ; ifelse([$2], , :, [$2]) else @@ -257,7 +144,7 @@ AC_DEFUN([CY_AC_TCL_PRIVATE_HEADERS], [ fi if test x"${private_dir}" = x; then - AC_ERROR(could not find private Tcl headers) + AC_MSG_ERROR(could not find private Tcl headers) else TCL_PRIVATE_INCLUDE="-I${private_dir}" AC_MSG_RESULT(${private_dir}) @@ -278,7 +165,7 @@ AC_DEFUN([CY_AC_TK_PRIVATE_HEADERS], [ fi if test x"${private_dir}" = x; then - AC_ERROR(could not find Tk private headers) + AC_MSG_ERROR(could not find Tk private headers) else TK_PRIVATE_INCLUDE="-I${private_dir}" AC_MSG_RESULT(${private_dir}) @@ -349,13 +236,21 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [ LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` LIBS="-lbfd -liberty -lz $intl $LIBS" - AC_CACHE_CHECK([$1], [$2], - [AC_TRY_LINK( - [#include - #include "bfd.h" - #include "$4" - ], - [return $3;], [[$2]=yes], [[$2]=no])]) + AC_CACHE_CHECK( + [$1], + [$2], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include + #include "bfd.h" + #include "$4"], + [return $3;] + )], + [[$2]=yes], + [[$2]=no] + )] + ) CFLAGS=$OLD_CFLAGS LDFLAGS=$OLD_LDFLAGS LIBS=$OLD_LIBS])