From 29d8aae6bdb1fba656e0c4f768743015c96bc238 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 7 Apr 2017 10:11:57 -0600 Subject: [PATCH] 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 --- libgcc/ChangeLog | 6 ++++++ libgcc/Makefile.in | 5 +++-- libgcc/config/sh/t-sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 427328df0a7..1dc5469cd8c 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2017-04-07 Jeff Law + + * 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 PR target/45053 diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index f71d3203f20..6f58fd451a6 100644 --- 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 46d01a64dbd..10869c47c9a 100644 --- 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 -- 2.30.2