glibc: fix unaligned __tls_get_addr issue

This commit is contained in:
rnhmjoj 2017-07-06 04:06:10 +02:00
parent 74f55017d2
commit 8fcc92fc69
No known key found for this signature in database
GPG key ID: 91BE884FBA4B591A
2 changed files with 37 additions and 1 deletions

View file

@ -68,7 +68,8 @@ stdenv.mkDerivation ({
++ lib.optionals stdenv.isi686 [
./fix-i686-memchr.patch
./i686-fix-vectorized-strcspn.patch
];
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch;
postPatch =
# Needed for glibc to build with the gnumake 3.82

View file

@ -0,0 +1,35 @@
From 3288c6da64add3b4561b8c10fff522027caea01c Mon Sep 17 00:00:00 2001
From: Nicholas Miell <nmiell@gmail.com>
Date: Sat, 17 Jun 2017 18:21:07 -0700
Subject: [PATCH] Align the stack on entry to __tls_get_addr()
Old versions of gcc (4 & 5) didn't align the stack according to the
AMD64 psABI when calling __tls_get_addr(). Apparently new versions of
gcc (7) got much more aggressive about vectorizing and generating MOVAPS
instructions, which means old binaries built with the buggy versions of
gcc are much more likely to crash when using versions of glibc built
using gcc 7.
For example, a large number of Linux games built using the Unity game
engine and available for purchase on Steam.
---
elf/dl-tls.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 5aba33b3fa..3f3cb917de 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -827,6 +827,10 @@ rtld_hidden_proto (__tls_get_addr)
rtld_hidden_def (__tls_get_addr)
#endif
+#ifdef __x86_64__
+/* Old versions of gcc didn't align the stack. */
+__attribute__((force_align_arg_pointer))
+#endif
/* The generic dynamic and local dynamic model cannot be used in
statically linked applications. */
void *
--
2.13.0