gdb/

	* breakpoint.c (parse_breakpoint_sals) <(*address) == NULL>: New
	variable pc.  Call find_pc_line instead of find_pc_overlay, restore
	original PC for it.

gdb/testsuite/
	* gdb.base/break-caller-line.c: New file.
	* gdb.base/break-caller-line.exp: New file.

1 files changed, 55 insertions, 0 deletions

diff --git a/gdb/testsuite/gdb.base/break-caller-line.exp b/gdb/testsuite/gdb.base/break-caller-line.exp
new file mode 100644
index 0000000000..45abe47686
--- /dev/null
+++ b/gdb/testsuite/gdb.base/break-caller-line.exp
@@ -0,0 +1,55 @@
+# Copyright (C) 2012 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/>.
+
+standard_testfile
+
+if { [prepare_for_testing ${testfile}.exp ${testfile}] } {
+    return -1
+}
+
+if ![runto callee] {
+    return 0
+}
+
+set test "up"
+gdb_test_multiple $test $test {
+    -re "\r\n(\[0-9\]+)\[ \t\]+callee \\(\\);\r\n$gdb_prompt $" {
+	set notcurrent $expect_out(1,string)
+	pass $test
+    }
+}
+
+set test {info line *$pc}
+gdb_test_multiple $test $test {
+    -re "\r\nLine (\[0-9\]+) of .*\r\n$gdb_prompt $" {
+	set current $expect_out(1,string)
+	pass $test
+    }
+}
+
+if {$notcurrent == $current} {
+    untested "target arch has an instruction after call as part of the caller line"
+    return 0
+}
+
+set test "break"
+gdb_test_multiple $test $test {
+    -re "\r\nBreakpoint \[0-9\]+ at .*, line $current\\.\r\n$gdb_prompt $" {
+	pass $test
+    }
+    -re "\r\nBreakpoint \[0-9\]+ at .*, line $notcurrent\\.\r\n$gdb_prompt $" {
+	fail "$test (caller line)"
+    }
+}