yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h (working copy) yann@1282: @@ -17,7 +17,7 @@ yann@1282: yann@1282: #define DL_MALLOC_ALIGN 8 /* EABI needs 8 byte alignment for STRD LDRD*/ yann@1282: yann@1282: -static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p) yann@1282: +static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p) yann@1282: { yann@1282: unsigned long i,t,inc; yann@1282: i=p; t=0; yann@1282: @@ -74,7 +74,7 @@ unsigned long _dl_linux_resolver(struct yann@1282: first element of the GOT. We used to use the PIC register to do this yann@1282: without a constant pool reference, but GCC 4.2 will use a pseudo-register yann@1282: for the PIC base, so it may not be in r10. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((unused)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((unused)) yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: Elf32_Addr dynamic; yann@1282: @@ -106,7 +106,7 @@ elf_machine_dynamic (void) yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((unused)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((unused)) yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: extern void __dl_start __asm__ ("_dl_start"); yann@1282: @@ -130,7 +130,7 @@ elf_machine_load_address (void) yann@1282: return pcrel_addr - got_addr; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h (working copy) yann@1282: @@ -90,7 +90,7 @@ void _dl_init_got(unsigned long *lpnt,st yann@1282: #define ELF_MACHINE_PLTREL_OVERLAP 1 yann@1282: yann@1282: /* Return the value of the GOT pointer. */ yann@1282: -static __inline__ Elf32_Addr * __attribute__ ((const)) yann@1282: +static __always_inline Elf32_Addr * __attribute__ ((const)) yann@1282: ppc_got (void) yann@1282: { yann@1282: Elf32_Addr *got; yann@1282: @@ -109,14 +109,14 @@ ppc_got (void) yann@1282: yann@1282: /* Return the link-time address of _DYNAMIC, stored as yann@1282: the first value in the GOT. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((const)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((const)) yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: return *ppc_got(); yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((const)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((const)) yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: Elf32_Addr *branchaddr; yann@1282: @@ -164,7 +164,7 @@ elf_machine_load_address (void) yann@1282: return runtime_dynamic - elf_machine_dynamic (); yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h (working copy) yann@1282: @@ -42,7 +42,7 @@ extern unsigned long _dl_linux_resolver( yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. */ yann@1282: -static __inline__ Elf32_Addr elf_machine_dynamic(void) yann@1282: +static __always_inline Elf32_Addr elf_machine_dynamic(void) yann@1282: { yann@1282: register Elf32_Addr *got; yann@1282: yann@1282: @@ -70,7 +70,7 @@ static __inline__ Elf32_Addr elf_machine yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr elf_machine_load_address(void) yann@1282: +static __always_inline Elf32_Addr elf_machine_load_address(void) yann@1282: { yann@1282: Elf32_Addr addr; yann@1282: yann@1282: @@ -123,7 +123,7 @@ static __inline__ Elf32_Addr elf_machine yann@1282: } \ yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h (working copy) yann@1282: @@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: register Elf32_Addr *got __asm__ ("%a5"); yann@1282: @@ -50,7 +50,7 @@ elf_machine_dynamic (void) yann@1282: yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: Elf32_Addr addr; yann@1282: @@ -60,7 +60,7 @@ elf_machine_load_address (void) yann@1282: return addr; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h (working copy) yann@1282: @@ -42,8 +42,8 @@ extern unsigned long _dl_linux_resolver( yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. */ yann@1282: -static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused; yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr elf_machine_dynamic (void) attribute_unused; yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: register Elf32_Addr *got __asm__ ("%ebx"); yann@1282: @@ -52,8 +52,8 @@ elf_machine_dynamic (void) yann@1282: yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused; yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr elf_machine_load_address (void) attribute_unused; yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: /* It doesn't matter what variable this is, the reference never makes yann@1282: @@ -66,7 +66,7 @@ elf_machine_load_address (void) yann@1282: return addr; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h (working copy) yann@1282: @@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver( yann@1282: || ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \ yann@1282: | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY)) yann@1282: yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_dynamic(void) yann@1282: { yann@1282: /* Don't just set this to an asm variable "r0" since that's not logical yann@1282: @@ -61,7 +61,7 @@ elf_machine_dynamic(void) yann@1282: there's some other symbol we could use, that we don't *have* to force a yann@1282: GOT entry for. */ yann@1282: yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_load_address(void) yann@1282: { yann@1282: Elf32_Addr gotaddr_diff; yann@1282: @@ -95,7 +95,7 @@ elf_machine_load_address(void) yann@1282: return gotaddr_diff; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h (working copy) yann@1282: @@ -87,7 +87,7 @@ extern unsigned long _dl_linux_resolver yann@1282: (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) yann@1282: yann@1282: /* Return the link-time address of _DYNAMIC. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: /* This function is only used while bootstrapping the runtime linker. yann@1282: @@ -97,7 +97,7 @@ elf_machine_dynamic (void) yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: Elf32_Addr addr, tmp; yann@1282: @@ -118,7 +118,7 @@ elf_machine_load_address (void) yann@1282: return addr - 3; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h (working copy) yann@1282: @@ -49,7 +49,7 @@ unsigned long _dl_linux_resolver(struct yann@1282: yann@1282: #ifndef COMPILE_ASM yann@1282: /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */ yann@1282: -static __inline__ unsigned long yann@1282: +static __always_inline unsigned long yann@1282: sparc_mod(unsigned long m, unsigned long p) yann@1282: { yann@1282: unsigned long i, t, inc; yann@1282: @@ -127,7 +127,7 @@ do { register Elf32_Addr pc __asm__(" yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: register Elf32_Addr *got __asm__ ("%l7"); yann@1282: @@ -138,7 +138,7 @@ elf_machine_dynamic (void) yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr yann@1282: +static __always_inline Elf32_Addr yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7"); yann@1282: @@ -157,7 +157,7 @@ elf_machine_load_address (void) yann@1282: return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h (working copy) yann@1282: @@ -163,7 +163,7 @@ void _dl_perform_mips_global_got_relocat yann@1282: yann@1282: #define OFFSET_GP_GOT 0x7ff0 yann@1282: yann@1282: -static __inline__ ElfW(Addr) * yann@1282: +static __always_inline ElfW(Addr) * yann@1282: elf_mips_got_from_gpreg (ElfW(Addr) gpreg) yann@1282: { yann@1282: /* FIXME: the offset of gp from GOT may be system-dependent. */ yann@1282: @@ -173,7 +173,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpre yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. We assume its $gp points to the primary GOT. */ yann@1282: -static __inline__ ElfW(Addr) yann@1282: +static __always_inline ElfW(Addr) yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: register ElfW(Addr) gp __asm__ ("$28"); yann@1282: @@ -192,7 +192,7 @@ elf_machine_dynamic (void) yann@1282: #endif yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ ElfW(Addr) yann@1282: +static __always_inline ElfW(Addr) yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: ElfW(Addr) addr; yann@1282: @@ -208,7 +208,7 @@ elf_machine_load_address (void) yann@1282: return addr; yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr, yann@1282: ElfW(Word) relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h (working copy) yann@1282: @@ -25,7 +25,7 @@ yann@1282: struct elf_resolve; yann@1282: extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); yann@1282: yann@1282: -static __inline__ unsigned int yann@1282: +static __always_inline unsigned int yann@1282: _dl_urem(unsigned int n, unsigned int base) yann@1282: { yann@1282: int res; yann@1282: @@ -100,7 +100,7 @@ _dl_urem(unsigned int n, unsigned int ba yann@1282: /* Return the link-time address of _DYNAMIC. Conveniently, this is the yann@1282: first element of the GOT. This must be inlined in a function which yann@1282: uses global data. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((unused)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((unused)) yann@1282: elf_machine_dynamic (void) yann@1282: { yann@1282: register Elf32_Addr *got; yann@1282: @@ -109,7 +109,7 @@ elf_machine_dynamic (void) yann@1282: } yann@1282: yann@1282: /* Return the run-time load address of the shared object. */ yann@1282: -static __inline__ Elf32_Addr __attribute__ ((unused)) yann@1282: +static __always_inline Elf32_Addr __attribute__ ((unused)) yann@1282: elf_machine_load_address (void) yann@1282: { yann@1282: Elf32_Addr addr; yann@1282: @@ -151,7 +151,7 @@ elf_machine_load_address (void) yann@1282: } \ yann@1282: } yann@1282: yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: { yann@1282: Index: uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h yann@1282: =================================================================== yann@1282: --- uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h (revision 25503) yann@1282: +++ uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h (working copy) yann@1282: @@ -213,7 +213,7 @@ while (0) yann@1282: #endif yann@1282: yann@1282: #include yann@1282: -static __inline__ void yann@1282: +static __always_inline void yann@1282: elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, yann@1282: Elf32_Word relative_count) yann@1282: {