svn commit: branches/uClibc-nptl/ldso/ldso: arm bfin cris i386 m68k mips powerpc sh etc...
carmelo at uclibc.org
carmelo at uclibc.org
Thu Mar 5 13:40:35 UTC 2009
Author: carmelo
Date: 2009-03-05 13:40:34 +0000 (Thu, 05 Mar 2009)
New Revision: 25545
Log:
Use __always_inline instead of __inline__
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
Modified:
branches/uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/bfin/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/i386/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/m68k/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/mips/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/sh/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/sparc/dl-sysdep.h
branches/uClibc-nptl/ldso/ldso/xtensa/dl-sysdep.h
Changeset:
Modified: branches/uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/arm/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/arm/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -18,7 +18,7 @@
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;
i=p; t=0;
@@ -79,7 +79,7 @@
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 __always_inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
Elf32_Addr dynamic;
@@ -111,7 +111,7 @@
}
/* 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)
{
extern void __dl_start __asm__ ("_dl_start");
@@ -135,7 +135,7 @@
return pcrel_addr - got_addr;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/bfin/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/bfin/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/bfin/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -210,7 +210,7 @@
#endif
#include <elf.h>
-static __inline__ void
+static __always_inline void
elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -37,7 +37,7 @@
|| ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \
| (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_dynamic(void)
{
/* Don't just set this to an asm variable "r0" since that's not logical
@@ -59,7 +59,7 @@
there's some other symbol we could use, that we don't *have* to force a
GOT entry for. */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_load_address(void)
{
Elf32_Addr gotaddr_diff;
@@ -93,7 +93,7 @@
return gotaddr_diff;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/i386/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/i386/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/i386/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -37,8 +37,8 @@
/* 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 __always_inline Elf32_Addr elf_machine_dynamic (void) attribute_unused;
+static __always_inline Elf32_Addr
elf_machine_dynamic (void)
{
register Elf32_Addr *got __asm__ ("%ebx");
@@ -47,8 +47,8 @@
/* 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)
{
/* It doesn't matter what variable this is, the reference never makes
@@ -61,7 +61,7 @@
return addr;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/m68k/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/m68k/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/m68k/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -39,7 +39,7 @@
/* 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 __always_inline Elf32_Addr
elf_machine_dynamic (void)
{
register Elf32_Addr *got __asm__ ("%a5");
@@ -48,7 +48,7 @@
/* Return the run-time load address of the shared object. */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_load_address (void)
{
Elf32_Addr addr;
@@ -58,7 +58,7 @@
return addr;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/mips/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/mips/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/mips/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -169,7 +169,7 @@
#define OFFSET_GP_GOT 0x7ff0
-static __inline__ ElfW(Addr) *
+static __always_inline ElfW(Addr) *
elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
{
/* FIXME: the offset of gp from GOT may be system-dependent. */
@@ -179,7 +179,7 @@
/* 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 __always_inline ElfW(Addr)
elf_machine_dynamic (void)
{
register ElfW(Addr) gp __asm__ ("$28");
@@ -198,7 +198,7 @@
#endif
/* Return the run-time load address of the shared object. */
-static __inline__ ElfW(Addr)
+static __always_inline ElfW(Addr)
elf_machine_load_address (void)
{
ElfW(Addr) addr;
@@ -214,7 +214,7 @@
return addr;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
ElfW(Word) relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -85,7 +85,7 @@
#define ELF_MACHINE_PLTREL_OVERLAP 1
/* Return the value of the GOT pointer. */
-static __inline__ Elf32_Addr * __attribute__ ((const))
+static __always_inline Elf32_Addr * __attribute__ ((const))
ppc_got (void)
{
Elf32_Addr *got;
@@ -104,14 +104,14 @@
/* Return the link-time address of _DYNAMIC, stored as
the first value in the GOT. */
-static __inline__ Elf32_Addr __attribute__ ((const))
+static __always_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 __always_inline Elf32_Addr __attribute__ ((const))
elf_machine_load_address (void)
{
Elf32_Addr *branchaddr;
@@ -159,7 +159,7 @@
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,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/sh/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/sh/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/sh/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -26,7 +26,7 @@
struct elf_resolve;
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)
{
int res;
@@ -104,7 +104,7 @@
/* 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 __always_inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
register Elf32_Addr *got;
@@ -113,7 +113,7 @@
}
/* 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)
{
Elf32_Addr addr;
@@ -155,7 +155,7 @@
} \
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -41,7 +41,7 @@
/* 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 __always_inline Elf32_Addr elf_machine_dynamic(void)
{
register Elf32_Addr *got;
@@ -69,7 +69,7 @@
}
/* 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;
@@ -122,7 +122,7 @@
} \
}
-static __inline__ void
+static __always_inline void
elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/sparc/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/sparc/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/sparc/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -52,7 +52,7 @@
#ifndef COMPILE_ASM
/* 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)
{
unsigned long i, t, inc;
@@ -118,7 +118,7 @@
/* 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 __always_inline Elf32_Addr
elf_machine_dynamic (void)
{
register Elf32_Addr *got __asm__ ("%l7");
@@ -129,7 +129,7 @@
}
/* Return the run-time load address of the shared object. */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_load_address (void)
{
register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7");
@@ -148,7 +148,7 @@
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,
Elf32_Word relative_count)
{
Modified: branches/uClibc-nptl/ldso/ldso/xtensa/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/xtensa/dl-sysdep.h 2009-03-05 13:40:11 UTC (rev 25544)
+++ branches/uClibc-nptl/ldso/ldso/xtensa/dl-sysdep.h 2009-03-05 13:40:34 UTC (rev 25545)
@@ -85,7 +85,7 @@
(((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
/* Return the link-time address of _DYNAMIC. */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_dynamic (void)
{
/* This function is only used while bootstrapping the runtime linker.
@@ -95,7 +95,7 @@
}
/* Return the run-time load address of the shared object. */
-static __inline__ Elf32_Addr
+static __always_inline Elf32_Addr
elf_machine_load_address (void)
{
Elf32_Addr addr, tmp;
@@ -116,7 +116,7 @@
return addr - 3;
}
-static __inline__ void
+static __always_inline void
elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
Elf32_Word relative_count)
{
More information about the uClibc-cvs
mailing list