[rpms/gdb] gdb-17.2-rebase-f44: remove patch gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

[rpms/gdb] gdb-17.2-rebase-f44: remove patch gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

[Andrew Burgess]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : 020018cffc9e547b7e7245b05927aaf872400c5e
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2025-01-07T10:10:29+00:00
            Stats  : +10/-115 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/020018cffc9e547b7e7245b05927aaf872400c5e?branch=gdb-17.2-rebase-f44

            Log:
            remove patch gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

Remove gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch, which is a
test only patch.  This test is already covered upstream with commit:

  commit a3b60e4588606354b93508a0008a5ca04b68fad8
  Date:   Fri May 4 22:22:04 2018 +0200

      aarch64: PR 19806: watchpoints: false negatives + PR 20207 contiguous ones

Which added the test gdb.base/watchpoint-unaligned.exp.  As this test
was added long ago, it is already present in our Fedora branches.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 1d333f4..860ddc0 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -48,10 +48,6 @@ Patch011: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 #=fedoratest
 Patch012: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
-# [aarch64] Fix hardware watchpoints (RH BZ 1261564).
-#=fedoratest
-Patch013: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
-
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
 # 'gdb' in the $PATH.
@@ -64,7 +60,7 @@ Patch013: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch014: gdb-add-index.patch
+Patch013: gdb-add-index.patch
 
 # Backport of upstream commit 36fb20fa93484b104d.  This is not really
 # relevant for our branch, but later commits that are important, and
@@ -88,17 +84,17 @@ Patch014: gdb-add-index.patch
 #
 # Change-Id: I4e25ec26ab06636629adebd02ceb161ee31c232d
 # Approved-by: Kevin Buettner <kevinb@redhat.com>
-Patch015: gdb-remove-qnx-neutrino-support.patch
+Patch014: gdb-remove-qnx-neutrino-support.patch
 
 # Backport patches related to build-id usage when opening a core
 # file, and also improving general build-id based lookup.  These will
 # all drop out when rebasing to GDB 16.
-Patch016: gdb-backport-buildid-related-changes.patch
+Patch015: gdb-backport-buildid-related-changes.patch
 
 # Not a backport.  Add a new script which hooks into GDB and suggests
 # RPMs to install when GDB finds an objfile with no debug info.
-Patch017: gdb-add-rpm-suggestion-script.patch
+Patch016: gdb-add-rpm-suggestion-script.patch
 
 
-Patch018: gdb-catchpoint-re-set.patch
+Patch017: gdb-catchpoint-re-set.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 6440154..37b4a7a 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -15,4 +15,3 @@
 %patch -p1 -P015
 %patch -p1 -P016
 %patch -p1 -P017
-%patch -p1 -P018

diff --git a/_patch_order b/_patch_order
index 2fe83cc..1858538 100644
--- a/_patch_order
+++ b/_patch_order
@@ -10,7 +10,6 @@ gdb-test-bt-cfi-without-die.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
-gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 gdb-add-index.patch
 gdb-remove-qnx-neutrino-support.patch
 gdb-backport-buildid-related-changes.patch

diff --git a/gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch b/gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
deleted file mode 100644
index a0eb440..0000000
--- a/gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
-
-;; [aarch64] Fix hardware watchpoints (RH BZ 1261564).
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.c
-@@ -0,0 +1,33 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2016 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/>.  */
-+
-+__attribute__((aligned(16))) struct
-+{
-+  int var0, var4, var8;
-+} aligned;
-+
-+int
-+main (void)
-+{
-+  aligned.var0 = 1;
-+  aligned.var4 = 2;
-+  aligned.var8 = 3;
-+
-+  aligned.var4 = aligned.var0;
-+
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/rhbz1261564-aarch64-watchpoint.exp
-@@ -0,0 +1,53 @@
-+# Copyright (C) 2016 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/>.
-+
-+if { [prepare_for_testing rhbz1261564-aarch64-watchpoint.exp "rhbz1261564-aarch64-watchpoint"] } {
-+    return -1
-+}
-+
-+if { ! [ runto main ] } then { return 0 }
-+
-+set test "rwatch aligned.var4"
-+if [istarget "s390*-*-*"] {
-+    gdb_test $test {Target does not support this type of hardware watchpoint\.}
-+    untested "s390* does not support hw read watchpoint"
-+    return
-+}
-+gdb_test $test "Hardware read watchpoint \[0-9\]+: aligned.var4"
-+
-+proc checkvar { address } {
-+    global gdb_prompt
-+
-+    set test "p &aligned.var$address"
-+    gdb_test_multiple $test $test {
-+	-re " = \\(int \\*\\) 0x\[0-9a-f\]+$address <aligned(\\+\[0-9\]+)?>\r\n$gdb_prompt $" {
-+	    pass $test
-+	}
-+	-re "\r\n$gdb_prompt $" {
-+	    untested "$test (unexpected ELF layout)"
-+	    return 0
-+	}
-+    }
-+    return 1
-+}
-+if ![checkvar "0"] { return }
-+if ![checkvar "4"] { return }
-+if ![checkvar "8"] { return }
-+
-+# Assumes: PPC_PTRACE_GETHWDBGINFO::data_bp_alignment == 8
-+# 'lwz' does read only 4 bytes but the hw watchpoint is 8 bytes wide.
-+setup_xfail "powerpc*-*-*"
-+
-+gdb_continue_to_end

diff --git a/gdb.spec b/gdb.spec
index 7188f2e..ced1738 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -928,6 +928,11 @@ fi
 # endif scl
 
 %changelog
+* Tue Jan 07 2025 Andrew Burgess <aburgess@redhat.com>
+- Remove gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch.  This test
+  should be covered by gdb.base/watchpoint-unaligned.exp which was
+  added upstream in commit a3b60e4588606354b93508a0008a5.
+
 * Thu Jan 02 2025 Guinevere Larsen <glarsen@redhat.com>
 - Remove gdb-rhbz1156192-recursive-dlopen-test.patch.