diff mbox

[gomp4/stage1] Utility functions for collect2/lto-wrapper/mkoffload 2/2

Message ID 532B2809.7040600@codesourcery.com
State New
Headers show

Commit Message

Bernd Schmidt March 20, 2014, 5:40 p.m. UTC 
On 03/20/2014 06:03 PM, Bernd Schmidt wrote:
> This is the second part of making a set of utility functions to be used
> by collect2, lto-wrapper and mkoffload.
>
> The implementations of some functions like fork_execute are changed to
> those from collect2 and the calls in lto-wrapper adapted accordingly.
> There are some minor changes in these functions: for example I avoid
> calling fatal_error, instead using the fatal/fatal_perror functions so
> that the cleanup routine is called properly (lto-wrapper does not use
> atexit as collect2 does).
>
> Committed on gomp-4_0-branch; ok for stage1?

This was missing Makefile.in from the commit. Now fixed.


Bernd
diff mbox

Patch

Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in	(revision 208724)
+++ gcc/Makefile.in	(working copy)
@@ -1904,7 +1904,8 @@  gcc-ranlib.c: gcc-ar.c
 gcc-nm.c: gcc-ar.c
 	cp $^ $@
 
-COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o file-find.o
+COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \
+  collect-utils.o file-find.o
 COLLECT2_LIBS = @COLLECT2_LIBS@
 collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
 # Don't try modifying collect2 (aka ld) in place--it might be linking this.
@@ -1915,11 +1916,10 @@  collect2$(exeext): $(COLLECT2_OBJS) $(LI
 CFLAGS-collect2.o += -DTARGET_MACHINE=\"$(target_noncanonical)\" \
 	@TARGET_SYSTEM_ROOT_DEFINE@
 
-lto-wrapper$(exeext): lto-wrapper.o collect-utils.o ggc-none.o \
-              libcommon-target.a $(LIBDEPS)
+LTO_WRAPPER_OBJS = lto-wrapper.o collect-utils.o ggc-none.o
+lto-wrapper$(exeext): $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBDEPS)
 	+$(LINKER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o T$@ \
-	    lto-wrapper.o collect-utils.o ggc-none.o libcommon-target.a \
-	    $(LIBS)
+	    $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBS)
 	mv -f T$@ $@
 
 # Files used by all variants of C or by the stand-alone pre-processor.