aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/config/alpha/t-alpha4
2 files changed, 10 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 23651e543e4..d8084d5a678 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-26 Richard Henderson <rth@redhat.com>
+
+ Backport from mainline
+ PR libgcc/80037
+ * config/alpha/t-alpha (CRTSTUFF_T_CFLAGS): New.
+
2017-05-26 Martin Liska <mliska@suse.cz>
Backport from mainline
diff --git a/libgcc/config/alpha/t-alpha b/libgcc/config/alpha/t-alpha
index 0b6ffb1ba34..0c2f8405c93 100644
--- a/libgcc/config/alpha/t-alpha
+++ b/libgcc/config/alpha/t-alpha
@@ -1,2 +1,6 @@
# This is a support routine for longlong.h, used by libgcc2.c.
LIB2ADD += $(srcdir)/config/alpha/qrnnd.S
+
+# When GAS-generated unwind tables are created, they get created
+# after the __FRAME_END__ terminator, which causes an ld error.
+CRTSTUFF_T_CFLAGS = -fno-unwind-tables