From 752fe419eaeab5b37fad4fb90ff528b5310e9cc3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 1 Oct 2021 11:17:12 +0100
Subject: [PATCH] Fix linker testsuite failures triggered by 2.27-13 patch.
 Resolves: #2008203

---
 ...ils-ld-default-entry-of-0-for-shared.patch | 72 +++++++++++++++++++
 binutils.spec                                 |  5 +-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/binutils-ld-default-entry-of-0-for-shared.patch b/binutils-ld-default-entry-of-0-for-shared.patch
index ffa9e7c..227db82 100644
--- a/binutils-ld-default-entry-of-0-for-shared.patch
+++ b/binutils-ld-default-entry-of-0-for-shared.patch
@@ -24,3 +24,75 @@
      }
  }
  
+diff -rup binutils.orig/ld/testsuite/ld-arm/tls-gdesc-got.d binutils-2.37/ld/testsuite/ld-arm/tls-gdesc-got.d
+--- binutils.orig/ld/testsuite/ld-arm/tls-gdesc-got.d	2021-09-29 13:17:21.501277341 +0100
++++ binutils-2.37/ld/testsuite/ld-arm/tls-gdesc-got.d	2021-09-29 13:20:04.481132127 +0100
+@@ -2,7 +2,7 @@
+ .*/tls-lib2-got.so:     file format elf32-.*arm.*
+ architecture: arm.*, flags 0x00000150:
+ HAS_SYMS, DYNAMIC, D_PAGED
+-start address 0x0+8(1e8|220)
++start address 0x[0-9a-f]+
+ 
+ 
+ Disassembly of section .got:
+diff -rup binutils.orig/ld/testsuite/ld-i386/tlsnopic.rd binutils-2.37/ld/testsuite/ld-i386/tlsnopic.rd
+--- binutils.orig/ld/testsuite/ld-i386/tlsnopic.rd	2021-09-29 13:17:21.588276729 +0100
++++ binutils-2.37/ld/testsuite/ld-i386/tlsnopic.rd	2021-09-29 13:20:59.456745814 +0100
+@@ -26,7 +26,7 @@ Key to Flags:
+ #...
+ 
+ Elf file type is DYN \(Shared object file\)
+-Entry point 0x1000
++Entry point 0x[0-9a-f]+
+ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr14207.d binutils-2.37/ld/testsuite/ld-x86-64/pr14207.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr14207.d	2021-09-29 13:17:21.551276989 +0100
++++ binutils-2.37/ld/testsuite/ld-x86-64/pr14207.d	2021-09-29 13:21:27.632547838 +0100
+@@ -5,7 +5,7 @@
+ #target: x86_64-*-linux*
+ 
+ Elf file type is DYN \(Shared object file\)
+-Entry point 0x149
++Entry point 0x[0-9a-f]+
+ There are 4 program headers, starting at offset 64
+ 
+ Program Headers:
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlsdesc.rd binutils-2.37/ld/testsuite/ld-x86-64/tlsdesc.rd
+--- binutils.orig/ld/testsuite/ld-x86-64/tlsdesc.rd	2021-09-29 13:17:21.554276968 +0100
++++ binutils-2.37/ld/testsuite/ld-x86-64/tlsdesc.rd	2021-09-29 13:21:47.920405285 +0100
+@@ -29,7 +29,7 @@ Key to Flags:
+ #...
+ 
+ Elf file type is DYN \(Shared object file\)
+-Entry point 0x1000
++Entry point 0x[0-9a-f]+
+ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic.rd binutils-2.37/ld/testsuite/ld-x86-64/tlspic.rd
+--- binutils.orig/ld/testsuite/ld-x86-64/tlspic.rd	2021-09-29 13:17:21.546277025 +0100
++++ binutils-2.37/ld/testsuite/ld-x86-64/tlspic.rd	2021-09-29 13:22:04.224290720 +0100
+@@ -29,7 +29,7 @@ Key to Flags:
+ #...
+ 
+ Elf file type is DYN \(Shared object file\)
+-Entry point 0x1000
++Entry point 0x[0-9a-f]+
+ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.37/ld/testsuite/ld-x86-64/tlspic2.rd
+--- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd	2021-09-29 13:17:21.552276982 +0100
++++ binutils-2.37/ld/testsuite/ld-x86-64/tlspic2.rd	2021-09-29 13:22:18.432190887 +0100
+@@ -30,7 +30,7 @@ Key to Flags:
+ #...
+ 
+ Elf file type is DYN \(Shared object file\)
+-Entry point 0x1000
++Entry point 0x[0-9a-f]+
+ There are [0-9]+ program headers, starting at offset [0-9]+
+ 
+ Program Headers:
diff --git a/binutils.spec b/binutils.spec
index 3b6bb94..85dd72c 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -39,7 +39,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.37
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -910,6 +910,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Wed Sep 29 2021 Nick Clifton  <nickc@redhat.com> - 2.27-14
+- Fix linker testsuite failures triggered by 2.27-13 patch.  (#2008203)
+
 * Fri Sep 17 2021 Nick Clifton  <nickc@redhat.com> - 2.27-13
 - Default to an entry address of 0 for shared libraries.  (#2004952)