diff options
Diffstat (limited to 'ports/sysdeps/am33')
-rw-r--r-- | ports/sysdeps/am33/dl-machine.h | 8 | ||||
-rw-r--r-- | ports/sysdeps/am33/elf/start.S | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/ports/sysdeps/am33/dl-machine.h b/ports/sysdeps/am33/dl-machine.h index 2db27378db..924319d039 100644 --- a/ports/sysdeps/am33/dl-machine.h +++ b/ports/sysdeps/am33/dl-machine.h @@ -55,16 +55,14 @@ elf_machine_load_address (void) return off + gotaddr - gotval; } -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF /* We add a declaration of this function here so that in dl-runtime.c the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters in registers. We cannot use this scheme for profiling because the _mcount call destroys the passed register information. */ -/* GKM FIXME: Fix trampoline to pass bounds so we can do - without the `__unbounded' qualifier. */ -static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset) +static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset) __attribute__ ((unused)); static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr) @@ -116,7 +114,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) /* This code is used in dl-runtime.c to call the `fixup' function and then redirect to the address it returns. */ -#if !defined PROF && !__BOUNDED_POINTERS__ +#ifndef PROF # define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ .text\n\ .globl _dl_runtime_resolve\n\ diff --git a/ports/sysdeps/am33/elf/start.S b/ports/sysdeps/am33/elf/start.S index 0ca71f14a4..e89f9db15c 100644 --- a/ports/sysdeps/am33/elf/start.S +++ b/ports/sysdeps/am33/elf/start.S @@ -37,8 +37,6 @@ NULL */ -#include "bp-sym.h" - .text .globl _start .type _start,@function @@ -63,13 +61,13 @@ _start: mov 0,a3 mov (32,sp), d1 /* argc. */ - mov BP_SYM (main), d0 /* main. */ + mov main, d0 /* main. */ /* Call the user's main function, and exit with its value. But let the libc call main. */ - call BP_SYM (__libc_start_main),[],0 + call __libc_start_main,[],0 - call BP_SYM (abort),[],0 /* Crash if somehow `exit' does return. */ + call abort,[],0 /* Crash if somehow `exit' does return. */ /* Define a symbol for the first piece of initialized data. */ .data |