From 5593a99a95f8f86240c6d8583a52a3956c691dba Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 31 Oct 2020 08:30:58 -0400 Subject: [PATCH] gdb: modernize configure.ac Run autoupdate on configure.ac and adjust the indentation of the result for better readability. This removes a bunch of warnings when running `autoreconf -vf -Wall`. The changes are: * Replace AC_INIT with AC_INIT and no arguments plus AC_CONFIG_SRCDIR. * Replace AC_ERROR with AC_MSG_ERROR. * Replace AC_TRY_LINK with AC_LINK_IFELSE. * Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE. * Replace AC_HELP_STRING with AS_HELP_STRING. autoupdate erroneously tries to replace AC_C_LONG_DOUBLE in a comment, which I reverted manually. All the changes in the generated configure file are insignificant whitespaces changes. gdb/ChangeLog: * configure.ac: Modernize. * configure: Re-generate. Change-Id: Ie3a1409c8032a36a6383da964286a46ece9b546e --- gdb/ChangeLog | 5 + gdb/configure | 118 +++++++++------ gdb/configure.ac | 366 ++++++++++++++++++++++++++++++----------------- 3 files changed, 316 insertions(+), 173 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 61024b80a23..ba47a12ddfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-31 Simon Marchi + + * configure.ac: Modernize. + * configure: Re-generate. + 2020-10-31 Simon Marchi * acinclude.m4 (AM_PROG_CC_STDC): Remove. diff --git a/gdb/configure b/gdb/configure index 990fe3eb07d..5678deac68c 100755 --- a/gdb/configure +++ b/gdb/configure @@ -2986,6 +2986,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h:config.in" @@ -7190,12 +7191,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -extern char _etext; - + extern char _etext; int main () { free (&_etext); + ; return 0; } @@ -7204,9 +7205,11 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_var__etext=yes else ac_cv_var__etext=no + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var__etext" >&5 $as_echo "$ac_cv_var__etext" >&6; } @@ -7223,12 +7226,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -extern char etext; - + extern char etext; int main () { free (&etext); + ; return 0; } @@ -7237,9 +7240,11 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_var_etext=yes else ac_cv_var_etext=no + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_etext" >&5 $as_echo "$ac_cv_var_etext" >&6; } @@ -7276,8 +7281,10 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_cc_supports_pg=yes else ac_cv_cc_supports_pg=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_supports_pg" >&5 $as_echo "$ac_cv_cc_supports_pg" >&6; } @@ -9182,7 +9189,7 @@ fi if test "$with_system_readline" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system readline is new enough" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system readline is new enough" >&5 $as_echo_n "checking whether system readline is new enough... " >&6; } if ${gdb_cv_readline_ok+:} false; then : $as_echo_n "(cached) " >&6 @@ -9190,13 +9197,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#include + #include int main () { #if RL_VERSION_MAJOR < 7 -# error "readline version 7 required" -#endif + # error "readline version 7 required" + #endif + ; return 0; } @@ -9205,8 +9213,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_readline_ok=yes else gdb_cv_readline_ok=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_readline_ok" >&5 $as_echo "$gdb_cv_readline_ok" >&6; } @@ -10642,7 +10652,7 @@ fi if test "${python_prog_path}" = missing; then - as_fn_error $? "unable to find python program ${python_prog}" "$LINENO" 5 + as_fn_error $? "unable to find python program ${python_prog}" "$LINENO" 5 fi ;; esac @@ -10656,21 +10666,21 @@ fi if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - as_fn_error $? "failure running python-config --includes" "$LINENO" 5 + as_fn_error $? "failure running python-config --includes" "$LINENO" 5 fi fi python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags` if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - as_fn_error $? "failure running python-config --ldflags" "$LINENO" 5 + as_fn_error $? "failure running python-config --ldflags" "$LINENO" 5 fi fi python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - as_fn_error $? "failure running python-config --exec-prefix" "$LINENO" 5 + as_fn_error $? "failure running python-config --exec-prefix" "$LINENO" 5 fi fi else @@ -15351,17 +15361,14 @@ if ${ac_cv_func_setpgrp_void+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include - int main () { - - if (setpgrp(1,1) == -1) - exit (0); - else - exit (1); +if (setpgrp(1,1) == -1) + exit (0); + else + exit (1); ; return 0; @@ -15371,8 +15378,10 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_func_setpgrp_void=no else ac_cv_func_setpgrp_void=yes + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5 $as_echo "$ac_cv_func_setpgrp_void" >&6; } @@ -15399,9 +15408,10 @@ int main () { #define REGEX_INTERFACE_VERSION 1 -#if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION -# error "Version mismatch" -#endif + #if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION + # error "Version mismatch" + #endif + ; return 0; } @@ -15410,8 +15420,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_gnu_regex=yes else gdb_cv_have_gnu_regex=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_gnu_regex" >&5 $as_echo "$gdb_cv_have_gnu_regex" >&6; } @@ -15457,12 +15469,13 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#define _KMEMUSER -#include + #define _KMEMUSER + #include int main () { struct lwp l; + ; return 0; } @@ -15471,8 +15484,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_struct_lwp=yes else gdb_cv_struct_lwp=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_struct_lwp" >&5 $as_echo "$gdb_cv_struct_lwp" >&6; } @@ -15491,11 +15506,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#include + #include int main () { struct reg r; + ; return 0; } @@ -15504,8 +15520,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_struct_reg=yes else gdb_cv_struct_reg=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_struct_reg" >&5 $as_echo "$gdb_cv_struct_reg" >&6; } @@ -15562,8 +15580,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_ptrace_getregs=yes else gdb_cv_have_ptrace_getregs=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_ptrace_getregs" >&5 @@ -15595,8 +15615,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_ptrace_getfpxregs=yes else gdb_cv_have_ptrace_getfpxregs=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_ptrace_getfpxregs" >&5 @@ -15616,11 +15638,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#include + #include int main () { PT_GETDBREGS; + ; return 0; } @@ -15629,8 +15652,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_pt_getdbregs=yes else gdb_cv_have_pt_getdbregs=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_pt_getdbregs" >&5 @@ -15650,11 +15675,12 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -#include + #include int main () { PT_GETXMMREGS; + ; return 0; } @@ -15663,8 +15689,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_pt_getxmmregs=yes else gdb_cv_have_pt_getxmmregs=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_pt_getxmmregs" >&5 @@ -15947,16 +15975,15 @@ $as_echo_n "checking for -bbigtoc option... " >&6; } if ${gdb_cv_bigtoc+:} false; then : $as_echo_n "(cached) " >&6 else + SAVE_LDFLAGS=$LDFLAGS - SAVE_LDFLAGS=$LDFLAGS - - case $GCC in - yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;; - *) gdb_cv_bigtoc=-bbigtoc ;; - esac + case $GCC in + yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;; + *) gdb_cv_bigtoc=-bbigtoc ;; + esac - LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15971,10 +15998,11 @@ if ac_fn_c_try_link "$LINENO"; then : else gdb_cv_bigtoc= + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="${SAVE_LDFLAGS}" + LDFLAGS="${SAVE_LDFLAGS}" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_bigtoc" >&5 @@ -16086,8 +16114,9 @@ int main () { #ifndef PTHDB_VERSION_3 - #error - #endif + #error + #endif + ; return 0; } @@ -16096,8 +16125,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_have_aix_thread_debug=yes else gdb_cv_have_aix_thread_debug=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_aix_thread_debug" >&5 @@ -16129,7 +16160,7 @@ _ACEOF fi if test "x$ac_cv_header_thread_db_h" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_NOTALLOC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_NOTALLOC" >&5 $as_echo_n "checking whether has TD_NOTALLOC... " >&6; } if ${gdb_cv_thread_db_h_has_td_notalloc+:} false; then : $as_echo_n "(cached) " >&6 @@ -16141,6 +16172,7 @@ int main () { int i = TD_NOTALLOC; + ; return 0; } @@ -16156,7 +16188,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_thread_db_h_has_td_notalloc" >&5 $as_echo "$gdb_cv_thread_db_h_has_td_notalloc" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_VERSION" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_VERSION" >&5 $as_echo_n "checking whether has TD_VERSION... " >&6; } if ${gdb_cv_thread_db_h_has_td_version+:} false; then : $as_echo_n "(cached) " >&6 @@ -16168,6 +16201,7 @@ int main () { int i = TD_VERSION; + ; return 0; } @@ -16183,7 +16217,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_thread_db_h_has_td_version" >&5 $as_echo "$gdb_cv_thread_db_h_has_td_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_NOTLS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether has TD_NOTLS" >&5 $as_echo_n "checking whether has TD_NOTLS... " >&6; } if ${gdb_cv_thread_db_h_has_td_notls+:} false; then : $as_echo_n "(cached) " >&6 @@ -16195,6 +16230,7 @@ int main () { int i = TD_NOTLS; + ; return 0; } diff --git a/gdb/configure.ac b/gdb/configure.ac index c1073f86799..bfc053ed096 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -20,7 +20,8 @@ dnl Process this file with autoconf to produce a configure script. m4_include(../config/debuginfod.m4) -AC_INIT(main.c) +AC_INIT +AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) AM_MAINTAINER_MODE @@ -157,7 +158,7 @@ AC_CONFIG_SUBDIRS(testsuite) AC_ARG_ENABLE(targets, AS_HELP_STRING([--enable-targets=TARGETS], [alternative target configurations]), [case "${enableval}" in - yes | "") AC_ERROR(enable-targets option must specify target names or 'all') + yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all') ;; no) enable_targets= ;; *) enable_targets=$enableval ;; @@ -391,22 +392,36 @@ AS_HELP_STRING([--enable-profiling], [enable profiling of GDB]), [enable_profiling=no]) AC_CHECK_FUNCS(monstartup _mcleanup) -AC_CACHE_CHECK([for _etext], ac_cv_var__etext, -[AC_TRY_LINK( -[#include -extern char _etext; -], -[free (&_etext);], ac_cv_var__etext=yes, ac_cv_var__etext=no)]) +AC_CACHE_CHECK( + [for _etext], + [ac_cv_var__etext], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include + extern char _etext;], + [free (&_etext);] + )], + [ac_cv_var__etext=yes], + [ac_cv_var__etext=no] + )] +) if test "$ac_cv_var__etext" = yes; then AC_DEFINE(HAVE__ETEXT, 1, [Define to 1 if your system has the _etext variable. ]) fi -AC_CACHE_CHECK([for etext], ac_cv_var_etext, -[AC_TRY_LINK( -[#include -extern char etext; -], -[free (&etext);], ac_cv_var_etext=yes, ac_cv_var_etext=no)]) +AC_CACHE_CHECK( + [for etext], + [ac_cv_var_etext], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include + extern char etext;], + [free (&etext);] + )], + [ac_cv_var_etext=yes], + [ac_cv_var_etext=no] + )] +) if test "$ac_cv_var_etext" = yes; then AC_DEFINE(HAVE_ETEXT, 1, [Define to 1 if your system has the etext variable. ]) @@ -419,9 +434,15 @@ if test "$enable_profiling" = yes ; then OLD_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $PROFILE_CFLAGS" - AC_CACHE_CHECK([whether $CC supports -pg], ac_cv_cc_supports_pg, - [AC_TRY_COMPILE([], [int x;], ac_cv_cc_supports_pg=yes, - ac_cv_cc_supports_pg=no)]) + AC_CACHE_CHECK( + [whether $CC supports -pg], + [ac_cv_cc_supports_pg], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [int x;])], + [ac_cv_cc_supports_pg=yes], + [ac_cv_cc_supports_pg=no] + )] + ) if test "$ac_cv_cc_supports_pg" = no; then AC_MSG_ERROR(--enable-profiling requires a compiler which supports -pg) @@ -574,16 +595,21 @@ AC_ARG_WITH([system-readline], [use installed readline library])]) if test "$with_system_readline" = yes; then - AC_CACHE_CHECK([whether system readline is new enough], - [gdb_cv_readline_ok], - [AC_TRY_COMPILE( - [#include -#include ], - [#if RL_VERSION_MAJOR < 7 -# error "readline version 7 required" -#endif], - gdb_cv_readline_ok=yes, - gdb_cv_readline_ok=no)]) + AC_CACHE_CHECK( + [whether system readline is new enough], + [gdb_cv_readline_ok], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include ], + [#if RL_VERSION_MAJOR < 7 + # error "readline version 7 required" + #endif] + )], + [gdb_cv_readline_ok=yes], + [gdb_cv_readline_ok=no] + )] + ) if test "$gdb_cv_readline_ok" != yes; then AC_MSG_ERROR([system readline is not new enough]) fi @@ -778,12 +804,12 @@ else python_prog=${with_python} python_prefix= else - AC_ERROR(invalid value for --with-python) + AC_MSG_ERROR(invalid value for --with-python) fi ;; */*) # Disallow --with-python=foo/bar. - AC_ERROR(invalid value for --with-python) + AC_MSG_ERROR(invalid value for --with-python) ;; *) # The user has either specified auto, yes, or the name of the python @@ -811,7 +837,7 @@ else python_prog="${with_python}" AC_PATH_PROG(python_prog_path, ${python_prog}, missing) if test "${python_prog_path}" = missing; then - AC_ERROR(unable to find python program ${python_prog}) + AC_MSG_ERROR(unable to find python program ${python_prog}) fi ;; esac @@ -825,21 +851,21 @@ else if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - AC_ERROR(failure running python-config --includes) + AC_MSG_ERROR(failure running python-config --includes) fi fi python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags` if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - AC_ERROR(failure running python-config --ldflags) + AC_MSG_ERROR(failure running python-config --ldflags) fi fi python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` if test $? != 0; then have_python_config=failed if test "${with_python}" != auto; then - AC_ERROR(failure running python-config --exec-prefix) + AC_MSG_ERROR(failure running python-config --exec-prefix) fi fi else @@ -944,7 +970,11 @@ if test "${have_libpython}" != no; then # Check that the compiler accepts it saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_TRY_COMPILE([],[],PYTHON_CFLAGS="${PYTHON_CFLAGS} $flag",) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [])], + [PYTHON_CFLAGS="${PYTHON_CFLAGS} $flag"], + [] + ) CFLAGS="$saved_CFLAGS" done AC_MSG_RESULT(${PYTHON_CFLAGS}) @@ -1305,15 +1335,21 @@ dnl Instead, assume we will have a prototype for setpgrp if cross compiling. if test "$cross_compiling" = no; then AC_FUNC_SETPGRP else - AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void, - [AC_TRY_COMPILE([ -#include -], [ - if (setpgrp(1,1) == -1) - exit (0); - else - exit (1); -], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)]) + AC_CACHE_CHECK( + [whether setpgrp takes no argument], + [ac_cv_func_setpgrp_void], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [if (setpgrp(1,1) == -1) + exit (0); + else + exit (1);] + )], + [ac_cv_func_setpgrp_void=no], + [ac_cv_func_setpgrp_void=yes] + )] + ) if test "$ac_cv_func_setpgrp_void" = yes; then AC_DEFINE(SETPGRP_VOID, 1) fi @@ -1327,14 +1363,18 @@ gdb_use_included_regex=yes AC_CACHE_CHECK( [for GNU regex], [gdb_cv_have_gnu_regex], - [AC_TRY_COMPILE( - [#include ], - [#define REGEX_INTERFACE_VERSION 1 -#if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION -# error "Version mismatch" -#endif], - gdb_cv_have_gnu_regex=yes, - gdb_cv_have_gnu_regex=no)]) + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [#define REGEX_INTERFACE_VERSION 1 + #if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION + # error "Version mismatch" + #endif] + )], + [gdb_cv_have_gnu_regex=yes], + [gdb_cv_have_gnu_regex=no] + )] +) if test "$gdb_cv_have_gnu_regex" = yes; then gdb_use_included_regex=no fi @@ -1355,21 +1395,39 @@ AC_CHECK_MEMBERS([struct thread.td_pcb], [], [], ]) # See if defines `struct lwp`. -AC_CACHE_CHECK([for struct lwp], gdb_cv_struct_lwp, -[AC_TRY_COMPILE([#include -#define _KMEMUSER -#include ], [struct lwp l;], -gdb_cv_struct_lwp=yes, gdb_cv_struct_lwp=no)]) +AC_CACHE_CHECK( + [for struct lwp], + [gdb_cv_struct_lwp], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #define _KMEMUSER + #include ], + [struct lwp l;] + )], + [gdb_cv_struct_lwp=yes], + [gdb_cv_struct_lwp=no] + )] +) if test "$gdb_cv_struct_lwp" = yes; then AC_DEFINE(HAVE_STRUCT_LWP, 1, [Define to 1 if your system has struct lwp.]) fi # See if degines `struct reg'. -AC_CACHE_CHECK([for struct reg in machine/reg.h], gdb_cv_struct_reg, -[AC_TRY_COMPILE([#include -#include ], [struct reg r;], -gdb_cv_struct_reg=yes, gdb_cv_struct_reg=no)]) +AC_CACHE_CHECK( + [for struct reg in machine/reg.h], + [gdb_cv_struct_reg], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include ], + [struct reg r;] + )], + [gdb_cv_struct_reg=yes], + [gdb_cv_struct_reg=no] + )] +) if test "$gdb_cv_struct_reg" = yes; then AC_DEFINE(HAVE_STRUCT_REG, 1, [Define to 1 if your system has struct reg in .]) @@ -1383,11 +1441,14 @@ AC_CHECK_MEMBERS([struct reg.r_fs, struct reg.r_gs], [], [], # See if provides the PTRACE_GETREGS request. AC_MSG_CHECKING(for PTRACE_GETREGS) -AC_CACHE_VAL(gdb_cv_have_ptrace_getregs, -[AC_TRY_COMPILE([#include ], - [PTRACE_GETREGS;], - [gdb_cv_have_ptrace_getregs=yes], - [gdb_cv_have_ptrace_getregs=no])]) +AC_CACHE_VAL( + [gdb_cv_have_ptrace_getregs], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include ], [PTRACE_GETREGS;])], + [gdb_cv_have_ptrace_getregs=yes], + [gdb_cv_have_ptrace_getregs=no] + )] +) AC_MSG_RESULT($gdb_cv_have_ptrace_getregs) if test "$gdb_cv_have_ptrace_getregs" = yes; then AC_DEFINE(HAVE_PTRACE_GETREGS, 1, @@ -1396,11 +1457,14 @@ fi # See if provides the PTRACE_GETFPXREGS request. AC_MSG_CHECKING(for PTRACE_GETFPXREGS) -AC_CACHE_VAL(gdb_cv_have_ptrace_getfpxregs, -[AC_TRY_COMPILE([#include ], - [PTRACE_GETFPXREGS;], - [gdb_cv_have_ptrace_getfpxregs=yes], - [gdb_cv_have_ptrace_getfpxregs=no])]) +AC_CACHE_VAL( + [gdb_cv_have_ptrace_getfpxregs], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include ], [PTRACE_GETFPXREGS;])], + [gdb_cv_have_ptrace_getfpxregs=yes], + [gdb_cv_have_ptrace_getfpxregs=no] + )] +) AC_MSG_RESULT($gdb_cv_have_ptrace_getfpxregs) if test "$gdb_cv_have_ptrace_getfpxregs" = yes; then AC_DEFINE(HAVE_PTRACE_GETFPXREGS, 1, @@ -1409,12 +1473,18 @@ fi # See if provides the PT_GETDBREGS request. AC_MSG_CHECKING(for PT_GETDBREGS) -AC_CACHE_VAL(gdb_cv_have_pt_getdbregs, -[AC_TRY_COMPILE([#include -#include ], - [PT_GETDBREGS;], - [gdb_cv_have_pt_getdbregs=yes], - [gdb_cv_have_pt_getdbregs=no])]) +AC_CACHE_VAL( + [gdb_cv_have_pt_getdbregs], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include ], + [PT_GETDBREGS;] + )], + [gdb_cv_have_pt_getdbregs=yes], + [gdb_cv_have_pt_getdbregs=no] + )] +) AC_MSG_RESULT($gdb_cv_have_pt_getdbregs) if test "$gdb_cv_have_pt_getdbregs" = yes; then AC_DEFINE(HAVE_PT_GETDBREGS, 1, @@ -1423,12 +1493,18 @@ fi # See if provides the PT_GETXMMREGS request. AC_MSG_CHECKING(for PT_GETXMMREGS) -AC_CACHE_VAL(gdb_cv_have_pt_getxmmregs, -[AC_TRY_COMPILE([#include -#include ], - [PT_GETXMMREGS;], - [gdb_cv_have_pt_getxmmregs=yes], - [gdb_cv_have_pt_getxmmregs=no])]) +AC_CACHE_VAL( + [gdb_cv_have_pt_getxmmregs], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include ], + [PT_GETXMMREGS;] + )], + [gdb_cv_have_pt_getxmmregs=yes], + [gdb_cv_have_pt_getxmmregs=no] + )] +) AC_MSG_RESULT($gdb_cv_have_pt_getxmmregs) if test "$gdb_cv_have_pt_getxmmregs" = yes; then AC_DEFINE(HAVE_PT_GETXMMREGS, 1, @@ -1551,18 +1627,23 @@ fi case ${host_os} in aix*) - AC_CACHE_CHECK([for -bbigtoc option], [gdb_cv_bigtoc], [ - SAVE_LDFLAGS=$LDFLAGS - - case $GCC in - yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;; - *) gdb_cv_bigtoc=-bbigtoc ;; - esac - - LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc - AC_TRY_LINK([], [int i;], [], [gdb_cv_bigtoc=]) - LDFLAGS="${SAVE_LDFLAGS}" - ]) + AC_CACHE_CHECK( + [for -bbigtoc option], [gdb_cv_bigtoc], + [SAVE_LDFLAGS=$LDFLAGS + + case $GCC in + yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;; + *) gdb_cv_bigtoc=-bbigtoc ;; + esac + + LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([], [int i;])], + [], + [gdb_cv_bigtoc=] + ) + LDFLAGS="${SAVE_LDFLAGS}"] + ) CONFIG_LDFLAGS="${CONFIG_LDFLAGS} ${gdb_cv_bigtoc}" ;; esac @@ -1578,7 +1659,11 @@ if test "${gdb_native}" = yes; then RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list" LDFLAGS="$LDFLAGS $RDYNAMIC" if test "${have_libpython}" = no; then - AC_TRY_LINK([], [], [dynamic_list=true]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([], [])], + [dynamic_list=true], + [] + ) else # Workaround http://bugs.python.org/issue4434 where static # libpythonX.Y.a would get its symbols required for @@ -1631,13 +1716,19 @@ if test "${build}" = "${host}" -a "${host}" = "${target}" ; then case ${host_os} in aix*) AC_MSG_CHECKING(for AiX thread debugging library) - AC_CACHE_VAL(gdb_cv_have_aix_thread_debug, - [AC_TRY_COMPILE([#include ], - [#ifndef PTHDB_VERSION_3 - #error - #endif], - gdb_cv_have_aix_thread_debug=yes, - gdb_cv_have_aix_thread_debug=no)]) + AC_CACHE_VAL( + [gdb_cv_have_aix_thread_debug], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [#ifndef PTHDB_VERSION_3 + #error + #endif] + )], + [gdb_cv_have_aix_thread_debug=yes], + [gdb_cv_have_aix_thread_debug=no] + )] + ) AC_MSG_RESULT($gdb_cv_have_aix_thread_debug) if test "$gdb_cv_have_aix_thread_debug" = yes; then CONFIG_SRCS="${CONFIG_SRCS} aix-thread.c" @@ -1657,33 +1748,44 @@ fi dnl See if we have a thread_db header file that has TD_NOTALLOC and dnl other error codes. if test "x$ac_cv_header_thread_db_h" = "xyes"; then - AC_CACHE_CHECK([whether has TD_NOTALLOC], - gdb_cv_thread_db_h_has_td_notalloc, - AC_TRY_COMPILE( - [#include ], - [int i = TD_NOTALLOC;], - gdb_cv_thread_db_h_has_td_notalloc=yes, - gdb_cv_thread_db_h_has_td_notalloc=no - ) - ) - AC_CACHE_CHECK([whether has TD_VERSION], - gdb_cv_thread_db_h_has_td_version, - AC_TRY_COMPILE( - [#include ], - [int i = TD_VERSION;], - gdb_cv_thread_db_h_has_td_version=yes, - gdb_cv_thread_db_h_has_td_version=no - ) - ) - AC_CACHE_CHECK([whether has TD_NOTLS], - gdb_cv_thread_db_h_has_td_notls, - AC_TRY_COMPILE( - [#include ], - [int i = TD_NOTLS;], - gdb_cv_thread_db_h_has_td_notls=yes, - gdb_cv_thread_db_h_has_td_notls=no - ) - ) + AC_CACHE_CHECK( + [whether has TD_NOTALLOC], + [gdb_cv_thread_db_h_has_td_notalloc], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [int i = TD_NOTALLOC;] + )], + [gdb_cv_thread_db_h_has_td_notalloc=yes], + [gdb_cv_thread_db_h_has_td_notalloc=no] + )] + ) + + AC_CACHE_CHECK( + [whether has TD_VERSION], + [gdb_cv_thread_db_h_has_td_version], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [int i = TD_VERSION;] + )], + [gdb_cv_thread_db_h_has_td_version=yes], + [gdb_cv_thread_db_h_has_td_version=no] + )] + ) + + AC_CACHE_CHECK( + [whether has TD_NOTLS], + [gdb_cv_thread_db_h_has_td_notls], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [int i = TD_NOTLS;] + )], + [gdb_cv_thread_db_h_has_td_notls=yes], + [gdb_cv_thread_db_h_has_td_notls=no] + )] + ) fi if test "x$gdb_cv_thread_db_h_has_td_notalloc" = "xyes"; then AC_DEFINE(THREAD_DB_HAS_TD_NOTALLOC, 1, @@ -2029,7 +2131,7 @@ fi # Check for babeltrace and babeltrace-ctf AC_ARG_WITH(babeltrace, - AC_HELP_STRING([--with-babeltrace], [include babeltrace support (auto/yes/no)]), + AS_HELP_STRING([--with-babeltrace], [include babeltrace support (auto/yes/no)]), [], [with_babeltrace=auto]) AC_MSG_CHECKING([whether to use babeltrace]) AC_MSG_RESULT([$with_babeltrace]) @@ -2072,7 +2174,7 @@ fi # Check for xxhash AC_ARG_WITH(xxhash, - AC_HELP_STRING([--with-xxhash], [use libxxhash for hashing (faster) (auto/yes/no)]), + AS_HELP_STRING([--with-xxhash], [use libxxhash for hashing (faster) (auto/yes/no)]), [], [with_xxhash=auto]) GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections]) @@ -2133,7 +2235,7 @@ dnl Add dependency for xsltproc if building with maintainer-mode enabled. AC_PATH_PROGS(XSLTPROC, xsltproc, missing) if test "x$USE_MAINTAINER_MODE" = xyes; then if test "${XSLTPROC}" = missing; then - AC_ERROR(unable to find xsltproc. maintainer-mode requires xsltproc.) + AC_MSG_ERROR(unable to find xsltproc. maintainer-mode requires xsltproc.) fi fi AC_SUBST(XSLTPROC) -- 2.30.2