summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
Diffstat (limited to 'ldso')
-rw-r--r--ldso/include/dl-elf.h4
-rw-r--r--ldso/include/dl-hash.h2
-rw-r--r--ldso/include/dl-syscall.h2
-rw-r--r--ldso/ldso/arm/dl-sysdep.h8
-rw-r--r--ldso/ldso/bfin/dl-syscalls.h2
-rw-r--r--ldso/ldso/bfin/dl-sysdep.h2
-rw-r--r--ldso/ldso/cris/dl-sysdep.h6
-rw-r--r--ldso/ldso/dl-hash.c4
-rw-r--r--ldso/ldso/frv/dl-syscalls.h2
-rw-r--r--ldso/ldso/i386/dl-sysdep.h10
-rw-r--r--ldso/ldso/m68k/dl-sysdep.h6
-rw-r--r--ldso/ldso/mips/dl-sysdep.h8
-rw-r--r--ldso/ldso/powerpc/dl-sysdep.h8
-rw-r--r--ldso/ldso/powerpc/elfinterp.c4
-rw-r--r--ldso/ldso/sh/dl-sysdep.h8
-rw-r--r--ldso/ldso/sh64/dl-sysdep.h6
-rw-r--r--ldso/ldso/sparc/dl-sysdep.h8
-rw-r--r--ldso/ldso/xtensa/dl-sysdep.h6
18 files changed, 48 insertions, 48 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
index 08b1c8b50..076678cfc 100644
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
@@ -21,8 +21,8 @@ struct elf_resolve;
extern int _dl_map_cache(void);
extern int _dl_unmap_cache(void);
#else
-static inline void _dl_map_cache(void) { }
-static inline void _dl_unmap_cache(void) { }
+static __inline__ void _dl_map_cache(void) { }
+static __inline__ void _dl_unmap_cache(void) { }
#endif
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h
index 2c0f306b6..9b87783fa 100644
--- a/ldso/include/dl-hash.h
+++ b/ldso/include/dl-hash.h
@@ -134,7 +134,7 @@ extern int _dl_linux_dynamic_link(void);
extern char * _dl_library_path;
extern char * _dl_not_lazy;
-static inline int _dl_symbol(char * name)
+static __inline__ int _dl_symbol(char * name)
{
if (name[0] != '_' || name[1] != 'd' || name[2] != 'l' || name[3] != '_')
return 0;
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index d017866eb..fcc5c24ec 100644
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -127,7 +127,7 @@ static __always_inline _syscall3(int, _dl_readlink, const char *, path, char *,
#ifdef __UCLIBC_HAS_SSP__
# include <sys/time.h>
# define __NR__dl_gettimeofday __NR_gettimeofday
-static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv,
+static __inline__ _syscall2(int, _dl_gettimeofday, struct timeval *, tv,
# ifdef __USE_BSD
struct timezone *, tz);
# else
diff --git a/ldso/ldso/arm/dl-sysdep.h b/ldso/ldso/arm/dl-sysdep.h
index 65368d296..2a83f86fb 100644
--- a/ldso/ldso/arm/dl-sysdep.h
+++ b/ldso/ldso/arm/dl-sysdep.h
@@ -15,7 +15,7 @@
GOT_BASE[1] = (unsigned long) MODULE; \
}
-static inline unsigned long arm_modulus(unsigned long m, unsigned long p)
+static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
{
unsigned long i,t,inc;
i=p; t=0;
@@ -72,7 +72,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
first element of the GOT. We used to use the PIC register to do this
without a constant pool reference, but GCC 4.2 will use a pseudo-register
for the PIC base, so it may not be in r10. */
-static inline Elf32_Addr __attribute__ ((unused))
+static __inline__ Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
Elf32_Addr dynamic;
@@ -104,7 +104,7 @@ elf_machine_dynamic (void)
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr __attribute__ ((unused))
+static __inline__ Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void)
{
extern void __dl_start __asm__ ("_dl_start");
@@ -128,7 +128,7 @@ elf_machine_load_address (void)
return pcrel_addr - got_addr;
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/bfin/dl-syscalls.h b/ldso/ldso/bfin/dl-syscalls.h
index f9ba79b7c..21e4cdd2c 100644
--- a/ldso/ldso/bfin/dl-syscalls.h
+++ b/ldso/ldso/bfin/dl-syscalls.h
@@ -30,7 +30,7 @@ extern int _dl_errno;
#if DYNAMIC_LOADER_IN_SIMULATOR
#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);
/* Make sure we don't get another definition of _dl_mmap from the
diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h
index 8c3a16663..735183585 100644
--- a/ldso/ldso/bfin/dl-sysdep.h
+++ b/ldso/ldso/bfin/dl-sysdep.h
@@ -213,7 +213,7 @@ while (0)
#endif
#include <elf.h>
-static inline void
+static __inline__ void
elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/cris/dl-sysdep.h b/ldso/ldso/cris/dl-sysdep.h
index b84dcad70..c68541d1b 100644
--- a/ldso/ldso/cris/dl-sysdep.h
+++ b/ldso/ldso/cris/dl-sysdep.h
@@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entr
|| ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \
| (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_dynamic(void)
{
/* Don't just set this to an asm variable "r0" since that's not logical
@@ -61,7 +61,7 @@ elf_machine_dynamic(void)
there's some other symbol we could use, that we don't *have* to force a
GOT entry for. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_load_address(void)
{
Elf32_Addr gotaddr_diff;
@@ -95,7 +95,7 @@ elf_machine_load_address(void)
return gotaddr_diff;
}
-static inline void
+static __inline__ void
elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c
index 6eef1c742..2a393353b 100644
--- a/ldso/ldso/dl-hash.c
+++ b/ldso/ldso/dl-hash.c
@@ -57,7 +57,7 @@ struct dyn_elf *_dl_handles = NULL;
/* This is the new hash function that is used by the ELF linker to generate the
* GNU hash table that each executable and library will have if --hash-style=[gnu,both]
* is passed to the linker. We need it to decode the GNU hash table. */
-static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name)
+static __inline__ Elf_Symndx _dl_gnu_hash (const unsigned char *name)
{
unsigned long h = 5381;
unsigned char c;
@@ -70,7 +70,7 @@ static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name)
/* This is the hash function that is used by the ELF linker to generate the
* hash table that each executable and library is required to have. We need
* it to decode the hash table. */
-static inline Elf_Symndx _dl_elf_hash(const unsigned char *name)
+static __inline__ Elf_Symndx _dl_elf_hash(const unsigned char *name)
{
unsigned long hash=0;
unsigned long tmp;
diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h
index ffd59b82d..093d0dca8 100644
--- a/ldso/ldso/frv/dl-syscalls.h
+++ b/ldso/ldso/frv/dl-syscalls.h
@@ -16,7 +16,7 @@ extern int _dl_errno;
#if DYNAMIC_LOADER_IN_SIMULATOR
#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);
/* Make sure we don't get another definition of _dl_mmap from the
diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h
index 931abe305..19128df7b 100644
--- a/ldso/ldso/i386/dl-sysdep.h
+++ b/ldso/ldso/i386/dl-sysdep.h
@@ -42,8 +42,8 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent
/* 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 elf_machine_dynamic (void) attribute_unused;
-static inline Elf32_Addr
+static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused;
+static __inline__ Elf32_Addr
elf_machine_dynamic (void)
{
register Elf32_Addr *got __asm__ ("%ebx");
@@ -52,8 +52,8 @@ elf_machine_dynamic (void)
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr elf_machine_load_address (void) attribute_unused;
-static inline Elf32_Addr
+static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused;
+static __inline__ Elf32_Addr
elf_machine_load_address (void)
{
/* It doesn't matter what variable this is, the reference never makes
@@ -66,7 +66,7 @@ elf_machine_load_address (void)
return addr;
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h
index 138cabd41..bb36dcc28 100644
--- a/ldso/ldso/m68k/dl-sysdep.h
+++ b/ldso/ldso/m68k/dl-sysdep.h
@@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
/* 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__ ("%a5");
@@ -50,7 +50,7 @@ elf_machine_dynamic (void)
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_load_address (void)
{
Elf32_Addr addr;
@@ -60,7 +60,7 @@ elf_machine_load_address (void)
return addr;
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h
index 1e69653b7..1b5a6e07a 100644
--- a/ldso/ldso/mips/dl-sysdep.h
+++ b/ldso/ldso/mips/dl-sysdep.h
@@ -163,7 +163,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy)
#define OFFSET_GP_GOT 0x7ff0
-static inline ElfW(Addr) *
+static __inline__ ElfW(Addr) *
elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
{
/* FIXME: the offset of gp from GOT may be system-dependent. */
@@ -173,7 +173,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
/* 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. We assume its $gp points to the primary GOT. */
-static inline ElfW(Addr)
+static __inline__ ElfW(Addr)
elf_machine_dynamic (void)
{
register ElfW(Addr) gp __asm__ ("$28");
@@ -192,7 +192,7 @@ elf_machine_dynamic (void)
#endif
/* Return the run-time load address of the shared object. */
-static inline ElfW(Addr)
+static __inline__ ElfW(Addr)
elf_machine_load_address (void)
{
ElfW(Addr) addr;
@@ -208,7 +208,7 @@ elf_machine_load_address (void)
return addr;
}
-static inline void
+static __inline__ void
elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
ElfW(Word) relative_count)
{
diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h
index a4a2dd144..48a8bfb69 100644
--- a/ldso/ldso/powerpc/dl-sysdep.h
+++ b/ldso/ldso/powerpc/dl-sysdep.h
@@ -90,7 +90,7 @@ void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt);
#define ELF_MACHINE_PLTREL_OVERLAP 1
/* Return the value of the GOT pointer. */
-static inline Elf32_Addr * __attribute__ ((const))
+static __inline__ Elf32_Addr * __attribute__ ((const))
ppc_got (void)
{
Elf32_Addr *got;
@@ -109,14 +109,14 @@ ppc_got (void)
/* Return the link-time address of _DYNAMIC, stored as
the first value in the GOT. */
-static inline Elf32_Addr __attribute__ ((const))
+static __inline__ Elf32_Addr __attribute__ ((const))
elf_machine_dynamic (void)
{
return *ppc_got();
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr __attribute__ ((const))
+static __inline__ Elf32_Addr __attribute__ ((const))
elf_machine_load_address (void)
{
Elf32_Addr *branchaddr;
@@ -164,7 +164,7 @@ elf_machine_load_address (void)
return runtime_dynamic - elf_machine_dynamic ();
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 8953e7059..7fa626fb4 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -186,7 +186,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
return finaladdr;
}
-static inline int
+static __inline__ int
_dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
{
@@ -368,7 +368,7 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
PPC_ISYNC;
}
-static inline int
+static __inline__ int
_dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
unsigned long rel_addr, unsigned long rel_size,
int (*reloc_fnc) (struct elf_resolve *tpnt, struct dyn_elf *scope,
diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h
index da109782e..35a66fb54 100644
--- a/ldso/ldso/sh/dl-sysdep.h
+++ b/ldso/ldso/sh/dl-sysdep.h
@@ -25,7 +25,7 @@
struct elf_resolve;
extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
-static inline unsigned int
+static __inline__ unsigned int
_dl_urem(unsigned int n, unsigned int base)
{
int res;
@@ -100,7 +100,7 @@ _dl_urem(unsigned int n, unsigned int base)
/* 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 __attribute__ ((unused))
+static __inline__ Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
register Elf32_Addr *got;
@@ -109,7 +109,7 @@ elf_machine_dynamic (void)
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr __attribute__ ((unused))
+static __inline__ Elf32_Addr __attribute__ ((unused))
elf_machine_load_address (void)
{
Elf32_Addr addr;
@@ -151,7 +151,7 @@ elf_machine_load_address (void)
} \
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/sh64/dl-sysdep.h b/ldso/ldso/sh64/dl-sysdep.h
index f16885b23..dadde6103 100644
--- a/ldso/ldso/sh64/dl-sysdep.h
+++ b/ldso/ldso/sh64/dl-sysdep.h
@@ -42,7 +42,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent
/* 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 elf_machine_dynamic(void)
+static __inline__ Elf32_Addr elf_machine_dynamic(void)
{
register Elf32_Addr *got;
@@ -70,7 +70,7 @@ static inline Elf32_Addr elf_machine_dynamic(void)
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr elf_machine_load_address(void)
+static __inline__ Elf32_Addr elf_machine_load_address(void)
{
Elf32_Addr addr;
@@ -123,7 +123,7 @@ static inline Elf32_Addr elf_machine_load_address(void)
} \
}
-static inline void
+static __inline__ void
elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/sparc/dl-sysdep.h b/ldso/ldso/sparc/dl-sysdep.h
index 82665083c..7707cfcb9 100644
--- a/ldso/ldso/sparc/dl-sysdep.h
+++ b/ldso/ldso/sparc/dl-sysdep.h
@@ -49,7 +49,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
#ifndef COMPILE_ASM
/* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
-static inline unsigned long
+static __inline__ unsigned long
sparc_mod(unsigned long m, unsigned long p)
{
unsigned long i, t, inc;
@@ -127,7 +127,7 @@ do { register Elf32_Addr pc __asm__("o7"); \
/* 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__ ("%l7");
@@ -138,7 +138,7 @@ elf_machine_dynamic (void)
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_load_address (void)
{
register Elf32_Addr *pc __asm__ ("%o7"), *got __asm ("%l7");
@@ -157,7 +157,7 @@ elf_machine_load_address (void)
return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4;
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
diff --git a/ldso/ldso/xtensa/dl-sysdep.h b/ldso/ldso/xtensa/dl-sysdep.h
index afbbf3bfe..b58feff54 100644
--- a/ldso/ldso/xtensa/dl-sysdep.h
+++ b/ldso/ldso/xtensa/dl-sysdep.h
@@ -87,7 +87,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
(((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
/* Return the link-time address of _DYNAMIC. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_dynamic (void)
{
/* This function is only used while bootstrapping the runtime linker.
@@ -97,7 +97,7 @@ elf_machine_dynamic (void)
}
/* Return the run-time load address of the shared object. */
-static inline Elf32_Addr
+static __inline__ Elf32_Addr
elf_machine_load_address (void)
{
Elf32_Addr addr, tmp;
@@ -118,7 +118,7 @@ elf_machine_load_address (void)
return addr - 3;
}
-static inline void
+static __inline__ void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:24:41 +0000