From 3f73d6ef90458b45bbbb33ef4c2b174d4662a22d Mon Sep 17 00:00:00 2001 From: Jing Yu Date: Wed, 15 Feb 2012 15:40:16 -0800 Subject: Sync down FSF r184235@google/gcc-4_6_2-mobile branch 1) Get mostly new patches from FSF gcc-4.6 branch 2) Fix PR52129 3) Insert GNU-stack note for all ARM targets Change-Id: I2b9926981210e517e4021242908074319a91d6bd --- gcc-4.6/config/ChangeLog | 8 ++++++++ gcc-4.6/config/acx.m4 | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'gcc-4.6/config') diff --git a/gcc-4.6/config/ChangeLog b/gcc-4.6/config/ChangeLog index e09a68b52..3c92ff460 100644 --- a/gcc-4.6/config/ChangeLog +++ b/gcc-4.6/config/ChangeLog @@ -1,3 +1,11 @@ +2011-12-18 Eric Botcazou + + * acx.m4 (Test for GNAT): Update comment and add quotes in final test. + +2011-10-26 Release Manager + + * GCC 4.6.2 released. + 2011-06-27 Release Manager * GCC 4.6.1 released. diff --git a/gcc-4.6/config/acx.m4 b/gcc-4.6/config/acx.m4 index b559c03eb..9ff31eb85 100644 --- a/gcc-4.6/config/acx.m4 +++ b/gcc-4.6/config/acx.m4 @@ -356,9 +356,9 @@ m4_define([AC_CHECK_HEADER],m4_defn([_AC_CHECK_HEADER_OLD])) ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR # Test for GNAT. -# We require the gnatbind program, and a compiler driver that -# understands Ada. We use the user's CC setting, already found, -# and possibly add $1 to the command-line parameters. +# We require the gnatbind & gnatmake programs, as well as a compiler driver +# that understands Ada. We use the user's CC setting, already found, and +# possibly add $1 to the command-line parameters. # # Sets the shell variable have_gnat to yes or no as appropriate, and # substitutes GNATBIND and GNATMAKE. @@ -387,7 +387,7 @@ if test x"$errors" = x && test -f conftest.$ac_objext; then fi rm -f conftest.*]) -if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then +if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then have_gnat=yes else have_gnat=no -- cgit v1.2.3