From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix Scrt1.o on s390{,x}
Date: Fri, 04 Jul 2003 19:22:00 -0000 [thread overview]
Message-ID: <20030704192224.GQ20507@sunsite.ms.mff.cuni.cz> (raw)
Hi!
On s390 without this patch PIEs were be just DT_TEXTREL, on s390x
crashed because __libc_start_main was usually not close enough to
_start.
2003-07-04 Jakub Jelinek <jakub@redhat.com>
* sysdeps/s390/s390-32/elf/start.S: Emit position independent code
if PIC.
* sysdeps/s390/s390-64/elf/start.S: Likewise.
--- libc/sysdeps/s390/s390-32/elf/start.S.jj 2002-12-09 15:37:23.000000000 -0500
+++ libc/sysdeps/s390/s390-32/elf/start.S 2003-07-04 15:07:32.000000000 -0400
@@ -1,5 +1,5 @@
/* Startup code compliant to the ELF s390 ABI.
- Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library.
@@ -66,19 +66,35 @@ _start:
l %r6,.L2-.Llit(%r13) # load pointer to __libc_csu_fini
l %r5,.L1-.Llit(%r13) # load pointer to __libc_csu_init
l %r2,.L3-.Llit(%r13) # load pointer to main
+ l %r1,.L4-.Llit(%r13) # load pointer to __libc_start_main
+#ifdef PIC
+ l %r12,.L5-.Llit(%r13) # load .got pointer
+ la %r6,0(%r13,%r6)
+ la %r5,0(%r13,%r5)
+ la %r2,0(%r13,%r2)
+ la %r1,0(%r13,%r1)
+ la %r12,0(%r13,%r12)
+#endif
/* ok, now branch to the libc main routine */
- l %r1,.L4-.Llit(%r13)
basr %r14,%r1
/* crash if __libc_start_main returns */
.word 0
.Llit:
+#ifndef PIC
.L1: .long __libc_csu_init
.L2: .long __libc_csu_fini
.L3: .long main
.L4: .long __libc_start_main
+#else
+.L1: .long __libc_csu_init-.Llit
+.L2: .long __libc_csu_fini-.Llit
+.L3: .long main-.Llit
+.L4: .long __libc_start_main@plt-.Llit
+.L5: .long _GLOBAL_OFFSET_TABLE_-.Llit
+#endif
/* FIXME: FPU flags or what ?!? */
--- libc/sysdeps/s390/s390-64/elf/start.S.jj 2002-12-09 15:37:20.000000000 -0500
+++ libc/sysdeps/s390/s390-64/elf/start.S 2003-07-04 15:07:17.000000000 -0400
@@ -1,5 +1,5 @@
/* Startup code compliant to the 64 bit S/390 ELF ABI.
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library.
@@ -64,7 +64,11 @@ _start:
larl %r2,main # load pointer to main
/* Ok, now branch to the libc main routine. */
+#ifdef PIC
+ brasl %r14,__libc_start_main@plt
+#else
brasl %r14,__libc_start_main
+#endif
/* Crash if __libc_start_main returns. */
.word 0
Jakub
next reply other threads:[~2003-07-04 19:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-04 19:22 Jakub Jelinek [this message]
2003-07-08 3:45 ` Ulrich Drepper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030704192224.GQ20507@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
--cc=roland@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).