re PR other/54761 (FAIL log)

PR other/54761
        * configure.ac (EXTRA_FLAGS): New.
	* Makefile.am (AM_FLAGS): Add $(EXTRA_FLAGS).
        * configure, Makefile.in: Regenerate.

From-SVN: r191981
This commit is contained in:
Uros Bizjak 2012-10-02 15:14:25 +02:00 committed by Uros Bizjak
parent b6b5cca81b
commit 5619500911
5 changed files with 26 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2012-10-02 Uros Bizjak <ubizjak@gmail.com>
PR other/54761
* configure.ac (EXTRA_FLAGS): New.
* Makefile.am (AM_FLAGS): Add $(EXTRA_FLAGS).
* configure, Makefile.in: Regenerate.
2012-09-29 Ian Lance Taylor <iant@google.com> 2012-09-29 Ian Lance Taylor <iant@google.com>
PR other/54749 PR other/54749

View File

@ -12,7 +12,7 @@
# notice, this list of conditions and the following disclaimer in # notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the # the documentation and/or other materials provided with the
# distribution. # distribution.
# (3) The name of the author may not be used to # (3) The name of the author may not be used to
# endorse or promote products derived from this software without # endorse or promote products derived from this software without
# specific prior written permission. # specific prior written permission.
@ -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 = $(WARN_FLAGS) $(PIC_FLAG) AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
noinst_LTLIBRARIES = libbacktrace.la noinst_LTLIBRARIES = libbacktrace.la

View File

@ -152,6 +152,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXTRA_FLAGS = @EXTRA_FLAGS@
FGREP = @FGREP@ FGREP = @FGREP@
FORMAT_FILE = @FORMAT_FILE@ FORMAT_FILE = @FORMAT_FILE@
GREP = @GREP@ GREP = @GREP@
@ -253,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 = $(WARN_FLAGS) $(PIC_FLAG) 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 \

View File

@ -612,6 +612,7 @@ FORMAT_FILE
BACKTRACE_SUPPORTS_THREADS BACKTRACE_SUPPORTS_THREADS
PIC_FLAG PIC_FLAG
WARN_FLAGS WARN_FLAGS
EXTRA_FLAGS
BACKTRACE_FILE BACKTRACE_FILE
multi_basedir multi_basedir
OTOOL64 OTOOL64
@ -11080,7 +11081,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11083 "configure" #line 11084 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11186,7 +11187,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11189 "configure" #line 11190 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11488,6 +11489,12 @@ fi
fi fi
EXTRA_FLAGS=
if test "x$GCC" = "xyes"; then
EXTRA_FLAGS=-funwind-tables
fi
WARN_FLAGS= WARN_FLAGS=
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
for real_option in -W -Wall -Wwrite-strings -Wstrict-prototypes \ for real_option in -W -Wall -Wwrite-strings -Wstrict-prototypes \

View File

@ -96,6 +96,12 @@ else
fi fi
AC_SUBST(BACKTRACE_FILE) AC_SUBST(BACKTRACE_FILE)
EXTRA_FLAGS=
if test "x$GCC" = "xyes"; then
EXTRA_FLAGS=-funwind-tables
fi
AC_SUBST(EXTRA_FLAGS)
ACX_PROG_CC_WARNING_OPTS([-W -Wall -Wwrite-strings -Wstrict-prototypes \ ACX_PROG_CC_WARNING_OPTS([-W -Wall -Wwrite-strings -Wstrict-prototypes \
-Wmissing-prototypes -Wold-style-definition \ -Wmissing-prototypes -Wold-style-definition \
-Wmissing-format-attribute -Wcast-qual], -Wmissing-format-attribute -Wcast-qual],