From f93b65a0f4e4e481eee904df841b5f67ccfc7364 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Sat, 13 Dec 2014 10:24:14 -0500
Subject: [PATCH] Add ChangeLog entries missing from the previous commit.

---
 gdb/ChangeLog           | 8 ++++++++
 gdb/gdbserver/ChangeLog | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7c3c2b94bcf..ee86a9ecad6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* acx_configure_dir.m4 (ACX_CONFIGURE_DIR): Add support for
+	new "EXTRA-ARGS" parameter.
+	* configure.ac: If large-file support is disabled in GDB,
+	pass --disable-largefile to ACX_CONFIGURE_DIR call for "gnulib".
+	* configure: Regenerate.
+
 2014-12-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	PR symtab/17642
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e65cdbd2c3c..6a5005e0a01 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.ac: If large-file support is disabled in GDBserver,
+	pass --disable-largefile to ACX_CONFIGURE_DIR call for "gnulib".
+	* configure: Regenerate.
+
 2014-12-12  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* linux-low.c (regsets_fetch_inferior_registers): Suppress the
-- 
2.30.2