diff options
| author | Thomas Quinot <quinot@adacore.com> | 2008-08-06 11:42:31 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-06 11:42:31 +0200 |
| commit | 46fbbc83a3bd55d12947d338b71e624ac6eb71ec (patch) | |
| tree | e6d0bf0acc9659bb83670e30112a3bc832d884e1 /gcc/ada/gcc-interface | |
| parent | c6aecf3bee303042c654da91ea56a36766c16ebf (diff) | |
| download | gcc-46fbbc83a3bd55d12947d338b71e624ac6eb71ec.zip gcc-46fbbc83a3bd55d12947d338b71e624ac6eb71ec.tar.gz gcc-46fbbc83a3bd55d12947d338b71e624ac6eb71ec.tar.bz2 | |
Makefile.in, [...]: Remove obsolete targets referencing gen-soccon When generating s-oscons.ads...
2008-08-06 Thomas Quinot <quinot@adacore.com>
* gcc-interface/Makefile.in, gcc-interface/Make-lang.in:
Remove obsolete targets referencing gen-soccon
When generating s-oscons.ads, use a file name that includes the
THREAD_KIND, to ensure that the (potentially different) version from a
previous build with a different threads flavour does not get reused.
From-SVN: r138787
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 19 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 7 |
2 files changed, 5 insertions, 21 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index a0af9a4..0fa4d87 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -309,17 +309,6 @@ gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS) gnat-cross: force make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp" \ $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) HOST_CFLAGS= HOST_CC=cc - -gen-soccon: force - $(MAKE) -C ada $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ - TRACE="$(TRACE)" \ - LIBGNAT_OBJS=gen-soccon \ - gnatlib - # Build hooks: @@ -951,17 +940,17 @@ OSCONS_CPP=../../../xgcc -B../../../ -E -C \ OSCONS_EXTRACT=../../../xgcc -S -B../../../ s-oscons-tmplt.i endif -ada/s-oscons.ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb +ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb -$(MKDIR) ada/bldtools/oscons $(RM) $(addprefix ada/bldtools/oscons/,$(notdir $^)) $(CP) $^ ada/bldtools/oscons - (cd ada/bldtools/oscons; gnatmake -q xoscons ; \ + (cd ada/bldtools/oscons ; gnatmake -q xoscons ; \ $(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \ $(OSCONS_CPP) ; \ $(OSCONS_EXTRACT) ; \ ./xoscons ; \ - $(RM) ../../s-oscons.ads ; \ - $(CP) s-oscons.ads ../../s-oscons.ads) + $(RM) ../../s-oscons-$(THREAD_KIND).ads ; \ + $(CP) s-oscons.ads ../../s-oscons-$(THREAD_KIND).ads) update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \ ada/nmake.ads diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 1df498a..913add5 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1966,7 +1966,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) # Copy generated target dependent sources $(RM) $(RTSDIR)/s-oscons.ads - (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) + (cd $(RTSDIR); $(LN_S) ../s-oscons-$(THREAD_KIND).ads s-oscons.ads) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) @@ -2286,11 +2286,6 @@ raise-gcc.o : raise-gcc.c raise.h raise.o : raise.c raise.h vx_stack_info.o : vx_stack_info.c -gen-soccon: gen-soccon.c gsocket.h - $(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -UIN_GCC -DTARGET=\"$(target_alias)\" \ - $< $(OUTPUT_OPTION) - cio.o : cio.c $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) |