From ceee074adf768bad6a6e77732f2ec920a584e56b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Jun 2024 14:28:55 +0100 Subject: [PATCH] Fix AArch64 EFI test. Resolves: RHEL-39953 --- .binutils.metadata | 2 ++ binutils-AArch64-EFI.patch | 9 +++++++++ binutils.spec | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .binutils.metadata diff --git a/.binutils.metadata b/.binutils.metadata new file mode 100644 index 0000000..4f5ab80 --- /dev/null +++ b/.binutils.metadata @@ -0,0 +1,2 @@ +2dd8d1ce34dc7b1cb2073123e30c4901221835b0 binutils-2.35.2.tar.xz +713b4e570b46156c1d5172c8eba1bec6ac92d8fe binutils-2.19.50.0.1-output-format.sed diff --git a/binutils-AArch64-EFI.patch b/binutils-AArch64-EFI.patch index 06ba201..eefcb4e 100644 --- a/binutils-AArch64-EFI.patch +++ b/binutils-AArch64-EFI.patch @@ -926,3 +926,12 @@ diff -rup binutils.orig/include/coff/pe.h binutils-2.35.2/include/coff/pe.h +#define PEAOUTHDR PEPAOUTHDR + +#include "coff-aarch64.c" +--- binutils.orig/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.d 2024-06-04 14:00:51.569526147 +0100 ++++ binutils-2.35.2/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.d 2024-06-04 14:00:59.049544354 +0100 +@@ -12,5 +12,5 @@ start address 0x0000000000000000 + + Sections: + Idx Name Size VMA LMA File off Algn +- 0 \.text 00000030 0[^ ]+ 0[^ ]+ 0[^ ]+ 2\*\*2 ++ 0 \.text 00000030 0[^ ]+ 0[^ ]+ 0[^ ]+ 2\*\*12 + CONTENTS, ALLOC, LOAD, READONLY, CODE diff --git a/binutils.spec b/binutils.spec index 9d830c1..39f8870 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.35.2 -Release: 44%{?dist} +Release: 45%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -1289,6 +1289,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue Jun 04 2024 Nick Clifton - 2.35.2-45 +- Fix AArch64 EFI test. (RHEL-39953) + * Thu Jan 25 2024 Nick Clifton - 2.35.2-44 - Make objcopy's --section-alignment option also affect sections. (RHEL-30268)