From 4424242c2cd447fe2959b26290277bf0abfec054 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Tue, 27 Jun 2023 15:12:30 -0400
Subject: [PATCH] 13.1.1-4.2

Fix switch to -gdwarf-4 on RHEL 8

Resolves: #2217938
---
 gcc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index 4da2110..08b3316 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -149,7 +149,7 @@ BuildRequires: scl-utils-build
 Summary: GCC version 13
 Name: %{?scl_prefix}gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.1%{?dist}
+Release: %{gcc_release}.2%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -743,7 +743,7 @@ echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
 %if 0%{?rhel} <= 8
 # Default to -gdwarf-4 rather than -gdwarf-5
-sed -i '/UInteger Var(dwarf_version)/s/Init(5)/Init(4)/' gcc/common.opt
+sed -i '/define DWARF_VERSION_DEFAULT/s/5/4/' gcc/defaults.h
 sed -i 's/\(version for most targets is \)5 /\14 /' gcc/doc/invoke.texi
 %endif
 
@@ -2898,6 +2898,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 27 2023 Marek Polacek <polacek@redhat.com> 13.1.1-4.2
+- fix switch to -gdwarf-4 on RHEL 8 (#2217938)
+
 * Tue Jun 20 2023 Marek Polacek <polacek@redhat.com> 13.1.1-4.1
 - don't require libgccjit-docs (#2216334)