From 64b7897d6d453e67afe3f9d81c8fc37c26f8d483 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 23 May 2001 23:56:31 +0000 Subject: Update. 2001-05-23 kaz Kojima * sysdeps/sh/dl-machine.h (_dl_runtime_resolve): Handle newer PLT. (_dl_runtime_profile): Likewise.. 2001-05-23 Thorsten Kukuk * sysdeps/posix/getaddrinfo.c: Support for AF_UNIX commented out. * posix/tst-getaddrinfo.c: Remove AF_UNIX test. 2001-05-19 H.J. Lu * elf/dl-deps.c (_dl_map_object_deps): Pass objname and errstring of the failed DSO to _dl_signal_error (). --- sysdeps/sh/dl-machine.h | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'sysdeps/sh') diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index 6a4aecf7da..aaaf9946a6 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -165,6 +165,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) .type _dl_runtime_resolve, @function .align 5 _dl_runtime_resolve: + mov.l r2,@-r15 mov.l r3,@-r15 mov.l r4,@-r15 mov.l r5,@-r15 @@ -175,6 +176,10 @@ _dl_runtime_resolve: mov.l r3,@-r15 " FGR_SAVE " sts.l pr,@-r15 + tst r0,r0 + bt 1f + mov r0,r2 +1: mov r0,r4 ! PLT type mov r2,r5 ! link map address " FUN_ADDR " @@ -189,8 +194,9 @@ _dl_runtime_resolve: mov.l @r15+,r6 mov.l @r15+,r5 mov.l @r15+,r4 + mov.l @r15+,r3 jmp @r0 ! Jump to function address. - mov.l @r15+,r3 + mov.l @r15+,r2 .align 2 3: .long " GOTJMP (fixup) " @@ -200,6 +206,7 @@ _dl_runtime_resolve: .type _dl_runtime_profile, @function .align 5 _dl_runtime_profile: + mov.l r2,@-r15 mov.l r3,@-r15 mov.l r4,@-r15 mov.l r5,@-r15 @@ -210,6 +217,10 @@ _dl_runtime_profile: mov.l r3,@-r15 " FGR_SAVE " sts.l pr,@-r15 + tst r0,r0 + bt 1f + mov r0,r2 +1: mov r0,r4 ! PLT type mov r2,r5 ! link map address sts pr,r7 ! return address @@ -225,8 +236,9 @@ _dl_runtime_profile: mov.l @r15+,r6 mov.l @r15+,r5 mov.l @r15+,r4 + mov.l @r15+,r3 jmp @r0 ! Jump to function address. - mov.l @r15+,r3 + mov.l @r15+,r2 .align 2 3: .long " GOTJMP (profile_fixup) " @@ -243,6 +255,7 @@ _dl_runtime_profile: .align 5 _dl_runtime_resolve: _dl_runtime_profile: + mov.l r2,@-r15 mov.l r3,@-r15 mov.l r4,@-r15 mov.l r5,@-r15 @@ -253,6 +266,10 @@ _dl_runtime_profile: mov.l r3,@-r15 " FGR_SAVE " sts.l pr,@-r15 + tst r0,r0 + bt 1f + mov r0,r2 +1: mov r0,r4 ! PLT type mov r2,r5 ! link map address sts pr,r7 ! return address @@ -268,8 +285,9 @@ _dl_runtime_profile: mov.l @r15+,r6 mov.l @r15+,r5 mov.l @r15+,r4 + mov.l @r15+,r3 jmp @r0 ! Jump to function address. - mov.l @r15+,r3 + mov.l @r15+,r2 .align 2 3: .long " GOTJMP (fixup) " -- cgit v1.2.3