diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2013-08-08 14:35:18 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2013-08-08 14:35:18 +0000 |
| commit | 07efff255d5204df067592693820db38cfd8cde2 (patch) | |
| tree | 75c187270b5c7bc54336cfc7e4c7a158c7a2e05f /gcc | |
| parent | 71cafea943fbb7a69a92c80e6dfdb5de119bfb33 (diff) | |
| download | gcc-07efff255d5204df067592693820db38cfd8cde2.zip gcc-07efff255d5204df067592693820db38cfd8cde2.tar.gz gcc-07efff255d5204df067592693820db38cfd8cde2.tar.bz2 | |
Makefile.in (TOOLS_LIBS): Pick C object files from the compiler build and use standard library variables.
* gcc-interface/Makefile.in (TOOLS_LIBS): Pick C object files from the
compiler build and use standard library variables.
(../../vxaddr2line$(exeext): Do not depend on targext.o and adjust.
(gnatmake-re): Do not depend on targext.o.
(gnatlink-re): Do not depend on link.o and targext.o.
(../../gnatmake$(exeext): Likewise.
(../../gnatlink$(exeext): Likewise.
From-SVN: r201602
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 17 |
2 files changed, 19 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4e0b0a8..fe062d8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,6 +1,16 @@ +2013-08-08 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/Makefile.in (TOOLS_LIBS): Pick C object files from the + compiler build and use standard library variables. + (../../vxaddr2line$(exeext): Do not depend on targext.o and adjust. + (gnatmake-re): Do not depend on targext.o. + (gnatlink-re): Do not depend on link.o and targext.o. + (../../gnatmake$(exeext): Likewise. + (../../gnatlink$(exeext): Likewise. + 2013-07-21 OndÅej BÃlka <neleai@seznam.cz> - * gcc-interface/gigi.h: Likewise. + * gcc-interface/gigi.h: Fix typos. * gcc-interface/trans.c: Likewise. * gcc-interface/utils2.c: Likewise. * gnat_rm.texi: Likewise. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 6aa93c4..bdaa29b 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -250,10 +250,9 @@ LIBS = $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) $(LIBIBERTY) $(SYSLIBS) LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBBACKTRACE) $(LIBIBERTY) # Default is no TGT_LIB; one might be passed down or something TGT_LIB = -TOOLS_LIBS = targext.o link.o ../../ggc-none.o ../../libcommon-target.a \ +TOOLS_LIBS = ../link.o ../targext.o ../../ggc-none.o ../../libcommon-target.a \ ../../libcommon.a ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \ - ../../../libbacktrace/.libs/libbacktrace.a ../../../libiberty/libiberty.a \ - $(SYSLIBS) $(TGT_LIB) + ../$(LIBBACKTRACE) ../$(LIBIBERTY) $(SYSLIBS) $(TGT_LIB) # Convert the target variable into a space separated list of architecture, # manufacturer, and operating system and assign each of those to its own @@ -2491,12 +2490,12 @@ common-tools: ../stamp-tools $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatdll $(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -../../vxaddr2line$(exeext): ../stamp-tools targext.o +../../vxaddr2line$(exeext): ../stamp-tools $(GNATMAKE) -c $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line - $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" targext.o $(CLIB) + $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" ../targext.o $(CLIB) -gnatmake-re: ../stamp-tools link.o targext.o +gnatmake-re: ../stamp-tools $(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)" $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake @@ -2507,7 +2506,7 @@ gnatmake-re: ../stamp-tools link.o targext.o # with the former version of gnatlink itself which cannot override itself. # gnatlink-re cannot be run at the same time as gnatmake-re, hence the # dependency -gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re +gnatlink-re: ../stamp-tools gnatmake-re $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink $(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \ @@ -2519,11 +2518,11 @@ gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re # stamp target in the parent directory whenever gnat1 is rebuilt # Likewise for the tools -../../gnatmake$(exeext): $(P) b_gnatm.o link.o targext.o $(GNATMAKE_OBJS) +../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS) +$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \ $(TOOLS_LIBS) -../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS) +../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS) +$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \ $(TOOLS_LIBS) |