diff -ur gcc-5.3.0~/libgcc/Makefile.in gcc-5.3.0/libgcc/Makefile.in
--- gcc-5.3.0~/libgcc/Makefile.in	2015-01-29 09:03:56.000000000 +0100
+++ gcc-5.3.0/libgcc/Makefile.in	2016-01-26 01:17:26.417825408 +0100
@@ -919,6 +919,10 @@
 endif
 endif
 
+libgcc-std.ver: $(srcdir)/libgcc-std.ver.in
+	sed -e 's/__PFX__/$(LIBGCC_VER_GNU_PREFIX)/g' \
+	    -e 's/__FIXPTPFX__/$(LIBGCC_VER_FIXEDPOINT_GNU_PREFIX)/g' < $< > $@
+
 ifeq ($(enable_shared),yes)
 
 # Map-file generation.
@@ -939,10 +943,6 @@
 mapfile = libgcc.map
 endif
 
-libgcc-std.ver: $(srcdir)/libgcc-std.ver.in
-	sed -e 's/__PFX__/$(LIBGCC_VER_GNU_PREFIX)/g' \
-	    -e 's/__FIXPTPFX__/$(LIBGCC_VER_FIXEDPOINT_GNU_PREFIX)/g' < $< > $@
-
 libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts) libgcc.a
 	# @multilib_flags@ is still needed because this may use
 	# $(GCC_FOR_TARGET) and $(LIBGCC2_CFLAGS) directly.
diff -ur gcc-5.3.0~/libgfortran/Makefile.in gcc-5.3.0/libgfortran/Makefile.in
--- gcc-5.3.0~/libgfortran/Makefile.in	2015-12-04 11:47:53.000000000 +0100
+++ gcc-5.3.0/libgfortran/Makefile.in	2016-01-26 01:21:05.589769982 +0100
@@ -1464,11 +1464,11 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libcaf_single.la: $(libcaf_single_la_OBJECTS) $(libcaf_single_la_DEPENDENCIES) $(EXTRA_libcaf_single_la_DEPENDENCIES) 
-	$(libcaf_single_la_LINK) -rpath $(cafexeclibdir) $(libcaf_single_la_OBJECTS) $(libcaf_single_la_LIBADD) $(LIBS)
+	$(libcaf_single_la_LINK) -rpath $(cafexeclibdir) -R$(cafexeclibdir) $(libcaf_single_la_OBJECTS) $(libcaf_single_la_LIBADD) $(LIBS)
 libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) $(EXTRA_libgfortran_la_DEPENDENCIES) 
-	$(libgfortran_la_LINK) -rpath $(toolexeclibdir) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS)
+	$(libgfortran_la_LINK) -rpath $(toolexeclibdir) -R$(toolexeclibdir) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS)
 libgfortranbegin.la: $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_DEPENDENCIES) $(EXTRA_libgfortranbegin_la_DEPENDENCIES) 
-	$(libgfortranbegin_la_LINK) -rpath $(myexeclibdir) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS)
+	$(libgfortranbegin_la_LINK) -rpath $(myexeclibdir) -R$(myexeclibdir) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -ur gcc-5.3.0~/libgomp/Makefile.in gcc-5.3.0/libgomp/Makefile.in
--- gcc-5.3.0~/libgomp/Makefile.in	2015-12-04 11:47:53.000000000 +0100
+++ gcc-5.3.0/libgomp/Makefile.in	2016-01-26 01:20:30.992237613 +0100
@@ -549,7 +549,7 @@
 libgomp-plugin-nvptx.la: $(libgomp_plugin_nvptx_la_OBJECTS) $(libgomp_plugin_nvptx_la_DEPENDENCIES) 
 	$(libgomp_plugin_nvptx_la_LINK) $(am_libgomp_plugin_nvptx_la_rpath) $(libgomp_plugin_nvptx_la_OBJECTS) $(libgomp_plugin_nvptx_la_LIBADD) $(LIBS)
 libgomp.la: $(libgomp_la_OBJECTS) $(libgomp_la_DEPENDENCIES) 
-	$(libgomp_la_LINK) -rpath $(toolexeclibdir) $(libgomp_la_OBJECTS) $(libgomp_la_LIBADD) $(LIBS)
+	$(libgomp_la_LINK) -rpath $(toolexeclibdir) -R$(toolexeclibdir) $(libgomp_la_OBJECTS) $(libgomp_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -ur gcc-5.3.0~/libitm/Makefile.in gcc-5.3.0/libitm/Makefile.in
--- gcc-5.3.0~/libitm/Makefile.in	2015-12-04 11:47:53.000000000 +0100
+++ gcc-5.3.0/libitm/Makefile.in	2016-01-26 01:19:57.044210817 +0100
@@ -446,7 +446,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libitm.la: $(libitm_la_OBJECTS) $(libitm_la_DEPENDENCIES) 
-	$(libitm_la_LINK) -rpath $(toolexeclibdir) $(libitm_la_OBJECTS) $(libitm_la_LIBADD) $(LIBS)
+	$(libitm_la_LINK) -rpath $(toolexeclibdir) -R$(toolexeclibdir) $(libitm_la_OBJECTS) $(libitm_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff -ur gcc-5.3.0~/libstdc++-v3/src/Makefile.in gcc-5.3.0/libstdc++-v3/src/Makefile.in
--- gcc-5.3.0~/libstdc++-v3/src/Makefile.in	2015-08-18 19:58:22.000000000 +0200
+++ gcc-5.3.0/libstdc++-v3/src/Makefile.in	2016-01-26 01:19:41.271583119 +0100
@@ -602,9 +602,9 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) $(EXTRA_libstdc___la_DEPENDENCIES) 
-	$(libstdc___la_LINK) $(am_libstdc___la_rpath) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+	$(libstdc___la_LINK) $(am_libstdc___la_rpath) -R$(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
 libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES) $(EXTRA_libvtv_la_DEPENDENCIES) 
-	$(libvtv_la_LINK) $(am_libvtv_la_rpath) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
+	$(libvtv_la_LINK) $(am_libvtv_la_rpath) -R$(toolexeclibdir) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)