summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-23 08:05:45 +0000
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-23 08:05:45 +0000
commit40ee4cb9496ed037957db9790e5bd87604d45fe5 (patch)
treecfe2869edccba2c8a51cd583e24e1c77bca9a5b0 /ldso
parent21c9dcf8b345401bdf290f34a144db80753b1b9f (diff)
avr32: Put underscores around asm, inline, etc.
This fixes build breakage introduced in r22868.
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/avr32/dl-startup.h2
-rw-r--r--ldso/ldso/avr32/dl-sysdep.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/ldso/ldso/avr32/dl-startup.h b/ldso/ldso/avr32/dl-startup.h
index 3b9a64176..3b8bf4ce2 100644
--- a/ldso/ldso/avr32/dl-startup.h
+++ b/ldso/ldso/avr32/dl-startup.h
@@ -9,7 +9,7 @@
/* This is the library loader's main entry point. Let _dl_boot2 do its
* initializations and jump to the application's entry point
* afterwards. */
-asm( " .text\n"
+__asm__(" .text\n"
" .global _start\n"
" .type _start,@function\n"
"_start:\n"
diff --git a/ldso/ldso/avr32/dl-sysdep.h b/ldso/ldso/avr32/dl-sysdep.h
index 1a301727b..5ee110101 100644
--- a/ldso/ldso/avr32/dl-sysdep.h
+++ b/ldso/ldso/avr32/dl-sysdep.h
@@ -60,22 +60,22 @@ unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got);
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
first element of the GOT. This must be inlined in a function which
uses global data. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_dynamic (void)
{
- register Elf32_Addr *got asm ("r6");
+ register Elf32_Addr *got __asm__("r6");
return *got;
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_load_address (void)
{
- extern void __dl_start asm("_dl_start");
+ extern void __dl_start __asm__("_dl_start");
Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
Elf32_Addr pcrel_addr;
- asm (" lddpc %0, 2f\n"
+ __asm__(" lddpc %0, 2f\n"
"1: add %0, pc\n"
" rjmp 3f\n"
" .align 2\n"
@@ -91,7 +91,7 @@ elf_machine_load_address (void)
* Currently, we don't use that tag, but we might in the future as
* this would reduce the startup time somewhat (although probably not by much).
*/
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{