This is bad copy/paste from somewhere. Retain the second _erodata symbol,
which follows the Build ID, and matches the other architectures.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>
---
xen/arch/ppc/xen.lds.S | 1 -
xen/arch/riscv/xen.lds.S | 1 -
2 files changed, 2 deletions(-)
diff --git a/xen/arch/ppc/xen.lds.S b/xen/arch/ppc/xen.lds.S
index 030e1ee37b55..05b6db272805 100644
--- a/xen/arch/ppc/xen.lds.S
+++ b/xen/arch/ppc/xen.lds.S
@@ -60,7 +60,6 @@ SECTIONS
VPCI_ARRAY
. = ALIGN(POINTER_ALIGN);
- _erodata = .; /* End of read-only data */
} :text
#if defined(BUILD_ID)
diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S
index 8510a87c4d06..ace6f49c579c 100644
--- a/xen/arch/riscv/xen.lds.S
+++ b/xen/arch/riscv/xen.lds.S
@@ -60,7 +60,6 @@ SECTIONS
VPCI_ARRAY
. = ALIGN(POINTER_ALIGN);
- _erodata = .; /* End of read-only data */
} :text
#if defined(BUILD_ID)
base-commit: fc84b4a5a37b9250d87ef63983b48e1953bba6d1
prerequisite-patch-id: b14999775a3dc222f2f94d7d5d7a1db377de9cb9
prerequisite-patch-id: 00650d75df673992b4c8cb6d7ac61dab72b9b309
prerequisite-patch-id: 5464f5f1e7448cde38749a3744c9e74708727dee
--
2.30.2
Hi Andrew, On 3/5/24 6:21 AM, Andrew Cooper wrote: > This is bad copy/paste from somewhere. Retain the second _erodata symbol, > which follows the Build ID, and matches the other architectures. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> For the PPC part: Acked-by: Shawn Anastasio <sanastasio@raptorengineering.com> Thanks, Shawn
RISC-V changes look good to me. Reviewed-by: Oleksii Kurochko <oleksii.kurochko@gmail.com> ~ Oleksii On Tue, 2024-03-05 at 12:21 +0000, Andrew Cooper wrote: > This is bad copy/paste from somewhere. Retain the second _erodata > symbol, > which follows the Build ID, and matches the other architectures. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> > CC: Shawn Anastasio <sanastasio@raptorengineering.com> > --- > xen/arch/ppc/xen.lds.S | 1 - > xen/arch/riscv/xen.lds.S | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/xen/arch/ppc/xen.lds.S b/xen/arch/ppc/xen.lds.S > index 030e1ee37b55..05b6db272805 100644 > --- a/xen/arch/ppc/xen.lds.S > +++ b/xen/arch/ppc/xen.lds.S > @@ -60,7 +60,6 @@ SECTIONS > VPCI_ARRAY > > . = ALIGN(POINTER_ALIGN); > - _erodata = .; /* End of read-only data */ > } :text > > #if defined(BUILD_ID) > diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S > index 8510a87c4d06..ace6f49c579c 100644 > --- a/xen/arch/riscv/xen.lds.S > +++ b/xen/arch/riscv/xen.lds.S > @@ -60,7 +60,6 @@ SECTIONS > VPCI_ARRAY > > . = ALIGN(POINTER_ALIGN); > - _erodata = .; /* End of read-only data */ > } :text > > #if defined(BUILD_ID) > > base-commit: fc84b4a5a37b9250d87ef63983b48e1953bba6d1 > prerequisite-patch-id: b14999775a3dc222f2f94d7d5d7a1db377de9cb9 > prerequisite-patch-id: 00650d75df673992b4c8cb6d7ac61dab72b9b309 > prerequisite-patch-id: 5464f5f1e7448cde38749a3744c9e74708727dee
On 05.03.2024 13:21, Andrew Cooper wrote: > This is bad copy/paste from somewhere. Retain the second _erodata symbol, > which follows the Build ID, and matches the other architectures. > > No functional change. I.e. the 2nd one took effect? (To be honest I'm surprised the linker didn't complain about a duplicate symbol there.) > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
On 05/03/2024 12:44 pm, Jan Beulich wrote: > On 05.03.2024 13:21, Andrew Cooper wrote: >> This is bad copy/paste from somewhere. Retain the second _erodata symbol, >> which follows the Build ID, and matches the other architectures. >> >> No functional change. > I.e. the 2nd one took effect? Seems to have done, yes. > (To be honest I'm surprised the linker > didn't complain about a duplicate symbol there.) > >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > Reviewed-by: Jan Beulich <jbeulich@suse.com> Thanks.
© 2016 - 2024 Red Hat, Inc.