From 8b94bf707f7bcb8072978eab232e5b09a22d64cf Mon Sep 17 00:00:00 2001 From: doko Date: Sun, 31 Jan 2010 15:01:53 +0000 Subject: [PATCH] 2010-01-31 Matthias Klose * 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 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 4 +++- gcc/configure.ac | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 670344d..b283f28 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-01-31 Matthias Klose + + * configure.ac: Fix __stack_chk_fail check for cross builds configured + --with-headers + * configure: Regenerate. + 2010-01-29 Eric Botcazou * 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 --- 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 --- 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" -- 2.7.4