AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-07-26  kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/dl-machine.h (elf_machine_load_address): Don't use
	multi-line strings.
	(FUN_ADDR, FGR_SAVE, ELF_MACHINE_RUNTIME_TRAMPOLINE): Likewise.
	(elf_machine_rela): Handle unaligned relocation.
This commit is contained in:
Ulrich Drepper 2001-07-26 01:39:53 +00:00
parent 370f00c3a7
commit 045fcd2621
5 changed files with 237 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-26 kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/dl-machine.h (elf_machine_load_address): Don't use
multi-line strings.
(FUN_ADDR, FGR_SAVE, ELF_MACHINE_RUNTIME_TRAMPOLINE): Likewise.
(elf_machine_rela): Handle unaligned relocation.
2001-06-07 David Mosberger <davidm@hpl.hp.com> 2001-06-07 David Mosberger <davidm@hpl.hp.com>
* sysdeps/ia64/dl-symaddr.c (_dl_symbol_address): Update call to * sysdeps/ia64/dl-symaddr.c (_dl_symbol_address): Update call to

14
NEWS
View File

@ -1,4 +1,4 @@
GNU C Library NEWS -- history of user-visible changes. 2001-6-18 GNU C Library NEWS -- history of user-visible changes. 2001-7-25
Copyright (C) 1992-2000, 2001 Free Software Foundation, Inc. Copyright (C) 1992-2000, 2001 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.
@ -16,6 +16,18 @@ Version 2.2.4
* Speed of regex for single-byte locales is back to previous levels. * Speed of regex for single-byte locales is back to previous levels.
Patch by Isamu Hasegawa. Patch by Isamu Hasegawa.
* Alpha, SPARC, and IA-64 now also using floating stacks
* Startup time of internatioanlized applications greatly improved through
iconv cache. Use iconvconfig to generate the cache file.
Contributed by Ulrich Drepper.
* The IA-64 specific part of ld.so was rewritten to eliminate some pretty
severe performance problems. Patch by David Mosberger.
* The Hurd port got a lot more functionality like AIO, various stdio
extensions, etc. Mainly done by Roland McGrath.
Version 2.2.3 Version 2.2.3

4
linuxthreads/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-26 kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/pt-machine.h (THREAD_SELF, INIT_THREAD_SELF): Defined.
2001-07-24 Ulrich Drepper <drepper@redhat.com> 2001-07-24 Ulrich Drepper <drepper@redhat.com>
* tst-context.c (main): Print explanation before bailing out * tst-context.c (main): Print explanation before bailing out

10
linuxthreads/sysdeps/sh/pt-machine.h
View File

@ -44,3 +44,13 @@ testandset (int *spinlock)
of the stack, just something somewhere in the current frame. */ of the stack, just something somewhere in the current frame. */
#define CURRENT_STACK_FRAME stack_pointer #define CURRENT_STACK_FRAME stack_pointer
register char * stack_pointer __asm__ ("r15"); register char * stack_pointer __asm__ ("r15");
/* Return the thread descriptor for the current thread. */
struct _pthread_descr_struct;
#define THREAD_SELF \
({ struct _pthread_descr_struct *self; \
__asm__("stc gbr,%0" : "=r" (self)); self;})
/* Initialize the thread-unique value. */
#define INIT_THREAD_SELF(descr, nr) \
({ __asm__("ldc %0,gbr" : : "r" (descr));})

374
sysdeps/sh/dl-machine.h
View File

@ -53,15 +53,15 @@ static inline Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void) elf_machine_load_address (void)
{ {
Elf32_Addr addr; Elf32_Addr addr;
asm ("mov.l .L1,r0 asm ("mov.l .L1,r0\n\
mov.l .L3,r2 mov.l .L3,r2\n\
add r12,r2 add r12,r2\n\
mov.l @(r0,r12),r0 mov.l @(r0,r12),r0\n\
bra .L2 bra .L2\n\
sub r0,r2 sub r0,r2\n\
.align 2 .align 2\n\
.L1: .long _dl_start@GOT .L1: .long _dl_start@GOT\n\
.L3: .long _dl_start@GOTOFF .L3: .long _dl_start@GOTOFF\n\
.L2: mov r2,%0" .L2: mov r2,%0"
: "=r" (addr) : : "r0", "r1", "r2"); : "=r" (addr) : : "r0", "r1", "r2");
return addr; return addr;
@ -114,13 +114,13 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
#ifdef SHARED #ifdef SHARED
#define FUN_ADDR "\ #define FUN_ADDR "\
mov.l 1f,r2 mov.l 1f,r2\n\
mova 1f,r0 mova 1f,r0\n\
bra 2f bra 2f\n\
add r0,r2 ! Get GOT address in r2 add r0,r2 ! Get GOT address in r2\n\
0: .align 2 0: .align 2\n\
1: .long _GLOBAL_OFFSET_TABLE_ 1: .long _GLOBAL_OFFSET_TABLE_\n\
2: mov.l 3f,r0 2: mov.l 3f,r0\n\
add r2,r0" add r2,r0"
#define GOTJMP(x) #x "@GOTOFF" #define GOTJMP(x) #x "@GOTOFF"
#else #else
@ -131,27 +131,27 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
#ifdef HAVE_FPU #ifdef HAVE_FPU
#define FGR_SAVE "\ #define FGR_SAVE "\
sts.l fpscr, @-r15 sts.l fpscr, @-r15\n\
mov #8,r3 mov #8,r3\n\
swap.w r3, r3 swap.w r3, r3\n\
lds r3, fpscr lds r3, fpscr\n\
fmov.s fr11, @-r15 fmov.s fr11, @-r15\n\
fmov.s fr10, @-r15 fmov.s fr10, @-r15\n\
fmov.s fr9, @-r15 fmov.s fr9, @-r15\n\
fmov.s fr8, @-r15 fmov.s fr8, @-r15\n\
fmov.s fr7, @-r15 fmov.s fr7, @-r15\n\
fmov.s fr6, @-r15 fmov.s fr6, @-r15\n\
fmov.s fr5, @-r15 fmov.s fr5, @-r15\n\
fmov.s fr4, @-r15" fmov.s fr4, @-r15"
#define FGR_LOAD "\ #define FGR_LOAD "\
fmov.s @r15+, fr4 fmov.s @r15+, fr4\n\
fmov.s @r15+, fr5 fmov.s @r15+, fr5\n\
fmov.s @r15+, fr6 fmov.s @r15+, fr6\n\
fmov.s @r15+, fr7 fmov.s @r15+, fr7\n\
fmov.s @r15+, fr8 fmov.s @r15+, fr8\n\
fmov.s @r15+, fr9 fmov.s @r15+, fr9\n\
fmov.s @r15+, fr10 fmov.s @r15+, fr10\n\
fmov.s @r15+, fr11 fmov.s @r15+, fr11\n\
lds.l @r15+, fpscr" lds.l @r15+, fpscr"
#else #else
#define FGR_SAVE "" #define FGR_SAVE ""
@ -160,140 +160,140 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
#ifndef PROF #ifndef PROF
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
.text .text\n\
.globl _dl_runtime_resolve .globl _dl_runtime_resolve\n\
.type _dl_runtime_resolve, @function .type _dl_runtime_resolve, @function\n\
.align 5 .align 5\n\
_dl_runtime_resolve: _dl_runtime_resolve:\n\
mov.l r2,@-r15 mov.l r2,@-r15\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
mov.l r4,@-r15 mov.l r4,@-r15\n\
mov.l r5,@-r15 mov.l r5,@-r15\n\
mov.l r6,@-r15 mov.l r6,@-r15\n\
mov.l r7,@-r15 mov.l r7,@-r15\n\
mov.l r12,@-r15 mov.l r12,@-r15\n\
movt r3 ! Save T flag. movt r3 ! Save T flag.\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
" FGR_SAVE " " FGR_SAVE "\n\
sts.l pr,@-r15 sts.l pr,@-r15\n\
tst r0,r0 tst r0,r0\n\
bt 1f bt 1f\n\
mov r0,r2 mov r0,r2\n\
1: 1:\n\
mov r0,r4 ! PLT type mov r0,r4 ! PLT type\n\
mov r2,r5 ! link map address mov r2,r5 ! link map address\n\
" FUN_ADDR " " FUN_ADDR "\n\
jsr @r0 ! Call resolver. jsr @r0 ! Call resolver.\n\
mov r1,r6 ! reloc offset mov r1,r6 ! reloc offset\n\
lds.l @r15+,pr ! Get register content back. lds.l @r15+,pr ! Get register content back.\n\
" FGR_LOAD " " FGR_LOAD "\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
shal r3 ! Lode T flag. shal r3 ! Lode T flag.\n\
mov.l @r15+,r12 mov.l @r15+,r12\n\
mov.l @r15+,r7 mov.l @r15+,r7\n\
mov.l @r15+,r6 mov.l @r15+,r6\n\
mov.l @r15+,r5 mov.l @r15+,r5\n\
mov.l @r15+,r4 mov.l @r15+,r4\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
jmp @r0 ! Jump to function address. jmp @r0 ! Jump to function address.\n\
mov.l @r15+,r2 mov.l @r15+,r2\n\
.align 2 .align 2\n\
3: 3:\n\
.long " GOTJMP (fixup) " .long " GOTJMP (fixup) "\n\
.size _dl_runtime_resolve, .-_dl_runtime_resolve .size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
\n\
.globl _dl_runtime_profile .globl _dl_runtime_profile\n\
.type _dl_runtime_profile, @function .type _dl_runtime_profile, @function\n\
.align 5 .align 5\n\
_dl_runtime_profile: _dl_runtime_profile:\n\
mov.l r2,@-r15 mov.l r2,@-r15\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
mov.l r4,@-r15 mov.l r4,@-r15\n\
mov.l r5,@-r15 mov.l r5,@-r15\n\
mov.l r6,@-r15 mov.l r6,@-r15\n\
mov.l r7,@-r15 mov.l r7,@-r15\n\
mov.l r12,@-r15 mov.l r12,@-r15\n\
movt r3 ! Save T flag. movt r3 ! Save T flag.\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
" FGR_SAVE " " FGR_SAVE "\n\
sts.l pr,@-r15 sts.l pr,@-r15\n\
tst r0,r0 tst r0,r0\n\
bt 1f bt 1f\n\
mov r0,r2 mov r0,r2\n\
1: 1:\n\
mov r0,r4 ! PLT type mov r0,r4 ! PLT type\n\
mov r2,r5 ! link map address mov r2,r5 ! link map address\n\
sts pr,r7 ! return address sts pr,r7 ! return address\n\
" FUN_ADDR " " FUN_ADDR "\n\
jsr @r0 ! Call resolver. jsr @r0 ! Call resolver.\n\
mov r1,r6 ! reloc offset mov r1,r6 ! reloc offset\n\
lds.l @r15+,pr ! Get register content back. lds.l @r15+,pr ! Get register content back.\n\
" FGR_LOAD " " FGR_LOAD "\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
shal r3 ! Lode T flag. shal r3 ! Lode T flag.\n\
mov.l @r15+,r12 mov.l @r15+,r12\n\
mov.l @r15+,r7 mov.l @r15+,r7\n\
mov.l @r15+,r6 mov.l @r15+,r6\n\
mov.l @r15+,r5 mov.l @r15+,r5\n\
mov.l @r15+,r4 mov.l @r15+,r4\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
jmp @r0 ! Jump to function address. jmp @r0 ! Jump to function address.\n\
mov.l @r15+,r2 mov.l @r15+,r2\n\
.align 2 .align 2\n\
3: 3:\n\
.long " GOTJMP (profile_fixup) " .long " GOTJMP (profile_fixup) "\n\
.size _dl_runtime_profile, .-_dl_runtime_profile .size _dl_runtime_profile, .-_dl_runtime_profile\n\
.previous .previous\n\
"); ");
#else #else
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
.text .text\n\
.globl _dl_runtime_resolve .globl _dl_runtime_resolve\n\
.globl _dl_runtime_profile .globl _dl_runtime_profile\n\
.type _dl_runtime_resolve, @function .type _dl_runtime_resolve, @function\n\
.type _dl_runtime_profile, @function .type _dl_runtime_profile, @function\n\
.align 5 .align 5\n\
_dl_runtime_resolve: _dl_runtime_resolve:\n\
_dl_runtime_profile: _dl_runtime_profile:\n\
mov.l r2,@-r15 mov.l r2,@-r15\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
mov.l r4,@-r15 mov.l r4,@-r15\n\
mov.l r5,@-r15 mov.l r5,@-r15\n\
mov.l r6,@-r15 mov.l r6,@-r15\n\
mov.l r7,@-r15 mov.l r7,@-r15\n\
mov.l r12,@-r15 mov.l r12,@-r15\n\
movt r3 ! Save T flag. movt r3 ! Save T flag.\n\
mov.l r3,@-r15 mov.l r3,@-r15\n\
" FGR_SAVE " " FGR_SAVE "\n\
sts.l pr,@-r15 sts.l pr,@-r15\n\
tst r0,r0 tst r0,r0\n\
bt 1f bt 1f\n\
mov r0,r2 mov r0,r2\n\
1: 1:\n\
mov r0,r4 ! PLT type mov r0,r4 ! PLT type\n\
mov r2,r5 ! link map address mov r2,r5 ! link map address\n\
sts pr,r7 ! return address sts pr,r7 ! return address\n\
" FUN_ADDR " " FUN_ADDR "\n\
jsr @r0 ! Call resolver. jsr @r0 ! Call resolver.\n\
mov r1,r6 ! reloc offset mov r1,r6 ! reloc offset\n\
lds.l @r15+,pr ! Get register content back. lds.l @r15+,pr ! Get register content back.\n\
" FGR_LOAD " " FGR_LOAD "\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
shal r3 ! Lode T flag. shal r3 ! Lode T flag.\n\
mov.l @r15+,r12 mov.l @r15+,r12\n\
mov.l @r15+,r7 mov.l @r15+,r7\n\
mov.l @r15+,r6 mov.l @r15+,r6\n\
mov.l @r15+,r5 mov.l @r15+,r5\n\
mov.l @r15+,r4 mov.l @r15+,r4\n\
mov.l @r15+,r3 mov.l @r15+,r3\n\
jmp @r0 ! Jump to function address. jmp @r0 ! Jump to function address.\n\
mov.l @r15+,r2 mov.l @r15+,r2\n\
.align 2 .align 2\n\
3: 3:\n\
.long " GOTJMP (fixup) " .long " GOTJMP (fixup) "\n\
.size _dl_runtime_resolve, .-_dl_runtime_resolve .size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
.size _dl_runtime_profile, .-_dl_runtime_profile .size _dl_runtime_profile, .-_dl_runtime_profile\n\
.previous .previous\n\
"); ");
#endif #endif
@ -446,6 +446,29 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
const Elf32_Sym *sym, const struct r_found_version *version, const Elf32_Sym *sym, const struct r_found_version *version,
Elf32_Addr *const reloc_addr) Elf32_Addr *const reloc_addr)
{ {
Elf32_Addr value;
#define COPY_UNALIGNED_WORD(sw, tw, align) \
{ \
void *__s = &(sw), *__t = &(tw); \
switch ((align)) \
{ \
case 0: \
*(unsigned long *) __t = *(unsigned long *) __s; \
break; \
case 2: \
*((unsigned short *) __t)++ = *((unsigned short *) __s)++; \
*((unsigned short *) __t) = *((unsigned short *) __s); \
break; \
default: \
*((unsigned char *) __t)++ = *((unsigned char *) __s)++; \
*((unsigned char *) __t)++ = *((unsigned char *) __s)++; \
*((unsigned char *) __t)++ = *((unsigned char *) __s)++; \
*((unsigned char *) __t) = *((unsigned char *) __s); \
break; \
} \
}
if (ELF32_R_TYPE (reloc->r_info) == R_SH_RELATIVE) if (ELF32_R_TYPE (reloc->r_info) == R_SH_RELATIVE)
{ {
#ifndef RTLD_BOOTSTRAP #ifndef RTLD_BOOTSTRAP
@ -453,15 +476,20 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
#endif #endif
{ {
if (reloc->r_addend) if (reloc->r_addend)
*reloc_addr = map->l_addr + reloc->r_addend; value = map->l_addr + reloc->r_addend;
else else
*reloc_addr += map->l_addr; {
COPY_UNALIGNED_WORD (*reloc_addr, value, (int) reloc_addr & 3);
value += map->l_addr;
}
COPY_UNALIGNED_WORD (value, *reloc_addr, (int) reloc_addr & 3);
} }
} }
else if (ELF32_R_TYPE (reloc->r_info) != R_SH_NONE) else if (ELF32_R_TYPE (reloc->r_info) != R_SH_NONE)
{ {
const Elf32_Sym *const refsym = sym; const Elf32_Sym *const refsym = sym;
Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
if (sym) if (sym)
value += sym->st_value; value += sym->st_value;
value += reloc->r_addend; value += reloc->r_addend;
@ -489,6 +517,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
break; break;
case R_SH_GLOB_DAT: case R_SH_GLOB_DAT:
case R_SH_JMP_SLOT: case R_SH_JMP_SLOT:
/* These addresses are always aligned. */
*reloc_addr = value; *reloc_addr = value;
break; break;
case R_SH_DIR32: case R_SH_DIR32:
@ -509,17 +538,20 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
used while loading those libraries. */ used while loading those libraries. */
value -= map->l_addr + refsym->st_value + reloc->r_addend; value -= map->l_addr + refsym->st_value + reloc->r_addend;
#endif #endif
*reloc_addr = value; COPY_UNALIGNED_WORD (value, *reloc_addr, (int) reloc_addr & 3);
break; break;
} }
case R_SH_REL32: case R_SH_REL32:
*reloc_addr = (value - (Elf32_Addr) reloc_addr); value = (value - (Elf32_Addr) reloc_addr);
COPY_UNALIGNED_WORD (value, *reloc_addr, (int) reloc_addr & 3);
break; break;
default: default:
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 0); _dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 0);
break; break;
} }
} }
#undef COPY_UNALIGNED_WORD
} }
static inline void static inline void