aboutsummaryrefslogtreecommitdiff
path: root/libjava/ChangeLog.merge
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/ChangeLog.merge')
-rw-r--r--libjava/ChangeLog.merge8
1 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog.merge b/libjava/ChangeLog.merge
index b61154dad71..0669c0a613f 100644
--- a/libjava/ChangeLog.merge
+++ b/libjava/ChangeLog.merge
@@ -1,5 +1,13 @@
2012-12-01 Matthias Klose <doko@ubuntu.com>
+ * configure.ac: Define and substitute GCDEFS.
+ Add -DGC_GCJ_SUPPORT when built for boehm-gc.
+ * Makefile.am (AM_CXXFLAGS): Add @GCDEFS@.
+ * configure: Regenerate.
+ * Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerate.
+
+2012-12-01 Matthias Klose <doko@ubuntu.com>
+
* gnu/gcj/util/natGCInfo.cc: Don't declare GC_clear_stack.
2012-12-01 Matthias Klose <doko@ubuntu.com>