From edceb2a99afcec306af2d9a50c2ed6ece43cf256 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri, 15 Feb 2013 20:28:24 +0000
Subject: [PATCH] gdb/ 	* gdb-gdb.gdb.in: Wrap set complaints, b
 internal_error, b info_command 	and dir commands into an if block.

---
 gdb/ChangeLog      |  5 +++++
 gdb/gdb-gdb.gdb.in | 27 +++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d5211b50720..529b6e07267 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb-gdb.gdb.in: Wrap set complaints, b internal_error, b info_command
+	and dir commands into an if block.
+
 2013-02-15  Sanimir Agovic  <sanimir.agovic@intel.com>
 
 	* python/py-breakpoint (struct pybp_code):  Use int instead of
diff --git a/gdb/gdb-gdb.gdb.in b/gdb/gdb-gdb.gdb.in
index ffb7f53b500..05a38b2670b 100644
--- a/gdb/gdb-gdb.gdb.in
+++ b/gdb/gdb-gdb.gdb.in
@@ -1,19 +1,26 @@
 echo Setting up the environment for debugging gdb.\n
 
-set complaints 1
+if !$gdb_init_done
+  set variable $gdb_init_done = 1
 
-b internal_error
+  set complaints 1
 
-b info_command
-commands
-	silent
-	return
+  b internal_error
+
+  b info_command
+  commands
+    silent
+    return
+  end
+
+  dir @srcdir@/../libiberty
+  dir @srcdir@/../bfd
+  dir @srcdir@
+  dir .
+
+  # Commands below are not fully compatible with wrapping into an 'if' block.
 end
 
-dir @srcdir@/../libiberty
-dir @srcdir@/../bfd
-dir @srcdir@
-dir .
 set prompt (top-gdb) 
 
 define pdie
-- 
2.30.2