aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2012-09-27 05:00:45 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2012-09-27 05:00:45 +0000
commite75d8ec9c0008ce3388e91c952e6fe6ec953e21e (patch)
tree0203bce252714eed5bc3c89b019dec8aac9b4a0c /gcc/ada
parent8054b82ee5c62c760373613f062ca57fa28db910 (diff)
downloadgcc-e75d8ec9c0008ce3388e91c952e6fe6ec953e21e.zip
gcc-e75d8ec9c0008ce3388e91c952e6fe6ec953e21e.tar.gz
gcc-e75d8ec9c0008ce3388e91c952e6fe6ec953e21e.tar.bz2
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
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog7
-rw-r--r--gcc/ada/gcc-interface/Makefile.in11
2 files changed, 15 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bf3aa68..6c8364d 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 887a62f..18446e0 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