diff options
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/ChangeLog | 7 | ||||
| -rw-r--r-- | libbacktrace/Makefile.am | 4 | ||||
| -rw-r--r-- | libbacktrace/Makefile.in | 3 | ||||
| -rwxr-xr-x | libbacktrace/configure | 11 | ||||
| -rw-r--r-- | libbacktrace/configure.ac | 6 |
5 files changed, 26 insertions, 5 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index c5725793f2f..986db499b7a 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -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> PR other/54749 diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am index a90a602d49d..da1250234c6 100644 --- a/libbacktrace/Makefile.am +++ b/libbacktrace/Makefile.am @@ -12,7 +12,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. - + # (3) The name of the author may not be used to # endorse or promote products derived from this software without # specific prior written permission. @@ -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 = $(WARN_FLAGS) $(PIC_FLAG) +AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) noinst_LTLIBRARIES = libbacktrace.la diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in index b416c267b10..3e7c91a1af8 100644 --- a/libbacktrace/Makefile.in +++ b/libbacktrace/Makefile.in @@ -152,6 +152,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXTRA_FLAGS = @EXTRA_FLAGS@ FGREP = @FGREP@ FORMAT_FILE = @FORMAT_FILE@ GREP = @GREP@ @@ -253,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 = $(WARN_FLAGS) $(PIC_FLAG) +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 51a509cf028..8e2ea413cba 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -612,6 +612,7 @@ FORMAT_FILE BACKTRACE_SUPPORTS_THREADS PIC_FLAG WARN_FLAGS +EXTRA_FLAGS BACKTRACE_FILE multi_basedir OTOOL64 @@ -11080,7 +11081,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11083 "configure" +#line 11084 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11186,7 +11187,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11189 "configure" +#line 11190 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11488,6 +11489,12 @@ fi fi +EXTRA_FLAGS= +if test "x$GCC" = "xyes"; then + EXTRA_FLAGS=-funwind-tables +fi + + WARN_FLAGS= save_CFLAGS="$CFLAGS" for real_option in -W -Wall -Wwrite-strings -Wstrict-prototypes \ diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac index dbd0a81e817..1ea8860f99b 100644 --- a/libbacktrace/configure.ac +++ b/libbacktrace/configure.ac @@ -96,6 +96,12 @@ else fi 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 \ -Wmissing-prototypes -Wold-style-definition \ -Wmissing-format-attribute -Wcast-qual], |