[Ada] Fix link failure of GNAT tools on Windows hosts

The Makefile correctly includes the xmake_file fragment, but it overrides
the adjustment made to the LIBS variable.

gcc/ada/
	PR ada/124918
	* gcc-interface/Makefile.in (TGT_LIB): Move up.
	(LIBBACKTRACE): Likewise.
	(LIBIBERTY): Likewise.
	(LIBGNAT): Likewise.
	(LIBS): Likewise.
	(TOOLS_LIBS): Use $(LIBS).
	(TOOLS1_LIBS): Delete.
	(../../gnatmake$(exeext)): Do not link with $(TOOLS1_LIBS).
	(../../gnatlink$(exeext)): Likewise.

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index b194744c37ce5afa096d97f7941d1f14c9f24d42..6ff2074f04d17c5ce52398518b0e3903b4768517 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -182,6 +182,9 @@ LIBICONV_DEP = @LIBICONV_DEP@
 # Any system libraries needed just for GNAT.
 SYSLIBS = @GNAT_LIBEXC@
 
+# Default is no TGT_LIB; one might be passed down or something
+TGT_LIB =
+
 # List extra gnattools
 EXTRA_GNATTOOLS =
 
@@ -203,6 +206,21 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
 # to deal with as it may conflict with the libgcc provided by the system).
 GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
 
+# We need to link against libbacktrace because diagnostics use it
+LIBBACKTRACE = ../../../libbacktrace/.libs/libbacktrace.a
+
+ifneq ($(enable_host_pie),)
+LIBIBERTY = ../../../libiberty/pic/libiberty.a
+LIBGNAT   = ../$(RTSDIR)/libgnat_pic.a
+else
+LIBIBERTY = ../../../libiberty/libiberty.a
+LIBGNAT   = ../$(RTSDIR)/libgnat.a
+endif
+
+# How to link with both our libraries and the system's installed libraries
+LIBS = $(LIBGNAT) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) $(LIBIBERTY) \
+  $(SYSLIBS) $(TGT_LIB)
+
 # End of variables for you to override.
 
 all: all.indirect
@@ -234,26 +252,9 @@ ALL_CPPFLAGS = $(CPPFLAGS)
 
 ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS)
 
-ifneq ($(enable_host_pie),)
-LIBIBERTY = ../../libiberty/pic/libiberty.a
-else
-LIBIBERTY = ../../libiberty/libiberty.a
-endif
-
-# We need to link against libbacktrace because diagnostic.c in
-# libcommon.a uses it.
-LIBBACKTRACE = ../../libbacktrace/.libs/libbacktrace.a
-
-# How to link with both our special library facilities
-# and the system's installed libraries.
-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 = ../version.o ../link.o ../targext.o ../../ggc-none.o \
   ../../libcommon-target.a ../../libcommon.a ../../../libcpp/libcpp.a \
-  $(LIBGNAT) $(LIBINTL) $(LIBICONV) ../$(LIBBACKTRACE) ../$(LIBIBERTY) \
-  $(SYSLIBS) $(TGT_LIB)
+  $(LIBS)
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
@@ -368,20 +369,8 @@ endif
 
 # Configuration of host tools
 
-# Under linux, host tools need to be linked with -ldl
-
-ifeq ($(strip $(filter-out linux%,$(host_os))),)
-   TOOLS1_LIBS=-ldl
-endif
-
 include $(fsrcdir)/ada/Makefile.rtl
 
-ifneq ($(enable_host_pie),)
-LIBGNAT=../$(RTSDIR)/libgnat_pic.a
-else
-LIBGNAT=../$(RTSDIR)/libgnat.a
-endif
-
 TOOLS_FLAGS_TO_PASS=           \
        "CC=$(CC)"              \
        "CFLAGS=$(CFLAGS) $(PICFLAG)"   \
@@ -522,10 +511,10 @@ gnatlink-re: ../stamp-tools gnatmake-re
 
 # Likewise for the tools
 ../../gnatmake$(exeext): b_gnatm.o $(GNATMAKE_OBJS)
-       +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
+       +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS)
 
 ../../gnatlink$(exeext): b_gnatl.o $(GNATLINK_OBJS)
-       +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
+       +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
 
 ../stamp-gnatlib-$(RTSDIR):
        @if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \