aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/Makefile.in2
-rwxr-xr-xgdb/configure2
-rw-r--r--gdb/configure.ac2
-rw-r--r--gdb/development.sh21
-rw-r--r--gdb/gdbserver/ChangeLog7
-rw-r--r--gdb/gdbserver/Makefile.in2
-rwxr-xr-xgdb/gdbserver/configure2
-rw-r--r--gdb/gdbserver/configure.ac2
9 files changed, 20 insertions, 27 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 719ae72..1fd19f6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-05 Joel Brobecker <brobecker@adacore.com>
+
+ * development.sh: Delete.
+ * Makefile.in (config.status): Adjust dependency on development.sh.
+ * configure.ac: Adjust development.sh source call.
+ * configure: Regenerate.
+
2014-06-04 Doug Evans <xdje42@gmail.com>
* guile/scm-breakpoint.c (struct gdbscm_breakpoint_object): New members
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e6c6c33..ea27cf5 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1476,7 +1476,7 @@ stamp-h: $(srcdir)/config.in config.status
CONFIG_LINKS= \
$(SHELL) config.status
-config.status: $(srcdir)/configure configure.tgt configure.host development.sh
+config.status: $(srcdir)/configure configure.tgt configure.host ../bfd/development.sh
$(SHELL) config.status --recheck
ACLOCAL = aclocal
diff --git a/gdb/configure b/gdb/configure
index 56c92d3..05ebace 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2714,7 +2714,7 @@ fi
# Set the 'development' global.
-. $srcdir/development.sh
+. $srcdir/../bfd/development.sh
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 903f378..138fc85 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -24,7 +24,7 @@ AC_CONFIG_HEADER(config.h:config.in)
AM_MAINTAINER_MODE
# Set the 'development' global.
-. $srcdir/development.sh
+. $srcdir/../bfd/development.sh
AC_PROG_CC
AC_USE_SYSTEM_EXTENSIONS
diff --git a/gdb/development.sh b/gdb/development.sh
deleted file mode 100644
index 1c21efa..0000000
--- a/gdb/development.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2012-2014 Free Software Foundation, Inc.
-#
-# This file is part of GDB.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Set to 'true' for development snapshots, 'false' for releases and
-# pre-releases. When true, provide more thorough testing with
-# -lmcheck.
-development=true
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0210536..71c7bcb 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-05 Joel Brobecker <brobecker@adacore.com>
+
+ * development.sh: Delete.
+ * Makefile.in (config.status): Adjust dependency on development.sh.
+ * configure.ac: Adjust development.sh source call.
+ * configure: Regenerate.
+
2014-06-02 Pedro Alves <palves@redhat.com>
* ax.c (gdb_free_agent_expr): New function.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index f773fa2..b795b38 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -390,7 +390,7 @@ $(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
CONFIG_LINKS= \
$(SHELL) config.status
-config.status: configure configure.srv $(srcdir)/../development.sh
+config.status: configure configure.srv $(srcdir)/../../bfd/development.sh
$(SHELL) ./config.status --recheck
# automatic rebuilding in automake-generated Makefiles requires
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 101062f..62adc71 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -4324,7 +4324,7 @@ fi
# Set the 'development' global.
-. $srcdir/../development.sh
+. $srcdir/../../bfd/development.sh
# Enable -lmcheck by default (it provides cheap-enough memory
# mangling), but turn it off for releases.
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 89a8eea..5a10ee7 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -41,7 +41,7 @@ AC_HEADER_STDC
AC_FUNC_ALLOCA
# Set the 'development' global.
-. $srcdir/../development.sh
+. $srcdir/../../bfd/development.sh
# Enable -lmcheck by default (it provides cheap-enough memory
# mangling), but turn it off for releases.