Delete gdb-6.5-sharedlibrary-path.patch, which was upstreamed in

commit 3ec033fab4a.
2023-09-28 19:13:18 -07:00 · 2023-09-28 19:13:18 -07:00 · aca26db9ee
commit aca26db9ee
parent 52db67646d
5 changed files with 49 additions and 245 deletions
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@ -10,167 +10,162 @@ Patch002: gdb-6.3-gstack-20050411.patch
 #=push+jan: It should be replaced by Infinity project.
 Patch003: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch

-# Fix TLS symbols resolving for shared libraries with a relative pathname.
-# The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
-#=fedoratest: One should recheck if it is really fixed upstream.
-Patch004: gdb-6.5-sharedlibrary-path.patch
-
 # Improved testsuite results by the testsuite provided by the courtesy of BEA.
 #=fedoratest: For upstream it should be rewritten as a dejagnu test, the test of no "??" was useful.
-Patch005: gdb-6.5-BEA-testsuite.patch
+Patch004: gdb-6.5-BEA-testsuite.patch

 # Test sideeffects of skipping ppc .so libs trampolines (BZ 218379).
 #=fedoratest
-Patch006: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
+Patch005: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

 # Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 #=fedoratest
-Patch007: gdb-6.6-bz229517-gcore-without-terminal.patch
+Patch006: gdb-6.6-bz229517-gcore-without-terminal.patch

 # Avoid too long timeouts on failing cases of "annota1.exp annota3.exp".
 #=fedoratest
-Patch008: gdb-6.6-testsuite-timeouts.patch
+Patch007: gdb-6.6-testsuite-timeouts.patch

 # Support for stepping over PPC atomic instruction sequences (BZ 237572).
 #=fedoratest
-Patch009: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch
+Patch008: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch

 # Test kernel VDSO decoding while attaching to an i386 process.
 #=fedoratest
-Patch010: gdb-6.3-attach-see-vdso-test.patch
+Patch009: gdb-6.3-attach-see-vdso-test.patch

 # Test leftover zombie process (BZ 243845).
 #=fedoratest
-Patch011: gdb-6.5-bz243845-stale-testing-zombie-test.patch
+Patch010: gdb-6.5-bz243845-stale-testing-zombie-test.patch

 # New locating of the matching binaries from the pure core file (build-id).
 #=push+jan
-Patch012: gdb-6.6-buildid-locate.patch
+Patch011: gdb-6.6-buildid-locate.patch

 # Fix loading of core files without build-ids but with build-ids in executables.
 # Load strictly build-id-checked core files only if no executable is specified
 # (Jan Kratochvil, RH BZ 1339862).
 #=push+jan
-Patch013: gdb-6.6-buildid-locate-solib-missing-ids.patch
+Patch012: gdb-6.6-buildid-locate-solib-missing-ids.patch

 #=push+jan
-Patch014: gdb-6.6-buildid-locate-rpm.patch
+Patch013: gdb-6.6-buildid-locate-rpm.patch

 # Test PPC hiding of call-volatile parameter register.
 #=fedoratest
-Patch015: gdb-6.7-ppc-clobbered-registers-O2-test.patch
+Patch014: gdb-6.7-ppc-clobbered-registers-O2-test.patch

 # Test ia64 memory leaks of the code using libunwind.
 #=fedoratest
-Patch016: gdb-6.5-ia64-libunwind-leak-test.patch
+Patch015: gdb-6.5-ia64-libunwind-leak-test.patch

 # Test hiding unexpected breakpoints on intentional step commands.
 #=fedoratest
-Patch017: gdb-6.5-missed-trap-on-step-test.patch
+Patch016: gdb-6.5-missed-trap-on-step-test.patch

 # Test gcore memory and time requirements for large inferiors.
 #=fedoratest
-Patch018: gdb-6.5-gcore-buffer-limit-test.patch
+Patch017: 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.
-Patch019: gdb-6.3-mapping-zero-inode-test.patch
+Patch018: gdb-6.3-mapping-zero-inode-test.patch

 # Test a crash on libraries missing the .text section.
 #=fedoratest
-Patch020: gdb-6.5-section-num-fixup-test.patch
+Patch019: gdb-6.5-section-num-fixup-test.patch

 # Fix resolving of variables at locations lists in prelinked libs (BZ 466901).
 #=fedoratest
-Patch021: gdb-6.8-bz466901-backtrace-full-prelinked.patch
+Patch020: gdb-6.8-bz466901-backtrace-full-prelinked.patch

 # New test for step-resume breakpoint placed in multiple threads at once.
 #=fedoratest
-Patch022: gdb-simultaneous-step-resume-breakpoint-test.patch
+Patch021: gdb-simultaneous-step-resume-breakpoint-test.patch

 # Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
 # Fix regression of undisplayed missing shared libraries caused by a fix for.
 #=fedoratest: It should be in glibc: libc-alpha: <20091004161706.GA27450@.*>
-Patch023: gdb-core-open-vdso-warning.patch
+Patch022: gdb-core-open-vdso-warning.patch

 # Fix follow-exec for C++ programs (bugreported by Martin Stransky).
 #=fedoratest
-Patch024: gdb-archer-next-over-throw-cxx-exec.patch
+Patch023: gdb-archer-next-over-throw-cxx-exec.patch

 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch025: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch024: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch

 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch026: gdb-test-bt-cfi-without-die.patch
+Patch025: gdb-test-bt-cfi-without-die.patch

 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch027: gdb-bz634108-solib_address.patch
+Patch026: gdb-bz634108-solib_address.patch

 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch028: gdb-test-dw2-aranges.patch
+Patch027: gdb-test-dw2-aranges.patch

 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch029: gdb-glibc-strstr-workaround.patch
+Patch028: gdb-glibc-strstr-workaround.patch

 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch030: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch029: 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
-Patch031: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch030: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch032: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch031: 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
-Patch033: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch032: 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
-Patch034: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch033: gdb-rhbz1156192-recursive-dlopen-test.patch

 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch035: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch034: 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
-Patch036: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch035: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch

 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch037: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch036: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch

 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch038: gdb-fedora-libncursesw.patch
+Patch037: gdb-fedora-libncursesw.patch

 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch039: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch038: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch

 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch040: gdb-container-rh-pkg.patch
+Patch039: gdb-container-rh-pkg.patch

 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch041: gdb-linux_perf-bundle.patch
+Patch040: gdb-linux_perf-bundle.patch

 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@ -184,34 +179,34 @@ Patch041: gdb-linux_perf-bundle.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch042: gdb-add-index.patch
+Patch041: gdb-add-index.patch

 # Backport "Fix a potential illegal memory access in the BFD library..."
 # (Nick Clifton, binutils/29988)
-Patch043: gdb-binutils29988-read_indexed_address.patch
+Patch042: gdb-binutils29988-read_indexed_address.patch

 # Backport upstream patch fixing a "dangling pointer" build problem
 # first seen when building with GCC 13.1.1 20230426 (Red Hat ;; 13.1.1-1).
-Patch044: gdb-rhbz2192105-ftbs-dangling-pointer
+Patch043: gdb-rhbz2192105-ftbs-dangling-pointer

 # Backport two commits, 0ad504dd464 and ea70f941f9b, from Lancelot SIX
 # which prevent repeated warnings from being printed while loading a
 # core file. (RH BZ 2160211)
-Patch045: gdb-rhbz2160211-excessive-core-file-warnings.patch
+Patch044: gdb-rhbz2160211-excessive-core-file-warnings.patch

 # Backport upstream commit f3eee5861743d635 to fix a crash triggered
 # when debuginfod makes use of particular openssl settings.
-Patch046: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch
+Patch045: gdb-bz2196395-debuginfod-legacy-openssl-crash.patch

 # Backport upstream commit f96328accde1e63 to fix a potential double
 # free issue in the debuginfod code.
-Patch047: gdb-bz2237515-debuginfod-double-free.patch
+Patch046: gdb-bz2237515-debuginfod-double-free.patch

 # Backport upstream commit 54392c4df604f20 to fix an incorrect
 # obstack allocation that wold lead to memory corruption.
-Patch048: gdb-bz2237392-dwarf-obstack-allocation.patch
+Patch047: gdb-bz2237392-dwarf-obstack-allocation.patch

 # Backport PR29922, SHT_NOBITS section
 # avoids section size sanity check.
-Patch049: gdb-rhbz2233961-CVE-2022-4806.patch
+Patch048: gdb-rhbz2233961-CVE-2022-4806.patch

--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@ -46,4 +46,3 @@
 %patch -p1 -P046
 %patch -p1 -P047
 %patch -p1 -P048
-%patch -p1 -P049
--- a/1
+++ b/1
@ -1,7 +1,6 @@
 gdb-6.3-rh-testversion-20041202.patch
 gdb-6.3-gstack-20050411.patch
 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
-gdb-6.5-sharedlibrary-path.patch
 gdb-6.5-BEA-testsuite.patch
 gdb-6.5-bz218379-ppc-solib-trampoline-test.patch
 gdb-6.6-bz229517-gcore-without-terminal.patch
--- a/gdb-6.5-sharedlibrary-path.patch
+++ b/gdb-6.5-sharedlibrary-path.patch
@ -1,193 +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.5-sharedlibrary-path.patch
-
-;; Fix TLS symbols resolving for shared libraries with a relative pathname.
-;; The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
-;;=fedoratest: One should recheck if it is really fixed upstream.
-
-If you provided some relative path to the shared library, such as with
-	export LD_LIBRARY_PATH=.
-then gdb would fail to match the shared library name during the TLS lookup.
-
-Dropped the workaround/fix for gdb-6.8.50.20081128 - is it still needed?
-
-The testsuite needs `gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch'.
-The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
-
-2006-09-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* solib-svr4.c (svr4_fetch_objfile_link_map): Match even absolute
-	requested pathnames to the internal loaded relative pathnames.
-
-2007-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Port to GDB-6.7.
-
-2008-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Port to gdb-6.7.50.20080227.
-
-diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-main.c b/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
-@@ -0,0 +1,31 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@prep.ai.mit.edu  */
-+
-+#include <pthread.h>
-+
-+extern __thread int var;
-+
-+int main()
-+{
-+  /* Ensure we link against pthreads even with --as-needed.  */
-+  pthread_testcancel();
-+  return var;
-+}
-diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
-@@ -0,0 +1,22 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   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.
-+
-+   Please email any bugs, comments, and/or additions to this file to:
-+   bug-gdb@prep.ai.mit.edu  */
-+
-+__thread int var = 42;
-diff --git a/gdb/testsuite/gdb.threads/tls-sepdebug.exp b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
-new file mode 100644
--- /dev/null
-+++ b/gdb/testsuite/gdb.threads/tls-sepdebug.exp
-@@ -0,0 +1,94 @@
-+# 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 test uses gdb_exit and gdb_start, which are not supported
-+# on non-extended-remote sessions.
-+if {[use_gdb_stub]} {
-+    untested "skipping test because of stub"
-+    return 0
-+}
-+
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+set testfile tls-sepdebug
-+set srcmainfile   ${testfile}-main.c
-+set srcsharedfile ${testfile}-shared.c
-+
-+set binmainfile        [standard_output_file ${testfile}-main]
-+set binsharedbase      ${testfile}-shared.so
-+set binsharedfile      [standard_output_file ${binsharedbase}]
-+set binshareddebugfile [standard_output_file ${binsharedbase}.debug]
-+
-+# Use explicit -soname as otherwise the full path to the library would get
-+# encoded into ${binmainfile} making LD_LIBRARY_PATH tests useless.
-+
-+# FIXME: gcc dependency (-Wl,-soname).
-+
-+if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]] != "" } {
-+    untested "Couldn't compile test library"
-+    return -1
-+}
-+
-+# eu-strip(1) works fine but it is a part of `elfutils', not `binutils'.
-+if 0 then {
-+    remote_exec build "eu-strip -f ${binshareddebugfile} ${binsharedfile}"
-+} else {
-+    remote_exec build "objcopy --only-keep-debug ${binsharedfile} ${binshareddebugfile}"
-+    remote_exec build "objcopy --strip-debug ${binsharedfile}"
-+    remote_exec build "objcopy --add-gnu-debuglink=${binshareddebugfile} ${binsharedfile}"
-+}
-+
-+# Do not use `shlib=' as it will automatically add also -rpath for gcc.
-+
-+if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcmainfile} ${binsharedfile}" "${binmainfile}" executable {debug}] != "" } {
-+    untested "Couldn't compile test program"
-+    return -1
-+}
-+
-+# Get things started.
-+
-+# Test also the proper resolving of relative library names to absolute ones.
-+# \$PWD is easy - it is the absolute way
-+# ${subdir} would fail on "print var"
-+
-+set absdir [file dirname [standard_output_file ${binsharedbase}]]
-+foreach ld_library_path [list $absdir [relative_filename [pwd] $absdir]] name { absolute relative }  {
-+
-+    gdb_exit
-+    gdb_start
-+    ###gdb_reinitialize_dir $srcdir/$subdir
-+
-+    gdb_test "set env LD_LIBRARY_PATH=$ld_library_path" \
-+             "" \
-+             "set env LD_LIBRARY_PATH is $name"
-+
-+    gdb_load ${binmainfile}
-+
-+    # For C programs, "start" should stop in main().
-+
-+    gdb_test "start" \
-+             "main \\(\\) at .*${srcmainfile}.*" \
-+             "start"
-+
-+    # Check for: Cannot find shared library `/usr/lib/debug/lib/libc-2.4.90.so.debug' in dynamic linker's load module list
-+    # as happens with TLS variables and `separate_debug_objfile_backlink'.
-+
-+    gdb_test "print var" \
-+             "\\\$1 = \[0-9\].*" \
-+             "print TLS variable from a shared library with $name-directory separate debug info file"
-+}
--- a/gdb.spec
+++ b/gdb.spec
@ -1252,6 +1252,10 @@ fi
 %endif

 %changelog
+* Thu Sep 28 2023 Kevin Buettner <kevinb@redhat.com>
+- Remove gdb-6.5-sharedlibrary-path.patch, which was upstreamed in
+  commit 3ec033fab4a.
+
 * Tue Sep 19 2023 Keith Seitz <keiths@redhat.com>
 - Remove gdb-rhbz1553104-s390x-arch12-test.patch, which is more thoroughly tested
  by binutils.