diff options
Diffstat (limited to 'sysdeps/arm')
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 36 | ||||
| -rw-r--r-- | sysdeps/arm/fpu/fpu_control.h (renamed from sysdeps/arm/fpu_control.h) | 0 | ||||
| -rw-r--r-- | sysdeps/arm/machine-gmon.h | 42 | ||||
| -rw-r--r-- | sysdeps/arm/sysdep.h | 8 |
4 files changed, 36 insertions, 50 deletions
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 7612285907..912f7863fb 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -398,35 +398,6 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, break; case R_ARM_GLOB_DAT: case R_ARM_JUMP_SLOT: - -#if 0 -#define _HEX(i) for (j=28; j>=0; j-=4) b[7-j/4]="0123456789abcdef"[((int)i>>j)&15]; -{ -char b[10]; -int j; -_HEX(map->l_addr); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -_HEX(sym->st_size); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -_HEX(&sym->st_value); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -_HEX(sym->st_value); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -_HEX(sym); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -_HEX(reloc_addr); -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -b[0]=' '; b[1]='\n'; -__asm__ (" mov r0, #2; mov r1, %0; mov r2, #2; swi 0x00900004; " - : : "r"(b) : "r0", "r1", "r2" ); -} -#endif *reloc_addr = value; break; case R_ARM_ABS32: @@ -451,7 +422,12 @@ __asm__ (" mov r0, #2; mov r1, %0; mov r2, #2; swi 0x00900004; " break; } case R_ARM_PC24: - *reloc_addr += (value - (Elf32_Addr) reloc_addr); + { + long int disp = (value - (Elf32_Addr) reloc_addr) / 4; + if ((disp >= (1<<24)) || (disp <= -(1<<24))) + assert (! "address out of range for PC24 reloc"); + *reloc_addr += disp; + } break; default: assert (! "unexpected dynamic reloc type"); diff --git a/sysdeps/arm/fpu_control.h b/sysdeps/arm/fpu/fpu_control.h index 8a2d338c49..8a2d338c49 100644 --- a/sysdeps/arm/fpu_control.h +++ b/sysdeps/arm/fpu/fpu_control.h diff --git a/sysdeps/arm/machine-gmon.h b/sysdeps/arm/machine-gmon.h index 27643df884..96b4c13c72 100644 --- a/sysdeps/arm/machine-gmon.h +++ b/sysdeps/arm/machine-gmon.h @@ -1,5 +1,5 @@ /* Machine-dependent definitions for profiling support. ARM version. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,19 +37,29 @@ static void mcount_internal (u_long frompc, u_long selfpc); #define _MCOUNT_DECL(frompc, selfpc) \ static void mcount_internal (u_long frompc, u_long selfpc) -#define MCOUNT \ -void _mcount (void) \ -{ \ - register unsigned long int frompc, selfpc; \ - __asm__("movs fp, fp; " \ - "moveq %0, $0; " \ - "ldrne %0, [fp, $-4]; " \ - "ldrne %1, [fp, $-12]; " \ - "movnes %1, %1; " \ - "ldrne %1, [%1, $-4]; " \ - : "=g" (selfpc), "=g" (frompc) \ - : : "cc" \ - ); \ - if (selfpc) \ - mcount_internal(frompc, selfpc); \ +/* This macro/func MUST save r0, r1 because the compiler inserts + blind calls to _mount(), ignoring the fact that _mcount may + clobber registers; therefore, _mcount may NOT clobber registers */ +/* if (this_fp!=0) { + r0 = this_lr + r1 = this_fp + r1 = [r1-4] which is caller's fp + if (r1!=0) + r1 = caller's lr + call mcount_internal(this_lr, caller's_lr) + } +*/ +#define MCOUNT \ +void _mcount (void) \ +{ \ + __asm__("stmdb sp!, {r0, r1, r2, r3};" \ + "movs fp, fp;" \ + "moveq r0, #0;" \ + "ldrne r0, [fp, $-4];" \ + "ldrne r1, [fp, $-12];" \ + "movnes r1, r1;" \ + "ldrne r1, [r1, $-4];" \ + "movs r1, r1;" \ + "blne mcount_internal;" \ + "ldmia sp!, {r0, r1, r2, r3}"); \ } diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h index 4fc90aeed0..13d34c741b 100644 --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -73,10 +73,10 @@ /* If compiled for profiling, call `mcount' at the start of each function. */ #ifdef PROF -/* The mcount code relies on a normal frame pointer being on the stack - to locate our caller, so push one just for its benefit. */ -#define CALL_MCOUNT \ -#error Profiling not supported. +#define CALL_MCOUNT \ + str lr,[sp, #-4]! \ + bl PLTJMP(mcount) \ + ldr lr, [sp], #4 #else #define CALL_MCOUNT /* Do nothing. */ #endif |