summaryrefslogtreecommitdiff
path: root/ldso/ldso
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-01-24 16:59:55 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-01-24 16:59:55 +0000
commitc3f6501060987d967a28495b009cd0da9da25252 (patch)
treeafc2ce9d7041c5972cbe2e868280b67461834453 /ldso/ldso
parent3dbc359dd87d3c12c5a0ea58ae4f2106ba561f20 (diff)
- use keywords __asm__ and __inline__ c99.
Diffstat (limited to 'ldso/ldso')
-rw-r--r--ldso/ldso/i386/dl-startup.h2
-rw-r--r--ldso/ldso/ldso.c2
-rw-r--r--ldso/ldso/sh/dl-sysdep.h4
-rw-r--r--ldso/ldso/x86_64/dl-startup.h2
-rw-r--r--ldso/ldso/x86_64/dl-sysdep.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h
index 6521bf72d..933c22c1e 100644
--- a/ldso/ldso/i386/dl-startup.h
+++ b/ldso/ldso/i386/dl-startup.h
@@ -3,7 +3,7 @@
* Architecture specific code used by dl-startup.c
* Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
*/
-__asm__(
+__asm__ (
" .text\n"
" .align 16\n"
" .globl _start\n"
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 8b4b20822..b1d3d8009 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -656,7 +656,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
ElfW(Ehdr) *epnt = (ElfW(Ehdr) *) auxvt[AT_BASE].a_un.a_val;
ElfW(Phdr) *myppnt = (ElfW(Phdr) *) (load_addr + epnt->e_phoff);
int j;
-
+
tpnt = _dl_add_elf_hash_table(tpnt->libname, (char *)load_addr,
tpnt->dynamic_info,
(unsigned long)tpnt->dynamic_addr,
diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h
index 1ecb34898..210d8526d 100644
--- a/ldso/ldso/sh/dl-sysdep.h
+++ b/ldso/ldso/sh/dl-sysdep.h
@@ -104,7 +104,7 @@ static inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
register Elf32_Addr *got;
- asm ("mov r12,%0" :"=r" (got));
+ __asm__ ("mov r12,%0" :"=r" (got));
return *got;
}
@@ -113,7 +113,7 @@ static inline Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void)
{
Elf32_Addr addr;
- asm ("mov.l 1f,r0\n\
+ __asm__ ("mov.l 1f,r0\n\
mov.l 3f,r2\n\
add r12,r2\n\
mov.l @(r0,r12),r0\n\
diff --git a/ldso/ldso/x86_64/dl-startup.h b/ldso/ldso/x86_64/dl-startup.h
index d58da554b..c9a0aac7a 100644
--- a/ldso/ldso/x86_64/dl-startup.h
+++ b/ldso/ldso/x86_64/dl-startup.h
@@ -6,7 +6,7 @@
*
* Parts taken from glibc/sysdeps/x86_64/dl-machine.h
*/
-asm(
+__asm__ (
" .text\n"
" .align 16\n"
" .global _start\n"
diff --git a/ldso/ldso/x86_64/dl-sysdep.h b/ldso/ldso/x86_64/dl-sysdep.h
index ae12deb0d..9e2aff14f 100644
--- a/ldso/ldso/x86_64/dl-sysdep.h
+++ b/ldso/ldso/x86_64/dl-sysdep.h
@@ -90,7 +90,7 @@ elf_machine_load_address (void)
and compare it with the current value that we can get via
an RIP relative addressing mode. */
- asm ("movq 1f(%%rip), %1\n"
+ __asm__ ("movq 1f(%%rip), %1\n"
"0:\tleaq _dl_start(%%rip), %0\n\t"
"subq %1, %0\n\t"
".section\t.data\n"