From: Ian Lance Taylor <iant@google.com>
Date: Thu, 27 Sep 2012 05:00:45 +0000 (+0000)
Subject: Makefile.in (LIBBACKTRACE): New variable.
X-Git-Tag: misc/gccgo-go1_1_2~610
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e75d8ec9c0008ce3388e91c952e6fe6ec953e21e;p=thirdparty%2Fgcc.git

Makefile.in (LIBBACKTRACE): New variable.

	* gcc-interface/Makefile.in (LIBBACKTRACE): New variable.
	(LIBS): Add $(LIBBACKTRACE).
	(LIBDEPS): Add $(LIBBACKTRACE).
	(TOOLS_LIBS): Add ../../../libbacktrace/.libs/libbacktrace.a.

From-SVN: r191793
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bf3aa685691a..6c8364d5bbab 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-26  Ian Lance Taylor  <iant@google.com>
+
+	* gcc-interface/Makefile.in (LIBBACKTRACE): New variable.
+	(LIBS): Add $(LIBBACKTRACE).
+	(LIBDEPS): Add $(LIBBACKTRACE).
+	(TOOLS_LIBS): Add ../../../libbacktrace/.libs/libbacktrace.a.
+
 2012-09-10  Diego Novillo  <dnovillo@google.com>
 
 	* gcc-interface/decl.c (build_subst_list): Adjust call to VEC_safe_push.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 887a62fd37ff..18446e0c79b3 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -240,15 +240,20 @@ ALL_COMPILERFLAGS = $(ALL_CFLAGS)
 # This is where we get libiberty.a from.
 LIBIBERTY = ../../libiberty/libiberty.a
 
+# 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) $(LIBIBERTY) $(SYSLIBS)
-LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBIBERTY)
+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 \
   ../../libcommon.a ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \
-  ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB)
+  ../../../libbacktrace/.libs/libbacktrace.a ../../../libiberty/libiberty.a \
+  $(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