diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-05-08 11:42:49 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-05-08 11:42:49 +0000 |
| commit | 49f1cd4350fd487c146b5990ed29d8c68d91c4ff (patch) | |
| tree | 492085dfd3b613129002fdc72a6481f485f08cf1 | |
| parent | 617dbccc4bb11903cee7841eacc0cd1cf459aee0 (diff) | |
Compile libcilkrts with -funwind-tables (PR target/60290)
Backport from mainline
2016-04-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR target/60290
* Makefile.am (GENERAL_FLAGS): Add -funwind-tables.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@236005 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libcilkrts/ChangeLog | 9 | ||||
| -rw-r--r-- | libcilkrts/Makefile.am | 3 | ||||
| -rw-r--r-- | libcilkrts/Makefile.in | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 81af67c3884..52b62b46b6b 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,12 @@ +2016-05-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Backport from mainline + 2016-04-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR target/60290 + * Makefile.am (GENERAL_FLAGS): Add -funwind-tables. + * Makefile.in: Regenerate. + 2016-04-27 Release Manager * GCC 6.1.0 released. 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) |