aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-08 03:49:44 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-08 03:49:44 +0000
commit57a5ea0215f9b7d6198927af695843aaffcd45a2 (patch)
tree81b4af3a1d151bc062e269a537d6e54ee08f92d8 /sysdeps/s390
parentd810b3584c4569612e078cbdd36bbf5c9272430c (diff)
downloadglibc-57a5ea0215f9b7d6198927af695843aaffcd45a2.tar
glibc-57a5ea0215f9b7d6198927af695843aaffcd45a2.tar.gz
glibc-57a5ea0215f9b7d6198927af695843aaffcd45a2.tar.bz2
glibc-57a5ea0215f9b7d6198927af695843aaffcd45a2.zip
Update.
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. 2003-07-07 Jakub Jelinek <jakub@redhat.com> * sysdeps/powerpc/powerpc64/elf/start.S: Put L(start_address) into .data.rel.ro.local section if PIC to avoid DT_TEXTREL.
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/s390-32/elf/start.S20
-rw-r--r--sysdeps/s390/s390-64/elf/start.S6
2 files changed, 23 insertions, 3 deletions
diff --git a/sysdeps/s390/s390-32/elf/start.S b/sysdeps/s390/s390-32/elf/start.S
index 1a0436b9a5..610a7c9155 100644
--- a/sysdeps/s390/s390-32/elf/start.S
+++ b/sysdeps/s390/s390-32/elf/start.S
@@ -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 ?!? */
diff --git a/sysdeps/s390/s390-64/elf/start.S b/sysdeps/s390/s390-64/elf/start.S
index 687a23cc67..8ba4695e18 100644
--- a/sysdeps/s390/s390-64/elf/start.S
+++ b/sysdeps/s390/s390-64/elf/start.S
@@ -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