From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 29 Dec 2015 18:01:29 +0000 (-0500)
Subject: adjust mips crt_arch entry point asm to avoid assembler bugs
X-Git-Tag: v1.1.13~104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e396fb996a80b035d0f6ecf7fed50f68aa3ebb7;p=oweals%2Fmusl.git

adjust mips crt_arch entry point asm to avoid assembler bugs

apparently the .gpword directive does not work reliably with local
text labels; values produced were offset by 64k from the correct
value, resulting in incorrect computation of the got pointer at
runtime. instead, use an external label so that the assembler does not
munge the relocation; the linker will then get it right.

commit 6fef8cafbd0f6f185897bc87feb1ff66e2e204e1 exposed this issue by
removing the old, non-PIE-compatible handwritten crt1.s, which was not
affected. presumably mips PIE executables (using Scrt1.o produced from
crt_arch.h) were already affected at the time.
---

diff --git a/arch/mips/crt_arch.h b/arch/mips/crt_arch.h
index 21e139b9..f4ba02ae 100644
--- a/arch/mips/crt_arch.h
+++ b/arch/mips/crt_arch.h
@@ -4,13 +4,16 @@ __asm__(
 ".text \n"
 ".global _" START "\n"
 ".global " START "\n"
+".global " START "_data\n"
 ".type   _" START ", @function\n"
 ".type   " START ", @function\n"
+".type   " START "_data, @function\n"
 "_" START ":\n"
 "" START ":\n"
 "	bal 1f \n"
 "	 move $fp, $0 \n"
-"2:	.gpword 2b \n"
+"" START "_data: \n"
+"	.gpword " START "_data \n"
 "	.gpword " START "_c \n"
 ".weak _DYNAMIC \n"
 ".hidden _DYNAMIC \n"