public inbox for
help / color / mirror / Atom feed
* [glibc] riscv: add support for static PIE
@ 2024-01-22 14:00 Andreas Schwab
  0 siblings, 0 replies; only message in thread
From: Andreas Schwab @ 2024-01-22 14:00 UTC (permalink / raw)
  To: glibc-cvs;h=6edaa12b41a373f249469d7b516d2043f81aea37

commit 6edaa12b41a373f249469d7b516d2043f81aea37
Author: Andreas Schwab <>
Date:   Wed Jan 17 15:35:57 2024 +0100

    riscv: add support for static PIE
    In order to support static PIE the startup code must avoid relocations
    before __libc_start_main is called.

 sysdeps/riscv/start.S | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S
index 0a1f713742..ede186ef23 100644
--- a/sysdeps/riscv/start.S
+++ b/sysdeps/riscv/start.S
@@ -50,7 +50,13 @@ ENTRY (ENTRY_POINT)
 	call  load_gp
 	mv    a5, a0  /* rtld_fini.  */
 	/* main may be in a shared library.  */
+#if defined PIC && !defined SHARED
+	/* Avoid relocation in static PIE since _start is called before it
+	   is relocated.  */
+	lla   a0, __wrap_main
 	la   a0, main
 	REG_L a1, 0(sp)      /* argc.  */
 	addi  a2, sp, SZREG  /* argv.  */
 	andi  sp, sp, ALMASK /* Align stack. */
@@ -62,6 +68,11 @@ ENTRY (ENTRY_POINT)
+#if defined PIC && !defined SHARED
+	tail  main@plt
 /* Dynamic links need the global pointer to be initialized prior to calling
    any shared library's initializers, so we use preinit_array to load it.
    This doesn't cut it for static links, though, since the global pointer

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-01-22 14:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-22 14:00 [glibc] riscv: add support for static PIE Andreas Schwab

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).