Makefile.in: Swap definition of LIBGCC_LINKS and inclusion of target makefile fragment.

	* Makefile.in: Swap definition of LIBGCC_LINKS and inclusion of
	target makefile fragment.
	* config/sh/t-sh (unwind-dw2-Os-4-200.o): Depend on LIBGCC_LINKS.

From-SVN: r246766

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 427328df0a79689562728c0af71a1108a1f5b287..1dc5469cd8c7a2e7168fe2687611ab86e6bb21f0 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-07  Jeff Law  <law@redhat.com>
+
+       * Makefile.in: Swap definition of LIBGCC_LINKS and inclusion of
+       target makefile fragment.
+       * config/sh/t-sh (unwind-dw2-Os-4-200.o): Depend on LIBGCC_LINKS.
+
 2017-04-07  Alan Modra  <amodra@gmail.com>
 
        PR target/45053

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index f71d3203f20c60c10b355d109f48cd5aace607ca..6f58fd451a6889c8a8c8dff9f5bac543c8afe3cd 100644 (file)
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -348,8 +348,6 @@ LIBUNWIND =
 SHLIBUNWIND_LINK =
 SHLIBUNWIND_INSTALL =
 
-tmake_file = @tmake_file@
-include $(srcdir)/empty.mk $(tmake_file)
 
 # Create links to files specified in config.host.
 LIBGCC_LINKS = enable-execute-stack.c unwind.h md-unwind-support.h \
@@ -366,6 +364,9 @@ sfp-machine.h: $(srcdir)/config/$(sfp_machine_header)
 gthr-default.h: $(srcdir)/$(thread_header)
        -$(LN_S) $< $@
 
+tmake_file = @tmake_file@
+include $(srcdir)/empty.mk $(tmake_file)
+
 # Collect target defines and headers from config.host.
 libgcc_tm_defines = @tm_defines@
 libgcc_tm_file = @tm_file@

diff --git a/libgcc/config/sh/t-sh b/libgcc/config/sh/t-sh
index 46d01a64dbd387a414e95790bb17b3609a734bfc..10869c47c9a083ea3fe10b6f225bad3b9c870620 100644 (file)
--- a/libgcc/config/sh/t-sh
+++ b/libgcc/config/sh/t-sh
@@ -45,7 +45,7 @@ sdivsi3_i4i-Os-4-200.o: $(srcdir)/config/sh/lib1funcs-Os-4-200.S
        $(gcc_compile) -c -DL_sdivsi3_i4i $<
 udivsi3_i4i-Os-4-200.o: $(srcdir)/config/sh/lib1funcs-Os-4-200.S
        $(gcc_compile) -c -DL_udivsi3_i4i $<
-unwind-dw2-Os-4-200.o: $(srcdir)/unwind-dw2.c
+unwind-dw2-Os-4-200.o: $(srcdir)/unwind-dw2.c $(LIBGCC_LINKS)
        $(gcc_compile) $(LIBGCC2_CFLAGS) $(vis_hide) -fexceptions -Os -c $<
 
 OBJS_Os_4_200=sdivsi3_i4i-Os-4-200.o udivsi3_i4i-Os-4-200.o unwind-dw2-Os-4-200.o