From 36a58fb342a3a9d651811e0aad7dac02582d1201 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 11 Dec 2012 19:45:45 +0100
Subject: [PATCH] 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
---
libbacktrace/ChangeLog | 10 ++++++++++
libbacktrace/Makefile.am | 2 +-
libbacktrace/Makefile.in | 2 +-
libbacktrace/configure | 39 +++++++++++++++++++++++++++++++++++----
libbacktrace/configure.ac | 20 ++++++++++++++++----
5 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 3bd8487be7d2..b2adcb1715f2 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,13 @@
+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>
PR bootstrap/54926
diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am
index 216731605f21..da1250234c6c 100644
--- a/libbacktrace/Makefile.am
+++ b/libbacktrace/Makefile.am
@@ -34,7 +34,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
-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
diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
index b5b2a423a75f..3e7c91a1af81 100644
--- a/libbacktrace/Makefile.in
+++ b/libbacktrace/Makefile.in
@@ -254,7 +254,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
-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
libbacktrace_la_SOURCES = \
backtrace.h \
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 737e81b92dfa..46ad9eec9a6f 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -11491,7 +11491,7 @@ fi
EXTRA_FLAGS=
if test -n "${with_target_subdir}"; then
- EXTRA_FLAGS=-funwind-tables
+ EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -funwind-tables option" >&5
$as_echo_n "checking for -funwind-tables option... " >&6; }
@@ -11521,9 +11521,40 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libbacktrace_cv_c_unwind_tables" >&5
$as_echo "$libbacktrace_cv_c_unwind_tables" >&6; }
- if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
- EXTRA_FLAGS=-funwind-tables
- fi
+ if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
+ EXTRA_FLAGS=-funwind-tables
+ 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
diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac
index 243ce22582f7..3a4217e73f04 100644
--- a/libbacktrace/configure.ac
+++ b/libbacktrace/configure.ac
@@ -98,7 +98,7 @@ AC_SUBST(BACKTRACE_FILE)
EXTRA_FLAGS=
if test -n "${with_target_subdir}"; then
- EXTRA_FLAGS=-funwind-tables
+ EXTRA_FLAGS="-funwind-tables -frandom-seed=\$@"
else
AC_CACHE_CHECK([for -funwind-tables option],
[libbacktrace_cv_c_unwind_tables],
@@ -109,9 +109,21 @@ else
[libbacktrace_cv_c_unwind_tables=yes],
[libbacktrace_cv_c_unwind_tables=no])
CFLAGS="$CFLAGS_hold"])
- if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
- EXTRA_FLAGS=-funwind-tables
- fi
+ if test "$libbacktrace_cv_c_unwind_tables" = "yes"; then
+ EXTRA_FLAGS=-funwind-tables
+ 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
AC_SUBST(EXTRA_FLAGS)
--
GitLab