From 2abbb72d88e8c8fc746e6024fa95f6be4e6859f062a1d334efaf1cc0b7800e65 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 3 Sep 2024 14:20:44 +0000 Subject: [PATCH] - Fix build on aarch64 with gcc14 (bsc#1225953) 66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=854 --- ...-irq_to_desc-to-fix-build-with-gcc14.patch | 19 ++++++------------- xen.changes | 4 ++-- xen.spec | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) rename 99f942f3-fix-aarch64.patch => 66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch (76%) diff --git a/99f942f3-fix-aarch64.patch b/66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch similarity index 76% rename from 99f942f3-fix-aarch64.patch rename to 66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch index 460bf1d..3e83c37 100644 --- a/99f942f3-fix-aarch64.patch +++ b/66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch @@ -1,10 +1,7 @@ -From 99f942f3d410059dc223ee0a908827e928ef3592 Mon Sep 17 00:00:00 2001 -From: Jan Beulich -Date: Thu, 29 Aug 2024 10:03:53 +0200 -Subject: [PATCH] Arm64: adjust __irq_to_desc() to fix build with gcc14 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: Arm64: adjust __irq_to_desc() to fix build with gcc14 +From: Jan Beulich jbeulich@suse.com Thu Aug 29 10:03:53 2024 +0200 +Date: Thu Aug 29 10:03:53 2024 +0200: +Git: 99f942f3d410059dc223ee0a908827e928ef3592 With the original code I observe @@ -23,13 +20,9 @@ again. Signed-off-by: Jan Beulich Acked-by: Michal Orzel ---- - xen/arch/arm/include/asm/irq.h | 2 +- - xen/arch/arm/irq.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h -index ec437add0971..88e060bf29f2 100644 +index ec437add09..88e060bf29 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -56,7 +56,7 @@ extern const unsigned int nr_irqs; @@ -42,7 +35,7 @@ index ec437add0971..88e060bf29f2 100644 #define irq_to_desc(irq) __irq_to_desc(irq) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c -index 6b89f64fd194..b9757d7ad364 100644 +index 6b89f64fd1..b9757d7ad3 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -48,7 +48,7 @@ void irq_end_none(struct irq_desc *irq) diff --git a/xen.changes b/xen.changes index d6aaa09..c922565 100644 --- a/xen.changes +++ b/xen.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Aug 30 07:32:58 UTC 2024 - Guillaume GARDET -- Fix build on aarch64 with gcc14: - * 99f942f3-fix-aarch64.patch +- Fix build on aarch64 with gcc14 (bsc#1225953) + 66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch ------------------------------------------------------------------- Wed Aug 14 14:10:47 MDT 2024 - carnold@suse.com diff --git a/xen.spec b/xen.spec index a535f81..6c6605a 100644 --- a/xen.spec +++ b/xen.spec @@ -162,7 +162,7 @@ Source99: baselibs.conf Patch1: 66a8b8ac-bunzip2-rare-failure.patch Patch2: 66bb6f78-x86-IOMMU-move-tracking-in-iommu_identity_mapping.patch Patch3: 66bb6fa5-x86-pass-through-document-as-security-unsupported.patch -Patch4: 99f942f3-fix-aarch64.patch +Patch4: 66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch # EMBARGOED security fixes # libxc Patch301: libxc-bitmap-long.patch