On Wed, Oct 31, 2018 at 4:26 AM Joseph Myers <jos...@codesourcery.com> wrote: > > This patch (diffs to generated files omitted below) updates GCC to use > autoconf 2.69 and automake 1.15.1. (That's not the latest automake > version, but it's the one used by binutils-gdb, with which consistency > is desirable, and in any case seems a useful incremental update that > should make a future update to 1.16.1 easier.) > > The changes are generally similar to the binutils-gdb ones, and are > copied from there where shared files and directories are involved > (there are some further changes to such shared directories, however, > which I'd expect to apply to binutils-gdb once this patch is in GCC). > Largely, obsolete AC_PREREQ calls are removed, while many > AC_LANG_SOURCE calls are added to avoid warnings from aclocal and > autoconf. Multilib support is no longer included in core automake, > meaning that multilib.am needs copying from automake's contrib > directory into the GCC source tree. Autoconf 2.69 has Go support, so > local copies of that support are removed. I hope the D support will > soon be submitted to upstream autoconf so the local copy of that can > be removed in a future update. > > Note that the regeneration did not include regeneration of > fixincludes/config.h.in (attempting such regeneration resulted in all > the USED_FOR_TARGET conditionals disappearing; and I don't see > anything in the fixincludes/ directory that would result in such > conditionals being generated, unlike in the gcc/ directory). Also > note that libvtv/testsuite/other-tests/Makefile.in was not > regenerated; that directory is not listed as a subdirectory for which > Makefile.in gets regenerated by calling "automake" in libvtv/, so I'm > not sure how it's meant to be regenerated. > > While I mostly fixed warnings should running aclocal / automake / > autoconf, there were various such warnings from automake in the > libgfortran, libgo, libgomp, liboffloadmic, libsanitizer, libphobos > directories that I did not fix, preferring to leave those to the > relevant subsystem maintainers. Specifically, most of those warnings > were of the following form (example from libgfortran): > > Makefile.am:48: warning: source file 'caf/single.c' is in a subdirectory, > Makefile.am:48: but option 'subdir-objects' is disabled > automake: warning: possible forward-incompatibility. > automake: At least a source file is in a subdirectory, but the > 'subdir-objects' > automake: automake option hasn't been enabled. For now, the corresponding > output > automake: object file(s) will be placed in the top-level directory. However, > automake: this behaviour will change in future Automake versions: they > will > automake: unconditionally cause object files to be placed in the same > subdirectory > automake: of the corresponding sources. > automake: You are advised to start using 'subdir-objects' option throughout > your > automake: project, to avoid future incompatibilities. > > I think it's best for the relevant maintainers to add subdir-objects > and do any other associated Makefile.am changes needed. In some cases > the paths in the warnings involved ../; I don't know if that adds any > extra complications to the use of subdir-objects. > > I've tested this with native, cross and Canadian cross builds. The > risk of any OS-specific issues should I hope be rather lower than if a > libtool upgrade were included (we *should* do such an upgrade at some > point, but it's more complicated - it involves identifying all our > local libtool changes to see if any aren't included in the upstream > version we update to, and reverting an upstream libtool patch that's > inappropriate for use in GCC); I think it would be better to get this > update into GCC so that people can test in different configurations > and we can fix any issues found, rather than to try to get more and > more testing done before it goes in.
OK. Thanks for the work! Richard. > top level: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * multilib.am: New file. From automake. > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * libtool.m4: Use AC_LANG_SOURCE. > * configure.ac: Remove AC_PREREQ, use AC_LANG_SOURCE. > * ar-lib: New file. > * test-driver: New file. > * configure: Re-generate. > > config: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * math.m4, tls.m4: Use AC_LANG_SOURCE. > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * override.m4 (_GCC_AUTOCONF_VERSION): Bump from 2.64 to 2.69. > > fixincludes: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * aclocal.m4, configure: Regenerate. > > gcc: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. Use single > line for second argument of AC_DEFINE_UNQUOTED. > * aclocal.m4, config.in, configure: Regenerate. > > gnattools: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * configure: Regenerate. > > gotools: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * config/go.m4: Remove file. > * Makefile.am (ACLOCAL_AMFLAGS): Do not use -I ./config. > * configure.ac: Remove AC_PREREQ. Do not include config/go.m4. > * Makefile.in, aclocal.m4, configure: Regenerate. > > intl: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * configure.ac: Add AC_USE_SYSTEM_EXTENSIONS, remove AC_PREREQ. > * configure: Re-generate. > * config.h.in: Re-generate. > * aclocal.m4: Re-generate. > > libada: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * configure: Regenerate. > > libatomic: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * acinclude.m4: Use AC_LANG_SOURCE. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: > Regenerate. > > libbacktrace: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * Makefile.in, aclocal.m4, config.h.in, configure: Regenerate. > > libcc1: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure: Regenerate. > > libcpp: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * aclocal.m4, config.in, configure: Regenerate. > > libdecnumber: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * configure.ac: Remove AC_PREREQ. > * configure: Re-generate. > * aclocal.m4. > > libffi: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > (AUTOMAKE_OPTIONS): Add info-in-builddir. > (CLEANFILES): Remove doc/libffi.info. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, fficonfig.h.in, > include/Makefile.in, man/Makefile.in, testsuite/Makefile.in: > Regenerate. > > libgcc: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * configure: Regenerate. > > libgfortran: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, config.h.in, configure: Regenerate. > > libgo: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * config/go.m4: Remove file. > * config/libtool.m4: Use AC_LANG_SOURCE. > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: > Regenerate. > > libgomp: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am > (AUTOMAKE_OPTIONS): Add info-in-builddir. > (CLEANFILES): Remove libgomp.info. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: > Regenerate. > > libhsail-rt: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure: Regenerate. > > libiberty: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * configure.ac: Remove AC_PREREQ. > * configure: Re-generate. > * config.in: Re-generate. > > libitm: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > (AUTOMAKE_OPTIONS): Add info-in-builddir. > (CLEANFILES): Remove libitm.info. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: > Regenerate. > > libobjc: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. > * aclocal.m4, config.h.in, configure: Regenerate. > > liboffloadmic: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. > * plugin/Makefile.am: Include multilib.am. > * plugin/configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, plugin/Makefile.in, > plugin/aclocal.m4, plugin/configure: Regenerate. > > libphobos: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. > * m4/autoconf.m4: Add extra argument to AC_LANG_DEFINE call. > * m4/druntime/os.m4: Use AC_LANG_SOURCE. > * Makefile.in, aclocal.m4, configure, libdruntime/Makefile.in, > src/Makefile.in, testsuite/Makefile.in: Regenerate. > > libquadmath: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > (AUTOMAKE_OPTIONS): Remove 1.8. Add info-in-builddir. > (all-local): Define outside conditional code. > (CLEANFILES): Remove libquadmath.info. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, config.h.in, configure: Regenerate. > > libsanitizer: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * Makefile.in, aclocal.m4, asan/Makefile.in, config.h.in, > configure, interception/Makefile.in, libbacktrace/Makefile.in, > lsan/Makefile.in, sanitizer_common/Makefile.in, tsan/Makefile.in, > ubsan/Makefile.in: Regenerate. > > libssp: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > (AUTOMAKE_OPTIONS): Remove 1.9.5. > * configure.ac: Remove AC_PREREQ. Quote argument to > AC_RUN_IFELSE. > * Makefile.in, aclocal.m4, configure: Regenerate. > > libstdc++-v3: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, doc/Makefile.in, > include/Makefile.in, libsupc++/Makefile.in, po/Makefile.in, > python/Makefile.in, src/Makefile.in, src/c++11/Makefile.in, > src/c++17/Makefile.in, src/c++98/Makefile.in, > src/filesystem/Makefile.in, testsuite/Makefile.in: Regenerate. > > libvtv: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > * configure.ac: Remove AC_PREREQ. > * Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: > Regenerate. > > lto-plugin: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE. > * Makefile.in, aclocal.m4, config.h.in, configure: Regenerate. > > zlib: > 2018-10-31 Joseph Myers <jos...@codesourcery.com> > > * Makefile.am: Include multilib.am. > > Merge from binutils-gdb: > 2018-06-19 Simon Marchi <simon.mar...@ericsson.com> > > * configure.ac: Modernize AC_INIT call, remove AC_PREREQ. > * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8, cygnus, add foreign. > * Makefile.in: Re-generate. > * aclocal.m4: Re-generate. > * configure: Re-generate. > > Index: ar-lib > =================================================================== > --- ar-lib (nonexistent) > +++ ar-lib (working copy) > @@ -0,0 +1,270 @@ > +#! /bin/sh > +# Wrapper for Microsoft lib.exe > + > +me=ar-lib > +scriptversion=2012-03-01.08; # UTC > + > +# Copyright (C) 2010-2017 Free Software Foundation, Inc. > +# Written by Peter Rosin <p...@lysator.liu.se>. > +# > +# 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 <http://www.gnu.org/licenses/>. > + > +# As a special exception to the GNU General Public License, if you > +# distribute this file as part of a program that contains a > +# configuration script generated by Autoconf, you may include it under > +# the same distribution terms that you use for the rest of that program. > + > +# This file is maintained in Automake, please report > +# bugs to <bug-autom...@gnu.org> or send patches to > +# <automake-patc...@gnu.org>. > + > + > +# func_error message > +func_error () > +{ > + echo "$me: $1" 1>&2 > + exit 1 > +} > + > +file_conv= > + > +# func_file_conv build_file > +# Convert a $build file to $host form and store it in $file > +# Currently only supports Windows hosts. > +func_file_conv () > +{ > + file=$1 > + case $file in > + / | /[!/]*) # absolute file, and not a UNC file > + if test -z "$file_conv"; then > + # lazily determine how to convert abs files > + case `uname -s` in > + MINGW*) > + file_conv=mingw > + ;; > + CYGWIN*) > + file_conv=cygwin > + ;; > + *) > + file_conv=wine > + ;; > + esac > + fi > + case $file_conv in > + mingw) > + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` > + ;; > + cygwin) > + file=`cygpath -m "$file" || echo "$file"` > + ;; > + wine) > + file=`winepath -w "$file" || echo "$file"` > + ;; > + esac > + ;; > + esac > +} > + > +# func_at_file at_file operation archive > +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE > +# for each of them. > +# When interpreting the content of the @FILE, do NOT use func_file_conv, > +# since the user would need to supply preconverted file names to > +# binutils ar, at least for MinGW. > +func_at_file () > +{ > + operation=$2 > + archive=$3 > + at_file_contents=`cat "$1"` > + eval set x "$at_file_contents" > + shift > + > + for member > + do > + $AR -NOLOGO $operation:"$member" "$archive" || exit $? > + done > +} > + > +case $1 in > + '') > + func_error "no command. Try '$0 --help' for more information." > + ;; > + -h | --h*) > + cat <<EOF > +Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] > + > +Members may be specified in a file named with @FILE. > +EOF > + exit $? > + ;; > + -v | --v*) > + echo "$me, version $scriptversion" > + exit $? > + ;; > +esac > + > +if test $# -lt 3; then > + func_error "you must specify a program, an action and an archive" > +fi > + > +AR=$1 > +shift > +while : > +do > + if test $# -lt 2; then > + func_error "you must specify a program, an action and an archive" > + fi > + case $1 in > + -lib | -LIB \ > + | -ltcg | -LTCG \ > + | -machine* | -MACHINE* \ > + | -subsystem* | -SUBSYSTEM* \ > + | -verbose | -VERBOSE \ > + | -wx* | -WX* ) > + AR="$AR $1" > + shift > + ;; > + *) > + action=$1 > + shift > + break > + ;; > + esac > +done > +orig_archive=$1 > +shift > +func_file_conv "$orig_archive" > +archive=$file > + > +# strip leading dash in $action > +action=${action#-} > + > +delete= > +extract= > +list= > +quick= > +replace= > +index= > +create= > + > +while test -n "$action" > +do > + case $action in > + d*) delete=yes ;; > + x*) extract=yes ;; > + t*) list=yes ;; > + q*) quick=yes ;; > + r*) replace=yes ;; > + s*) index=yes ;; > + S*) ;; # the index is always updated implicitly > + c*) create=yes ;; > + u*) ;; # TODO: don't ignore the update modifier > + v*) ;; # TODO: don't ignore the verbose modifier > + *) > + func_error "unknown action specified" > + ;; > + esac > + action=${action#?} > +done > + > +case $delete$extract$list$quick$replace,$index in > + yes,* | ,yes) > + ;; > + yesyes*) > + func_error "more than one action specified" > + ;; > + *) > + func_error "no action specified" > + ;; > +esac > + > +if test -n "$delete"; then > + if test ! -f "$orig_archive"; then > + func_error "archive not found" > + fi > + for member > + do > + case $1 in > + @*) > + func_at_file "${1#@}" -REMOVE "$archive" > + ;; > + *) > + func_file_conv "$1" > + $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $? > + ;; > + esac > + done > + > +elif test -n "$extract"; then > + if test ! -f "$orig_archive"; then > + func_error "archive not found" > + fi > + if test $# -gt 0; then > + for member > + do > + case $1 in > + @*) > + func_at_file "${1#@}" -EXTRACT "$archive" > + ;; > + *) > + func_file_conv "$1" > + $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $? > + ;; > + esac > + done > + else > + $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member > + do > + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? > + done > + fi > + > +elif test -n "$quick$replace"; then > + if test ! -f "$orig_archive"; then > + if test -z "$create"; then > + echo "$me: creating $orig_archive" > + fi > + orig_archive= > + else > + orig_archive=$archive > + fi > + > + for member > + do > + case $1 in > + @*) > + func_file_conv "${1#@}" > + set x "$@" "@$file" > + ;; > + *) > + func_file_conv "$1" > + set x "$@" "$file" > + ;; > + esac > + shift > + shift > + done > + > + if test -n "$orig_archive"; then > + $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $? > + else > + $AR -NOLOGO -OUT:"$archive" "$@" || exit $? > + fi > + > +elif test -n "$list"; then > + if test ! -f "$orig_archive"; then > + func_error "archive not found" > + fi > + $AR -NOLOGO -LIST "$archive" || exit $? > +fi > > Property changes on: ar-lib > ___________________________________________________________________ > Added: svn:executable > ## -0,0 +1 ## > +* > \ No newline at end of property > Index: config/math.m4 > =================================================================== > --- config/math.m4 (revision 265631) > +++ config/math.m4 (working copy) > @@ -25,7 +25,7 @@ > AC_REQUIRE([GCC_CHECK_LIBM]) > AC_REQUIRE([GCC_CHECK_MATH_HEADERS]) > AC_CACHE_CHECK([for $1], [gcc_cv_math_func_$1], > - [AC_LINK_IFELSE([ > + [AC_LINK_IFELSE([AC_LANG_SOURCE([ > #ifdef HAVE_COMPLEX_H > #include <complex.h> > #endif > @@ -40,7 +40,7 @@ > { > return 0; > } > -], > +])], > [gcc_cv_math_func_$1=yes], > [gcc_cv_math_func_$1=no])]) > if test $gcc_cv_math_func_$1 = yes; then > Index: config/override.m4 > =================================================================== > --- config/override.m4 (revision 265631) > +++ config/override.m4 (working copy) > @@ -29,7 +29,7 @@ > > dnl Ensure exactly this Autoconf version is used > m4_ifndef([_GCC_AUTOCONF_VERSION], > - [m4_define([_GCC_AUTOCONF_VERSION], [2.64])]) > + [m4_define([_GCC_AUTOCONF_VERSION], [2.69])]) > > dnl Test for the exact version when AC_INIT is expanded. > dnl This allows to update the tree in steps (for testing) > Index: config/tls.m4 > =================================================================== > --- config/tls.m4 (revision 265631) > +++ config/tls.m4 (working copy) > @@ -4,14 +4,14 @@ > GCC_ENABLE(tls, yes, [], [Use thread-local storage]) > AC_CACHE_CHECK([whether the target supports thread-local storage], > gcc_cv_have_tls, [ > - AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], > + AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { > return a = b; }])], > [dnl If the test case passed with dynamic linking, try again with > dnl static linking, but only if static linking is supported (not > dnl on Solaris 10). This fails with some older Red Hat releases. > chktls_save_LDFLAGS="$LDFLAGS" > LDFLAGS="-static $LDFLAGS" > - AC_LINK_IFELSE([int main() { return 0; }], > - [AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], > + AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], > + [AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { > return a = b; }])], > [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])], > [gcc_cv_have_tls=yes]) > LDFLAGS="$chktls_save_LDFLAGS" > @@ -71,7 +71,7 @@ > [gcc_cv_have_tls=no], > [dnl This is the cross-compiling case. Assume libc supports TLS if the > dnl binutils and the compiler do. > - AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], > + AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { > return a = b; }])], > [chktls_save_LDFLAGS="$LDFLAGS" > dnl Shared library options may depend on the host; this check > dnl is only known to be needed for GNU/Linux. > @@ -83,8 +83,8 @@ > chktls_save_CFLAGS="$CFLAGS" > CFLAGS="-fPIC $CFLAGS" > dnl If -shared works, test if TLS works in a shared library. > - AC_LINK_IFELSE([int f() { return 0; }], > - [AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; > }], > + AC_LINK_IFELSE([AC_LANG_SOURCE([int f() { return 0; }])], > + [AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int f() { > return a = b; }])], > [gcc_cv_have_tls=yes], > [gcc_cv_have_tls=no])], > [gcc_cv_have_tls=yes]) > @@ -102,7 +102,7 @@ > GCC_ENABLE(tls, yes, [], [Use thread-local storage]) > AC_CACHE_CHECK([whether the target assembler supports thread-local > storage], > gcc_cv_have_cc_tls, [ > - AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }], > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { > return a = b; }])], > [gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])] > )]) > if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then > Index: configure.ac > =================================================================== > --- configure.ac (revision 265631) > +++ configure.ac (working copy) > @@ -31,7 +31,6 @@ > m4_include([config/isl.m4]) > > AC_INIT(move-if-change) > -AC_PREREQ(2.64) > AC_DISABLE_OPTION_CHECKING > > progname=$0 > @@ -1289,11 +1288,11 @@ > LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" > AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) > AC_LANG_PUSH(C++) > - AC_LINK_IFELSE([ > + AC_LINK_IFELSE([AC_LANG_SOURCE([ > #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) > #error -static-libstdc++ not implemented > #endif > -int main() {}], > +int main() {}])], > [AC_MSG_RESULT([yes]); have_static_libs=yes], > [AC_MSG_RESULT([no])]) > AC_LANG_POP(C++) > Index: fixincludes/configure.ac > =================================================================== > --- fixincludes/configure.ac (revision 265631) > +++ fixincludes/configure.ac (working copy) > @@ -1,4 +1,3 @@ > -AC_PREREQ(2.64) > > AC_INIT(fixincludes, [ ]) > AC_CONFIG_SRCDIR(inclhack.def) > Index: gcc/configure.ac > =================================================================== > --- gcc/configure.ac (revision 265631) > +++ gcc/configure.ac (working copy) > @@ -23,7 +23,6 @@ > # Initialization and sanity checks > # -------------------------------- > > -AC_PREREQ(2.64) > AC_INIT > AC_CONFIG_SRCDIR(tree.c) > AC_CONFIG_HEADER(auto-host.h:config.in) > @@ -450,11 +449,11 @@ > # -fno-strict-aliasing *and* is older than GCC 4.3. > CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" > AC_MSG_CHECKING([whether $CXX is affected by placement new aliasing bug]) > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) > #error compiler not affected by placement new aliasing bug > #endif > -], > +])], > [AC_MSG_RESULT([yes]); aliasing_flags='-fno-strict-aliasing'], > [AC_MSG_RESULT([no])]) > > @@ -1611,12 +1610,12 @@ > powerpc*-*-darwin*) > AC_CACHE_CHECK([whether mcontext_t fields have underscores], > gcc_cv_mcontext_underscores, > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #include <sys/cdefs.h> > #include <sys/signal.h> > #include <ucontext.h> > int main() { mcontext_t m; if (m->ss.srr0) return 0; return 0; } > -], > +])], > gcc_cv_mcontext_underscores=no, gcc_cv_mcontext_underscores=yes)) > if test $gcc_cv_mcontext_underscores = yes; then > AC_DEFINE(HAS_MCONTEXT_T_UNDERSCORES,,dnl > @@ -2904,8 +2903,7 @@ > .cfi_personality 0, symbol > .cfi_endproc]) > AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_PERSONALITY_DIRECTIVE, > - [`if test $gcc_cv_as_cfi_personality_directive = yes; > - then echo 1; else echo 0; fi`], > + [`if test $gcc_cv_as_cfi_personality_directive = yes; then echo 1; else > echo 0; fi`], > [Define 0/1 if your assembler supports .cfi_personality.]) > > gcc_GAS_CHECK_FEATURE([cfi sections directive], > @@ -2932,8 +2930,7 @@ > esac]) > GCC_TARGET_TEMPLATE(HAVE_GAS_CFI_SECTIONS_DIRECTIVE) > AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_SECTIONS_DIRECTIVE, > - [`if test $gcc_cv_as_cfi_sections_directive = yes; > - then echo 1; else echo 0; fi`], > + [`if test $gcc_cv_as_cfi_sections_directive = yes; then echo 1; else echo > 0; fi`], > [Define 0/1 if your assembler supports .cfi_sections.]) > > # GAS versions up to and including 2.11.0 may mis-optimize > @@ -5537,7 +5534,7 @@ > saved_LDFLAGS="$LDFLAGS" > for clearcap_map in sol2-clearcapv2.map sol2-clearcap.map; do > LDFLAGS="$saved_LDFLAGS -Wl,-M,${srcdir}/config/$clearcap_map" > - AC_LINK_IFELSE([int main(void) {return 0;}], > + AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], > [gcc_cv_ld_clearcap=yes; break], [gcc_cv_ld_clearcap=no]) > done > LDFLAGS="$saved_LDFLAGS" > @@ -6505,7 +6502,7 @@ > [gcc_cv_c_no_fpie], > [saved_CXXFLAGS="$CXXFLAGS" > CXXFLAGS="$CXXFLAGS -fno-PIE" > - AC_COMPILE_IFELSE([int main(void) {return 0;}], > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], > [gcc_cv_c_no_fpie=yes], > [gcc_cv_c_no_fpie=no]) > CXXFLAGS="$saved_CXXFLAGS"]) > @@ -6519,7 +6516,7 @@ > [gcc_cv_no_pie], > [saved_LDFLAGS="$LDFLAGS" > LDFLAGS="$LDFLAGS -no-pie" > - AC_LINK_IFELSE([int main(void) {return 0;}], > + AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])], > [gcc_cv_no_pie=yes], > [gcc_cv_no_pie=no]) > LDFLAGS="$saved_LDFLAGS"]) > Index: gnattools/configure.ac > =================================================================== > --- gnattools/configure.ac (revision 265631) > +++ gnattools/configure.ac (working copy) > @@ -19,7 +19,6 @@ > sinclude(../config/override.m4) > > AC_INIT > -AC_PREREQ([2.64]) > > AC_CONFIG_SRCDIR([Makefile.in]) > > Index: gotools/Makefile.am > =================================================================== > --- gotools/Makefile.am (revision 265631) > +++ gotools/Makefile.am (working copy) > @@ -15,7 +15,7 @@ > # along with this program; see the file COPYING3. If not see > # <http://www.gnu.org/licenses/>. > > -ACLOCAL_AMFLAGS = -I ./config -I ../config > +ACLOCAL_AMFLAGS = -I ../config > > gcc_version := $(shell $(GCC_FOR_TARGET) -dumpversion) > > Index: gotools/config/go.m4 > =================================================================== > --- gotools/config/go.m4 (revision 265631) > +++ gotools/config/go.m4 (nonexistent) > @@ -1,92 +0,0 @@ > -dnl acinclude.m4 -- configure macros > - > -dnl Copyright 2009 The Go Authors. All rights reserved. > -dnl Use of this source code is governed by a BSD-style > -dnl license that can be found in the LICENSE file. > - > -dnl Go support--this could be in autoconf. > -dnl This version is probably autoconf 2.64 specific. > - > -AC_LANG_DEFINE([Go], [go], [GO], [], > -[ac_ext=go > -ac_compile='$GOC -c $GOCFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD' > -ac_link='$GOC -o conftest$ac_exeext $GOCFLAGS $LDFLAGS conftest.$ac_ext > $LIBS >&AS_MESSAGE_LOG_FD' > -ac_compile_gnu=yes > -]) > - > -AU_DEFUN([AC_LANG_GO], [AC_LANG(Go)]) > - > -m4_define([AC_LANG_PROGRAM(Go)], > -[package main > -$1 > -func main() { > -$2 > -}]) > - > -m4_define([_AC_LANG_IO_PROGRAM(Go)], > -[AC_LANG_PROGRAM([import "os"], > -[if f, err := os.Create("conftest.out"), err != nil { > - os.Exit(1); > - } > - if err := f.Close(); err != nil { > - os.Exit(1); > - } > - os.Exit(0); > -])]) > - > -m4_define([AC_LANG_CALL(Go)], > -[AC_LANG_PROGRAM([$1 > -m4_if([$2], [main], , > -[func $2();])],[$2();])]) > - > -m4_define([AC_LANG_FUNC_LINK_TRY(Go)], > -[AC_LANG_PROGRAM( > -[func $1() int; > -var f := $1; > -], [return f();])]) > - > -m4_define([AC_LANG_BOOL_COMPILE_TRY(Go)], > -[AC_LANG_PROGRAM([$1], [var test_array @<:@1 - 2 * !($2)@:>@; > -test_array @<:@0@:>@ = 0 > -])]) > - > -m4_define([AC_LANG_INT_SAVE(Go)], > -[AC_LANG_PROGRAM([$1 > -import os > -func longval() long { return $2 } > -func ulongval() ulong { return $2 }], > -[panic("unimplemented")])]) > - > -AC_DEFUN([AC_LANG_COMPILER(Go)], > -[AC_REQUIRE([AC_PROG_GO])]) > - > -AN_MAKEVAR([GOC], [AC_PROG_GO]) > -AN_PROGRAM([gccgo], [AC_PROG_GO]) > -AC_DEFUN([AC_PROG_GO], > -[AC_LANG_PUSH(Go)dnl > -AC_ARG_VAR([GOC], [Go compiler command])dnl > -AC_ARG_VAR([GOCFLAGS], [Go compiler flags])dnl > -_AC_ARG_VAR_LDFLAGS()dnl > -m4_ifval([$1], > - [AC_CHECK_TOOLS(GOC, [$1])], > -[AC_CHECK_TOOL(GOC, gccgo) > -if test -z "$GOC"; then > - if test -n "$ac_tool_prefix"; then > - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [$ac_tool_prefix}gccgo]) > - fi > -fi > -if test -z "$GOC"; then > - AC_CHECK_PROG(GOC, gccgo, gccgo, , , gccgo) > -fi > -]) > - > -# Provide some information about the compiler. > -_AS_ECHO_LOG([checking for _AC_LANG compiler version]) > -set X $ac_compile > -ac_compiler=$[2] > -_AC_DO_LIMIT([$ac_compiler --version >&AS_MESSAGE_LOG_FD]) > -m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl > -m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl > -GOCFLAGS="-g -O2" > -AC_LANG_POP(Go)dnl > -])# AC_PROG_GO > Index: gotools/configure.ac > =================================================================== > --- gotools/configure.ac (revision 265631) > +++ gotools/configure.ac (working copy) > @@ -16,11 +16,8 @@ > # <http://www.gnu.org/licenses/>. > > AC_INIT(package-unused, version-unused,, gotools) > -AC_PREREQ(2.64) > AC_CONFIG_SRCDIR(Makefile.am) > > -m4_include([config/go.m4]) > - > # Determine the noncanonical names used for directories. > ACX_NONCANONICAL_BUILD > ACX_NONCANONICAL_HOST > Index: intl/configure.ac > =================================================================== > --- intl/configure.ac (revision 265631) > +++ intl/configure.ac (working copy) > @@ -1,5 +1,5 @@ > -AC_PREREQ(2.64) > AC_INIT > +AC_USE_SYSTEM_EXTENSIONS > AC_CONFIG_SRCDIR(gettext.c) > AC_CONFIG_HEADER(config.h) > AC_CONFIG_MACRO_DIR(../config) > Index: libada/configure.ac > =================================================================== > --- libada/configure.ac (revision 265631) > +++ libada/configure.ac (working copy) > @@ -22,7 +22,6 @@ > sinclude(../config/unwind_ipinfo.m4) > > AC_INIT > -AC_PREREQ([2.64]) > > AC_CONFIG_SRCDIR([Makefile.in]) > > Index: libatomic/Makefile.am > =================================================================== > --- libatomic/Makefile.am (revision 265631) > +++ libatomic/Makefile.am (working copy) > @@ -150,3 +150,5 @@ > # when it is reloaded during the build of all-multi. > all-multi: $(libatomic_la_LIBADD) > $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) > + > +include $(top_srcdir)/../multilib.am > Index: libatomic/acinclude.m4 > =================================================================== > --- libatomic/acinclude.m4 (revision 265631) > +++ libatomic/acinclude.m4 (working copy) > @@ -25,7 +25,7 @@ > dnl > AC_DEFUN([LIBAT_HAVE_INT_MODE],[ > AC_CACHE_CHECK([for $2 byte integer],[libat_cv_have_mode_$1], > - [AC_COMPILE_IFELSE([int x __attribute__((mode($1)));], > + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([int x __attribute__((mode($1)));])], > [libat_cv_have_mode_$1=yes],[libat_cv_have_mode_$1=no])]) > LIBAT_DEFINE_YESNO([HAVE_INT$2], [$libat_cv_have_mode_$1], > [Have support for $2 byte integers.]) > Index: libatomic/configure.ac > =================================================================== > --- libatomic/configure.ac (revision 265631) > +++ libatomic/configure.ac (working copy) > @@ -22,7 +22,6 @@ > # see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > # <http://www.gnu.org/licenses/>. > > -AC_PREREQ(2.59) > AC_INIT([GNU Atomic Library], 1.0,,[libatomic]) > AC_CONFIG_HEADER(auto-config.h) > > Index: libbacktrace/Makefile.am > =================================================================== > --- libbacktrace/Makefile.am (revision 265631) > +++ libbacktrace/Makefile.am (working copy) > @@ -195,3 +195,4 @@ > unknown.lo: config.h backtrace.h internal.h > xcoff.lo: config.h backtrace.h internal.h > > +include $(top_srcdir)/../multilib.am > Index: libbacktrace/configure.ac > =================================================================== > --- libbacktrace/configure.ac (revision 265631) > +++ libbacktrace/configure.ac (working copy) > @@ -29,7 +29,6 @@ > # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > # POSSIBILITY OF SUCH DAMAGE. > > -AC_PREREQ(2.64) > AC_INIT(package-unused, version-unused,, libbacktrace) > AC_CONFIG_SRCDIR(backtrace.h) > AC_CONFIG_HEADER(config.h) > @@ -305,12 +304,12 @@ > ALLOC_FILE=alloc.lo > else > VIEW_FILE=mmapio.lo > - AC_PREPROC_IFELSE([ > + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ > #include <sys/mman.h> > #if !defined(MAP_ANONYMOUS) && !defined(MAP_ANON) > #error no MAP_ANONYMOUS > #endif > -], [ALLOC_FILE=mmap.lo], [ALLOC_FILE=alloc.lo]) > +])], [ALLOC_FILE=mmap.lo], [ALLOC_FILE=alloc.lo]) > fi > AC_SUBST(VIEW_FILE) > AC_SUBST(ALLOC_FILE) > @@ -414,7 +413,7 @@ > [libgo_cv_lib_pthread], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -pthread" > -AC_COMPILE_IFELSE([[int i;]], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_lib_pthread=yes], > [libgo_cv_lib_pthread=no]) > CFLAGS=$CFLAGS_hold]) > Index: libcc1/configure.ac > =================================================================== > --- libcc1/configure.ac (revision 265631) > +++ libcc1/configure.ac (working copy) > @@ -16,7 +16,6 @@ > dnl along with GCC; see the file COPYING3. If not see > dnl <http://www.gnu.org/licenses/>. > > -AC_PREREQ(2.64) > AC_INIT([libcc1], [version-unused]) > AC_CONFIG_SRCDIR([libcc1.cc]) > AC_CONFIG_HEADER(cc1plugin-config.h) > Index: libcpp/configure.ac > =================================================================== > --- libcpp/configure.ac (revision 265631) > +++ libcpp/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # -*- Autoconf -*- > # Process this file with autoconf to produce a configure script. > > -AC_PREREQ(2.64) > AC_INIT(cpplib, [ ], gcc-b...@gcc.gnu.org, cpplib) > AC_CONFIG_SRCDIR(ucnid.h) > AC_CONFIG_MACRO_DIR(../config) > @@ -42,7 +41,7 @@ > # Dependency checking. > ZW_CREATE_DEPDIR > AC_LANG_PUSH([C++]) > -AC_COMPILE_IFELSE([[int i;]], [], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [], > [AC_MSG_ERROR([C++ compiler missing or inoperational])]) > AC_LANG_POP([C++]) > ZW_PROG_COMPILER_DEPENDENCIES([CXX]) > Index: libdecnumber/configure.ac > =================================================================== > --- libdecnumber/configure.ac (revision 265631) > +++ libdecnumber/configure.ac (working copy) > @@ -19,7 +19,6 @@ > # along with GCC; see the file COPYING3. If not see > # <http://www.gnu.org/licenses/>. > > -AC_PREREQ(2.64) > AC_INIT(libdecnumber, [ ], gcc-b...@gcc.gnu.org, libdecnumber) > AC_CONFIG_SRCDIR(decNumber.h) > AC_CONFIG_MACRO_DIR(../config) > Index: libffi/Makefile.am > =================================================================== > --- libffi/Makefile.am (revision 265631) > +++ libffi/Makefile.am (working copy) > @@ -1,6 +1,6 @@ > ## Process this with automake to create Makefile.in > > -AUTOMAKE_OPTIONS = foreign subdir-objects > +AUTOMAKE_OPTIONS = foreign subdir-objects info-in-builddir > > ACLOCAL_AMFLAGS = -I .. -I ../config > > @@ -52,7 +52,7 @@ > $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)/doc -o > doc/libffi.info $(srcdir)/doc/libffi.texi > @touch $@ > > -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) doc/libffi.info > +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) > MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info > > ## ################################################################ > @@ -243,3 +243,5 @@ > clean-recursive: clean-multi > distclean-recursive: distclean-multi > maintainer-clean-recursive: maintainer-clean-multi > + > +include $(top_srcdir)/../multilib.am > Index: libffi/configure.ac > =================================================================== > --- libffi/configure.ac (revision 265631) > +++ libffi/configure.ac (working copy) > @@ -1,6 +1,5 @@ > dnl Process this with autoconf to create configure > > -AC_PREREQ(2.64) > > AC_INIT([libffi], [3.99999], [http://github.com/atgreen/libffi/issues]) > AC_CONFIG_HEADERS([fficonfig.h]) > Index: libgcc/configure.ac > =================================================================== > --- libgcc/configure.ac (revision 265631) > +++ libgcc/configure.ac (working copy) > @@ -13,7 +13,6 @@ > sinclude(../config/sjlj.m4) > sinclude(../config/cet.m4) > > -AC_PREREQ(2.64) > AC_INIT([GNU C Runtime Library], 1.0,,[libgcc]) > AC_CONFIG_SRCDIR([static-object.mk]) > > @@ -229,7 +228,8 @@ > > # Check for fixed-point support. > AC_CACHE_CHECK([whether fixed-point is supported], [libgcc_cv_fixed_point], > - [AC_COMPILE_IFELSE([_Sat _Fract x;], > [libgcc_cv_fixed_point=yes], > + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_Sat _Fract x;])], > + [libgcc_cv_fixed_point=yes], > [libgcc_cv_fixed_point=no])]) > fixed_point=$libgcc_cv_fixed_point > AC_SUBST(fixed_point) > @@ -270,11 +270,11 @@ > # Check for assembler CFI support. > AC_CACHE_CHECK([whether assembler supports CFI directives], [libgcc_cv_cfi], > [AC_COMPILE_IFELSE( > -[asm("\n\ > +[AC_LANG_SOURCE([asm("\n\ > .text\n\ > .cfi_startproc\n\ > .cfi_personality 0, symbol\n\ > - .cfi_endproc");], > + .cfi_endproc");])], > [libgcc_cv_cfi=yes], > [libgcc_cv_cfi=no])]) > > @@ -296,9 +296,10 @@ > AC_CACHE_CHECK([whether the target is hard-float], > [libgcc_cv_mips_hard_float], > [AC_COMPILE_IFELSE( > - [#ifndef __mips_hard_float > + [AC_LANG_SOURCE([#ifndef __mips_hard_float > #error FOO > - #endif], > + #endif > + ])], > [libgcc_cv_mips_hard_float=yes], > [libgcc_cv_mips_hard_float=no])]) > esac > @@ -395,7 +396,7 @@ > AC_CACHE_CHECK([for PowerPC ISA 2.06 to build __float128 libraries], > [libgcc_cv_powerpc_float128], > [AC_COMPILE_IFELSE( > - [vector double dadd (vector double a, vector double b) { return a + b; > }], > + [AC_LANG_SOURCE([vector double dadd (vector double a, vector double b) { > return a + b; }])], > [libgcc_cv_powerpc_float128=yes], > [libgcc_cv_powerpc_float128=no])]) > > @@ -403,7 +404,7 @@ > AC_CACHE_CHECK([for PowerPC ISA 3.0 to build hardware __float128 > libraries], > [libgcc_cv_powerpc_float128_hw], > [AC_COMPILE_IFELSE( > - [#include <sys/auxv.h> > + [AC_LANG_SOURCE([#include <sys/auxv.h> > #ifndef AT_PLATFORM > #error "AT_PLATFORM is not defined" > #endif > @@ -418,7 +419,7 @@ > } > void *add_resolver (void) { return (void *) add; } > __float128 add_ifunc (__float128, __float128) > - __attribute__ ((__ifunc__ ("add_resolver")));], > + __attribute__ ((__ifunc__ ("add_resolver")));])], > [libgcc_cv_powerpc_float128_hw=yes], > [libgcc_cv_powerpc_float128_hw=no])]) > CFLAGS="$saved_CFLAGS" > Index: libgfortran/Makefile.am > =================================================================== > --- libgfortran/Makefile.am (revision 265631) > +++ libgfortran/Makefile.am (working copy) > @@ -1223,3 +1223,5 @@ > endif > > EXTRA_DIST = $(m4_files) > + > +include $(top_srcdir)/../multilib.am > Index: libgfortran/configure.ac > =================================================================== > --- libgfortran/configure.ac (revision 265631) > +++ libgfortran/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # Process this file with autoconf to produce a configure script, like so: > # aclocal && autoconf && autoheader && automake > > -AC_PREREQ(2.64) > AC_INIT([GNU Fortran Runtime Library], 0.3,,[libgfortran]) > AC_CONFIG_HEADER(config.h) > GCC_TOPLEV_SUBDIRS > Index: libgo/Makefile.am > =================================================================== > --- libgo/Makefile.am (revision 265631) > +++ libgo/Makefile.am (working copy) > @@ -1224,3 +1224,5 @@ > > distclean-local: > find . -name '*.lo.dep' -print | xargs rm -f > + > +include $(top_srcdir)/../multilib.am > Index: libgo/config/go.m4 > =================================================================== > --- libgo/config/go.m4 (revision 265631) > +++ libgo/config/go.m4 (nonexistent) > @@ -1,92 +0,0 @@ > -dnl acinclude.m4 -- configure macros > - > -dnl Copyright 2009 The Go Authors. All rights reserved. > -dnl Use of this source code is governed by a BSD-style > -dnl license that can be found in the LICENSE file. > - > -dnl Go support--this could be in autoconf. > -dnl This version is probably autoconf 2.64 specific. > - > -AC_LANG_DEFINE([Go], [go], [GO], [], > -[ac_ext=go > -ac_compile='$GOC -c $GOCFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD' > -ac_link='$GOC -o conftest$ac_exeext $GOCFLAGS $LDFLAGS conftest.$ac_ext > $LIBS >&AS_MESSAGE_LOG_FD' > -ac_compile_gnu=yes > -]) > - > -AU_DEFUN([AC_LANG_GO], [AC_LANG(Go)]) > - > -m4_define([AC_LANG_PROGRAM(Go)], > -[package main > -$1 > -func main() { > -$2 > -}]) > - > -m4_define([AC_LANG_IO_PROGRAM(Go)], > -[AC_LANG_PROGRAM([import "os"], > -[if f, err := os.Open("conftest.out", os.O_WRONLY), err != nil { > - os.Exit(1); > - } > - if err := f.Close(); err != nil { > - os.Exit(1); > - } > - os.Exit(0); > -])]) > - > -m4_define([AC_LANG_CALL(Go)], > -[AC_LANG_PROGRAM([$1 > -m4_if([$2], [main], , > -[func $2();])],[$2();])]) > - > -m4_define([AC_LANG_FUNC_LINK_TRY(Go)], > -[AC_LANG_PROGRAM( > -[func $1() int; > -var f := $1; > -], [return f();])]) > - > -m4_define([AC_LANG_BOOL_COMPILE_TRY(Go)], > -[AC_LANG_PROGRAM([$1], [var test_array @<:@1 - 2 * !($2)@:>@; > -test_array @<:@0@:>@ = 0 > -])]) > - > -m4_define([AC_LANG_INT_SAVE(Go)], > -[AC_LANG_PROGRAM([$1 > -import os > -func longval() long { return $2 } > -func ulongval() ulong { return $2 }], > -[panic("unimplemented")])]) > - > -AC_DEFUN([AC_LANG_COMPILER(Go)], > -[AC_REQUIRE([AC_PROG_GO])]) > - > -AN_MAKEVAR([GOC], [AC_PROG_GO]) > -AN_PROGRAM([gccgo], [AC_PROG_GO]) > -AC_DEFUN([AC_PROG_GO], > -[AC_LANG_PUSH(Go)dnl > -AC_ARG_VAR([GOC], [Go compiler command])dnl > -AC_ARG_VAR([GOCFLAGS], [Go compiler flags])dnl > -_AC_ARG_VAR_LDFLAGS()dnl > -m4_ifval([$1], > - [AC_CHECK_TOOLS(GOC, [$1])], > -[AC_CHECK_TOOL(GOC, gccgo) > -if test -z "$GOC"; then > - if test -n "$ac_tool_prefix"; then > - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [$ac_tool_prefix}gccgo]) > - fi > -fi > -if test -z "$GOC"; then > - AC_CHECK_PROG(GOC, gccgo, gccgo, , , gccgo) > -fi > -]) > - > -# Provide some information about the compiler. > -_AS_ECHO_LOG([checking for _AC_LANG compiler version]) > -set X $ac_compile > -ac_compiler=$[2] > -_AC_DO_LIMIT([$ac_compiler --version >&AS_MESSAGE_LOG_FD]) > -m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl > -m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl > -GOCFLAGS="-g -O2" > -AC_LANG_POP(Go)dnl > -])# AC_PROG_GO > Index: libgo/config/libtool.m4 > =================================================================== > --- libgo/config/libtool.m4 (revision 265631) > +++ libgo/config/libtool.m4 (working copy) > @@ -1084,7 +1084,7 @@ > # to the aix ld manual. > m4_defun([_LT_SYS_MODULE_PATH_AIX], > [m4_require([_LT_DECL_SED])dnl > -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ > +AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ > lt_aix_libpath_sed=' > /Import File Strings/,/^$/ { > /^0/ { > @@ -4937,7 +4937,7 @@ > # implicitly export all symbols. > save_LDFLAGS="$LDFLAGS" > LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo > ${wl}-update_registry ${wl}/dev/null" > - AC_LINK_IFELSE(int foo(void) {}, > + AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], > _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs > $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && > func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry > ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o > $lib' > ) > LDFLAGS="$save_LDFLAGS" > Index: libgo/configure.ac > =================================================================== > --- libgo/configure.ac (revision 265631) > +++ libgo/configure.ac (working copy) > @@ -6,7 +6,6 @@ > > # Process this file with autoreconf to produce configure. > > -AC_PREREQ(2.64) > AC_INIT(package-unused, version-unused,, libgo) > AC_CONFIG_SRCDIR(Makefile.am) > AC_CONFIG_HEADER(config.h) > @@ -248,15 +247,17 @@ > changequote(,)dnl > i[34567]86-*-* | x86_64-*-*) > changequote([,])dnl > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #ifdef __x86_64__ > #error 64-bit > -#endif], > +#endif > +])], > [GOARCH=386], > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #ifdef __ILP32__ > #error x32 > -#endif], > +#endif > +])], > [GOARCH=amd64], > [GOARCH=amd64p32])) > ;; > @@ -267,20 +268,23 @@ > GOARCH=m68k > ;; > mips*-*-*) > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if _MIPS_SIM != _ABIO32 > #error not o32 > -#endif], > +#endif > +])], > [mips_abi="o32"], > - [AC_COMPILE_IFELSE([ > + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if _MIPS_SIM != _ABIN32 > #error not n32 > -#endif], > +#endif > +])], > [mips_abi="n32"], > - [AC_COMPILE_IFELSE([ > + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if _MIPS_SIM != _ABI64 > #error not n64 > -#endif], > +#endif > +])], > [mips_abi="n64"], > [AC_MSG_ERROR([unknown MIPS ABI]) > [mips_abi="n32"]])])]) > @@ -299,16 +303,18 @@ > GOARCH=nios2 > ;; > rs6000*-*-* | powerpc*-*-*) > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #ifdef _ARCH_PPC64 > #error 64-bit > -#endif], > +#endif > +])], > [GOARCH=ppc], > [ > -AC_COMPILE_IFELSE([ > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN__) > #error 64be > -#endif], > +#endif > +])], > [GOARCH=ppc64le], > [GOARCH=ppc64])]) > ;; > @@ -316,10 +322,11 @@ > GOARCH=riscv64 > ;; > s390*-*-*) > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if defined(__s390x__) > #error 64-bit > -#endif], > +#endif > +])], > [GOARCH=s390], > [GOARCH=s390x]) > ;; > @@ -330,10 +337,11 @@ > GOARCH=sh > ;; > sparc*-*-*) > - AC_COMPILE_IFELSE([ > + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ > #if defined(__sparcv9) || defined(__arch64__) > #error 64-bit > -#endif], > +#endif > +])], > [GOARCH=sparc], > [GOARCH=sparc64]) > ;; > @@ -389,7 +397,7 @@ > [libgo_cv_c_split_stack_supported], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -fsplit-stack" > -AC_COMPILE_IFELSE([[int i;]], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_c_split_stack_supported=yes], > [libgo_cv_c_split_stack_supported=no]) > CFLAGS=$CFLAGS_hold]) > @@ -505,7 +513,7 @@ > [libgo_cv_lib_pthread], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -pthread -L../libatomic/.libs" > -AC_COMPILE_IFELSE([[int i;]], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_lib_pthread=yes], > [libgo_cv_lib_pthread=no]) > CFLAGS=$CFLAGS_hold]) > @@ -572,11 +580,11 @@ > > AC_CACHE_CHECK([for __sync_bool_compare_and_swap_4], > [libgo_cv_func___sync_bool_compare_and_swap_4], > -[AC_LINK_IFELSE([ > +[AC_LINK_IFELSE([AC_LANG_SOURCE([ > typedef unsigned int uint32 __attribute__ ((mode (SI))); > uint32 i; > int main() { return __sync_bool_compare_and_swap (&i, 0, 1); } > -], > +])], > [libgo_cv_func___sync_bool_compare_and_swap_4=yes], > [libgo_cv_func___sync_bool_compare_and_swap_4=no])]) > if test "$libgo_cv_func___sync_bool_compare_and_swap_4" = "yes"; then > @@ -586,11 +594,11 @@ > > AC_CACHE_CHECK([for __sync_bool_compare_and_swap_8], > [libgo_cv_func___sync_bool_compare_and_swap_8], > -[AC_LINK_IFELSE([ > +[AC_LINK_IFELSE([AC_LANG_SOURCE([ > typedef unsigned int uint64 __attribute__ ((mode (DI))); > uint64 i; > int main() { return __sync_bool_compare_and_swap (&i, 0, 1); } > -], > +])], > [libgo_cv_func___sync_bool_compare_and_swap_8=yes], > [libgo_cv_func___sync_bool_compare_and_swap_8=no])]) > if test "$libgo_cv_func___sync_bool_compare_and_swap_8" = "yes"; then > @@ -600,11 +608,11 @@ > > AC_CACHE_CHECK([for __sync_fetch_and_add_4], > [libgo_cv_func___sync_fetch_and_add_4], > -[AC_LINK_IFELSE([ > +[AC_LINK_IFELSE([AC_LANG_SOURCE([ > typedef unsigned int uint32 __attribute__ ((mode (SI))); > uint32 i; > int main() { return __sync_fetch_and_add (&i, 1); } > -], > +])], > [libgo_cv_func___sync_fetch_and_add_4=yes], > [libgo_cv_func___sync_fetch_and_add_4=no])]) > if test "$libgo_cv_func___sync_fetch_and_add_4" = "yes"; then > @@ -614,11 +622,11 @@ > > AC_CACHE_CHECK([for __sync_add_and_fetch_8], > [libgo_cv_func___sync_add_and_fetch_8], > -[AC_LINK_IFELSE([ > +[AC_LINK_IFELSE([AC_LANG_SOURCE([ > typedef unsigned int uint64 __attribute__ ((mode (DI))); > uint64 i; > int main() { return __sync_add_and_fetch (&i, 1); } > -], > +])], > [libgo_cv_func___sync_add_and_fetch_8=yes], > [libgo_cv_func___sync_add_and_fetch_8=no])]) > if test "$libgo_cv_func___sync_add_and_fetch_8" = "yes"; then > @@ -632,7 +640,7 @@ > [libgo_cv_c_stringops], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -minline-all-stringops" > -AC_COMPILE_IFELSE([int i;], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_c_stringops=yes], > [libgo_cv_c_stringops=no]) > CFLAGS=$CFLAGS_hold]) > @@ -648,7 +656,7 @@ > [libgo_cv_c_fancymath], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -mfancy-math-387" > -AC_COMPILE_IFELSE([int i;], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_c_fancymath=yes], > [libgo_cv_c_fancymath=no]) > CFLAGS=$CFLAGS_hold]) > @@ -819,7 +827,7 @@ > [libgo_cv_c_unused_arguments], > [CFLAGS_hold=$CFLAGS > CFLAGS="$CFLAGS -Qunused-arguments" > -AC_COMPILE_IFELSE([[int i;]], > +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], > [libgo_cv_c_unused_arguments=yes], > [libgo_cv_c_unused_arguments=no]) > CFLAGS=$CFLAGS_hold]) > Index: libgomp/Makefile.am > =================================================================== > --- libgomp/Makefile.am (revision 265631) > +++ libgomp/Makefile.am (working copy) > @@ -1,5 +1,6 @@ > ## Process this file with automake to produce Makefile.in > > +AUTOMAKE_OPTIONS = info-in-builddir > ACLOCAL_AMFLAGS = -I .. -I ../config > SUBDIRS = testsuite > > @@ -136,5 +137,7 @@ > @touch $@ > > > -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info > +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) > MAINTAINERCLEANFILES = $(srcdir)/libgomp.info > + > +include $(top_srcdir)/../multilib.am > Index: libgomp/configure.ac > =================================================================== > --- libgomp/configure.ac (revision 265631) > +++ libgomp/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # Process this file with autoconf to produce a configure script, like so: > # aclocal -I ../config && autoconf && autoheader && automake > > -AC_PREREQ(2.64) > AC_INIT([GNU Offloading and Multi Processing Runtime Library], > 1.0,,[libgomp]) > AC_CONFIG_HEADER(config.h) > > Index: libhsail-rt/configure.ac > =================================================================== > --- libhsail-rt/configure.ac (revision 265631) > +++ libhsail-rt/configure.ac (working copy) > @@ -34,7 +34,6 @@ > # POSSIBILITY OF SUCH DAMAGE. > > AC_INIT([phsa HSAIL runtime library], [1.0], > [pekka.jaaskelai...@parmance.com]) > -AC_PREREQ([2.64]) > > # Needed to define ${target}. Needs to be very early to avoid annoying > # warning about calling AC_ARG_PROGRAM before AC_CANONICAL_SYSTEM > Index: libiberty/configure.ac > =================================================================== > --- libiberty/configure.ac (revision 265631) > +++ libiberty/configure.ac (working copy) > @@ -1,6 +1,5 @@ > dnl Process this file with autoconf to produce a configure script > > -AC_PREREQ(2.64) > AC_INIT > AC_CONFIG_SRCDIR([xmalloc.c]) > > Index: libitm/Makefile.am > =================================================================== > --- libitm/Makefile.am (revision 265631) > +++ libitm/Makefile.am (working copy) > @@ -1,5 +1,6 @@ > ## Process this file with automake to produce Makefile.in > > +AUTOMAKE_OPTIONS = info-in-builddir > ACLOCAL_AMFLAGS = -I .. -I ../config > SUBDIRS = testsuite > > @@ -118,5 +119,7 @@ > @touch $@ > > > -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libitm.info > +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) > MAINTAINERCLEANFILES = $(srcdir)/libitm.info > + > +include $(top_srcdir)/../multilib.am > Index: libitm/configure.ac > =================================================================== > --- libitm/configure.ac (revision 265631) > +++ libitm/configure.ac (working copy) > @@ -15,7 +15,6 @@ > # along with this program; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, > USA. > > -AC_PREREQ(2.59) > AC_INIT([GNU TM Runtime Library], 1.0,,[libitm]) > AC_CONFIG_HEADER(config.h) > > Index: libobjc/configure.ac > =================================================================== > --- libobjc/configure.ac (revision 265631) > +++ libobjc/configure.ac (working copy) > @@ -18,7 +18,6 @@ > #along with GCC; see the file COPYING3. If not see > #<http://www.gnu.org/licenses/>. > > -AC_PREREQ(2.64) > AC_INIT(package-unused, version-unused,, libobjc) > AC_CONFIG_SRCDIR([objc/objc.h]) > GCC_TOPLEV_SUBDIRS > Index: liboffloadmic/Makefile.am > =================================================================== > --- liboffloadmic/Makefile.am (revision 265631) > +++ liboffloadmic/Makefile.am (working copy) > @@ -157,3 +157,4 @@ > > MAKEOVERRIDES = > > +include $(top_srcdir)/../multilib.am > Index: liboffloadmic/configure.ac > =================================================================== > --- liboffloadmic/configure.ac (revision 265631) > +++ liboffloadmic/configure.ac (working copy) > @@ -28,7 +28,6 @@ > # Process this file with autoconf to produce a configure script, like so: > # aclocal -I .. -I ../config && autoconf && automake > > -AC_PREREQ([2.64]) > AC_INIT([MIC Offload Runtime Library], [1.0], ,[liboffloadmic]) > > AC_CANONICAL_SYSTEM > Index: liboffloadmic/plugin/Makefile.am > =================================================================== > --- liboffloadmic/plugin/Makefile.am (revision 265631) > +++ liboffloadmic/plugin/Makefile.am (working copy) > @@ -122,3 +122,4 @@ > > MAKEOVERRIDES = > > +include $(top_srcdir)/../../multilib.am > Index: liboffloadmic/plugin/configure.ac > =================================================================== > --- liboffloadmic/plugin/configure.ac (revision 265631) > +++ liboffloadmic/plugin/configure.ac (working copy) > @@ -29,7 +29,6 @@ > # Process this file with autoconf to produce a configure script, like so: > # aclocal -I ../.. -I ../../config && autoconf && automake > > -AC_PREREQ([2.64]) > AC_INIT([Intel MIC Offload Plugin], [1.0], ,[libgomp-plugin-intelmic]) > > AC_CONFIG_AUX_DIR(../..) > Index: libphobos/Makefile.am > =================================================================== > --- libphobos/Makefile.am (revision 265631) > +++ libphobos/Makefile.am (working copy) > @@ -67,3 +67,5 @@ > > # Subdir rules rely on $(FLAGS_TO_PASS) > FLAGS_TO_PASS = $(AM_MAKEFLAGS) > + > +include $(top_srcdir)/../multilib.am > Index: libphobos/configure.ac > =================================================================== > --- libphobos/configure.ac (revision 265631) > +++ libphobos/configure.ac (working copy) > @@ -26,7 +26,6 @@ > # autoreconf2.64 > # > > -AC_PREREQ(2.64) > AC_INIT(package-unused, version-unused,, libphobos) > AC_CONFIG_SRCDIR(libdruntime/gcc/attribute.d) > AC_CONFIG_HEADERS(config.h) > Index: libphobos/m4/autoconf.m4 > =================================================================== > --- libphobos/m4/autoconf.m4 (revision 265631) > +++ libphobos/m4/autoconf.m4 (working copy) > @@ -9,7 +9,7 @@ > > # AC_LANG(D) > # ----------- > -AC_LANG_DEFINE([D], [d], [GDC], [], > +AC_LANG_DEFINE([D], [d], [GDC], [GDC], [], > [ac_ext=d > ac_compile='$GDC -c $GDCFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD' > ac_link='$GDC -o conftest$ac_exeext $GDCFLAGS $LDFLAGS conftest.$ac_ext > $LIBS >&AS_MESSAGE_LOG_FD' > Index: libphobos/m4/druntime/os.m4 > =================================================================== > --- libphobos/m4/druntime/os.m4 (revision 265631) > +++ libphobos/m4/druntime/os.m4 (working copy) > @@ -164,7 +164,7 @@ > [ > AC_LANG_PUSH([C]) > AC_MSG_CHECKING([for minfo section bracketing]) > - AC_LINK_IFELSE([ > + AC_LINK_IFELSE([AC_LANG_SOURCE([ > void* module_info_ptr __attribute__((section ("minfo"))); > extern void* __start_minfo __attribute__((visibility ("hidden"))); > extern void* __stop_minfo __attribute__((visibility ("hidden"))); > @@ -174,7 +174,7 @@ > // Never run, just to prevent compiler from optimizing access > return &__start_minfo == &__stop_minfo; > } > - ], > + ])], > [AC_MSG_RESULT([yes]) > DCFG_MINFO_BRACKETING=true], > [AC_MSG_RESULT([no]) > Index: libquadmath/Makefile.am > =================================================================== > --- libquadmath/Makefile.am (revision 265631) > +++ libquadmath/Makefile.am (working copy) > @@ -1,8 +1,7 @@ > ## Process this file with automake to produce Makefile.in > > -AUTOMAKE_OPTIONS = 1.8 foreign > +AUTOMAKE_OPTIONS = foreign info-in-builddir > > - > ## Skip over everything if the quadlib is not available: > if BUILD_LIBQUADMATH > ACLOCAL_AMFLAGS = -I .. -I ../config > @@ -123,6 +122,7 @@ > else > STAMP_GENINSRC = > endif > +ALL_LOCAL_DEPS = $(STAMP_GENINSRC) > > # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) > if BUILD_INFO > @@ -132,8 +132,6 @@ > endif > > > -all-local: $(STAMP_GENINSRC) > - > stamp-geninsrc: libquadmath.info > cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info > @touch $@ > @@ -142,11 +140,13 @@ > $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o > libquadmath.info $(srcdir)/libquadmath.texi > @touch $@ > > -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info > +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) > MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info > > endif BUILD_LIBQUADMATH > > +all-local: $(ALL_LOCAL_DEPS) > + > # Unconditionally override this target, so that automake's definition > # does not wrongly interfere. > libquadmath.info: $(STAMP_BUILD_INFO) > @@ -172,3 +172,5 @@ > > libquadmath-vers.texi: > echo "@set BUGURL $(REPORT_BUGS_TEXI)" > $@ > + > +include $(top_srcdir)/../multilib.am > Index: libquadmath/configure.ac > =================================================================== > --- libquadmath/configure.ac (revision 265631) > +++ libquadmath/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # Process this file with autoconf to produce a configure script, like so: > # aclocal && autoconf && autoheader && automake > > -AC_PREREQ(2.64) > AC_INIT([GCC Quad-precision Math Library], 0.1,,[libquadmath]) > AC_CONFIG_HEADER(config.h) > > Index: libsanitizer/Makefile.am > =================================================================== > --- libsanitizer/Makefile.am (revision 265631) > +++ libsanitizer/Makefile.am (working copy) > @@ -71,3 +71,4 @@ > > ## ################################################################ > > +include $(top_srcdir)/../multilib.am > Index: libsanitizer/configure.ac > =================================================================== > --- libsanitizer/configure.ac (revision 265631) > +++ libsanitizer/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # -*- Autoconf -*- > # Process this file with autoconf to produce a configure script. > > -AC_PREREQ([2.64]) > AC_INIT(package-unused, version-unused, libsanitizer) > AC_CONFIG_SRCDIR([include/sanitizer/common_interface_defs.h]) > > @@ -253,12 +252,12 @@ > ALLOC_FILE=alloc.lo > else > VIEW_FILE=mmapio.lo > - AC_PREPROC_IFELSE([ > + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ > #include <sys/mman.h> > #if !defined(MAP_ANONYMOUS) && !defined(MAP_ANON) > #error no MAP_ANONYMOUS > #endif > -], [ALLOC_FILE=mmap.lo], [ALLOC_FILE=alloc.lo]) > +])], [ALLOC_FILE=mmap.lo], [ALLOC_FILE=alloc.lo]) > fi > AC_SUBST(VIEW_FILE) > AC_SUBST(ALLOC_FILE) > Index: libssp/Makefile.am > =================================================================== > --- libssp/Makefile.am (revision 265631) > +++ libssp/Makefile.am (working copy) > @@ -3,7 +3,7 @@ > ## Copyright (C) 2005-2018 Free Software Foundation, Inc. > ## > > -AUTOMAKE_OPTIONS = 1.9.5 foreign > +AUTOMAKE_OPTIONS = foreign > ACLOCAL_AMFLAGS = -I .. -I ../config > MAINT_CHARSET = latin1 > > @@ -107,3 +107,4 @@ > > ## ################################################################ > > +include $(top_srcdir)/../multilib.am > Index: libssp/configure.ac > =================================================================== > --- libssp/configure.ac (revision 265631) > +++ libssp/configure.ac (working copy) > @@ -2,7 +2,6 @@ > # > # aclocal -I .. -I ../config && autoconf && autoheader && automake > > -AC_PREREQ(2.64) > AC_INIT(libssp, 1.0) > AC_CONFIG_SRCDIR(ssp.c) > AC_CANONICAL_SYSTEM > @@ -131,7 +130,7 @@ > fi > > AC_MSG_CHECKING([whether vsnprintf is usable]) > -AC_RUN_IFELSE(AC_LANG_PROGRAM([ > +AC_RUN_IFELSE([AC_LANG_PROGRAM([ > #include <stdarg.h> > #include <string.h> > #include <stdio.h> > @@ -147,7 +146,7 @@ > [char buf@<:@8@:>@; memset (buf, 'A', sizeof (buf)); > if (foo (buf, 4, ".%s.", "CDEFG") != 7) > return 1; > - return memcmp (buf, ".CD\0AAAA", sizeof (buf)) != 0;]), > + return memcmp (buf, ".CD\0AAAA", sizeof (buf)) != 0;])], > [ssp_have_usable_vsnprintf=define], > [ssp_have_usable_vsnprintf=undef], > [ssp_have_usable_vsnprintf=undef]) > Index: libstdc++-v3/Makefile.am > =================================================================== > --- libstdc++-v3/Makefile.am (revision 265631) > +++ libstdc++-v3/Makefile.am (working copy) > @@ -172,3 +172,5 @@ > > # Subdir rules rely on $(FLAGS_TO_PASS) > FLAGS_TO_PASS = $(AM_MAKEFLAGS) > + > +include $(top_srcdir)/../multilib.am > Index: libstdc++-v3/configure.ac > =================================================================== > --- libstdc++-v3/configure.ac (revision 265631) > +++ libstdc++-v3/configure.ac (working copy) > @@ -1,6 +1,5 @@ > # Process this file with autoreconf to produce a configure script. > > -AC_PREREQ(2.64) > AC_INIT(package-unused, version-unused,, libstdc++) > AC_CONFIG_SRCDIR(src/shared/hashtable-aux.cc) > AC_CONFIG_HEADER(config.h) > Index: libtool.m4 > =================================================================== > --- libtool.m4 (revision 265631) > +++ libtool.m4 (working copy) > @@ -1079,7 +1079,7 @@ > # to the aix ld manual. > m4_defun([_LT_SYS_MODULE_PATH_AIX], > [m4_require([_LT_DECL_SED])dnl > -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ > +AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ > lt_aix_libpath_sed=' > /Import File Strings/,/^$/ { > /^0/ { > @@ -4932,7 +4932,7 @@ > # implicitly export all symbols. > save_LDFLAGS="$LDFLAGS" > LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo > ${wl}-update_registry ${wl}/dev/null" > - AC_LINK_IFELSE(int foo(void) {}, > + AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], > _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs > $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && > func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry > ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o > $lib' > ) > LDFLAGS="$save_LDFLAGS" > Index: libvtv/Makefile.am > =================================================================== > --- libvtv/Makefile.am (revision 265631) > +++ libvtv/Makefile.am (working copy) > @@ -122,3 +122,5 @@ > CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ > --mode=link $(CXXVTV) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ > $(LDFLAGS) -o $@ > + > +include $(top_srcdir)/../multilib.am > Index: libvtv/configure.ac > =================================================================== > --- libvtv/configure.ac (revision 265631) > +++ libvtv/configure.ac (working copy) > @@ -1,7 +1,6 @@ > # -*- Autoconf -*- > # Process this file with autoconf to produce a configure script. > > -AC_PREREQ([2.64]) > AC_INIT([GNU Vtable Verification Runtime Library], 1.0,,[libvtv]) > #AC_INIT(package-unused, version-unused, libvtv) > AC_CONFIG_SRCDIR([vtv_rts.h]) > Index: lto-plugin/configure.ac > =================================================================== > --- lto-plugin/configure.ac (revision 265631) > +++ lto-plugin/configure.ac (working copy) > @@ -1,4 +1,3 @@ > -AC_PREREQ(2.64) > AC_INIT([LTO plugin for ld], 0.1,,[lto-plugin]) > AC_CANONICAL_SYSTEM > GCC_TOPLEV_SUBDIRS > @@ -18,8 +17,8 @@ > saved_LDFLAGS="$LDFLAGS" > LDFLAGS="$LDFLAGS -static-libgcc" > AC_MSG_CHECKING([for -static-libgcc]) > -AC_LINK_IFELSE([ > - int main() {}], [have_static_libgcc=yes], [have_static_libgcc=no]) > +AC_LINK_IFELSE([AC_LANG_SOURCE([ > + int main() {}])], [have_static_libgcc=yes], [have_static_libgcc=no]) > AC_MSG_RESULT($have_static_libgcc); > LDFLAGS="$saved_LDFLAGS" > # Need -Wc to get it through libtool. > Index: multilib.am > =================================================================== > --- multilib.am (nonexistent) > +++ multilib.am (working copy) > @@ -0,0 +1,45 @@ > +## automake - create Makefile.in from Makefile.am > + > +## Copyright (C) 1994-2017 Free Software Foundation, Inc. > +## This Makefile.in is free software; the Free Software Foundation > +## gives unlimited permission to copy and/or distribute it, > +## with or without modifications, as long as this notice is preserved. > + > +## 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. > + > +MULTISRCTOP = > +MULTIBUILDTOP = > +MULTIDIRS = > +MULTISUBDIR = > +MULTIDO = true > +MULTICLEAN = true > + > +# GNU Make needs to see an explicit $(MAKE) variable in the command it > +# runs to enable its job server during parallel builds. Hence the > +# comments below. > +all-multi: > + $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) > +install-multi: > + $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) > +mostlyclean-multi: > + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE) > +clean-multi: > + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE) > +distclean-multi: > + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE) > +maintainer-clean-multi: > + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # > $(MAKE) > + > +.MAKE .PHONY: all-multi clean-multi distclean-multi install-am \ > + install-multi maintainer-clean-multi mostlyclean-multi > + > +install-exec-local: install-multi > + > +all-local: all-multi > +mostlyclean-local: mostlyclean-multi > +clean-local: clean-multi > +distclean-local: distclean-multi > +maintainer-clean-local: maintainer-clean-multi > Index: test-driver > =================================================================== > --- test-driver (nonexistent) > +++ test-driver (working copy) > @@ -0,0 +1,148 @@ > +#! /bin/sh > +# test-driver - basic testsuite driver script. > + > +scriptversion=2016-01-11.22; # UTC > + > +# Copyright (C) 2011-2017 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 <http://www.gnu.org/licenses/>. > + > +# As a special exception to the GNU General Public License, if you > +# distribute this file as part of a program that contains a > +# configuration script generated by Autoconf, you may include it under > +# the same distribution terms that you use for the rest of that program. > + > +# This file is maintained in Automake, please report > +# bugs to <bug-autom...@gnu.org> or send patches to > +# <automake-patc...@gnu.org>. > + > +# Make unconditional expansion of undefined variables an error. This > +# helps a lot in preventing typo-related bugs. > +set -u > + > +usage_error () > +{ > + echo "$0: $*" >&2 > + print_usage >&2 > + exit 2 > +} > + > +print_usage () > +{ > + cat <<END > +Usage: > + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH > + [--expect-failure={yes|no}] [--color-tests={yes|no}] > + [--enable-hard-errors={yes|no}] [--] > + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] > +The '--test-name', '--log-file' and '--trs-file' options are mandatory. > +END > +} > + > +test_name= # Used for reporting. > +log_file= # Where to save the output of the test script. > +trs_file= # Where to save the metadata of the test run. > +expect_failure=no > +color_tests=no > +enable_hard_errors=yes > +while test $# -gt 0; do > + case $1 in > + --help) print_usage; exit $?;; > + --version) echo "test-driver $scriptversion"; exit $?;; > + --test-name) test_name=$2; shift;; > + --log-file) log_file=$2; shift;; > + --trs-file) trs_file=$2; shift;; > + --color-tests) color_tests=$2; shift;; > + --expect-failure) expect_failure=$2; shift;; > + --enable-hard-errors) enable_hard_errors=$2; shift;; > + --) shift; break;; > + -*) usage_error "invalid option: '$1'";; > + *) break;; > + esac > + shift > +done > + > +missing_opts= > +test x"$test_name" = x && missing_opts="$missing_opts --test-name" > +test x"$log_file" = x && missing_opts="$missing_opts --log-file" > +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" > +if test x"$missing_opts" != x; then > + usage_error "the following mandatory options are missing:$missing_opts" > +fi > + > +if test $# -eq 0; then > + usage_error "missing argument" > +fi > + > +if test $color_tests = yes; then > + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. > + red=' [0;31m' # Red. > + grn=' [0;32m' # Green. > + lgn=' [1;32m' # Light green. > + blu=' [1;34m' # Blue. > + mgn=' [0;35m' # Magenta. > + std=' [m' # No color. > +else > + red= grn= lgn= blu= mgn= std= > +fi > + > +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' > +trap "st=129; $do_exit" 1 > +trap "st=130; $do_exit" 2 > +trap "st=141; $do_exit" 13 > +trap "st=143; $do_exit" 15 > + > +# Test script is run here. > +"$@" >$log_file 2>&1 > +estatus=$? > + > +if test $enable_hard_errors = no && test $estatus -eq 99; then > + tweaked_estatus=1 > +else > + tweaked_estatus=$estatus > +fi > + > +case $tweaked_estatus:$expect_failure in > + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; > + 0:*) col=$grn res=PASS recheck=no gcopy=no;; > + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; > + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; > + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; > + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; > +esac > + > +# Report the test outcome and exit status in the logs, so that one can > +# know whether the test passed or failed simply by looking at the '.log' > +# file, without the need of also peaking into the corresponding '.trs' > +# file (automake bug#11814). > +echo "$res $test_name (exit status: $estatus)" >>$log_file > + > +# Report outcome to console. > +echo "${col}${res}${std}: $test_name" > + > +# Register the test result, and other relevant metadata. > +echo ":test-result: $res" > $trs_file > +echo ":global-test-result: $res" >> $trs_file > +echo ":recheck: $recheck" >> $trs_file > +echo ":copy-in-global-log: $gcopy" >> $trs_file > + > +# Local Variables: > +# mode: shell-script > +# sh-indentation: 2 > +# eval: (add-hook 'write-file-hooks 'time-stamp) > +# time-stamp-start: "scriptversion=" > +# time-stamp-format: "%:y-%02m-%02d.%02H" > +# time-stamp-time-zone: "UTC0" > +# time-stamp-end: "; # UTC" > +# End: > > Property changes on: test-driver > ___________________________________________________________________ > Added: svn:executable > ## -0,0 +1 ## > +* > \ No newline at end of property > Index: zlib/Makefile.am > =================================================================== > --- zlib/Makefile.am (revision 265631) > +++ zlib/Makefile.am (working copy) > @@ -1,6 +1,6 @@ > ## Process this file with automake to create Makefile.in. > > -AUTOMAKE_OPTIONS = 1.8 cygnus > +AUTOMAKE_OPTIONS = foreign > > ACLOCAL_AMFLAGS = -I .. -I ../config > > @@ -59,3 +59,5 @@ > "PICFLAG=$(PICFLAG)" \ > "RANLIB=$(RANLIB)" \ > "DESTDIR=$(DESTDIR)" > + > +include $(top_srcdir)/../multilib.am > Index: zlib/configure.ac > =================================================================== > --- zlib/configure.ac (revision 265631) > +++ zlib/configure.ac (working copy) > @@ -1,7 +1,6 @@ > dnl Process this with autoconf to create configure > > -AC_PREREQ(2.64) > -AC_INIT > +AC_INIT([zlib], [1.1.4]) > AC_CONFIG_SRCDIR([zlib.h]) > > if test -n "${with_target_subdir}"; then > @@ -14,7 +13,7 @@ > mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" > AC_SUBST(mkinstalldirs) > > -AM_INIT_AUTOMAKE(zlib, 1.1.4) > +AM_INIT_AUTOMAKE > > AM_MAINTAINER_MODE > > > > -- > Joseph S. Myers > jos...@codesourcery.com
