Merge GDB 7.5.1

gdb/testsuite/gdb.arch/amd64-entry-value-param.exp

Index: gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
similarity index 54%
copy from gdb/testsuite/gdb.base/watchpoint-delete.exp
copy to gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
index 0c5deaad7a08969946d2dd44d57c660bc8b45def..9d80dc63b3145264fde1b063f7749f83f2c726bc 100644
--- a/gdb/testsuite/gdb.base/watchpoint-delete.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
@@ -1,5 +1,5 @@
-# Copyright 2010-2012 Free Software Foundation, Inc.
-
+# 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
@@ -13,26 +13,39 @@
 # 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 testfile "watchpoint-delete"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set testfile amd64-entry-value-param
+set srcfile ${testfile}.S
+set csrcfile ${testfile}.c
+set opts {}
+
+if [info exists COMPILE] {
+    # make check RUNTESTFLAGS="gdb.arch/amd64-entry-value-param.exp COMPILE=1"
+    set srcfile ${csrcfile}
+    lappend opts debug optimize=-O2
+} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
+    verbose "Skipping amd64-entry-value-param."
+    return
+}
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
-    untested ${testfile}.exp
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } {
     return -1
 }
 
-# It is more compatible this way.
-gdb_test_no_output "set can-use-hw-watchpoints 0"
-
 if ![runto_main] {
     return -1
 }
 
-# Ensure there is a parent frame to create related bp_watchpoint_scope.
+set srcfile $csrcfile
 gdb_breakpoint [gdb_get_line_number "break-here"]
+
 gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+gdb_test "p y" " = 2"
+gdb_test "p b" " = 4"
 
-gdb_test "watch x" {Watchpoint [0-9]+: x}
+gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+gdb_test "p y" " = 4"
+gdb_test "p b" " = 8"
 
-gdb_test_no_output {delete $bpnum}
+gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+gdb_test "p y" " = 10"
+gdb_test "p b" " = 20"