[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/2.19/

[Sergei Trofimovich]

commit:     09b83ce882607cd545070a6c1ac9dd87f7143464
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:46:00 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 20:03:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b83ce8

sys-libs/glibc: restore used glibc-2.19-ia64-gcc-4.8-reloc-hack.patch

glibc-2.19-ia64-gcc-4.8-reloc-hack.patch is used at least by glibc-2.24

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
new file mode 100644
index 00000000000..72a616a046a
--- /dev/null
+++ b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/503838
+http://gcc.gnu.org/PR60465
+https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
+https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
+
+newer versions of gcc generate relocations in the elf_get_dynamic_info func
+which glibc relies on to populate some info structs.  those structs are then
+used by ldso to process relocations in itself.  glibc requires that there are
+no relocations until that point (*after* elf_get_dynamic_info), so we end up
+crashing during elf_get_dynamic_info because the relocation has not yet been
+processed.
+
+this hack shuffles the code in a way that tricks gcc into not generating the
+relocation.  we need to figure out something better for upstream.
+
+--- a/elf/get-dynamic-info.h
++++ b/elf/get-dynamic-info.h
+@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
+ 	info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ 	     + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
+       else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
+-	info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+-	     + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++	{
++	  d_tag_utype i =
++	      DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
++	      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
++	  info[i] = dyn;
++	}
+       ++dyn;
+     }
+