[rpms/gdb] gdb-17.2-rebase-f44: Drop 2 patches that already have upstreamed tests

[rpms/gdb] gdb-17.2-rebase-f44: Drop 2 patches that already have upstreamed tests

[Guinevere Larsen]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : a93b82624d32ce93b167b27de287301ed50d6350
            Author : Guinevere Larsen <blarsen@redhat.com>
            Date   : 2024-08-08T11:21:03-03:00
            Stats  : +24/-286 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/a93b82624d32ce93b167b27de287301ed50d6350?branch=gdb-17.2-rebase-f44

            Log:
            Drop 2 patches that already have upstreamed tests

patches are:
* gdb-6.7-ppc-clobbered-registers-O2-test
* gdb-rhbz947564-findvar-assertion-frame-failed-testcase

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 10246f1..e2d2c4f 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -36,78 +36,69 @@ Patch008: gdb-6.6-buildid-locate.patch
 #=push+jan
 Patch009: gdb-6.6-buildid-locate-solib-missing-ids.patch
 
-# Test PPC hiding of call-volatile parameter register.
-#=fedoratest
-Patch010: gdb-6.7-ppc-clobbered-registers-O2-test.patch
-
 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch011: gdb-6.5-gcore-buffer-limit-test.patch
+Patch010: gdb-6.5-gcore-buffer-limit-test.patch
 
 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
-Patch012: gdb-6.3-mapping-zero-inode-test.patch
+Patch011: gdb-6.3-mapping-zero-inode-test.patch
 
 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch013: gdb-6.5-section-num-fixup-test.patch
+Patch012: gdb-6.5-section-num-fixup-test.patch
 
 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch014: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch013: gdb-6.8-bz466901-backtrace-full-prelinked.patch
 
 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch015: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch014: gdb-simultaneous-step-resume-breakpoint-test.patch
 
 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch016: gdb-archer-next-over-throw-cxx-exec.patch
+Patch015: gdb-archer-next-over-throw-cxx-exec.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch017: gdb-test-bt-cfi-without-die.patch
+Patch016: gdb-test-bt-cfi-without-die.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch018: gdb-test-dw2-aranges.patch
+Patch017: gdb-test-dw2-aranges.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch019: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
-
-# Import regression test for `gdb/findvar.c:417: internal-error:
-# read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
-#=fedoratest
-Patch020: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch018: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch021: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch019: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 
 # Fix 'gdb gives highly misleading error when debuginfo pkg is present,
 # but not corresponding binary pkg' (RH BZ 981154).
 #=push+jan
-Patch022: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch020: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch023: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch021: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch024: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch022: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch025: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch023: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch026: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch024: 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
@@ -121,12 +112,12 @@ Patch026: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch027: gdb-add-index.patch
+Patch025: gdb-add-index.patch
 
 # Backport upstream commit 7db795bc67a.
-Patch028: gdb-remove-use-of-py-isascii
+Patch026: gdb-remove-use-of-py-isascii
 
 # 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.
-Patch029: gdb-add-rpm-suggestion-script.patch
+Patch027: gdb-add-rpm-suggestion-script.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index f93264f..efd00da 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -25,5 +25,3 @@
 %patch -p1 -P025
 %patch -p1 -P026
 %patch -p1 -P027
-%patch -p1 -P028
-%patch -p1 -P029

diff --git a/_patch_order b/_patch_order
index a62ae44..8e918b6 100644
--- a/_patch_order
+++ b/_patch_order
@@ -7,7 +7,6 @@ gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
 gdb-6.5-bz243845-stale-testing-zombie-test.patch
 gdb-6.6-buildid-locate.patch
 gdb-6.6-buildid-locate-solib-missing-ids.patch
-gdb-6.7-ppc-clobbered-registers-O2-test.patch
 gdb-6.5-gcore-buffer-limit-test.patch
 gdb-6.3-mapping-zero-inode-test.patch
 gdb-6.5-section-num-fixup-test.patch
@@ -17,7 +16,6 @@ gdb-archer-next-over-throw-cxx-exec.patch
 gdb-test-bt-cfi-without-die.patch
 gdb-test-dw2-aranges.patch
 gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
-gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 gdb-rhbz1156192-recursive-dlopen-test.patch

diff --git a/gdb-6.7-ppc-clobbered-registers-O2-test.patch b/gdb-6.7-ppc-clobbered-registers-O2-test.patch
deleted file mode 100644
index 08ee2f9..0000000
--- a/gdb-6.7-ppc-clobbered-registers-O2-test.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-6.7-ppc-clobbered-registers-O2-test.patch
-
-;; Test PPC hiding of call-volatile parameter register.
-;;=fedoratest
-
-2007-11-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* gdb.arch/ppc-clobbered-registers-O2.exp: `powerpc64' changed to
-	`powerpc*'.
-
-Testcase for:
-
-http://sourceware.org/ml/gdb-patches/2007-09/msg00228.html
-
-2007-10-21  Luis Machado  <luisgpm@br.ibm.com>
-
-	* rs6000-tdep.c (ppc_dwarf2_frame_init_reg): New function.
-	* (rs6000_gdbarch_init): Install ppc_dwarf2_frame_init_reg as
-	default dwarf2_frame_set_init_reg function.
-
-diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.c
-@@ -0,0 +1,21 @@
-+
-+unsigned * __attribute__((noinline))
-+start_sequence (unsigned * x, unsigned * y)
-+{
-+	return (unsigned *)0xdeadbeef;
-+};
-+
-+unsigned __attribute__((noinline))
-+gen_movsd (unsigned * operand0, unsigned * operand1)
-+{
-+	return *start_sequence(operand0, operand1);
-+}
-+
-+int main(void)
-+{
-+  unsigned x, y;
-+
-+  x = 13;
-+  y = 14;
-+  return (int)gen_movsd (&x, &y);
-+}
-diff --git a/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.arch/ppc-clobbered-registers-O2.exp
-@@ -0,0 +1,54 @@
-+# Copyright 2006 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 2 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, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# This file is part of the gdb testsuite.
-+
-+# Test displaying call clobbered registers in optimized binaries for ppc.
-+# GDB should not show incorrect values.
-+
-+if ![istarget "powerpc*-*"] then {
-+    verbose "Skipping powerpc* call clobbered registers testing."
-+    return
-+}
-+
-+set testfile "ppc-clobbered-registers-O2"
-+set srcfile ${testfile}.c
-+set binfile [standard_output_file ${testfile}]
-+set compile_flags "debug additional_flags=-O2"
-+
-+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${compile_flags}] != "" } {
-+    unsupported "Testcase compile failed."
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+gdb_load ${binfile}
-+
-+if ![runto_main] then {
-+    perror "Couldn't run to breakpoint"
-+    continue
-+}
-+
-+gdb_test "b start_sequence" ".*Breakpoint 2 at.*line 6.*" \
-+  "Insert breakpoint at problematic function"
-+
-+gdb_test continue ".*Breakpoint 2.*in start_sequence.*" \
-+  "Run until problematic function"
-+
-+gdb_test backtrace ".*operand0=<value optimized out>.*operand1=<value optimized out>.*" \
-+  "Check value of call clobbered registers"

diff --git a/gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch b/gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
deleted file mode 100644
index 0df5ee5..0000000
--- a/gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+++ /dev/null
@@ -1,147 +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-rhbz947564-findvar-assertion-frame-failed-testcase.patch
-
-;; Import regression test for `gdb/findvar.c:417: internal-error:
-;; read_var_value: Assertion `frame' failed.' (RH BZ 947564) from RHEL 6.5.
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.threads/tls-rhbz947564.cc b/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
-@@ -0,0 +1,53 @@
-+#include <iostream>
-+#include <pthread.h>
-+
-+class x
-+  {
-+  public:
-+    int n;
-+
-+    x() : n(0) {}
-+  };
-+
-+class y
-+  {
-+  public:
-+    int v;
-+
-+    y() : v(0) {}
-+    static __thread x *xp;
-+  };
-+
-+__thread x *y::xp;
-+
-+static void
-+foo (y *yp)
-+{
-+  yp->v = 1;   /* foo_marker */
-+}
-+
-+static void *
-+bar (void *unused)
-+{
-+  x xinst;
-+  y::xp= &xinst;
-+
-+  y yy;
-+  foo(&yy);
-+
-+  return NULL;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+  pthread_t t[2];
-+
-+  pthread_create (&t[0], NULL, bar, NULL);
-+  pthread_create (&t[1], NULL, bar, NULL);
-+
-+  pthread_join (t[0], NULL);
-+  pthread_join (t[1], NULL);
-+
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.threads/tls-rhbz947564.exp b/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
-@@ -0,0 +1,75 @@
-+# Copyright (C) 2013 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/>.  */
-+
-+set testfile tls-rhbz947564
-+set srcfile ${testfile}.cc
-+set binfile [standard_output_file ${testfile}]
-+
-+if [istarget "*-*-linux"] then {
-+    set target_cflags "-D_MIT_POSIX_THREADS"
-+} else {
-+    set target_cflags ""
-+}
-+
-+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list c++ debug]] != "" } {
-+    return -1
-+}
-+
-+gdb_exit
-+gdb_start
-+gdb_reinitialize_dir $srcdir/$subdir
-+
-+gdb_load ${binfile}
-+
-+if { ![runto_main] } {
-+    fail "Can't run to function main"
-+    return 0
-+}
-+
-+gdb_breakpoint "foo"
-+gdb_continue_to_breakpoint "foo" ".* foo_marker .*"
-+
-+proc get_xp_val {try} {
-+    global expect_out
-+    global gdb_prompt
-+    global hex
-+
-+    set xp_val ""
-+    gdb_test_multiple "print *yp" "print yp value" {
-+	-re { = \{v = 0, static xp = (0x[0-9a-f]+)\}.* } {
-+	    pass "print $try value of *yp"
-+	    set xp_val $expect_out(1,string)
-+	}
-+	-re "$gdb_prompt $" {
-+	    fail "print $try value of *yp"
-+	}
-+	timeout {
-+	    fail "print $try value of *yp (timeout)"
-+	}
-+    }
-+    return $xp_val
-+}
-+
-+set first_run [get_xp_val "first"]
-+
-+gdb_test "continue" "Breakpoint \[0-9\]+, foo \\\(yp=$hex\\\) at.*"
-+
-+set second_run [get_xp_val "second"]
-+
-+if { $first_run != $second_run } {
-+    pass "different values for TLS variable"
-+} else {
-+    fail "different values for TLS variable"
-+}

diff --git a/gdb.spec b/gdb.spec
index c3f839d..542afd4 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -926,6 +926,12 @@ fi
 # endif scl
 
 %changelog
+* Thu Aug  8 2024 Guinevere Larsen <blarsen@redhat.com>
+- Remove gdb-6.7-ppc-clobbered-registers-O2-test.patch
+    This test is already upstreamed in gdb.opt
+- Remove gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+    This is already covered by gdb.thread/tls.exp
+
 * Wed Jul 24 2024 Alexandra Hájková <ahajkova@redhat.com> - 15.1-1
 - Rebase to FSF GDB 15.1.
 - Update local patches: