From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Thu, 25 Jan 2018 18:33:18 +0000 (-0800)
Subject: sysdeps/init_array: Add PREINIT_FUNCTION to crti.S
X-Git-Tag: glibc-2.27~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532cf290d023487b141b9369f29cd780ec93ac8b;p=thirdparty%2Fglibc.git

sysdeps/init_array: Add PREINIT_FUNCTION to crti.S

The RISC-V port contains a crti.S that simply contains a link to
PREINIT_FUNCTION (when defined).  As this should be entirely generic,
Joseph Myers suggested that we update the generic init_array version to
contain this.  Since RISC-V is the only user of init_array this won't
break any existing ports.

2018-01-29  Palmer Dabbelt  <palmer@sifive.com>

        * sysdeps/init_array/crti.S (.section .init_array): Add
        PREINIT_FUNCTION when defined.
---

diff --git a/ChangeLog b/ChangeLog
index 3a38045869b..ed498e8df3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-29  Palmer Dabbelt  <palmer@sifive.com>
+
+	* sysdeps/init_array/crti.S (.section .init_array): Add
+	PREINIT_FUNCTION when defined.
+
 2018-01-29  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #22701]
diff --git a/sysdeps/init_array/crti.S b/sysdeps/init_array/crti.S
index 0a6e9fd9533..145c918f939 100644
--- a/sysdeps/init_array/crti.S
+++ b/sysdeps/init_array/crti.S
@@ -11,3 +11,17 @@
    But new configurations without compatibility concerns for
    toolchains without .init_array support can use this to avoid the
    superfluous .init and .fini boilerplate code.  */
+
+#ifdef PREINIT_FUNCTION
+
+#if PREINIT_FUNCTION_WEAK
+# error PREINIT_FUNCTION_WEAK is unsupported
+#endif
+
+/* This arranges for PREINIT_FUNCTION to be called upon loading a library that
+   contains crti.o.  */
+
+	.section .init_array,"a",%init_array
+	.dc.a PREINIT_FUNCTION
+
+#endif