2010-01-31 Matthias Klose <doko@ubuntu.com>

        * configure.ac: Fix __stack_chk_fail check for cross builds configured
        --with-headers
        * configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156402 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 670344d..b283f28 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-31  Matthias Klose  <doko@ubuntu.com>
+
+       * configure.ac: Fix __stack_chk_fail check for cross builds configured
+       --with-headers
+       * configure: Regenerate.
+
 2010-01-29  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-ssa-alias.c (same_type_for_tbaa): Return -1 if the types have

diff --git a/gcc/configure b/gcc/configure
index 589c8b4..4fc3b10 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -24570,7 +24570,9 @@ else
     case "$target" in
        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-       if test "x$with_sysroot" = x; then
+       if test "x$with_headers" != x; then
+         glibc_header_dir=$with_headers
+       elif test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
        elif test "x$with_build_sysroot" != "x"; then
          glibc_header_dir="${with_build_sysroot}/usr/include"

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 0d507e9..b75cc76 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3853,7 +3853,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
     case "$target" in
        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-       if test "x$with_sysroot" = x; then
+       if test "x$with_headers" != x; then
+         glibc_header_dir=$with_headers
+       elif test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
        elif test "x$with_build_sysroot" != "x"; then
          glibc_header_dir="${with_build_sysroot}/usr/include"