--- /dev/null
+--- gcc/config/t-slibgcc-elf-ver
++++ gcc/config/t-slibgcc-elf-ver
+@@ -24,11 +24,9 @@
+ # $(slibdir) double quoted to protect it from expansion while building
+ # libgcc.mk. We want this delayed until actual install time.
+ SHLIB_INSTALL = \
+- $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+- $(INSTALL_DATA) $(SHLIB_NAME) \
+- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
+- rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
+- $(LN_S) $(SHLIB_SONAME) \
+- $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
++ $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(libsubdir)/@shlib_dir@; \
++ $$(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(libsubdir)/@shlib_dir@; \
++ rm -f $$(DESTDIR)$$(libsubdir)/@shlib_dir@$(SHLIB_SOLINK); \
++ $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(libsubdir)/@shlib_dir@$(SHLIB_SOLINK)
+ SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
+ SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver