- tidy up inline:

  ldso and syscalls are __always_inline (the latter would need more cleanup)

7 files changed, 50 insertions, 50 deletions

diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
index 05741636d..73edbffa7 100644
--- a/ldso/ldso/arm/dl-startup.h
+++ b/ldso/ldso/arm/dl-startup.h
@@ -136,7 +136,7 @@ __asm__(
 #define GET_ARGV(ARGVP, ARGS) ARGVP = (((unsigned long*)ARGS)+1)
 
 /* Handle relocation of the symbols in the dynamic loader. */
-static inline
+static __always_inline
 void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr,
 	unsigned long symbol_addr, unsigned long load_addr, Elf32_Sym *symtab)
 {
diff --git a/ldso/ldso/bfin/dl-inlines.h b/ldso/ldso/bfin/dl-inlines.h
index f8b8f85f1..6ed1bdaf9 100644
--- a/ldso/ldso/bfin/dl-inlines.h
+++ b/ldso/ldso/bfin/dl-inlines.h
@@ -26,7 +26,7 @@ USA.  */
 
 /* Initialize a DL_LOADADDR_TYPE given a got pointer and a complete
    load map.  */
-inline static void
+static __always_inline void
 __dl_init_loadaddr_map (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Addr dl_boot_got_pointer,
 			struct elf32_fdpic_loadmap *map)
 {
@@ -47,7 +47,7 @@ __dl_init_loadaddr_map (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Addr dl_boo
 /* Figure out how many LOAD segments there are in the given headers,
    and allocate a block for the load map big enough for them.
    got_value will be properly initialized later on, with INIT_GOT.  */
-inline static int
+static __always_inline int
 __dl_init_loadaddr (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Phdr *ppnt,
 		    int pcnt)
 {
@@ -73,7 +73,7 @@ __dl_init_loadaddr (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Phdr *ppnt,
 }
 
 /* Incrementally initialize a load map.  */
-inline static void
+static __always_inline void
 __dl_init_loadaddr_hdr (struct elf32_fdpic_loadaddr loadaddr, void *addr,
 			Elf32_Phdr *phdr, int maxsegs)
 {
@@ -99,12 +99,12 @@ __dl_init_loadaddr_hdr (struct elf32_fdpic_loadaddr loadaddr, void *addr,
 #endif
 }
 
-inline static void __dl_loadaddr_unmap
+static __always_inline void __dl_loadaddr_unmap
 (struct elf32_fdpic_loadaddr loadaddr, struct funcdesc_ht *funcdesc_ht);
 
 /* Figure out whether the given address is in one of the mapped
    segments.  */
-inline static int
+static __always_inline int
 __dl_addr_in_loadaddr (void *p, struct elf32_fdpic_loadaddr loadaddr)
 {
   struct elf32_fdpic_loadmap *map = loadaddr.map;
@@ -118,7 +118,7 @@ __dl_addr_in_loadaddr (void *p, struct elf32_fdpic_loadaddr loadaddr)
   return 0;
 }
 
-inline static void * _dl_funcdesc_for (void *entry_point, void *got_value);
+static __always_inline void * _dl_funcdesc_for (void *entry_point, void *got_value);
 
 /* The hashcode handling code below is heavily inspired in libiberty's
    hashtab code, but with most adaptation points and support for
@@ -127,7 +127,7 @@ inline static void * _dl_funcdesc_for (void *entry_point, void *got_value);
    Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Vladimir Makarov (vmakarov@cygnus.com).  */
 
-inline static unsigned long
+static __always_inline unsigned long
 higher_prime_number (unsigned long n)
 {
   /* These are primes that are near, but slightly smaller than, a
@@ -202,13 +202,13 @@ struct funcdesc_ht
   size_t n_elements;
 };
 
-inline static int
+static __always_inline int
 hash_pointer (const void *p)
 {
   return (int) ((long)p >> 3);
 }
 
-inline static struct funcdesc_ht *
+static __always_inline struct funcdesc_ht *
 htab_create (void)
 {
   struct funcdesc_ht *ht = _dl_malloc (sizeof (struct funcdesc_ht));
@@ -229,7 +229,7 @@ htab_create (void)
 
 /* This is only called from _dl_loadaddr_unmap, so it's safe to call
    _dl_free().  See the discussion below.  */
-inline static void
+static __always_inline void
 htab_delete (struct funcdesc_ht *htab)
 {
   int i;
@@ -249,7 +249,7 @@ htab_delete (struct funcdesc_ht *htab)
    This function also assumes there are no deleted entries in the table.
    HASH is the hash value for the element to be inserted.  */
 
-inline static struct funcdesc_value **
+static __always_inline struct funcdesc_value **
 find_empty_slot_for_expand (struct funcdesc_ht *htab, int hash)
 {
   size_t size = htab->size;
@@ -281,7 +281,7 @@ find_empty_slot_for_expand (struct funcdesc_ht *htab, int hash)
    this function will return zero, indicating that the table could not be
    expanded.  If all goes well, it will return a non-zero value.  */
 
-inline static int
+static __always_inline int
 htab_expand (struct funcdesc_ht *htab)
 {
   struct funcdesc_value **oentries;
@@ -339,7 +339,7 @@ htab_expand (struct funcdesc_ht *htab)
    When inserting an entry, NULL may be returned if memory allocation
    fails.  */
 
-inline static struct funcdesc_value **
+static __always_inline struct funcdesc_value **
 htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert)
 {
   unsigned int index;
@@ -415,7 +415,7 @@ _dl_funcdesc_for (void *entry_point, void *got_value)
   return _dl_stabilize_funcdesc (*entry);
 }
 
-inline static void const *
+static __always_inline void const *
 _dl_lookup_address (void const *address)
 {
   struct elf_resolve *rpnt;
@@ -487,7 +487,7 @@ __dl_loadaddr_unmap (struct elf32_fdpic_loadaddr loadaddr,
     htab_delete (funcdesc_ht);
 }
 
-inline static int
+static __always_inline int
 __dl_is_special_segment (Elf32_Ehdr *epnt,
 			 Elf32_Phdr *ppnt)
 {
@@ -515,7 +515,7 @@ __dl_is_special_segment (Elf32_Ehdr *epnt,
   return 0;
 }
 
-inline static char *
+static __always_inline char *
 __dl_map_segment (Elf32_Ehdr *epnt,
 		  Elf32_Phdr *ppnt,
 		  int infile,
diff --git a/ldso/ldso/bfin/dl-syscalls.h b/ldso/ldso/bfin/dl-syscalls.h
index 21e4cdd2c..916d0f84e 100644
--- a/ldso/ldso/bfin/dl-syscalls.h
+++ b/ldso/ldso/bfin/dl-syscalls.h
@@ -44,8 +44,8 @@ static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
 # endif
 
 #include <bits/uClibc_page.h> /* for PAGE_SIZE */
-inline static void *_dl_memset(void*,int,size_t);
-inline static ssize_t _dl_pread(int fd, void *buf, size_t count, off_t offset);
+static __always_inline void *_dl_memset(void*,int,size_t);
+static __always_inline ssize_t _dl_pread(int fd, void *buf, size_t count, off_t offset);
 
 static __ptr_t
 _dl_mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
@@ -152,11 +152,11 @@ _dl_mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
 #include <unistd.h>
 
 #define __NR___syscall_lseek __NR_lseek
-inline static unsigned long _dl_read(int fd, const void *buf, unsigned long count);
+static __always_inline unsigned long _dl_read(int fd, const void *buf, unsigned long count);
 
-inline static _syscall3(__off_t, __syscall_lseek, int, fd, __off_t, offset,
+static __always_inline _syscall3(__off_t, __syscall_lseek, int, fd, __off_t, offset,
 			int, whence);
-inline static ssize_t
+static __always_inline ssize_t
 _dl_pread(int fd, void *buf, size_t count, off_t offset)
 {
   __off_t orig = __syscall_lseek (fd, 0, SEEK_CUR);
@@ -177,10 +177,10 @@ _dl_pread(int fd, void *buf, size_t count, off_t offset)
 }
 #else
 #define __NR___syscall_pread __NR_pread
-inline static _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
+static __always_inline _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
 			size_t, count, off_t, offset_hi, off_t, offset_lo);
 
-inline static ssize_t
+static __always_inline ssize_t
 _dl_pread(int fd, void *buf, size_t count, off_t offset)
 {
   return(__syscall_pread(fd,buf,count,__LONG_LONG_PAIR (offset >> 31, offset)));
@@ -190,18 +190,18 @@ _dl_pread(int fd, void *buf, size_t count, off_t offset)
 
 #ifdef __NR_sram_alloc
 #define __NR__dl_sram_alloc __NR_sram_alloc
-inline static _syscall2(__ptr_t, _dl_sram_alloc,
+static __always_inline _syscall2(__ptr_t, _dl_sram_alloc,
 			size_t, len, unsigned long, flags);
 #endif
 
 #ifdef __NR_sram_free
 #define __NR__dl_sram_free __NR_sram_free
-inline static _syscall1(int, _dl_sram_free, __ptr_t, addr);
+static __always_inline _syscall1(int, _dl_sram_free, __ptr_t, addr);
 #endif
 
 #ifdef __NR_dma_memcpy
 #define __NR__dl_dma_memcpy __NR_dma_memcpy
-inline static _syscall3(__ptr_t, _dl_dma_memcpy,
+static __always_inline _syscall3(__ptr_t, _dl_dma_memcpy,
 			__ptr_t, dest, __ptr_t, src, size_t, len);
 #endif
 
diff --git a/ldso/ldso/cris/dl-startup.h b/ldso/ldso/cris/dl-startup.h
index 832c3528b..dc9cd8fe2 100644
--- a/ldso/ldso/cris/dl-startup.h
+++ b/ldso/ldso/cris/dl-startup.h
@@ -53,7 +53,7 @@ __asm__(""					\
 
 
 /* Handle relocation of the symbols in the dynamic loader. */
-static inline
+static __always_inline
 void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr,
 	unsigned long symbol_addr, unsigned long load_addr, Elf32_Sym *symtab)
 {
diff --git a/ldso/ldso/frv/dl-inlines.h b/ldso/ldso/frv/dl-inlines.h
index 0d469dd88..95233a7c0 100644
--- a/ldso/ldso/frv/dl-inlines.h
+++ b/ldso/ldso/frv/dl-inlines.h
@@ -10,7 +10,7 @@
 
 /* Initialize a DL_LOADADDR_TYPE given a got pointer and a complete
    load map.  */
-inline static void
+static __always_inline void
 __dl_init_loadaddr_map (struct elf32_fdpic_loadaddr *loadaddr, void *got_value,
 			struct elf32_fdpic_loadmap *map)
 {
@@ -31,7 +31,7 @@ __dl_init_loadaddr_map (struct elf32_fdpic_loadaddr *loadaddr, void *got_value,
 /* Figure out how many LOAD segments there are in the given headers,
    and allocate a block for the load map big enough for them.
    got_value will be properly initialized later on, with INIT_GOT.  */
-inline static int
+static __always_inline int
 __dl_init_loadaddr (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Phdr *ppnt,
 		    int pcnt)
 {
@@ -57,7 +57,7 @@ __dl_init_loadaddr (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Phdr *ppnt,
 }
 
 /* Incrementally initialize a load map.  */
-inline static void
+static __always_inline void
 __dl_init_loadaddr_hdr (struct elf32_fdpic_loadaddr loadaddr, void *addr,
 			Elf32_Phdr *phdr, int maxsegs)
 {
@@ -83,12 +83,12 @@ __dl_init_loadaddr_hdr (struct elf32_fdpic_loadaddr loadaddr, void *addr,
 #endif
 }
 
-inline static void __dl_loadaddr_unmap
+static __always_inline void __dl_loadaddr_unmap
 (struct elf32_fdpic_loadaddr loadaddr, struct funcdesc_ht *funcdesc_ht);
 
 /* Figure out whether the given address is in one of the mapped
    segments.  */
-inline static int
+static __always_inline int
 __dl_addr_in_loadaddr (void *p, struct elf32_fdpic_loadaddr loadaddr)
 {
   struct elf32_fdpic_loadmap *map = loadaddr.map;
@@ -102,7 +102,7 @@ __dl_addr_in_loadaddr (void *p, struct elf32_fdpic_loadaddr loadaddr)
   return 0;
 }
 
-inline static void * _dl_funcdesc_for (void *entry_point, void *got_value);
+static __always_inline void * _dl_funcdesc_for (void *entry_point, void *got_value);
 
 /* The hashcode handling code below is heavily inspired in libiberty's
    hashtab code, but with most adaptation points and support for
@@ -111,7 +111,7 @@ inline static void * _dl_funcdesc_for (void *entry_point, void *got_value);
    Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Vladimir Makarov (vmakarov@cygnus.com).  */
 
-inline static unsigned long
+static __always_inline unsigned long
 higher_prime_number (unsigned long n)
 {
   /* These are primes that are near, but slightly smaller than, a
@@ -186,13 +186,13 @@ struct funcdesc_ht
   size_t n_elements;
 };
 
-inline static int
+static __always_inline int
 hash_pointer (const void *p)
 {
   return (int) ((long)p >> 3);
 }
 
-inline static struct funcdesc_ht *
+static __always_inline struct funcdesc_ht *
 htab_create (void)
 {
   struct funcdesc_ht *ht = _dl_malloc (sizeof (struct funcdesc_ht));
@@ -213,7 +213,7 @@ htab_create (void)
 
 /* This is only called from _dl_loadaddr_unmap, so it's safe to call
    _dl_free().  See the discussion below.  */
-inline static void
+static __always_inline void
 htab_delete (struct funcdesc_ht *htab)
 {
   int i;
@@ -233,7 +233,7 @@ htab_delete (struct funcdesc_ht *htab)
    This function also assumes there are no deleted entries in the table.
    HASH is the hash value for the element to be inserted.  */
 
-inline static struct funcdesc_value **
+static __always_inline struct funcdesc_value **
 find_empty_slot_for_expand (struct funcdesc_ht *htab, int hash)
 {
   size_t size = htab->size;
@@ -265,7 +265,7 @@ find_empty_slot_for_expand (struct funcdesc_ht *htab, int hash)
    this function will return zero, indicating that the table could not be
    expanded.  If all goes well, it will return a non-zero value.  */
 
-inline static int
+static __always_inline int
 htab_expand (struct funcdesc_ht *htab)
 {
   struct funcdesc_value **oentries;
@@ -323,7 +323,7 @@ htab_expand (struct funcdesc_ht *htab)
    When inserting an entry, NULL may be returned if memory allocation
    fails.  */
 
-inline static struct funcdesc_value **
+static __always_inline struct funcdesc_value **
 htab_find_slot (struct funcdesc_ht *htab, void *ptr, int insert)
 {
   unsigned int index;
@@ -399,7 +399,7 @@ _dl_funcdesc_for (void *entry_point, void *got_value)
   return _dl_stabilize_funcdesc (*entry);
 }
 
-inline static void const *
+static __always_inline void const *
 _dl_lookup_address (void const *address)
 {
   struct elf_resolve *rpnt;
diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h
index 093d0dca8..a4bff1d47 100644
--- a/ldso/ldso/frv/dl-syscalls.h
+++ b/ldso/ldso/frv/dl-syscalls.h
@@ -30,8 +30,8 @@ static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
 # endif
 
 #include <bits/uClibc_page.h> /* for PAGE_SIZE */
-inline static void *_dl_memset(void*,int,size_t);
-inline static ssize_t _dl_pread(int fd, void *buf, size_t count, off_t offset);
+static __always_inline void *_dl_memset(void*,int,size_t);
+static __always_inline ssize_t _dl_pread(int fd, void *buf, size_t count, off_t offset);
 
 static __ptr_t
 _dl_mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
@@ -138,11 +138,11 @@ _dl_mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
 #include <unistd.h>
 
 #define __NR___syscall_lseek __NR_lseek
-inline static unsigned long _dl_read(int fd, const void *buf, unsigned long count);
+static __always_inline unsigned long _dl_read(int fd, const void *buf, unsigned long count);
 
-inline static _syscall3(__off_t, __syscall_lseek, int, fd, __off_t, offset,
+static __always_inline _syscall3(__off_t, __syscall_lseek, int, fd, __off_t, offset,
 			int, whence);
-inline static ssize_t
+static __always_inline ssize_t
 _dl_pread(int fd, void *buf, size_t count, off_t offset)
 {
   __off_t orig = __syscall_lseek (fd, 0, SEEK_CUR);
@@ -163,10 +163,10 @@ _dl_pread(int fd, void *buf, size_t count, off_t offset)
 }
 #else
 #define __NR___syscall_pread __NR_pread
-inline static _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
+static __always_inline _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf,
 			size_t, count, off_t, offset_hi, off_t, offset_lo);
 
-inline static ssize_t
+static __always_inline ssize_t
 _dl_pread(int fd, void *buf, size_t count, off_t offset)
 {
   return(__syscall_pread(fd,buf,count,__LONG_LONG_PAIR (offset >> 31, offset)));
diff --git a/ldso/ldso/sh/dl-syscalls.h b/ldso/ldso/sh/dl-syscalls.h
index d3672512f..712852c4c 100644
--- a/ldso/ldso/sh/dl-syscalls.h
+++ b/ldso/ldso/sh/dl-syscalls.h
@@ -9,6 +9,6 @@ extern int _dl_errno;
 #warning !!! gcc 4.1 and later have problems with __always_inline so redefined as inline
 # ifdef __always_inline
 # undef __always_inline
-# define __always_inline inline
+# define __always_inline __inline__
 # endif
 #endif