summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2013-09-04 10:48:01 +0000
committerIvan Maidanski <ivmai@mail.ru>2013-09-15 13:13:23 +0400
commit7f6331e16d82af3571cf518b292e41ddc6ed14ac (patch)
treec689e4479e39baf1985e53595be9738962a63759
parentae77190e8d82e25fde181db336e1283d6a06d795 (diff)
downloadbdwgc-7f6331e16d82af3571cf518b292e41ddc6ed14ac.tar.gz
2013-09-04 Matthias Klose <doko@ubuntu.com>
* Makefile.am (libgcjgc_la_LIBADD): Add EXTRA_TEST_LIBS. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202245 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4524b312..0cd4dbec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-04 Matthias Klose <doko@ubuntu.com>
+
+ * Makefile.am (libgcjgc_la_LIBADD): Add EXTRA_TEST_LIBS.
+ * Makefile.in: Regenerate.
+
2013-03-16 Yvan Roux <yvan.roux@linaro.org>
* include/private/gcconfig.h (AARCH64): New macro (defined only if
diff --git a/Makefile.am b/Makefile.am
index 2b68938e..468e6ffc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
# Include THREADLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS)
+libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
libgcjgc_la_DEPENDENCIES = $(addobjs)
libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)
diff --git a/Makefile.in b/Makefile.in
index e1a3b70c..cd588103 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,7 +338,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
# Include THREADLIBS here to ensure that the correct versions of
# linuxthread semaphore functions get linked:
-libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS)
+libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(EXTRA_TEST_LIBS)
libgcjgc_la_DEPENDENCIES = $(addobjs)
libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS)