diff options
author | Vladimir Makarov <vmakarov@redhat.com> | 2008-05-30 22:19:45 +0000 |
---|---|---|
committer | Vladimir Makarov <vmakarov@redhat.com> | 2008-05-30 22:19:45 +0000 |
commit | 747c113a101da1b3ac0578243b0639c5a341a63b (patch) | |
tree | 74fced8997f9b19f048b8ae90cb4458c08ad01d2 /config | |
parent | eae43b25431ccf5bad4cdcad350f598d9cabf0cd (diff) |
2008-05-30 Vladimir Makarov <vmakarov@redhat.com>
Merge 132243:136204 from trunk
* ira.c (setup_eliminable_regset): Use cfun.
(ira): Set up DF_VERIFY_SCHEDULED.
* ira-lives.c (process_bb_node_lives): Use cfun.
* ira_build (ira_build): Use crtl.
* local-alloc.c (update_equiv_regs): Rescan equivalent insn.
* final (rest_of_handle_final): Use crtl.
* caller-save.c (save_call_clobbered_regs): Initialize save.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ira@136224 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
-rw-r--r-- | config/ChangeLog | 26 | ||||
-rw-r--r-- | config/acx.m4 | 28 | ||||
-rw-r--r-- | config/override.m4 (renamed from config/confsubdir.m4) | 78 |
3 files changed, 123 insertions, 9 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 9152d8acdab..92df0eb25a2 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,29 @@ +2008-05-12 Samuel Tardieu <sam@rfc1149.net> + Paolo Bonzini <bonzini@gnu.org> + + PR ada/36001 + * acx.m4: Add optional parameter to ACX_PROG_GNAT. + +2008-04-23 Paolo Bonzini <bonzini@gnu.org> + + * override.m4: Apply _AC_ARG_VALIDATE fix to all versions + but 2.62. + +2008-04-18 Paolo Bonzini <bonzini@gnu.org> + + PR bootstrap/35457 + + * confsubdir.m4: Rename to... + * override.m4: ... this. Make sure aclocal always picks it. + Add more lenient precious variable check, backported from + autoconf trunk. + +2008-04-04 Nick Clifton <nickc@redhat.com> + + PR binutils/4334 + * acx.m4 (ACX_CHECK_CYGWIN_CAT_WORKS): New macro to check that + cygwin builds are not running in textmode. + 2008-03-27 Paolo Bonzini <bonzini@gnu.org> * extensions.m4: New. diff --git a/config/acx.m4 b/config/acx.m4 index c8a32c9f9ed..cea08b7204f 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -357,7 +357,8 @@ 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. +# 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. @@ -380,7 +381,7 @@ acx_cv_cc_gcc_supports_ada=no # Other compilers, like HP Tru64 UNIX cc, exit successfully when # given a .adb file, but produce no object file. So we must check # if an object file was really produced to guard against this. -errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` +errors=`(${CC} $1[]m4_ifval([$1], [ ])-c conftest.adb) 2>&1 || echo failure` if test x"$errors" = x && test -f conftest.$ac_objext; then acx_cv_cc_gcc_supports_ada=yes fi @@ -595,3 +596,26 @@ AC_DEFUN([ACX_BUGURL],[ AC_SUBST(REPORT_BUGS_TO) AC_SUBST(REPORT_BUGS_TEXI) ]) + +dnl #### +dnl # ACX_CHECK_CYGWIN_CAT_WORKS +dnl # On Cygwin hosts, check that the cat command ignores +dnl # carriage returns as otherwise builds will not work. +dnl # See binutils PR 4334 for more details. +AC_DEFUN([ACX_CHECK_CYGWIN_CAT_WORKS],[ +AC_MSG_CHECKING([to see if cat works as expected]) +echo a >cygwin-cat-check +if test `cat cygwin-cat-check` == a ; then + rm cygwin-cat-check + AC_MSG_RESULT(yes) +else + rm cygwin-cat-check + AC_MSG_RESULT(no) + AC_MSG_ERROR([The cat command does not ignore carriage return characters. + Please either mount the build directory in binary mode or run the following + commands before running any configure script: +set -o igncr +export SHELLOPTS + ]) +fi +]) diff --git a/config/confsubdir.m4 b/config/override.m4 index 4e1e8c4641c..592f64139b6 100644 --- a/config/confsubdir.m4 +++ b/config/override.m4 @@ -1,6 +1,7 @@ -dnl Fix Autoconf-2.59 AC_CONFIG_SUBDIRS whitespace mangling, -dnl by overriding the broken internal Autoconf macro with a -dnl backport of the 2.60 fix. +dnl Fix Autoconf-2.59 bugs: by overriding broken internal +dnl Autoconf macros with backports of the 2.60+ fix. +dnl - AC_CONFIG_SUBDIRS whitespace mangling, +dnl - more lenient precious variable checks dnl dnl This file should be a no-op for Autoconf versions != 2.59. dnl It can be removed once the complete tree has moved to a @@ -16,12 +17,13 @@ dnl Redefine AC_CONFIG_SUBDIRS so aclocal pulls in this file dnl when needed. ifdef([m4_PACKAGE_VERSION], -[ifelse(m4_PACKAGE_VERSION, [2.59], [ +[dnl AC_DEFUN a commonly used macro so this file is picked up. +m4_copy([AC_PREREQ], [_AC_PREREQ]) +AC_DEFUN([AC_PREREQ], [frob]) +m4_copy([_AC_PREREQ], [AC_PREREQ]) -dnl Redefine AC_CONFIG_SUBDIRS so this file is picked up if needed. -AC_DEFUN([AC_CONFIG_SUBDIRS], defn([AC_CONFIG_SUBDIRS])) +ifelse(m4_PACKAGE_VERSION, [2.59], [ -dnl Override the broken macro. # _AC_OUTPUT_SUBDIRS # ------------------ # This is a subroutine of AC_OUTPUT, but it does not go into @@ -124,4 +126,66 @@ if test "$no_recursion" != yes; then done fi ])# _AC_OUTPUT_SUBDIRS +]) + +ifelse(m4_PACKAGE_VERSION, [2.62],, [ + +# _AC_ARG_VAR_VALIDATE +# -------------------- +# The code is the same as autoconf 2.59, but with a more lenient check +# on precious variables that has been added in autoconf 2.62. +m4_define([_AC_ARG_VAR_VALIDATE], +[# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([[a-zA-Z_0-9]]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + AS_MESSAGE([error: `$ac_var' was set to `$ac_old_val' in the previous run], 2) + ac_cache_corrupted=: ;; + ,set) + AS_MESSAGE([error: `$ac_var' was not set in the previous run], 2) + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + AS_MESSAGE([error: `$ac_var' has changed since the previous run:], 2) + ac_cache_corrupted=: + else + AS_MESSAGE([warning: ignoring whitespace changes in `$ac_var' since the previous run:], 2) + eval $ac_var=\$ac_old_val + fi + AS_MESSAGE([ former value: `$ac_old_val'], 2) + AS_MESSAGE([ current value: `$ac_new_val'], 2) + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +dnl If you change this globbing pattern, test it on an old shell -- +dnl it's sensitive. Putting any kind of quote in it causes syntax errors. +[ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)] + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + AS_MESSAGE([error: changes in the environment can compromise the build], 2) + AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over]) +fi +])# _AC_ARG_VAR_VALIDATE ])]) |