From 49157ac41cdc96a4e23341a31faa16294aaeb211 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed, 30 Jul 2025 08:40:09 +0530
Subject: [PATCH] Drop the workaround for CVE-2025-5702

Resolves: RHEL-100161
---
 gcc-toolset-15-gcc.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gcc-toolset-15-gcc.spec b/gcc-toolset-15-gcc.spec
index 01155e6..76d04cc 100644
--- a/gcc-toolset-15-gcc.spec
+++ b/gcc-toolset-15-gcc.spec
@@ -172,7 +172,7 @@ BuildRequires: gcc-toolset-%{gts_ver}-devel
 Summary: GCC version %{gcc_major}
 Name: %{?scl_prefix}gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.4%{?dist}
+Release: %{gcc_release}.5%{?dist}
 # License notes for some of the less obvious ones:
 #   gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para
 #   isl: MIT, BSD-2-Clause
@@ -825,13 +825,6 @@ sed -i '/^GENERATE_TREEVIEW/s/YES/NO/' libstdc++-v3/doc/doxygen/user.cfg.in
 # Undo the broken autoconf change in recent Fedora versions
 export CONFIG_SITE=NONE
 
-%if 0%{?rhel} == 10
-# Work around https://issues.redhat.com/browse/RHEL-49348
-%ifarch ppc64le
-export GLIBC_TUNABLES=glibc.cpu.hwcaps=-arch_3_1
-%endif
-%endif
-
 CC=gcc
 CXX=g++
 OPT_FLAGS="%{optflags}"
@@ -2911,6 +2904,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 30 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.5
+- Drop the workaround for CVE-2025-5702 (RHEL-100161)
+
 * Fri Jun 20 2025 Siddhesh Poyarekar <siddhesh@redhat.com> 15.1.1-2.4
 - Require gcc-toolset-N-runtime (RHEL-94672)