Sync toplevel files with GCC

Sync with GCC
	2015-07-24  Michael Darling  <darlingm@gmail.com>

	PR other/66259
	* config-ml.in: Reflects renaming of configure.in to configure.ac
	* configure: Likewise
	* configure.ac: Likewise
This commit is contained in:
H.J. Lu 2015-07-27 07:49:05 -07:00
parent edb71a9c38
commit 136bb21fda
4 changed files with 21 additions and 11 deletions

View file

@ -1,3 +1,13 @@
2015-07-27 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC
2015-07-24 Michael Darling <darlingm@gmail.com>
PR other/66259
* config-ml.in: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
2015-07-14 H.J. Lu <hongjiu.lu@intel.com> 2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.in: Regenerated. * Makefile.in: Regenerated.

View file

@ -31,7 +31,7 @@
# user select which libraries s/he really wants. # user select which libraries s/he really wants.
# #
# Subdirectories wishing to use multilib should put the following lines # Subdirectories wishing to use multilib should put the following lines
# in the "post-target" section of configure.in. # in the "post-target" section of configure.ac.
# #
# if [ "${srcdir}" = "." ] ; then # if [ "${srcdir}" = "." ] ; then
# if [ "${with_target_subdir}" != "." ] ; then # if [ "${with_target_subdir}" != "." ] ; then
@ -182,8 +182,8 @@ if [ "${enable_multilib}" = yes ]; then
# ${with_multisubdir} tells us we're in the right branch, but we could be # ${with_multisubdir} tells us we're in the right branch, but we could be
# in a subdir of that. # in a subdir of that.
# ??? The previous version could void this test by separating the process into # ??? The previous version could void this test by separating the process into
# two files: one that only the library's toplevel configure.in ran (to # two files: one that only the library's toplevel configure.ac ran (to
# configure the multilib subdirs), and another that all configure.in's ran to # configure the multilib subdirs), and another that all configure.ac's ran to
# update the Makefile. It seemed reasonable to collapse all multilib support # update the Makefile. It seemed reasonable to collapse all multilib support
# into one file, but it does leave us with having to perform this test. # into one file, but it does leave us with having to perform this test.
ml_toplevel_p=no ml_toplevel_p=no

8
configure vendored
View file

@ -6176,7 +6176,7 @@ if test -d ${srcdir}/gcc; then
if test x"${enable_languages+set}" != xset; then if test x"${enable_languages+set}" != xset; then
if test x"${LANGUAGES+set}" = xset; then if test x"${LANGUAGES+set}" = xset; then
enable_languages="${LANGUAGES}" enable_languages="${LANGUAGES}"
echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2 echo configure.ac: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
else else
enable_languages=all enable_languages=all
fi fi
@ -6184,7 +6184,7 @@ if test -d ${srcdir}/gcc; then
if test x"${enable_languages}" = x || if test x"${enable_languages}" = x ||
test x"${enable_languages}" = xyes; test x"${enable_languages}" = xyes;
then then
echo configure.in: --enable-languages needs at least one language argument 1>&2 echo configure.ac: --enable-languages needs at least one language argument 1>&2
exit 1 exit 1
fi fi
fi fi
@ -6194,7 +6194,7 @@ if test -d ${srcdir}/gcc; then
# and make the substitution. # and make the substitution.
case ,${enable_languages}, in case ,${enable_languages}, in
*,f95,*) *,f95,*)
echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 echo configure.ac: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
;; ;;
esac esac
@ -6816,7 +6816,7 @@ fi
# have requested that this magic not happen. # have requested that this magic not happen.
# #
# The command line options always override the explicit settings in # The command line options always override the explicit settings in
# configure.in, and the settings in configure.in override this magic. # configure.ac, and the settings in configure.ac override this magic.
# #
# If the default for a toolchain is to use GNU as and ld, and you don't # If the default for a toolchain is to use GNU as and ld, and you don't
# want to do that, then you should use the --without-gnu-as and # want to do that, then you should use the --without-gnu-as and

View file

@ -1866,7 +1866,7 @@ if test -d ${srcdir}/gcc; then
if test x"${enable_languages+set}" != xset; then if test x"${enable_languages+set}" != xset; then
if test x"${LANGUAGES+set}" = xset; then if test x"${LANGUAGES+set}" = xset; then
enable_languages="${LANGUAGES}" enable_languages="${LANGUAGES}"
echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2 echo configure.ac: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
else else
enable_languages=all enable_languages=all
fi fi
@ -1874,7 +1874,7 @@ if test -d ${srcdir}/gcc; then
if test x"${enable_languages}" = x || if test x"${enable_languages}" = x ||
test x"${enable_languages}" = xyes; test x"${enable_languages}" = xyes;
then then
echo configure.in: --enable-languages needs at least one language argument 1>&2 echo configure.ac: --enable-languages needs at least one language argument 1>&2
exit 1 exit 1
fi fi
fi fi
@ -1884,7 +1884,7 @@ if test -d ${srcdir}/gcc; then
# and make the substitution. # and make the substitution.
case ,${enable_languages}, in case ,${enable_languages}, in
*,f95,*) *,f95,*)
echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 echo configure.ac: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
;; ;;
esac esac
@ -2455,7 +2455,7 @@ fi
# have requested that this magic not happen. # have requested that this magic not happen.
# #
# The command line options always override the explicit settings in # The command line options always override the explicit settings in
# configure.in, and the settings in configure.in override this magic. # configure.ac, and the settings in configure.ac override this magic.
# #
# If the default for a toolchain is to use GNU as and ld, and you don't # If the default for a toolchain is to use GNU as and ld, and you don't
# want to do that, then you should use the --without-gnu-as and # want to do that, then you should use the --without-gnu-as and