From 107db84d77a1abb0b1e5ae8ffade976325d23ac5 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 19 May 2022 14:13:15 +0100 Subject: [PATCH] Fix bug preventing ld testsuite from running --- binutils-testsuite-fixes.patch | 2 +- binutils.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/binutils-testsuite-fixes.patch b/binutils-testsuite-fixes.patch index 643599b..8254b06 100644 --- a/binutils-testsuite-fixes.patch +++ b/binutils-testsuite-fixes.patch @@ -973,7 +973,7 @@ diff -rup binutils.orig/ld/testsuite/lib/ld-lib.exp binutils-2.38/ld/testsuite/l return 1 } -+ if [istarget "i[3-6]86-*-*"] } { ++ if [istarget "i[3-6]86-*-*"] { + return 1 + } + diff --git a/binutils.spec b/binutils.spec index 2f7ac59..279b267 100644 --- a/binutils.spec +++ b/binutils.spec @@ -374,6 +374,9 @@ Requires(post): coreutils BuildRequires: elfutils-debuginfod-client-devel %endif +# The priority of the linker. Important oif the gold linker is also being built. +%{!?ld_bfd_priority: %global ld_bfd_priority 50} + #---------------------------------------------------------------------------- %description @@ -389,8 +392,6 @@ of an object or archive file), strings (for listing printable strings from files), strip (for discarding symbols), and addr2line (for converting addresses to file and line). -%{!?ld_bfd_priority: %global ld_bfd_priority 50} - #---------------------------------------------------------------------------- %package devel