From 02fab25d92e1b10ed644b0ae05bf05b8d9baff39 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Mon, 15 Apr 2024 09:46:13 -0700 Subject: [PATCH] Fix i686 build error in gdb-rhel-10464-xsave-update-7of21.patch Resolves: RHEL-10464 --- gdb-rhel-10464-xsave-update-7of21.patch | 4 ++-- gdb.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb-rhel-10464-xsave-update-7of21.patch b/gdb-rhel-10464-xsave-update-7of21.patch index 0cf78ff..1b38824 100644 --- a/gdb-rhel-10464-xsave-update-7of21.patch +++ b/gdb-rhel-10464-xsave-update-7of21.patch @@ -79,7 +79,7 @@ diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c { - char xstateregs[X86_XSTATE_MAX_SIZE]; + struct gdbarch *gdbarch = regcache->arch (); -+ const i386_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; @@ -90,7 +90,7 @@ diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c { - char xstateregs[X86_XSTATE_MAX_SIZE]; + struct gdbarch *gdbarch = regcache->arch (); -+ const i386_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ const struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; diff --git a/gdb.spec b/gdb.spec index 668e866..24be06b 100644 --- a/gdb.spec +++ b/gdb.spec @@ -37,7 +37,7 @@ Version: 10.2 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL # Do not provide URL for snapshots as the file lasts there only for 2 days. @@ -1158,6 +1158,10 @@ fi %endif %changelog +* Mon Apr 15 2024 Keith Seitz - 10.2-15.el9 +- Fix i686 build error in gdb-rhel-10464-xsave-update-7of21.patch. + (Keith Seitz, RHEL-10464) + * Thu Apr 11 2024 Keith Seitz - 10.2-14.el9 - Backport "Fix GDB internal error by using text (instead of data) section offset"