summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog9
-rw-r--r--libgcc/config/t-slibgcc-sld23
2 files changed, 32 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 3186d069dec..f561edd2274 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-04 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR target/59788
+ * config/t-slibgcc-sld (libgcc-unwind.map): New target.
+ (install-libgcc-unwind-map-forbuild): New target.
+ (all): Depend on install-libgcc-unwind-map-forbuild.
+ (install-libgcc-unwind-map): New target.
+ (install): Depend on install-libgcc-unwind-map.
+
2014-02-02 Sandra Loosemore <sandra@codesourcery.com>
* config/nios2/crti.S (_init): Initialize GOT pointer from
diff --git a/libgcc/config/t-slibgcc-sld b/libgcc/config/t-slibgcc-sld
index 178700047cc..ec6e5db0a3b 100644
--- a/libgcc/config/t-slibgcc-sld
+++ b/libgcc/config/t-slibgcc-sld
@@ -3,3 +3,26 @@
SHLIB_LDFLAGS = -Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \
-Wl,-M,$(SHLIB_MAP)
+
+# Linker mapfile to enforce direct binding to libgcc_s unwinder
+# (PR target/59788).
+libgcc-unwind.map: libgcc-std.ver
+ @(echo "{"; \
+ for f in `grep _Unwind_ $< | sort`; do \
+ echo " $$f = EXTERN DIRECT;"; \
+ done; \
+ echo "};" ) > $@
+
+# Copy libgcc-unwind.map to the place where gcc will look for it at build-time.
+install-libgcc-unwind-map-forbuild: libgcc-unwind.map
+ dest=$(gcc_objdir)/tmp$$$$-$<; \
+ cp $< $$dest; \
+ chmod a+r $$dest; \
+ sh $(srcdir)/../move-if-change $$dest $(gcc_objdir)/$<
+
+all: install-libgcc-unwind-map-forbuild
+
+install-libgcc-unwind-map: libgcc-unwind.map
+ $(INSTALL_DATA) $< $(DESTDIR)$(slibdir)
+
+install: install-libgcc-unwind-map