diff options
| -rw-r--r-- | include/libc-symbols.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/i386/dl-startup.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/i386/dl-sysdep.h | 4 | ||||
| -rw-r--r-- | libc/stdlib/abort.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/__syscall_error.c | 6 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/syscalls.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/brk.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/sigaction.c | 12 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/internals.h | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 479a17a2f..7440e00d5 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -245,7 +245,7 @@ /* We want the .gnu.warning.SYMBOL section to be unallocated. */ #define __make_section_unallocated(section_string) \ - asm (".section " section_string "\n\t.previous"); + __asm__ (".section " section_string "\n\t.previous"); /* Tacking on "\n\t#" to the section name makes gcc put it's bogus section attributes on what looks like a comment to the assembler. */ diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h index d3c7109d9..6521bf72d 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/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h index a8b1ab33a..a1613bea4 100644 --- a/ldso/ldso/i386/dl-sysdep.h +++ b/ldso/ldso/i386/dl-sysdep.h @@ -47,7 +47,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent static inline Elf32_Addr __attribute__ ((unused)) elf_machine_dynamic (void) { - register Elf32_Addr *got asm ("%ebx"); + register Elf32_Addr *got __asm__ ("%ebx"); return *got; } @@ -61,7 +61,7 @@ elf_machine_load_address (void) via the GOT to make sure the compiler initialized %ebx in time. */ extern int _dl_errno; Elf32_Addr addr; - asm ("leal _dl_start@GOTOFF(%%ebx), %0\n" + __asm__ ("leal _dl_start@GOTOFF(%%ebx), %0\n" "subl _dl_start@GOT(%%ebx), %0" : "=r" (addr) : "m" (_dl_errno) : "cc"); return addr; diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c index cce9c3be0..29e53a18e 100644 --- a/libc/stdlib/abort.c +++ b/libc/stdlib/abort.c @@ -37,7 +37,7 @@ libc_hidden_proto(_exit) /* Our last ditch effort to commit suicide */ #ifdef __UCLIBC_ABORT_INSTRUCTION__ -# define ABORT_INSTRUCTION asm(__UCLIBC_ABORT_INSTRUCTION__) +# define ABORT_INSTRUCTION __asm__(__UCLIBC_ABORT_INSTRUCTION__) #else # define ABORT_INSTRUCTION # warning "no abort instruction defined for your arch" diff --git a/libc/sysdeps/linux/i386/__syscall_error.c b/libc/sysdeps/linux/i386/__syscall_error.c index 98240da3e..d96d20c0f 100644 --- a/libc/sysdeps/linux/i386/__syscall_error.c +++ b/libc/sysdeps/linux/i386/__syscall_error.c @@ -27,9 +27,9 @@ int attribute_hidden __syscall_error(void) { - register int edx asm("%edx"); - asm("mov %eax, %edx"); - asm("negl %edx"); + register int edx __asm__("%edx"); + __asm__("mov %eax, %edx"); + __asm__("negl %edx"); __set_errno(edx); return -1; } diff --git a/libc/sysdeps/linux/i386/bits/syscalls.h b/libc/sysdeps/linux/i386/bits/syscalls.h index 6ad3b1dd9..a69c4a669 100644 --- a/libc/sysdeps/linux/i386/bits/syscalls.h +++ b/libc/sysdeps/linux/i386/bits/syscalls.h @@ -20,7 +20,7 @@ /* We need some help from the assembler to generate optimal code. We define some macros here which later will be used. */ -asm (".L__X'%ebx = 1\n\t" +__asm__ (".L__X'%ebx = 1\n\t" ".L__X'%ecx = 2\n\t" ".L__X'%edx = 2\n\t" ".L__X'%eax = 3\n\t" @@ -112,7 +112,7 @@ return (type) (INLINE_SYSCALL(name, 6, arg1, arg2, arg3, arg4, arg5, arg6)); \ #define INLINE_SYSCALL(name, nr, args...) \ ({ \ unsigned int resultvar; \ - asm volatile ( \ + __asm__ __volatile__ ( \ LOADARGS_##nr \ "movl %1, %%eax\n\t" \ "int $0x80\n\t" \ diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c index 1b3128f9c..fcf7f3b33 100644 --- a/libc/sysdeps/linux/i386/brk.c +++ b/libc/sysdeps/linux/i386/brk.c @@ -30,7 +30,7 @@ int brk (void *addr) { void *__unbounded newbrk, *__unbounded scratch; - asm ("movl %%ebx, %1\n" /* Save %ebx in scratch register. */ + __asm__ ("movl %%ebx, %1\n" /* Save %ebx in scratch register. */ "movl %3, %%ebx\n" /* Put ADDR in %ebx to be syscall arg. */ "int $0x80 # %2\n" /* Perform the system call. */ "movl %1, %%ebx\n" /* Restore %ebx from scratch register. */ diff --git a/libc/sysdeps/linux/i386/sigaction.c b/libc/sysdeps/linux/i386/sigaction.c index c550c75d2..cc1d75c6b 100644 --- a/libc/sysdeps/linux/i386/sigaction.c +++ b/libc/sysdeps/linux/i386/sigaction.c @@ -31,8 +31,8 @@ #if defined __NR_rt_sigaction libc_hidden_proto(memcpy) -extern void restore_rt (void) asm ("__restore_rt") attribute_hidden; -extern void restore (void) asm ("__restore") attribute_hidden; +extern void restore_rt (void) __asm__ ("__restore_rt") attribute_hidden; +extern void restore (void) __asm__ ("__restore") attribute_hidden; /* If ACT is not NULL, change the action for SIG to *ACT. If OACT is not NULL, put the old action for SIG in *OACT. */ @@ -74,7 +74,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa #else -extern void restore (void) asm ("__restore") attribute_hidden; +extern void restore (void) __asm__ ("__restore") attribute_hidden; /* If ACT is not NULL, change the action for SIG to *ACT. If OACT is not NULL, put the old action for SIG in *OACT. */ @@ -97,7 +97,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa kact.sa_restorer = &restore; } - asm volatile ("pushl %%ebx\n" + __asm__ __volatile__ ("pushl %%ebx\n" "movl %2, %%ebx\n" "int $0x80\n" "popl %%ebx" @@ -141,7 +141,7 @@ libc_hidden_def(sigaction) #define RESTORE(name, syscall) RESTORE2 (name, syscall) #define RESTORE2(name, syscall) \ -asm \ +__asm__ \ ( \ ".text\n" \ " .align 16\n" \ @@ -158,7 +158,7 @@ RESTORE (restore_rt, __NR_rt_sigreturn) /* For the boring old signals. */ # undef RESTORE2 # define RESTORE2(name, syscall) \ -asm \ +__asm__ \ ( \ ".text\n" \ " .align 8\n" \ diff --git a/libpthread/linuxthreads.old/internals.h b/libpthread/linuxthreads.old/internals.h index 8422db58f..1aadb96b9 100644 --- a/libpthread/linuxthreads.old/internals.h +++ b/libpthread/linuxthreads.old/internals.h @@ -366,7 +366,7 @@ extern size_t __pagesize; all outstanding operations which modify memory. Some architectures distinguish between full, read and write barriers. */ #ifndef MEMORY_BARRIER -#define MEMORY_BARRIER() asm ("" : : : "memory") +#define MEMORY_BARRIER() __asm__ ("" : : : "memory") #endif #ifndef READ_MEMORY_BARRIER #define READ_MEMORY_BARRIER() MEMORY_BARRIER() |