lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

* sysdeps/s390/s390-32/elf/start.S: Replace pc relative relocation

Browse Source 
by a GOT relocation to make Scrt1.o position independent.
	* sysdeps/s390/s390-64/elf/start.S: Likewise.

	* sysdeps/unix/sysv/linux/s390/s390-32/syscall.S: Add support for
	six system call parameters.
	* sysdeps/unix/sysv/linux/s390/s390-64/syscall.S: Likewise.
This commit is contained in:
Ulrich Drepper
2006-05-05 18:26:01 +00:00
parent cdb9c32138
commit 308bb2d557
5 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-05-05 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/s390/s390-32/elf/start.S: Replace pc relative relocation
by a GOT relocation to make Scrt1.o position independent.
* sysdeps/s390/s390-64/elf/start.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/syscall.S: Add support for
six system call parameters.
* sysdeps/unix/sysv/linux/s390/s390-64/syscall.S: Likewise.
2006-05-05 Ulrich Drepper <drepper@redhat.com> 2006-05-05 Ulrich Drepper <drepper@redhat.com>
* sunrpc/svcauth_des.c (cache_init): Use calloc instead of * sunrpc/svcauth_des.c (cache_init): Use calloc instead of

9
sysdeps/s390/s390-32/elf/start.S
View File

@ -1,5 +1,6 @@
/* Startup code compliant to the ELF s390 ABI. /* Startup code compliant to the ELF s390 ABI.
Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006
Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -88,9 +89,9 @@ _start:
l %r12,.L5-.Llit(%r13) # load .got pointer l %r12,.L5-.Llit(%r13) # load .got pointer
la %r6,0(%r13,%r6) la %r6,0(%r13,%r6)
la %r5,0(%r13,%r5) la %r5,0(%r13,%r5)
la %r2,0(%r13,%r2)
la %r1,0(%r13,%r1)
la %r12,0(%r13,%r12) la %r12,0(%r13,%r12)
l %r2,0(%r12,%r2)
la %r1,0(%r13,%r1)
#endif #endif
/* ok, now branch to the libc main routine */ /* ok, now branch to the libc main routine */
@ -108,7 +109,7 @@ _start:
#else #else
.L1: .long __libc_csu_init-.Llit .L1: .long __libc_csu_init-.Llit
.L2: .long __libc_csu_fini-.Llit .L2: .long __libc_csu_fini-.Llit
.L3: .long main-.Llit .L3: .long main@GOT
.L4: .long __libc_start_main@plt-.Llit .L4: .long __libc_start_main@plt-.Llit
.L5: .long _GLOBAL_OFFSET_TABLE_-.Llit .L5: .long _GLOBAL_OFFSET_TABLE_-.Llit
#endif #endif

6
sysdeps/s390/s390-64/elf/start.S
View File

@ -1,5 +1,5 @@
/* Startup code compliant to the 64 bit S/390 ELF ABI. /* Startup code compliant to the 64 bit S/390 ELF ABI.
Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -78,12 +78,14 @@ _start:
la %r7,160(%r15) la %r7,160(%r15)
larl %r6,__libc_csu_fini # load pointer to __libc_csu_fini larl %r6,__libc_csu_fini # load pointer to __libc_csu_fini
larl %r5,__libc_csu_init # load pointer to __libc_csu_init larl %r5,__libc_csu_init # load pointer to __libc_csu_init
larl %r2,main # load pointer to main
/* Ok, now branch to the libc main routine. */ /* Ok, now branch to the libc main routine. */
#ifdef PIC #ifdef PIC
larl %r2,main@GOTENT # load pointer to main
lg %r2,0(%r2)
brasl %r14,__libc_start_main@plt brasl %r14,__libc_start_main@plt
#else #else
larl %r2,main # load pointer to main
brasl %r14,__libc_start_main brasl %r14,__libc_start_main
#endif #endif

9
sysdeps/unix/sysv/linux/s390/s390-32/syscall.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. /* Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -48,13 +48,14 @@ ENTRY (syscall)
lr %r4,%r5 /* third parameter */ lr %r4,%r5 /* third parameter */
lr %r5,%r6 /* fourth parameter */ lr %r5,%r6 /* fourth parameter */
l %r6,192(%r15) /* fifth parameter */ l %r6,192(%r15) /* fifth parameter */
l %r7,196(%r15) /* sixth parameter */
basr %r7,0 basr %r8,0
0: cl %r1,4f-0b(%r7) /* svc number < 256? */ 0: cl %r1,4f-0b(%r8) /* svc number < 256? */
jl 2f jl 2f
1: svc 0 1: svc 0
j 3f j 3f
2: ex %r1,1b-0b(%r7) /* lsb of R1 is subsituted as SVC number */ 2: ex %r1,1b-0b(%r8) /* lsb of R1 is subsituted as SVC number */
3: l %r15,0(%r15) /* load back chain */ 3: l %r15,0(%r15) /* load back chain */
cfi_adjust_cfa_offset (-96) cfi_adjust_cfa_offset (-96)
lm %r6,15,24(%r15) /* load registers */ lm %r6,15,24(%r15) /* load registers */

9
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2001 Free Software Foundation, Inc. /* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -48,13 +48,14 @@ ENTRY (syscall)
lgr %r4,%r5 /* Third parameter. */ lgr %r4,%r5 /* Third parameter. */
lgr %r5,%r6 /* Fourth parameter. */ lgr %r5,%r6 /* Fourth parameter. */
lg %r6,320(%r15) /* Fifth parameter. */ lg %r6,320(%r15) /* Fifth parameter. */
lg %r7,328(%r15) /* Sixth parameter. */
basr %r7,0 basr %r8,0
0: clg %r1,4f-0b(%r7) /* svc number < 256? */ 0: clg %r1,4f-0b(%r8) /* svc number < 256? */
jl 2f jl 2f
1: svc 0 1: svc 0
j 3f j 3f
2: ex %r1,1b-0b(%r7) /* lsb of R1 is subsituted as SVC number */ 2: ex %r1,1b-0b(%r8) /* lsb of R1 is subsituted as SVC number */
3: lg %r15,0(%r15) /* load back chain */ 3: lg %r15,0(%r15) /* load back chain */
cfi_adjust_cfa_offset (-160) cfi_adjust_cfa_offset (-160)
lmg %r6,15,48(%r15) /* Load registers. */ lmg %r6,15,48(%r15) /* Load registers. */