From ec1a9e7dab4b1bf244056f355fc8364b5ccf2009 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 26 Apr 2016 08:55:02 +0000 Subject: [PATCH] Compile libcilkrts with -funwind-tables (PR target/60290) PR target/60290 * Makefile.am (GENERAL_FLAGS): Add -funwind-tables. * Makefile.in: Regenerate. From-SVN: r235432 --- libcilkrts/ChangeLog | 6 ++++++ libcilkrts/Makefile.am | 3 +++ libcilkrts/Makefile.in | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index ed26a3a1e1b..8fada8a82a6 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,9 @@ +2016-04-26 Rainer Orth + + PR target/60290 + * Makefile.am (GENERAL_FLAGS): Add -funwind-tables. + * Makefile.in: Regenerate. + 2015-11-09 Igor Zamyatin PR target/66326 diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am index 70538a21a50..4f944dd1a62 100644 --- a/libcilkrts/Makefile.am +++ b/libcilkrts/Makefile.am @@ -43,6 +43,9 @@ GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime -I$(top_srcdir)/ # Enable Intel Cilk Plus extension GENERAL_FLAGS += -fcilkplus +# Always generate unwind tables +GENERAL_FLAGS += -funwind-tables + AM_CFLAGS = $(XCFLAGS) $(GENERAL_FLAGS) -std=c99 AM_CPPFLAGS = $(GENERAL_FLAGS) AM_LDFLAGS = $(XLDFLAGS) diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index 629aa6a62be..a25d1c6f50e 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -371,9 +371,11 @@ ACLOCAL_AMFLAGS = -I .. -I ../config # GENERAL_FLAGS += -D_Cilk_spawn="" -D_Cilk_sync="" -D_Cilk_for=for # Enable Intel Cilk Plus extension + +# Always generate unwind tables GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime \ -I$(top_srcdir)/runtime/config/$(config_dir) \ - -DIN_CILK_RUNTIME=1 -fcilkplus + -DIN_CILK_RUNTIME=1 -fcilkplus -funwind-tables AM_CFLAGS = $(XCFLAGS) $(GENERAL_FLAGS) -std=c99 AM_CPPFLAGS = $(GENERAL_FLAGS) AM_LDFLAGS = $(XLDFLAGS)