[rpms/gdb] gdb-17.2-rebase-f44: remove gdb-fortran-frame-string.patch file

[rpms/gdb] gdb-17.2-rebase-f44: remove gdb-fortran-frame-string.patch file

[Andrew Burgess]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : b3008271fb8a0fefbb5854d1d1286c289eb86af4
            Author : Andrew Burgess <aburgess@redhat.com>
            Date   : 2022-12-09T19:14:01+00:00
            Stats  : +22/-128 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/b3008271fb8a0fefbb5854d1d1286c289eb86af4?branch=gdb-17.2-rebase-f44

            Log:
            remove gdb-fortran-frame-string.patch file

Remove the 'gdb-fortran-frame-string.patch' patch from Fedora GDB.  I
have pushed an upstream test that covers everything that this test
covered, see upstream GDB commit:

  commit 1c01b23603766fbca4ed4dd12fdd710860e6038e
  Date:   Fri Nov 4 14:51:11 2022 +0000

      gdb/fortran/testsuite: print values and types of string variables

As this is just a testsuite patch, I'm not going to backport this to
Fedora GDB, but when we next rebase, we will pick up this test.

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index c9cc0fc..6e6a944 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -204,58 +204,54 @@ Patch049: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
 #=push+jan
 Patch050: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 
-# Display Fortran strings in backtraces.
-#=fedoratest
-Patch051: gdb-fortran-frame-string.patch
-
 # Testcase for '[SAP] Recursive dlopen causes SAP HANA installer to
 # crash.' (RH BZ 1156192).
 #=fedoratest
-Patch052: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch051: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch053: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch052: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 
 # Fix 'backport GDB 7.4 fix to RHEL 6.6 GDB' [Original Sourceware bug
 # description: 'C++ (and objc): Internal error on unqualified name
 # re-set', PR 11657] (RH BZ 1186476).
 #=fedoratest
-Patch054: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch053: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch055: gdb-rhbz1350436-type-printers-error.patch
+Patch054: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch056: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch055: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch057: gdb-fedora-libncursesw.patch
+Patch056: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch058: gdb-opcodes-clflushopt-test.patch
+Patch057: gdb-opcodes-clflushopt-test.patch
 
 # [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
 #=push+jan
-Patch059: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch058: gdb-6.6-buildid-locate-rpm-scl.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch060: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch059: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch061: gdb-container-rh-pkg.patch
+Patch060: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch062: gdb-linux_perf-bundle.patch
+Patch061: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@@ -264,28 +260,28 @@ Patch062: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch063: gdb-libexec-add-index.patch
+Patch062: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch064: gdb-rhbz1398387-tab-crash-test.patch
+Patch063: gdb-rhbz1398387-tab-crash-test.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch065: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch064: gdb-rhbz1553104-s390x-arch12-test.patch
 
 
-Patch066: gdb-backport-readline_support.patch
+Patch065: gdb-backport-readline_support.patch
 
 # [gdb/testsuite] Use prototype to call libc functions
 # (Tom de Vries)
-Patch067: gdb-backport-fix-break-main-file-remove-fail.patch
+Patch066: gdb-backport-fix-break-main-file-remove-fail.patch
 
 # Constify target_desc to fix PPC ODR violations.
 # (Keith Seitz, build/22395)
-Patch068: gdb-sw22395-constify-target_desc.patch
+Patch067: gdb-sw22395-constify-target_desc.patch
 
 # libiberty: Fix C89-isms in configure tests
 # (Florian Weimer, RHBZ 2143992)
-Patch069: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
+Patch068: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 4ef8e6c..f004491 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -66,4 +66,3 @@
 %patch066 -p1
 %patch067 -p1
 %patch068 -p1
-%patch069 -p1

diff --git a/_patch_order b/_patch_order
index 25b8f1e..c92296c 100644
--- a/_patch_order
+++ b/_patch_order
@@ -48,7 +48,6 @@ 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-fortran-frame-string.patch
 gdb-rhbz1156192-recursive-dlopen-test.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

diff --git a/gdb-fortran-frame-string.patch b/gdb-fortran-frame-string.patch
deleted file mode 100644
index 4bdd059..0000000
--- a/gdb-fortran-frame-string.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-fortran-frame-string.patch
-
-;; Display Fortran strings in backtraces.
-;;=fedoratest
-
-http://sourceware.org/ml/gdb-patches/2014-07/msg00709.html
-
-Hi,
-
-for Fortran it fixes displaying normal strings also in frames/backtraces:
-
-(gdb) frame
-->
-
-The patch is simple and I do not see why it should not be this way.
-
-For C/C++ TYPE_CODE_STRING is not used.  I am not aware of Pascal but that
-language is currently not really much supported in GDB anyway.
-
-This was a part of my archer/jankratochvil/vla branch but it is not a part of
-the Intel VLA patchset as it in fact is completely unrelated to "VLA".
-
-No regressions on {x86_64,x86_64-m32,i686}-fedora22pre-linux-gnu.
-
-Thanks,
-Jan
-
-diff --git a/gdb/testsuite/gdb.fortran/fortran-frame-string.exp b/gdb/testsuite/gdb.fortran/fortran-frame-string.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.fortran/fortran-frame-string.exp
-@@ -0,0 +1,36 @@
-+# 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 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.
-+
-+standard_testfile .f90
-+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } {
-+    return -1
-+}
-+
-+if ![runto MAIN__] then {
-+    perror "couldn't run to breakpoint MAIN__"
-+    continue
-+}
-+
-+gdb_breakpoint [gdb_get_line_number "s = s"]
-+gdb_continue_to_breakpoint "s = s"
-+
-+gdb_test "ptype s" {type = character\*3}
-+gdb_test "p s" " = 'foo'"
-+
-+# Fix rejected upstream:
-+# https://sourceware.org/ml/gdb-patches/2014-07/msg00768.html
-+setup_kfail "rejected" *-*-*
-+gdb_test "frame" { \(s='foo', .*}
-diff --git a/gdb/testsuite/gdb.fortran/fortran-frame-string.f90 b/gdb/testsuite/gdb.fortran/fortran-frame-string.f90
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.fortran/fortran-frame-string.f90
-@@ -0,0 +1,28 @@
-+! 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 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.
-+!
-+! Ihis file is the Fortran source file for dynamic.exp.
-+! Original file written by Jakub Jelinek <jakub@redhat.com>.
-+! Modified for the GDB testcase by Jan Kratochvil <jan.kratochvil@redhat.com>.
-+
-+  subroutine f(s)
-+  character*3 s
-+  s = s
-+  end
-+
-+  program main
-+  call f ('foo')
-+  end

diff --git a/gdb.spec b/gdb.spec
index ddb58c5..f2efb40 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1196,6 +1196,10 @@ fi
 
 %changelog
 * Fri Dec 9 2022 Andrew Burgess <aburgess@redhat.com>
+- Remove gdb-fortran-frame-string.patch, a version of this test has
+  now been upstreamed.
+
+* Fri Dec 9 2022 Andrew Burgess <aburgess@redhat.com>
 - Remove gdb-bfd-aliasing.patch.
 
 * Fri Dec 9 2022 Andrew Burgess <aburgess@redhat.com>