diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2020-10-31 08:30:59 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-10-31 08:30:59 -0400 |
| commit | 864ca435655273c773055213f033ba621a9f9b17 (patch) | |
| tree | 5c8aad5b4e3d552eed7dba1950c82aaea3835292 /gdbsupport | |
| parent | 5164c11714c92ba7690d4f93de6be6a90f460220 (diff) | |
| download | gdb-864ca435655273c773055213f033ba621a9f9b17.zip gdb-864ca435655273c773055213f033ba621a9f9b17.tar.gz gdb-864ca435655273c773055213f033ba621a9f9b17.tar.bz2 | |
gdbsupport: replace AC_TRY_COMPILE in warning.m4
Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + AC_LANG_PROGRAM.
All changes in generated configure files are insignificant whitespace
changes.
gdb/ChangeLog:
* configure: Re-generate.
gdbserver/ChangeLog:
* configure: Re-generate.
gdbsupport/ChangeLog:
* configure: Re-generate.
* warning.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE +
AC_LANG_PROGRAM.
Change-Id: I517bd20ec3af960ad999a586761df0ac8959a3fc
Diffstat (limited to 'gdbsupport')
| -rw-r--r-- | gdbsupport/ChangeLog | 6 | ||||
| -rwxr-xr-x | gdbsupport/configure | 7 | ||||
| -rw-r--r-- | gdbsupport/warning.m4 | 24 |
3 files changed, 26 insertions, 11 deletions
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 634b7c7..1f4f4a2 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,6 +1,12 @@ 2020-10-31 Simon Marchi <simon.marchi@polymtl.ca> * configure: Re-generate. + * warning.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + + AC_LANG_PROGRAM. + +2020-10-31 Simon Marchi <simon.marchi@polymtl.ca> + + * configure: Re-generate. * ptrace.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + AC_LANG_PROGRAM. diff --git a/gdbsupport/configure b/gdbsupport/configure index 904403d..1452b35 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -10306,13 +10306,14 @@ $as_echo_n "checking compiler warning flags... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ struct scoped_restore_base {}; - struct scoped_restore_tmpl : public scoped_restore_base { - ~scoped_restore_tmpl() {} - }; + struct scoped_restore_tmpl : public scoped_restore_base { + ~scoped_restore_tmpl() {} + }; int main () { const scoped_restore_base &b = scoped_restore_tmpl(); + ; return 0; } diff --git a/gdbsupport/warning.m4 b/gdbsupport/warning.m4 index 649be75..c88d4c6 100644 --- a/gdbsupport/warning.m4 +++ b/gdbsupport/warning.m4 @@ -139,15 +139,23 @@ then # Check for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38958, # fixed in GCC 4.9. This test is derived from the gdb # source code that triggered this bug in GCC. - AC_TRY_COMPILE( - [struct scoped_restore_base {}; - struct scoped_restore_tmpl : public scoped_restore_base { - ~scoped_restore_tmpl() {} - };], - [const scoped_restore_base &b = scoped_restore_tmpl();], - WARN_CFLAGS="${WARN_CFLAGS} $w",) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [struct scoped_restore_base {}; + struct scoped_restore_tmpl : public scoped_restore_base { + ~scoped_restore_tmpl() {} + };], + [const scoped_restore_base &b = scoped_restore_tmpl();] + )], + [WARN_CFLAGS="${WARN_CFLAGS} $w"], + [] + ) else - AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [])], + [WARN_CFLAGS="${WARN_CFLAGS} $w"], + [] + ) fi CFLAGS="$saved_CFLAGS" CXXFLAGS="$saved_CXXFLAGS" |