Makefile.in: Revert most changes.

	* gcc-interface/Makefile.in: Revert most changes.
	* gcc-interface/Make-lang.in (gnatlib): Remove ada/s-oscons.ads.
libada/
	* libada/Makefile.in: Revert most changes.

From-SVN: r193280

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4238a24c49aeda55c7bf4851a3b96736cf01f1c9..2012814cbdd1c065770ea815e3190680b9bfa95f 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/Makefile.in: Revert most changes.
+       * gcc-interface/Make-lang.in (gnatlib): Remove ada/s-oscons.ads.
+
 2012-11-06  Arnaud Charlet  <charlet@adacore.com>
 
        * gcc-interface/Makefile.in (copy-s-oscons): New target.

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 7f9e38a37101be5668420d6990dd95df4d4eb458..bdf78eb29ec75b75338c76943e855b390014d89b 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -574,7 +574,7 @@ canadian-gnattools: force
        $(MAKE) -C ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2
        $(MAKE) -C ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools4
 
-gnatlib gnatlib-sjlj gnatlib-zcx gnatlib-shared: ada/s-oscons.ads force
+gnatlib gnatlib-sjlj gnatlib-zcx gnatlib-shared: force
        $(MAKE) -C ada $(COMMON_FLAGS_TO_PASS)  \
           GNATLIBFLAGS="$(GNATLIBFLAGS)" \
           GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index cfba9a19703c2c6ac76ede641fa78b222ba93895..d27a81366410b15416930d3871dc114648c91f36 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2607,11 +2607,43 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
        $(RM) ../stamp-gnatlib-$(RTSDIR)
        touch ../stamp-gnatlib1-$(RTSDIR)
 
-$(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR)
-       $(RM) $(RTSDIR)/s-oscons.ads
-       (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads)
+ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(subst -, ,$(host)))),)
+OSCONS_CPP=../../$(DECC) -E /comment=as_is -DNATIVE \
+             -DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c
 
-copy-s-oscons: $(RTSDIR)/s-oscons.ads
+OSCONS_EXTRACT=../../$(DECC) -DNATIVE \
+                 -DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c ; \
+  ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \
+  ./s-oscons-tmplt.exe > s-oscons-tmplt.s
+
+else
+# GCC_FOR_TARGET has paths relative to the gcc directory, so we need to adjust
+# for running it from $(RTSDIR)
+OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \
+  | sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`
+OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \
+  -DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i
+OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS) -S s-oscons-tmplt.i
+endif
+
+./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb
+       -$(MKDIR) ./bldtools/oscons
+       $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^))
+       $(CP) $^ ./bldtools/oscons
+       (cd ./bldtools/oscons ; gnatmake -q xoscons)
+
+$(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons
+       $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s
+       (cd $(RTSDIR) ; \
+           $(OSCONS_CPP) ; \
+           $(OSCONS_EXTRACT) ; \
+           ../bldtools/oscons/xoscons s-oscons)
+
+# Don't use semicolon separated shell commands that involve list expansions.
+# The semicolon triggers a call to DCL on VMS and DCL can't handle command
+# line lengths in excess of 256 characters.
+# Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS)
+# is guaranteed to overflow the buffer.
 
 gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
 # C files

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 6172aad82cc240e43a3f8b272bbbcd7c5fa48073..1778a14e4a29114ebe40baddce6fd55a085679db 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,16 +1,3 @@
-2012-10-30  Arnaud Charlet  <charlet@adacore.com>
-
-       * Makefile.in (osconstool): Revert previous change, still needed
-       after all. Add call to copy-s-oscons target.
-
-2012-10-30  Arnaud Charlet  <charlet@adacore.com>
-
-       * Makefile.in (osconstool): Removed, no longer needed.
-
-2012-10-30  Arnaud Charlet  <charlet@adacore.com>
-
-       * Makefile.in (osconstool): Fix target.
-
 2012-06-11  Olivier Hainque  <hainque@adacore.com>
 
        * Makefile.in (GNATLIBCFLAGS_FOR_C): Remove $(PICFLAG).

diff --git a/libada/Makefile.in b/libada/Makefile.in
index 863b136fc85150350dc116de88346362473c9af6..389a2fb2f79991b8281cac427ff618fcd99207fa 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -113,8 +113,7 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        $(LN_S) $(ADA_RTS_DIR) adalib
 
 osconstool:
-       $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
-       $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) copy-s-oscons
+       $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
 
 install-gnatlib: $(GCC_DIR)/ada/Makefile
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib