Explorar el Código

Use __always_inline instead of __inline__

Carmelo Amoroso hace 17 años
padre
commit
c190f738e1

+ 4 - 4
ldso/ldso/arm/dl-sysdep.h

@@ -15,7 +15,7 @@
   GOT_BASE[1] = (unsigned long) MODULE; \
   GOT_BASE[1] = (unsigned long) MODULE; \
 }
 }
 
 
-static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
+static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p)
 {
 {
 	unsigned long i,t,inc;
 	unsigned long i,t,inc;
 	i=p; t=0;
 	i=p; t=0;
@@ -67,7 +67,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
    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
    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.  */
    for the PIC base, so it may not be in r10.  */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
   Elf32_Addr dynamic;
   Elf32_Addr dynamic;
@@ -99,7 +99,7 @@ elf_machine_dynamic (void)
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	extern void __dl_start __asm__ ("_dl_start");
 	extern void __dl_start __asm__ ("_dl_start");
@@ -123,7 +123,7 @@ elf_machine_load_address (void)
 	return pcrel_addr - got_addr;
 	return pcrel_addr - got_addr;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 1 - 1
ldso/ldso/bfin/dl-sysdep.h

@@ -210,7 +210,7 @@ while (0)
 #endif
 #endif
 
 
 #include <elf.h>
 #include <elf.h>
-static __inline__ void
+static __always_inline void
 elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 3 - 3
ldso/ldso/cris/dl-sysdep.h

@@ -37,7 +37,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_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT)	\
    | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
    | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
 
 
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_dynamic(void)
 elf_machine_dynamic(void)
 {
 {
 	/* Don't just set this to an asm variable "r0" since that's not logical
 	/* Don't just set this to an asm variable "r0" since that's not logical
@@ -59,7 +59,7 @@ elf_machine_dynamic(void)
    there's some other symbol we could use, that we don't *have* to force a
    there's some other symbol we could use, that we don't *have* to force a
    GOT entry for.  */
    GOT entry for.  */
 
 
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_load_address(void)
 elf_machine_load_address(void)
 {
 {
 	Elf32_Addr gotaddr_diff;
 	Elf32_Addr gotaddr_diff;
@@ -93,7 +93,7 @@ elf_machine_load_address(void)
 	return gotaddr_diff;
 	return gotaddr_diff;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
                      Elf32_Word relative_count)
                      Elf32_Word relative_count)
 {
 {

+ 5 - 5
ldso/ldso/i386/dl-sysdep.h

@@ -37,8 +37,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
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    first element of the GOT.  This must be inlined in a function which
    uses global data.  */
    uses global data.  */
-static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused;
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr elf_machine_dynamic (void) attribute_unused;
+static __always_inline Elf32_Addr
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	register Elf32_Addr *got __asm__ ("%ebx");
 	register Elf32_Addr *got __asm__ ("%ebx");
@@ -47,8 +47,8 @@ elf_machine_dynamic (void)
 
 
 
 
 /* Return the run-time load address of the shared object.  */
 /* 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 __always_inline Elf32_Addr elf_machine_load_address (void) attribute_unused;
+static __always_inline Elf32_Addr
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	/* It doesn't matter what variable this is, the reference never makes
 	/* It doesn't matter what variable this is, the reference never makes
@@ -61,7 +61,7 @@ elf_machine_load_address (void)
 	return addr;
 	return addr;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 3 - 3
ldso/ldso/m68k/dl-sysdep.h

@@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    first element of the GOT.  This must be inlined in a function which
    uses global data.  */
    uses global data.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	register Elf32_Addr *got __asm__ ("%a5");
 	register Elf32_Addr *got __asm__ ("%a5");
@@ -48,7 +48,7 @@ elf_machine_dynamic (void)
 
 
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	Elf32_Addr addr;
 	Elf32_Addr addr;
@@ -58,7 +58,7 @@ elf_machine_load_address (void)
 	return addr;
 	return addr;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 4 - 4
ldso/ldso/mips/dl-sysdep.h

@@ -169,7 +169,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy)
 
 
 #define OFFSET_GP_GOT 0x7ff0
 #define OFFSET_GP_GOT 0x7ff0
 
 
-static __inline__ ElfW(Addr) *
+static __always_inline ElfW(Addr) *
 elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
 elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
 {
 {
 	/* FIXME: the offset of gp from GOT may be system-dependent. */
 	/* FIXME: the offset of gp from GOT may be system-dependent. */
@@ -179,7 +179,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    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.  */
    uses global data.  We assume its $gp points to the primary GOT.  */
-static __inline__ ElfW(Addr)
+static __always_inline ElfW(Addr)
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	register ElfW(Addr) gp __asm__ ("$28");
 	register ElfW(Addr) gp __asm__ ("$28");
@@ -198,7 +198,7 @@ elf_machine_dynamic (void)
 #endif
 #endif
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ ElfW(Addr)
+static __always_inline ElfW(Addr)
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	ElfW(Addr) addr;
 	ElfW(Addr) addr;
@@ -214,7 +214,7 @@ elf_machine_load_address (void)
 	return addr;
 	return addr;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
 elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
 		      ElfW(Word) relative_count)
 		      ElfW(Word) relative_count)
 {
 {

+ 4 - 4
ldso/ldso/powerpc/dl-sysdep.h

@@ -85,7 +85,7 @@ void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt);
 #define ELF_MACHINE_PLTREL_OVERLAP 1
 #define ELF_MACHINE_PLTREL_OVERLAP 1
 
 
 /* Return the value of the GOT pointer.  */
 /* Return the value of the GOT pointer.  */
-static __inline__ Elf32_Addr * __attribute__ ((const))
+static __always_inline Elf32_Addr * __attribute__ ((const))
 ppc_got (void)
 ppc_got (void)
 {
 {
 	Elf32_Addr *got;
 	Elf32_Addr *got;
@@ -104,14 +104,14 @@ ppc_got (void)
 
 
 /* Return the link-time address of _DYNAMIC, stored as
 /* Return the link-time address of _DYNAMIC, stored as
    the first value in the GOT. */
    the first value in the GOT. */
-static __inline__ Elf32_Addr __attribute__ ((const))
+static __always_inline Elf32_Addr __attribute__ ((const))
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	return *ppc_got();
 	return *ppc_got();
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr __attribute__ ((const))
+static __always_inline Elf32_Addr __attribute__ ((const))
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
   Elf32_Addr *branchaddr;
   Elf32_Addr *branchaddr;
@@ -159,7 +159,7 @@ elf_machine_load_address (void)
   return runtime_dynamic - elf_machine_dynamic ();
   return runtime_dynamic - elf_machine_dynamic ();
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 4 - 4
ldso/ldso/sh/dl-sysdep.h

@@ -25,7 +25,7 @@
 struct elf_resolve;
 struct elf_resolve;
 extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 
 
-static __inline__ unsigned int
+static __always_inline unsigned int
 _dl_urem(unsigned int n, unsigned int base)
 _dl_urem(unsigned int n, unsigned int base)
 {
 {
   int res;
   int res;
@@ -95,7 +95,7 @@ _dl_urem(unsigned int n, unsigned int base)
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    first element of the GOT.  This must be inlined in a function which
    uses global data.  */
    uses global data.  */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	register Elf32_Addr *got;
 	register Elf32_Addr *got;
@@ -104,7 +104,7 @@ elf_machine_dynamic (void)
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr __attribute__ ((unused))
+static __always_inline Elf32_Addr __attribute__ ((unused))
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	Elf32_Addr addr;
 	Elf32_Addr addr;
@@ -146,7 +146,7 @@ elf_machine_load_address (void)
     } \
     } \
   }
   }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 3 - 3
ldso/ldso/sh64/dl-sysdep.h

@@ -41,7 +41,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
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    first element of the GOT.  This must be inlined in a function which
    uses global data.  */
    uses global data.  */
-static __inline__ Elf32_Addr elf_machine_dynamic(void)
+static __always_inline Elf32_Addr elf_machine_dynamic(void)
 {
 {
 	register Elf32_Addr *got;
 	register Elf32_Addr *got;
 
 
@@ -69,7 +69,7 @@ static __inline__ Elf32_Addr elf_machine_dynamic(void)
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr elf_machine_load_address(void)
+static __always_inline Elf32_Addr elf_machine_load_address(void)
 {
 {
 	Elf32_Addr addr;
 	Elf32_Addr addr;
 
 
@@ -122,7 +122,7 @@ static __inline__ Elf32_Addr elf_machine_load_address(void)
 	}						\
 	}						\
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		     Elf32_Word relative_count)
 		     Elf32_Word relative_count)
 {
 {

+ 4 - 4
ldso/ldso/sparc/dl-sysdep.h

@@ -52,7 +52,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 
 
 #ifndef COMPILE_ASM
 #ifndef COMPILE_ASM
 /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
 /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
-static __inline__ unsigned long
+static __always_inline unsigned long
 sparc_mod(unsigned long m, unsigned long p)
 sparc_mod(unsigned long m, unsigned long p)
 {
 {
 	unsigned long i, t, inc;
 	unsigned long i, t, inc;
@@ -118,7 +118,7 @@ do {    register Elf32_Addr pc __asm__("o7"); \
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
    first element of the GOT.  This must be inlined in a function which
    first element of the GOT.  This must be inlined in a function which
    uses global data.  */
    uses global data.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
 	register Elf32_Addr *got __asm__ ("%l7");
 	register Elf32_Addr *got __asm__ ("%l7");
@@ -129,7 +129,7 @@ elf_machine_dynamic (void)
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
 	register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7");
 	register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7");
@@ -148,7 +148,7 @@ elf_machine_load_address (void)
 	return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4;
 	return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {

+ 3 - 3
ldso/ldso/xtensa/dl-sysdep.h

@@ -85,7 +85,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
   (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
   (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
 
 
 /* Return the link-time address of _DYNAMIC.  */
 /* Return the link-time address of _DYNAMIC.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_dynamic (void)
 elf_machine_dynamic (void)
 {
 {
   /* This function is only used while bootstrapping the runtime linker.
   /* This function is only used while bootstrapping the runtime linker.
@@ -95,7 +95,7 @@ elf_machine_dynamic (void)
 }
 }
 
 
 /* Return the run-time load address of the shared object.  */
 /* Return the run-time load address of the shared object.  */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
 elf_machine_load_address (void)
 elf_machine_load_address (void)
 {
 {
   Elf32_Addr addr, tmp;
   Elf32_Addr addr, tmp;
@@ -116,7 +116,7 @@ elf_machine_load_address (void)
   return addr - 3;
   return addr - 3;
 }
 }
 
 
-static __inline__ void
+static __always_inline void
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
 		      Elf32_Word relative_count)
 		      Elf32_Word relative_count)
 {
 {