diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 3675b4f..c14bb49 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3824,11 +3824,6 @@ update_breakpoints_after_exec (void)
continue;
}
}
- /* FIXME what about longjmp breakpoints? Re-create them here? */
- create_overlay_event_breakpoint ();
- create_longjmp_master_breakpoint ();
- create_std_terminate_master_breakpoint ();
- create_exception_master_breakpoint ();
}
int
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.c b/gdb/testsuite/gdb.base/execl-update-breakpoints.c
new file mode 100644
index 0000000..4eb76e8
--- /dev/null
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.c
@@ -0,0 +1,38 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2014 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 . */
+
+#include
+#include
+#include
+#include
+
+int
+main (int argc, char **argv)
+{
+ size_t len;
+ char *bin;
+
+ len = strlen (argv[0]);
+ bin = malloc (len + 1);
+ memcpy (bin, argv[0], len + 1);
+ if (bin[len - 1] == '1')
+ bin[len - 1] = '2';
+
+ execl (bin, bin, (char *) NULL);
+ perror ("execl failed");
+ exit (1);
+}
diff --git a/gdb/testsuite/gdb.base/execl-update-breakpoints.exp b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
new file mode 100644
index 0000000..eb1024b
--- /dev/null
+++ b/gdb/testsuite/gdb.base/execl-update-breakpoints.exp
@@ -0,0 +1,114 @@
+# Copyright 2014 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 .
+
+# Test that when following an exec, we don't try to insert breakpoints
+# in the new image at the addresses the symbols had before the exec.
+
+# Remote protocol does not support follow-exec notifications.
+
+if [is_remote target] {
+ continue
+}
+
+standard_testfile
+
+# Build two copies of the program, each linked at a different address.
+# The address of "main" in the first binary should end up being an
+# unmapped address in the second binary.
+
+set exec1 ${testfile}1
+set exec2 ${testfile}2
+set binfile1 ${binfile}1
+set binfile2 ${binfile}2
+
+if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile}" \
+ [list debug ldflags=-Wl,-Ttext=0x1000000]] } {
+ return -1
+}
+if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile}" \
+ [list debug ldflags=-Wl,-Ttext=0x2000000]] } {
+ return -1
+}
+
+# First check whether the address of "main" in exec1 is readable in
+# exec2. If it is, then skip the test as unsupported.
+
+clean_restart ${exec1}
+if ![runto_main] then {
+ fail "Couldn't run to main"
+ return -1
+}
+
+set addr ""
+set test "main address first"
+gdb_test_multiple "p/x &main" $test {
+ -re " = (0x\[0-9a-f\]+)\r\n$gdb_prompt $" {
+ set addr $expect_out(1,string)
+ pass $test
+ }
+}
+
+clean_restart ${exec2}
+if ![runto_main] then {
+ fail "Couldn't run to main"
+ return -1
+}
+
+set cannot_access 0
+set test "probe memory access"
+gdb_test_multiple "x $addr" $test {
+ -re "Cannot access memory at address .*$gdb_prompt $" {
+ set cannot_access 1
+ pass $test
+ }
+ -re ".*$gdb_prompt $" {
+ pass $test
+ }
+}
+
+if {!$cannot_access} {
+ unsupported "main address is readable in second binary"
+ return
+}
+
+# The test proper. ALWAYS_INSERTED indicates whether testing in
+# "breakpoint always-inserted" mode.
+
+proc test { always_inserted } {
+ global exec1
+
+ clean_restart ${exec1}
+
+ gdb_test_no_output "set breakpoint always-inserted $always_inserted"
+
+ if ![runto_main] then {
+ fail "Couldn't run to main"
+ return -1
+ }
+
+ # On a buggy GDB, with always-inserted on, we'd see:
+ # (gdb) continue
+ # Continuing.
+ # Warning:
+ # Cannot insert breakpoint 1.
+ # Cannot access memory at address 0x10000ff
+ gdb_test "continue" "Breakpoint 1, main.*" "continue across exec"
+}
+
+foreach always_inserted { "off" "on" } {
+ with_test_prefix "always-inserted $always_inserted" {
+ test $always_inserted
+ }
+}