summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ldso/include/dl-syscall.h42
-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
-rw-r--r--libc/sysdeps/linux/i386/__syscall_error.c20
7 files changed, 37 insertions, 37 deletions
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index 27af703e8..c0173838c 100644
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -66,83 +66,83 @@
dynamic linking at all, so we cannot return any error codes.
We just punt if there is an error. */
#define __NR__dl_exit __NR_exit
-static inline _syscall1(void, _dl_exit, int, status);
+static __inline__ _syscall1(void, _dl_exit, int, status);
#define __NR__dl_close __NR_close
-static inline _syscall1(int, _dl_close, int, fd);
+static __inline__ _syscall1(int, _dl_close, int, fd);
#define __NR__dl_open __NR_open
-static inline _syscall3(int, _dl_open, const char *, fn, int, flags, __kernel_mode_t, mode);
+static __inline__ _syscall3(int, _dl_open, const char *, fn, int, flags, __kernel_mode_t, mode);
#define __NR__dl_write __NR_write
-static inline _syscall3(unsigned long, _dl_write, int, fd,
+static __inline__ _syscall3(unsigned long, _dl_write, int, fd,
const void *, buf, unsigned long, count);
#define __NR__dl_read __NR_read
-static inline _syscall3(unsigned long, _dl_read, int, fd,
+static __inline__ _syscall3(unsigned long, _dl_read, int, fd,
const void *, buf, unsigned long, count);
#define __NR__dl_mprotect __NR_mprotect
-static inline _syscall3(int, _dl_mprotect, const void *, addr, unsigned long, len, int, prot);
+static __inline__ _syscall3(int, _dl_mprotect, const void *, addr, unsigned long, len, int, prot);
#define __NR__dl_stat __NR_stat
-static inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf);
+static __inline__ _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf);
#define __NR__dl_fstat __NR_fstat
-static inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf);
+static __inline__ _syscall2(int, _dl_fstat, int, fd, struct stat *, buf);
#define __NR__dl_munmap __NR_munmap
-static inline _syscall2(int, _dl_munmap, void *, start, unsigned long, length);
+static __inline__ _syscall2(int, _dl_munmap, void *, start, unsigned long, length);
#ifdef __NR_getxuid
# define __NR_getuid __NR_getxuid
#endif
#define __NR__dl_getuid __NR_getuid
-static inline _syscall0(uid_t, _dl_getuid);
+static __inline__ _syscall0(uid_t, _dl_getuid);
#ifndef __NR_geteuid
# define __NR_geteuid __NR_getuid
#endif
#define __NR__dl_geteuid __NR_geteuid
-static inline _syscall0(uid_t, _dl_geteuid);
+static __inline__ _syscall0(uid_t, _dl_geteuid);
#ifdef __NR_getxgid
# define __NR_getgid __NR_getxgid
#endif
#define __NR__dl_getgid __NR_getgid
-static inline _syscall0(gid_t, _dl_getgid);
+static __inline__ _syscall0(gid_t, _dl_getgid);
#ifndef __NR_getegid
# define __NR_getegid __NR_getgid
#endif
#define __NR__dl_getegid __NR_getegid
-static inline _syscall0(gid_t, _dl_getegid);
+static __inline__ _syscall0(gid_t, _dl_getegid);
#ifdef __NR_getxpid
# define __NR_getpid __NR_getxpid
#endif
#define __NR__dl_getpid __NR_getpid
-static inline _syscall0(gid_t, _dl_getpid);
+static __inline__ _syscall0(gid_t, _dl_getpid);
#define __NR__dl_readlink __NR_readlink
-static inline _syscall3(int, _dl_readlink, const char *, path, char *, buf, size_t, bufsiz);
+static __inline__ _syscall3(int, _dl_readlink, const char *, path, char *, buf, size_t, bufsiz);
#ifdef __UCLIBC_HAS_SSP__
#include <sys/time.h>
#define __NR__dl_gettimeofday __NR_gettimeofday
-static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, struct timezone *, tz);
+static __inline__ _syscall2(int, _dl_gettimeofday, struct timeval *, tv, struct timezone *, tz);
#endif
#ifdef __NR_mmap
#ifdef __UCLIBC_MMAP_HAS_6_ARGS__
#define __NR__dl_mmap __NR_mmap
-static inline _syscall6(void *, _dl_mmap, void *, start, size_t, length,
+static __inline__ _syscall6(void *, _dl_mmap, void *, start, size_t, length,
int, prot, int, flags, int, fd, off_t, offset);
#else
#define __NR__dl_mmap_real __NR_mmap
-static inline _syscall1(void *, _dl_mmap_real, unsigned long *, buffer);
+static __inline__ _syscall1(void *, _dl_mmap_real, unsigned long *, buffer);
-static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
+static __inline__ void * _dl_mmap(void * addr, unsigned long size, int prot,
int flags, int fd, unsigned long offset)
{
unsigned long buffer[6];
@@ -158,11 +158,11 @@ static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
#endif
#elif defined __NR_mmap2
#define __NR___syscall_mmap2 __NR_mmap2
-static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
+static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
size_t, len, int, prot, int, flags, int, fd, off_t, offset);
/*always 12, even on architectures where PAGE_SHIFT != 12 */
#define MMAP2_PAGE_SHIFT 12
-static inline void * _dl_mmap(void * addr, unsigned long size, int prot,
+static __inline__ void * _dl_mmap(void * addr, unsigned long size, int prot,
int flags, int fd, unsigned long offset)
{
if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
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"
diff --git a/libc/sysdeps/linux/i386/__syscall_error.c b/libc/sysdeps/linux/i386/__syscall_error.c
index d96d20c0f..63540540e 100644
--- a/libc/sysdeps/linux/i386/__syscall_error.c
+++ b/libc/sysdeps/linux/i386/__syscall_error.c
@@ -8,17 +8,17 @@
/* This routine is jumped to by all the syscall handlers, to stash
* an error number into errno. */
-/* This version uses a lot of magic and relies heavily on x86
- * calling convention ... The advantage is that this is the same
+/* This version uses a lot of magic and relies heavily on x86
+ * calling convention ... The advantage is that this is the same
* size as the previous __syscall_error() but all the .S functions
* need just one instruction.
*
- * Local .S files have to set %eax to the negative errno value
- * and then jump to this function. The neglected return to caller
- * and return value of -1 is taken care of here so we don't have to
+ * Local .S files have to set %eax to the negative errno value
+ * and then jump to this function. The neglected return to caller
+ * and return value of -1 is taken care of here so we don't have to
* worry about it in the .S functions.
*
- * We have to stash the errno from %eax in a local stack var because
+ * We have to stash the errno from %eax in a local stack var because
* __set_errno will prob call a function thus clobbering %eax on us.
*/
@@ -27,9 +27,9 @@
int attribute_hidden __syscall_error(void)
{
- register int edx __asm__("%edx");
- __asm__("mov %eax, %edx");
- __asm__("negl %edx");
- __set_errno(edx);
+ register int edx __asm__ ("%edx");
+ __asm__ ("mov %eax, %edx\n\t"
+ "negl %edx");
+ __set_errno (edx);
return -1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 10:56:56 +0000