From 1d8abd74c4ae9b28035b549345f9f736cdb98c10 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 24 Apr 2008 09:24:59 +0000 Subject: - fixup asm. No object-code changes --- ldso/ldso/frv/dl-inlines.h | 2 +- ldso/ldso/frv/dl-syscalls.h | 2 +- ldso/ldso/frv/dl-sysdep.h | 2 +- ldso/ldso/frv/elfinterp.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ldso/ldso/frv') diff --git a/ldso/ldso/frv/dl-inlines.h b/ldso/ldso/frv/dl-inlines.h index 345139696..00ff263ea 100644 --- a/ldso/ldso/frv/dl-inlines.h +++ b/ldso/ldso/frv/dl-inlines.h @@ -406,7 +406,7 @@ _dl_lookup_address (void const *address) struct funcdesc_value const *fd; /* Make sure we don't make assumptions about its alignment. */ - asm ("" : "+r" (address)); + __asm__ ("" : "+r" (address)); if ((Elf32_Addr)address & 7) /* It's not a function descriptor. */ diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h index 3ece9d85e..ffd59b82d 100644 --- a/ldso/ldso/frv/dl-syscalls.h +++ b/ldso/ldso/frv/dl-syscalls.h @@ -53,7 +53,7 @@ _dl_mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) if (! _dl_mmap_base) { void *stack; - asm ("mov sp, %0" : "=r" (stack)); + __asm__ ("mov sp, %0" : "=r" (stack)); _dl_mmap_base = (void *)(((long)stack + 2 * PAGE_SIZE) & -PAGE_SIZE); retry: if (((void **)_dl_mmap_base)[0] == _dl_mmap_base diff --git a/ldso/ldso/frv/dl-sysdep.h b/ldso/ldso/frv/dl-sysdep.h index 3efc10118..f72d54a4d 100644 --- a/ldso/ldso/frv/dl-sysdep.h +++ b/ldso/ldso/frv/dl-sysdep.h @@ -76,7 +76,7 @@ struct funcdesc_ht; ((void(*)(void)) _dl_funcdesc_for ((void*)(ADDR), (LOADADDR).got_value)) #define _dl_stabilize_funcdesc(val) \ - ({ asm ("" : "+m" (*(val))); (val); }) + ({ __asm__ ("" : "+m" (*(val))); (val); }) #define DL_CALL_FUNC_AT_ADDR(ADDR, LOADADDR, SIGNATURE, ...) \ ({ struct funcdesc_value fd = { (void*)(ADDR), (LOADADDR).got_value }; \ diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c index a6e4d2727..d8714c58e 100644 --- a/ldso/ldso/frv/elfinterp.c +++ b/ldso/ldso/frv/elfinterp.c @@ -172,7 +172,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, reloc_addr = (unsigned long *)(intptr_t) DL_RELOC_ADDR (rpnt->r_offset, tpnt->loadaddr); - asm ("" : "=r" (reloc_addr_packed) : "0" (reloc_addr)); + __asm__ ("" : "=r" (reloc_addr_packed) : "0" (reloc_addr)); reloc_type = ELF32_R_TYPE(rpnt->r_info); symtab_index = ELF32_R_SYM(rpnt->r_info); symbol_addr = 0; @@ -238,7 +238,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, = symbol_tpnt->loadaddr.got_value; else funcval.got_value = 0; - asm ("std%I0\t%1, %M0" + __asm__ ("std%I0\t%1, %M0" : "=m" (*(struct funcdesc_value *)reloc_addr) : "e" (funcval)); break; -- cgit v1.2.3