Commit 36a58fb3 by Jakub Jelinek Committed by Jakub Jelinek

re PR bootstrap/54926 (Bootstrap comparison failure for various files in libbacktrace)

	PR bootstrap/54926
	* Makefile.am (AM_CFLAGS): Remove -frandom-seed=$@.
	* configure.ac: If --with-target-subdir, add -frandom-seed=$@
	to EXTRA_FLAGS unconditionally, otherwise check whether the compiler
	accepts it.
	* Makefile.in: Regenerated.
	* configure: Regenerated.

From-SVN: r194412
parent e208b05b
2012-12-11 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/54926
* Makefile.am (AM_CFLAGS): Remove -frandom-seed=$@.
* configure.ac: If --with-target-subdir, add -frandom-seed=$@
to EXTRA_FLAGS unconditionally, otherwise check whether the compiler
accepts it.
* Makefile.in: Regenerated.
* configure: Regenerated.
2012-12-07 Jakub Jelinek <jakub@redhat.com> 2012-12-07 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/54926 PR bootstrap/54926
......
...@@ -34,7 +34,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config ...@@ -34,7 +34,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
-I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include -I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) -frandom-seed=$@ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
noinst_LTLIBRARIES = libbacktrace.la noinst_LTLIBRARIES = libbacktrace.la
......
...@@ -254,7 +254,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config ...@@ -254,7 +254,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
-I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include -I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include
AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) -frandom-seed=$@ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
noinst_LTLIBRARIES = libbacktrace.la noinst_LTLIBRARIES = libbacktrace.la
libbacktrace_la_SOURCES = \ libbacktrace_la_SOURCES = \
backtrace.h \ backtrace.h \
......
...@@ -11491,7 +11491,7 @@ fi ...@@ -11491,7 +11491,7 @@ fi
EXTRA_FLAGS= EXTRA_FLAGS=
if test -n "${with_target_subdir}"; then if test -n "${with_target_subdir}"; then
EXTRA_FLAGS=-funwind-tables EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -funwind-tables option" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -funwind-tables option" >&5
$as_echo_n "checking for -funwind-tables option... " >&6; } $as_echo_n "checking for -funwind-tables option... " >&6; }
...@@ -11521,9 +11521,40 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ...@@ -11521,9 +11521,40 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_unwind_tables" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_unwind_tables" >&5
$as_echo "$libbacktrace_cv_c_unwind_tables" >&6; } $as_echo "$libbacktrace_cv_c_unwind_tables" >&6; }
if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
EXTRA_FLAGS=-funwind-tables EXTRA_FLAGS=-funwind-tables
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -frandom-seed=string option" >&5
$as_echo_n "checking for -frandom-seed=string option... " >&6; }
if test "${libbacktrace_cv_c_random_seed_string+set}" = set; then :
$as_echo_n "(cached) " >&6
else
CFLAGS_hold="$CFLAGS"
CFLAGS="$CFLAGS -frandom-seed=conftest.lo"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
libbacktrace_cv_c_random_seed_string=yes
else
libbacktrace_cv_c_random_seed_string=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$CFLAGS_hold"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_random_seed_string" >&5
$as_echo "$libbacktrace_cv_c_random_seed_string" >&6; }
if test "$libbacktrace_cv_c_random_seed_string" = "yes"; then
EXTRA_FLAGS="$EXTRA_FLAGS -frandom-seed=\$@"
fi
fi fi
......
...@@ -98,7 +98,7 @@ AC_SUBST(BACKTRACE_FILE) ...@@ -98,7 +98,7 @@ AC_SUBST(BACKTRACE_FILE)
EXTRA_FLAGS= EXTRA_FLAGS=
if test -n "${with_target_subdir}"; then if test -n "${with_target_subdir}"; then
EXTRA_FLAGS=-funwind-tables EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
else else
AC_CACHE_CHECK([for -funwind-tables option], AC_CACHE_CHECK([for -funwind-tables option],
[libbacktrace_cv_c_unwind_tables], [libbacktrace_cv_c_unwind_tables],
...@@ -109,9 +109,21 @@ else ...@@ -109,9 +109,21 @@ else
[libbacktrace_cv_c_unwind_tables=yes], [libbacktrace_cv_c_unwind_tables=yes],
[libbacktrace_cv_c_unwind_tables=no]) [libbacktrace_cv_c_unwind_tables=no])
CFLAGS="$CFLAGS_hold"]) CFLAGS="$CFLAGS_hold"])
if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
EXTRA_FLAGS=-funwind-tables EXTRA_FLAGS=-funwind-tables
fi fi
AC_CACHE_CHECK([for -frandom-seed=string option],
[libbacktrace_cv_c_random_seed_string],
[CFLAGS_hold="$CFLAGS"
CFLAGS="$CFLAGS -frandom-seed=conftest.lo"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([], [return 0;])],
[libbacktrace_cv_c_random_seed_string=yes],
[libbacktrace_cv_c_random_seed_string=no])
CFLAGS="$CFLAGS_hold"])
if test "$libbacktrace_cv_c_random_seed_string" = "yes"; then
EXTRA_FLAGS="$EXTRA_FLAGS -frandom-seed=\$@"
fi
fi fi
AC_SUBST(EXTRA_FLAGS) AC_SUBST(EXTRA_FLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment