diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 6e6a944..792b270 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -150,108 +150,100 @@ Patch036: gdb-ppc-power7-test.patch
 #=fedoratest
 Patch037: gdb-archer-next-over-throw-cxx-exec.patch
 
-# Backport DWARF-4 support (BZ 601887, Tom Tromey).
-#=fedoratest
-Patch038: gdb-bz601887-dwarf4-rh-test.patch
-
 # Workaround librpm BZ 643031 due to its unexpected exit() calls (BZ 642879).
 #=push+jan
-Patch039: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
+Patch038: gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 
 # [delayed-symfile] Test a backtrace regression on CFIs without DIE (BZ 614604).
 #=fedoratest
-Patch040: gdb-test-bt-cfi-without-die.patch
+Patch039: gdb-test-bt-cfi-without-die.patch
 
 # Verify GDB Python built-in function gdb.solib_address exists (BZ # 634108).
 #=fedoratest
-Patch041: gdb-bz634108-solib_address.patch
+Patch040: gdb-bz634108-solib_address.patch
 
 # New test gdb.arch/x86_64-pid0-core.exp for kernel PID 0 cores (BZ 611435).
 #=fedoratest
-Patch042: gdb-test-pid0-core.patch
+Patch041: gdb-test-pid0-core.patch
 
 # [archer-tromey-delayed-symfile] New test gdb.dwarf2/dw2-aranges.exp.
 #=fedoratest
-Patch043: gdb-test-dw2-aranges.patch
+Patch042: gdb-test-dw2-aranges.patch
 
 # Test GDB opcodes/ disassembly of Intel Ivy Bridge instructions (BZ 696890).
 #=fedoratest
-Patch044: gdb-test-ivy-bridge.patch
+Patch043: gdb-test-ivy-bridge.patch
 
 # Workaround PR libc/14166 for inferior calls of strstr.
 #=fedoratest: Compatibility with RHELs (unchecked which ones).
-Patch045: gdb-glibc-strstr-workaround.patch
+Patch044: gdb-glibc-strstr-workaround.patch
 
 # Include testcase for `Unable to see a variable inside a module (XLF)' (BZ 823789).
 #=fedoratest
-Patch046: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
+Patch045: gdb-rhel5.9-testcase-xlf-var-inside-mod.patch
 
 # Testcase for `Setting solib-absolute-prefix breaks vDSO' (BZ 818343).
 #=fedoratest
-Patch047: gdb-rhbz-818343-set-solib-absolute-prefix-testcase.patch
+Patch046: 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
-Patch048: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
+Patch047: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch
 
 # Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
 #=fedoratest
-Patch049: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
+Patch048: 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
-Patch050: gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
+Patch049: 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
-Patch051: gdb-rhbz1156192-recursive-dlopen-test.patch
+Patch050: gdb-rhbz1156192-recursive-dlopen-test.patch
 
 # Fix '`catch syscall' doesn't work for parent after `fork' is called'
 # (Philippe Waroquiers, RH BZ 1149205).
 #=fedoratest
-Patch052: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
+Patch051: 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
-Patch053: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
+Patch052: gdb-rhbz1186476-internal-error-unqualified-name-re-set-test.patch
 
 # Test 'info type-printers' Python error (RH BZ 1350436).
 #=fedoratest
-Patch054: gdb-rhbz1350436-type-printers-error.patch
+Patch053: gdb-rhbz1350436-type-printers-error.patch
 
 # Fix '[ppc64] and [s390x] wrong prologue skip on -O2 -g code' (Jan
 # Kratochvil, RH BZ 1084404).
 #=fedoratest
-Patch055: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
+Patch054: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
 # Force libncursesw over libncurses to match the includes (RH BZ 1270534).
 #=push+jan
-Patch056: gdb-fedora-libncursesw.patch
+Patch055: gdb-fedora-libncursesw.patch
 
 # Test clflushopt instruction decode (for RH BZ 1262471).
 #=fedoratest
-Patch057: gdb-opcodes-clflushopt-test.patch
-
-# [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
-#=push+jan
-Patch058: gdb-6.6-buildid-locate-rpm-scl.patch
+Patch056: gdb-opcodes-clflushopt-test.patch
 
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch059: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch057: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Add messages suggesting more recent RHEL gdbserver (RH BZ 1321114).
 #=fedora
-Patch060: gdb-container-rh-pkg.patch
+Patch058: gdb-container-rh-pkg.patch
 
 # [dts+el7] [x86*] Bundle linux_perf.h for libipt (RH BZ 1256513).
 #=fedora
-Patch061: gdb-linux_perf-bundle.patch
+Patch059: gdb-linux_perf-bundle.patch
 
 # Fix gdb-headless /usr/bin/ executables (BZ 1390251).
 #
@@ -260,28 +252,28 @@ Patch061: gdb-linux_perf-bundle.patch
 #
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #=fedora
-Patch062: gdb-libexec-add-index.patch
+Patch060: gdb-libexec-add-index.patch
 
 # New testcase for: Fix <tab>-completion crash (Gary Benson, RH BZ 1398387).
 #=fedoratest
-Patch063: gdb-rhbz1398387-tab-crash-test.patch
+Patch061: gdb-rhbz1398387-tab-crash-test.patch
 
 # [s390x] Backport arch12 instructions decoding (RH BZ 1553104).
 # =fedoratest
-Patch064: gdb-rhbz1553104-s390x-arch12-test.patch
+Patch062: gdb-rhbz1553104-s390x-arch12-test.patch
 
 
-Patch065: gdb-backport-readline_support.patch
+Patch063: gdb-backport-readline_support.patch
 
 # [gdb/testsuite] Use prototype to call libc functions
 # (Tom de Vries)
-Patch066: gdb-backport-fix-break-main-file-remove-fail.patch
+Patch064: gdb-backport-fix-break-main-file-remove-fail.patch
 
 # Constify target_desc to fix PPC ODR violations.
 # (Keith Seitz, build/22395)
-Patch067: gdb-sw22395-constify-target_desc.patch
+Patch065: gdb-sw22395-constify-target_desc.patch
 
 # libiberty: Fix C89-isms in configure tests
 # (Florian Weimer, RHBZ 2143992)
-Patch068: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
+Patch066: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
 
diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index f004491..8d1967c 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -64,5 +64,3 @@
 %patch064 -p1
 %patch065 -p1
 %patch066 -p1
-%patch067 -p1
-%patch068 -p1
diff --git a/_patch_order b/_patch_order
index c92296c..bb36e5c 100644
--- a/_patch_order
+++ b/_patch_order
@@ -35,7 +35,6 @@ gdb-ccache-workaround.patch
 gdb-lineno-makeup-test.patch
 gdb-ppc-power7-test.patch
 gdb-archer-next-over-throw-cxx-exec.patch
-gdb-bz601887-dwarf4-rh-test.patch
 gdb-6.6-buildid-locate-rpm-librpm-workaround.patch
 gdb-test-bt-cfi-without-die.patch
 gdb-bz634108-solib_address.patch
@@ -55,7 +54,6 @@ gdb-rhbz1350436-type-printers-error.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 gdb-fedora-libncursesw.patch
 gdb-opcodes-clflushopt-test.patch
-gdb-6.6-buildid-locate-rpm-scl.patch
 gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 gdb-container-rh-pkg.patch
 gdb-linux_perf-bundle.patch
diff --git a/gdb-6.6-buildid-locate-rpm-scl.patch b/gdb-6.6-buildid-locate-rpm-scl.patch
deleted file mode 100644
index 7d4389a..0000000
--- a/gdb-6.6-buildid-locate-rpm-scl.patch
+++ /dev/null
@@ -1,42 +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-6.6-buildid-locate-rpm-scl.patch
-
-;; [SCL] Skip deprecated .gdb_index warning for Red Hat built files (BZ 953585).
-;;=push+jan
-
-warning: Skipping deprecated .gdb_index section
-https://bugzilla.redhat.com/show_bug.cgi?id=953585
-
-diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
---- a/gdb/dwarf2/read.c
-+++ b/gdb/dwarf2/read.c
-@@ -2797,6 +2797,16 @@ read_gdb_index_from_buffer (const char *filename,
-      "set use-deprecated-index-sections on".  */
-   if (version < 6 && !deprecated_ok)
-     {
-+#ifdef GDB_INDEX_VERIFY_VENDOR
-+      extern int rpm_verify_vendor (const char *filename);
-+
-+      /* Red Hat Developer Toolset exception.  */
-+      if (rpm_verify_vendor (filename))
-+	{}
-+      else
-+      {
-+
-+#endif
-       static int warning_printed = 0;
-       if (!warning_printed)
- 	{
-@@ -2808,6 +2818,10 @@ to use the section anyway."),
- 	  warning_printed = 1;
- 	}
-       return 0;
-+#ifdef GDB_INDEX_VERIFY_VENDOR
-+
-+      }
-+#endif
-     }
-   /* Version 7 indices generated by gold refer to the CU for a symbol instead
-      of the TU (for symbols coming from TUs),
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index 1a87c47..afe4e58 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -568,7 +568,8 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	  /* Stop increasing SEQNO.  */
 +	  break;
 +	}
-+
+ 
+-      return {};
 +      /* lrealpath() is expensive even for the usually non-existent files.  */
 +      gdb::unique_xmalloc_ptr<char> filename_holder;
 +      const char *filename = nullptr;
@@ -596,8 +597,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	{
 +	  if (separate_debug_file_debug)
 +	    fprintf_unfiltered (gdb_stdlog, _(" no, unable to open.\n"));
- 
--      return {};
++
 +	  continue;
 +	}
 +
@@ -628,13 +628,13 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +      /* If none of the real files is found report as missing file
 +	 always the non-.%u-suffixed file.  */
 +      std::string link0 = orig_link;
- 
--      return {};
++
 +      /* If the symlink has target request to install the target.
 +	 BASE-debuginfo.rpm contains the symlink but BASE.rpm may be missing.
 +	 https://bugzilla.redhat.com/show_bug.cgi?id=981154  */
 +      std::string link0_resolved (link_resolve (link0.c_str (), 0));
-+
+ 
+-      return {};
 +      if (link_all.empty ())
 +	link_all = link0_resolved;
 +      else
@@ -703,7 +703,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
  	  if (debug_bfd != NULL)
  	    return debug_bfd;
  	}
-@@ -183,30 +687,649 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
+@@ -183,30 +687,595 @@ build_id_to_bfd_suffix (size_t build_id_len, const bfd_byte *build_id,
    return {};
  }
  
@@ -765,11 +765,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +/* Returns the count of newly added rpms.  */
 +
 +static int
-+#ifndef GDB_INDEX_VERIFY_VENDOR
 +missing_rpm_enlist (const char *filename)
-+#else
-+missing_rpm_enlist_1 (const char *filename, int verify_vendor)
-+#endif
 +{
 +  static int rpm_init_done = 0;
 +  rpmts ts;
@@ -876,11 +872,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  mi = rpmtsInitIterator_p (ts, RPMTAG_BASENAMES, filename, 0);
 +  if (mi != NULL)
 +    {
-+#ifndef GDB_INDEX_VERIFY_VENDOR
 +      for (;;)
-+#else
-+      if (!verify_vendor) for (;;)
-+#endif
 +	{
 +	  Header h;
 +	  char *debuginfo, **slot, *s, *s2;
@@ -998,38 +990,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +	    xfree (debuginfo);
 +	  count++;
 +	}
-+#ifdef GDB_INDEX_VERIFY_VENDOR
-+      else /* verify_vendor */
-+	{
-+	  int vendor_pass = 0, vendor_fail = 0;
-+
-+	  for (;;)
-+	    {
-+	      Header h;
-+	      errmsg_t err;
-+	      char *vendor;
-+
-+	      h = rpmdbNextIterator_p (mi);
-+	      if (h == NULL)
-+		break;
-+
-+	      vendor = headerFormat_p (h, "%{vendor}", &err);
-+	      if (!vendor)
-+		{
-+		  warning (_("Error querying the rpm file `%s': %s"), filename,
-+			   err);
-+		  continue;
-+		}
-+	      if (strcmp (vendor, "Red Hat, Inc.") == 0)
-+		vendor_pass = 1;
-+	      else
-+		vendor_fail = 1;
-+	      xfree (vendor);
-+	    }
-+	  count = vendor_pass != 0 && vendor_fail == 0;
-+	}
-+#endif
-+
 +      rpmdbFreeIterator_p (mi);
 +    }
 +
@@ -1038,20 +998,6 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
 +  return count;
 +}
 +
-+#ifdef GDB_INDEX_VERIFY_VENDOR
-+missing_rpm_enlist (const char *filename)
-+{
-+  return missing_rpm_enlist_1 (filename, 0);
-+}
-+
-+extern int rpm_verify_vendor (const char *filename);
-+int
-+rpm_verify_vendor (const char *filename)
-+{
-+  return missing_rpm_enlist_1 (filename, 1);
-+}
-+#endif
-+
 +static bool
 +missing_rpm_list_compar (const char *ap, const char *bp)
 +{
@@ -1359,7 +1305,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
    if (build_id != NULL)
      {
        if (separate_debug_file_debug)
-@@ -214,8 +1337,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
+@@ -214,8 +1283,21 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
  			    _("\nLooking for separate debug info (build-id) for "
  			      "%s\n"), objfile_name (objfile));
  
@@ -1382,7 +1328,7 @@ diff --git a/gdb/build-id.c b/gdb/build-id.c
        /* Prevent looping on a stripped .debug file.  */
        if (abfd != NULL
  	  && filename_cmp (bfd_get_filename (abfd.get ()),
-@@ -228,3 +1364,22 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
+@@ -228,3 +1310,22 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
  
    return std::string ();
  }
diff --git a/gdb-bz601887-dwarf4-rh-test.patch b/gdb-bz601887-dwarf4-rh-test.patch
deleted file mode 100644
index 966c986..0000000
--- a/gdb-bz601887-dwarf4-rh-test.patch
+++ /dev/null
@@ -1,254 +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-bz601887-dwarf4-rh-test.patch
-
-;; Backport DWARF-4 support (BZ 601887, Tom Tromey).
-;;=fedoratest
-
-diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.S
-@@ -0,0 +1,167 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2010 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/>.  */
-+
-+	.file	"rh-dwarf4-x86_64.c"
-+	.section	.debug_abbrev,"",@progbits
-+.Ldebug_abbrev0:
-+	.section	.debug_info,"",@progbits
-+.Ldebug_info0:
-+	.section	.debug_line,"",@progbits
-+.Ldebug_line0:
-+	.text
-+.Ltext0:
-+.globl main
-+	.type	main, @function
-+main:
-+.LFB0:
-+	.file 1 "gdb.dwarf2/rh-dwarf4-x86_64.c"
-+	# gdb.dwarf2/rh-dwarf4-x86_64.c:20
-+	.loc 1 20 0
-+	.cfi_startproc
-+	# basic block 2
-+	pushq	%rbp
-+	.cfi_def_cfa_offset 16
-+	movq	%rsp, %rbp
-+	.cfi_offset 6, -16
-+	.cfi_def_cfa_register 6
-+	# gdb.dwarf2/rh-dwarf4-x86_64.c:21
-+	.loc 1 21 0
-+	movl	$0, %eax
-+	# gdb.dwarf2/rh-dwarf4-x86_64.c:22
-+	.loc 1 22 0
-+	leave
-+	.cfi_def_cfa 7, 8
-+	ret
-+	.cfi_endproc
-+.LFE0:
-+	.size	main, .-main
-+.Letext0:
-+	.section	.debug_info
-+	.long	0x4e	# Length of Compilation Unit Info
-+	.value	0x4	# DWARF version number
-+	.long	.Ldebug_abbrev0	# Offset Into Abbrev. Section
-+	.byte	0x8	# Pointer Size (in bytes)
-+	.uleb128 0x1	# (DIE (0xb) DW_TAG_compile_unit)
-+	.long	.LASF0	# DW_AT_producer: "GNU C 4.4.4 20100503 (Red Hat 4.4.4-2)"
-+	.byte	0x1	# DW_AT_language
-+	.long	.LASF1	# DW_AT_name: "gdb.dwarf2/rh-dwarf4-x86_64.c"
-+	.long	.LASF2	# DW_AT_comp_dir
-+	.quad	.Ltext0	# DW_AT_low_pc
-+	.quad	.Letext0	# DW_AT_high_pc
-+	.long	.Ldebug_line0	# DW_AT_stmt_list
-+	.uleb128 0x2	# (DIE (0x2d) DW_TAG_subprogram)
-+			# DW_AT_external
-+	.long	.LASF3	# DW_AT_name: "main"
-+	.byte	0x1	# DW_AT_decl_file (gdb.dwarf2/rh-dwarf4-x86_64.c)
-+	.byte	0x13	# DW_AT_decl_line
-+			# DW_AT_prototyped
-+	.long	0x4a	# DW_AT_type
-+	.quad	.LFB0	# DW_AT_low_pc
-+	.quad	.LFE0	# DW_AT_high_pc
-+	.uleb128 0x1	# DW_AT_frame_base
-+	.byte	0x9c	# DW_OP_call_frame_cfa
-+	.uleb128 0x3	# (DIE (0x4a) DW_TAG_base_type)
-+	.byte	0x4	# DW_AT_byte_size
-+	.byte	0x5	# DW_AT_encoding
-+	.ascii "int\0"	# DW_AT_name
-+	.byte	0x0	# end of children of DIE 0xb
-+	.section	.debug_abbrev
-+	.uleb128 0x1	# (abbrev code)
-+	.uleb128 0x11	# (TAG: DW_TAG_compile_unit)
-+	.byte	0x1	# DW_children_yes
-+	.uleb128 0x25	# (DW_AT_producer)
-+	.uleb128 0xe	# (DW_FORM_strp)
-+	.uleb128 0x13	# (DW_AT_language)
-+	.uleb128 0xb	# (DW_FORM_data1)
-+	.uleb128 0x3	# (DW_AT_name)
-+	.uleb128 0xe	# (DW_FORM_strp)
-+	.uleb128 0x1b	# (DW_AT_comp_dir)
-+	.uleb128 0xe	# (DW_FORM_strp)
-+	.uleb128 0x11	# (DW_AT_low_pc)
-+	.uleb128 0x1	# (DW_FORM_addr)
-+	.uleb128 0x12	# (DW_AT_high_pc)
-+	.uleb128 0x1	# (DW_FORM_addr)
-+	.uleb128 0x10	# (DW_AT_stmt_list)
-+	.uleb128 0x17	# (DW_FORM_sec_offset)
-+	.byte	0x0
-+	.byte	0x0
-+	.uleb128 0x2	# (abbrev code)
-+	.uleb128 0x2e	# (TAG: DW_TAG_subprogram)
-+	.byte	0x0	# DW_children_no
-+	.uleb128 0x3f	# (DW_AT_external)
-+	.uleb128 0x19	# (DW_FORM_flag_present)
-+	.uleb128 0x3	# (DW_AT_name)
-+	.uleb128 0xe	# (DW_FORM_strp)
-+	.uleb128 0x3a	# (DW_AT_decl_file)
-+	.uleb128 0xb	# (DW_FORM_data1)
-+	.uleb128 0x3b	# (DW_AT_decl_line)
-+	.uleb128 0xb	# (DW_FORM_data1)
-+	.uleb128 0x27	# (DW_AT_prototyped)
-+	.uleb128 0x19	# (DW_FORM_flag_present)
-+	.uleb128 0x49	# (DW_AT_type)
-+	.uleb128 0x13	# (DW_FORM_ref4)
-+	.uleb128 0x11	# (DW_AT_low_pc)
-+	.uleb128 0x1	# (DW_FORM_addr)
-+	.uleb128 0x12	# (DW_AT_high_pc)
-+	.uleb128 0x1	# (DW_FORM_addr)
-+	.uleb128 0x40	# (DW_AT_frame_base)
-+	.uleb128 0x18	# (DW_FORM_exprloc)
-+	.byte	0x0
-+	.byte	0x0
-+	.uleb128 0x3	# (abbrev code)
-+	.uleb128 0x24	# (TAG: DW_TAG_base_type)
-+	.byte	0x0	# DW_children_no
-+	.uleb128 0xb	# (DW_AT_byte_size)
-+	.uleb128 0xb	# (DW_FORM_data1)
-+	.uleb128 0x3e	# (DW_AT_encoding)
-+	.uleb128 0xb	# (DW_FORM_data1)
-+	.uleb128 0x3	# (DW_AT_name)
-+	.uleb128 0x8	# (DW_FORM_string)
-+	.byte	0x0
-+	.byte	0x0
-+	.byte	0x0
-+	.section	.debug_pubnames,"",@progbits
-+	.long	0x17	# Length of Public Names Info
-+	.value	0x2	# DWARF Version
-+	.long	.Ldebug_info0	# Offset of Compilation Unit Info
-+	.long	0x52	# Compilation Unit Length
-+	.long	0x2d	# DIE offset
-+	.ascii "main\0"	# external name
-+	.long	0x0
-+	.section	.debug_aranges,"",@progbits
-+	.long	0x2c	# Length of Address Ranges Info
-+	.value	0x2	# DWARF Version
-+	.long	.Ldebug_info0	# Offset of Compilation Unit Info
-+	.byte	0x8	# Size of Address
-+	.byte	0x0	# Size of Segment Descriptor
-+	.value	0x0	# Pad to 16 byte boundary
-+	.value	0x0
-+	.quad	.Ltext0	# Address
-+	.quad	.Letext0-.Ltext0	# Length
-+	.quad	0x0
-+	.quad	0x0
-+	.section	.debug_str,"MS",@progbits,1
-+.LASF2:
-+	.string	"."
-+.LASF0:
-+	.string	"GNU C 4.4.4 20100503 (Red Hat 4.4.4-2)"
-+.LASF1:
-+	.string	"gdb.dwarf2/rh-dwarf4-x86_64.c"
-+.LASF3:
-+	.string	"main"
-+	.ident	"GCC: (GNU) 4.4.4 20100503 (Red Hat 4.4.4-2)"
-+	.section	.note.GNU-stack,"",@progbits
-diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.c
-@@ -0,0 +1,22 @@
-+/* This testcase is part of GDB, the GNU debugger.
-+
-+   Copyright 2010 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/>.  */
-+
-+int
-+main (void)
-+{
-+  return 0;
-+}
-diff --git a/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp
-new file mode 100644
---- /dev/null
-+++ b/gdb/testsuite/gdb.dwarf2/rh-dwarf4-x86_64.exp
-@@ -0,0 +1,42 @@
-+# Copyright 2010 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/>.
-+
-+# This test can only be run on targets which support DWARF-2 and use gas.
-+# For now pick a sampling of likely targets.
-+if {![istarget *-*-linux*]
-+    && ![istarget *-*-gnu*]
-+    && ![istarget *-*-elf*]
-+    && ![istarget *-*-openbsd*]
-+    && ![istarget arm-*-eabi*]
-+    && ![istarget powerpc-*-eabi*]} {
-+    return 0
-+}
-+
-+if {![istarget x86_64-*]} {
-+    return 0
-+}
-+
-+set testfile "rh-dwarf4-x86_64"
-+set srcfile ${testfile}.S
-+set executable ${testfile}.x
-+set binfile [standard_output_file ${executable}]
-+
-+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-+    return -1
-+}
-+
-+clean_restart $executable
-+
-+gdb_test "ptype main" {type = int \(void\)}
diff --git a/gdb.spec b/gdb.spec
index f2efb40..68f5e8a 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -672,11 +672,6 @@ export LDFLAGS="%{?__global_ldflags} %{?_with_asan:-fsanitize=address}"
 CFLAGS="$CFLAGS -DDNF_DEBUGINFO_INSTALL"
 %endif
 
-# Patch833: gdb-6.6-buildid-locate-rpm-scl.patch
-%if 0%{?el6:1} && 0%{?scl:1}
-CFLAGS="$CFLAGS -DGDB_INDEX_VERIFY_VENDOR"
-%endif
-
 %if 0%{have_libipt} && 0%{?el7:1} && 0%{?scl:1}
 (
  mkdir libipt-%{libipt_version}-root
@@ -1195,6 +1190,10 @@ fi
 %endif
 
 %changelog
+* Fri Dec 16 2022 Keith Seitz <keiths@redhat.com>
+- Remove gdb-6.6-buildid-locate-rpm-scl.patch and
+  gdb-bz601887-dwarf4-rh-test.patch.
+
 * Fri Dec 9 2022 Andrew Burgess <aburgess@redhat.com>
 - Remove gdb-fortran-frame-string.patch, a version of this test has
   now been upstreamed.