[rpms/gdb] gdb-17.2-rebase-f44: Merge #194 `Remove 32-bit userspace support on RHEL10+`

[rpms/gdb] gdb-17.2-rebase-f44: Merge #194 `Remove 32-bit userspace support on RHEL10+`

[Kevin Buettner]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : dac67d6b2f0ccf18c16a5c24477a70e9405c3620
Author : Kevin Buettner <kevinb@redhat.com>
Date   : 2025-05-29T16:57:22+00:00
Stats  : +22/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/dac67d6b2f0ccf18c16a5c24477a70e9405c3620?branch=gdb-17.2-rebase-f44

Log:
Merge #194 `Remove 32-bit userspace support on RHEL10+`

---
diff --git a/gdb.spec b/gdb.spec
index 1fc6cf2..1dd4abc 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -204,8 +204,10 @@ BuildRequires: boost-devel
   %global bits_other (%{__isa_name}-64)
 %endif
 
-%ifarch ppc64 x86_64
-  %global bits_other (%{__isa_name}-32)
+%ifarch x86_64
+  %if 0%{?fedora:1} || 0%{?rhel} < 10
+    %global bits_other (%{__isa_name}-32)
+  %endif
 %endif
 
 BuildRequires: sharutils dejagnu

diff --git a/gdb.spec b/gdb.spec
index 1cfd8fb..1dd4abc 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -443,6 +443,17 @@ COMMON_GDB_CONFIGURE_FLAGS="\
 %endif
 "
 
+# The base set of targets that Fedora and RHEL support.  These are the
+# targets that every GDB build, regardless of host architecture,
+# supports debugging.  This means that these targets can be used as
+# remote debug targets.
+ENABLED_TARGETS="aarch64-linux-gnu,powerpc-linux-gnu,riscv64-linux-gnu,s390-linux-gnu,x86_64-redhat-linux-gnu"
+
+# Fedora, and older RHEL also have 32-bit ARM support.
+%if 0%{?fedora:1} || (0%{?rhel:1} && 0%{?rhel} < 10)
+ENABLED_TARGETS="$ENABLED_TARGETS,arm-linux-gnu"
+%endif
+
 # Identify the build directory with the version of gdb as well as the
 # architecture, to allow for mutliple versions to be installed and
 # built.
@@ -483,7 +494,7 @@ CXXFLAGS="$CXXFLAGS %{?_with_asan:-fsanitize=address}"
 %endif
         --with-auto-load-dir='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}'      \
         --with-auto-load-safe-path='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}'        \
-        --enable-targets=s390-linux-gnu,powerpc-linux-gnu,arm-linux-gnu,aarch64-linux-gnu,riscv64-linux-gnu,x86_64-redhat-linux-gnu     \
+        --enable-targets=${ENABLED_TARGETS}     \
         %{_target_platform}
 
 # Prepare gdb/config.h first.
@@ -546,7 +557,7 @@ $(: ppc64 host build crashes on ppc variant of libexpat.so )    \
 %endif
         --with-auto-load-dir='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}'      \
         --with-auto-load-safe-path='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}'        \
-        --enable-targets=s390-linux-gnu,powerpc-linux-gnu,arm-linux-gnu,aarch64-linux-gnu,riscv64-linux-gnu,x86_64-redhat-linux-gnu     \
+        --enable-targets=${ENABLED_TARGETS}     \
         %{_target_platform}
 
 if [ -z "%{!?_with_profile:no}" ]
@@ -925,6 +936,11 @@ fi
 # endif scl
 
 %changelog
+* Wed May 28 2025 Andrew Burgess <aburgess@redhat.com>
+- Remove 32-bit ARM support for RHEL 10+.  This is not a RHEL
+  supported target, so lets drop this target.  Retain for older RHEL
+  versions, as well as Fedora.
+
 * Mon May 12 2025 Keith Seitz <keiths@redhat.com>
 - Remove gdb-rhbz1149205-catch-syscall-after-fork-test.patch
   in favor of upstream commit.