diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dda582df37..9b00e0b2cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* symtab.c (symbol_find_demangled_name): Likewise.
+
 2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Tom Tromey  <tromey@redhat.com>
 
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 13234f236d..d1e2cb4a1f 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -500,7 +500,7 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol,
       || gsymbol->language == language_auto)
     {
       demangled =
-        cplus_demangle (mangled, DMGL_PARAMS | DMGL_ANSI | DMGL_VERBOSE);
+        cplus_demangle (mangled, DMGL_PARAMS | DMGL_ANSI);
       if (demangled != NULL)
 	{
 	  gsymbol->language = language_cplus;
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d61fd865f6..756cd31638 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2011-05-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.cp/no-dmgl-verbose.cc: New file.
+	* gdb.cp/no-dmgl-verbose.exp: New file.
+
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/break-interp.exp (reach_1, test_ld): Allow also the prefix
 	__GI_.
diff --git a/gdb/testsuite/gdb.cp/no-dmgl-verbose.cc b/gdb/testsuite/gdb.cp/no-dmgl-verbose.cc
new file mode 100644
index 0000000000..2c7c2a7b77
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/no-dmgl-verbose.cc
@@ -0,0 +1,23 @@
+/* This test file is part of GDB, the GNU debugger.
+
+   Copyright 2011 Free Software Foundation, Inc.
+
+   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/>.  */
+
+#include <string>
+
+void
+f (std::string s)
+{
+}
diff --git a/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp b/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp
new file mode 100644
index 0000000000..491a3032e9
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/no-dmgl-verbose.exp
@@ -0,0 +1,38 @@
+# Copyright 2011 Free Software Foundation, Inc.
+
+# 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/>.  */
+
+# Test loading symbols from unrelocated C++ object files.
+
+set testfile no-dmgl-verbose
+set srcfile ${testfile}.cc
+set executable ${testfile}.o
+set binfile ${objdir}/${subdir}/${executable}
+
+if { [skip_cplus_tests] } { continue }
+
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {c++ debug}] != "" } {
+     untested ${testfile}.exp
+     return -1
+}
+
+clean_restart ${executable}
+
+gdb_test_no_output "set breakpoint pending off"
+
+gdb_breakpoint {'f(std::string)'}
+
+gdb_test {break 'f(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)'} \
+	 {Function ".*" not defined\.} \
+	 "DMGL_VERBOSE-demangled f(std::string) is not defined"