summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-10-24 08:34:31 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-10-24 08:34:31 +0000
commit694525ec2e1ba8cd93affc352dfd149ace4fa016 (patch)
tree522d2b1dd3d1fe84dce467355851bc5794165c0f
parentae549acff0899cbec32bd2a1353a99ea26d6bc00 (diff)
downloaduClibc-alpine-694525ec2e1ba8cd93affc352dfd149ace4fa016.tar.bz2
uClibc-alpine-694525ec2e1ba8cd93affc352dfd149ace4fa016.tar.xz
- tidy up inline:
ldso and syscalls are __always_inline (the latter would need more cleanup)
-rw-r--r--ldso/ldso/arm/dl-startup.h2
-rw-r--r--ldso/ldso/bfin/dl-inlines.h32
-rw-r--r--ldso/ldso/bfin/dl-syscalls.h20
-rw-r--r--ldso/ldso/cris/dl-startup.h2
-rw-r--r--ldso/ldso/frv/dl-inlines.h28
-rw-r--r--ldso/ldso/frv/dl-syscalls.h14
-rw-r--r--ldso/ldso/sh/dl-syscalls.h2
-rw-r--r--libc/stdlib/stdlib.c2
-rw-r--r--libc/sysdeps/linux/bfin/bits/elf-fdpic.h2
-rw-r--r--libc/sysdeps/linux/bfin/crtreloc.c4
-rw-r--r--libc/sysdeps/linux/common/__syscall_fcntl.c2
-rw-r--r--libc/sysdeps/linux/common/getcwd.c4
-rw-r--r--libc/sysdeps/linux/common/getdents.c2
-rw-r--r--libc/sysdeps/linux/common/getrlimit.c4
-rw-r--r--libc/sysdeps/linux/common/ioctl.c2
-rw-r--r--libc/sysdeps/linux/common/ppoll.c2
-rw-r--r--libc/sysdeps/linux/common/setrlimit.c4
-rw-r--r--libc/sysdeps/linux/common/sigprocmask.c4
-rw-r--r--libc/sysdeps/linux/common/sysctl.c2
-rw-r--r--libc/sysdeps/linux/e1/bits/fenvinline.h2
-rw-r--r--libc/sysdeps/linux/frv/bits/elf-fdpic.h2
-rw-r--r--libc/sysdeps/linux/frv/crtreloc.c4
-rw-r--r--libc/sysdeps/linux/powerpc/ioctl.c2
-rw-r--r--libm/e_lgamma_r.c2
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h2
25 files changed, 74 insertions, 74 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
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index d72b80941..3c74be71a 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -936,7 +936,7 @@ libc_hidden_def(_stdlib_mb_cur_max)
* To note, until now all the supported encoding are stateless.
*/
-static inline int is_stateful(unsigned char encoding)
+static __always_inline int is_stateful(unsigned char encoding)
{
switch (encoding)
{
diff --git a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h
index 905648054..b7e87b8e9 100644
--- a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h
+++ b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h
@@ -64,7 +64,7 @@ struct elf32_fdpic_loadaddr {
/* Map a pointer's VMA to its corresponding address according to the
load map. */
-inline static void *
+static __always_inline void *
__reloc_pointer (void *p,
const struct elf32_fdpic_loadmap *map)
{
diff --git a/libc/sysdeps/linux/bfin/crtreloc.c b/libc/sysdeps/linux/bfin/crtreloc.c
index 5e038256a..408ded2f8 100644
--- a/libc/sysdeps/linux/bfin/crtreloc.c
+++ b/libc/sysdeps/linux/bfin/crtreloc.c
@@ -41,7 +41,7 @@ union word {
/* Compute the runtime address of pointer in the range [p,e), and then
map the pointer pointed by it. */
-inline static void ***
+static __always_inline void ***
reloc_range_indirect (void ***p, void ***e,
const struct elf32_fdpic_loadmap *map)
{
@@ -102,7 +102,7 @@ __self_reloc (const struct elf32_fdpic_loadmap *map,
need. */
/* Remap pointers in [p,e). */
-inline static void**
+static __always_inline void**
reloc_range (void **p, void **e,
const struct elf32_fdpic_loadmap *map)
{
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index 697abd0d4..a3fb74fa3 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -21,7 +21,7 @@ libc_hidden_proto(__libc_fcntl64)
#endif
#define __NR___syscall_fcntl __NR_fcntl
-static inline
+static __always_inline
_syscall3(int, __syscall_fcntl, int, fd, int, cmd, long, arg)
int __libc_fcntl(int fd, int cmd, ...)
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c
index f8fa3968b..ddeb483d6 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -30,7 +30,7 @@ libc_hidden_proto(stat)
#ifdef __NR_getcwd
# define __NR___syscall_getcwd __NR_getcwd
-static inline
+static __always_inline
_syscall2(int, __syscall_getcwd, char *, buf, unsigned long, size)
#else
@@ -144,7 +144,7 @@ oops:
return 0;
}
-static inline
+static __always_inline
int __syscall_getcwd(char * buf, unsigned long size)
{
int len;
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
index 97c6d8b06..cff87e55c 100644
--- a/libc/sysdeps/linux/common/getdents.c
+++ b/libc/sysdeps/linux/common/getdents.c
@@ -39,7 +39,7 @@ struct kernel_dirent
ssize_t __getdents (int fd, char *buf, size_t nbytes) attribute_hidden;
#define __NR___syscall_getdents __NR_getdents
-static inline _syscall3(int, __syscall_getdents, int, fd, unsigned char *, kdirp, size_t, count);
+static __always_inline _syscall3(int, __syscall_getdents, int, fd, unsigned char *, kdirp, size_t, count);
#ifdef __ASSUME_GETDENTS32_D_TYPE
ssize_t __getdents (int fd, char *buf, size_t nbytes)
diff --git a/libc/sysdeps/linux/common/getrlimit.c b/libc/sysdeps/linux/common/getrlimit.c
index ec62b2e45..40b3c7368 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -21,7 +21,7 @@ libc_hidden_proto(getrlimit)
/* just call ugetrlimit() */
# define __NR___syscall_ugetrlimit __NR_ugetrlimit
-static inline
+static __always_inline
_syscall2(int, __syscall_ugetrlimit, enum __rlimit_resource, resource,
struct rlimit *, rlim)
int getrlimit(__rlimit_resource_t resource, struct rlimit *rlimits)
@@ -39,7 +39,7 @@ _syscall2(int, getrlimit, __rlimit_resource_t, resource,
/* we have to handle old style getrlimit() */
# define __NR___syscall_getrlimit __NR_getrlimit
-static inline
+static __always_inline
_syscall2(int, __syscall_getrlimit, int, resource, struct rlimit *, rlim)
int getrlimit(__rlimit_resource_t resource, struct rlimit *rlimits)
diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c
index 4792409d4..51f83a372 100644
--- a/libc/sysdeps/linux/common/ioctl.c
+++ b/libc/sysdeps/linux/common/ioctl.c
@@ -14,7 +14,7 @@
libc_hidden_proto(ioctl)
#define __NR___syscall_ioctl __NR_ioctl
-static inline
+static __always_inline
_syscall3(int, __syscall_ioctl, int, fd, int, request, void *, arg)
int ioctl(int fd, unsigned long int request, ...)
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index 8b12e612f..a203c0c55 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -25,7 +25,7 @@
libc_hidden_proto(ppoll)
# define __NR___libc_ppoll __NR_ppoll
-static inline
+static __always_inline
_syscall4(int, __libc_ppoll, struct pollfd *, fds,
nfds_t, nfds, const struct timespec *, timeout,
const __sigset_t *, sigmask)
diff --git a/libc/sysdeps/linux/common/setrlimit.c b/libc/sysdeps/linux/common/setrlimit.c
index 9a344a121..3811cd7d4 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -21,7 +21,7 @@ libc_hidden_proto(setrlimit)
/* just call usetrlimit() */
# define __NR___syscall_usetrlimit __NR_usetrlimit
-static inline
+static __always_inline
_syscall2(int, __syscall_usetrlimit, enum __rlimit_resource, resource,
const struct rlimit *, rlim)
int setrlimit(__rlimit_resource_t resource, struct rlimit *rlimits)
@@ -39,7 +39,7 @@ _syscall2(int, setrlimit, __rlimit_resource_t, resource,
/* we have to handle old style setrlimit() */
# define __NR___syscall_setrlimit __NR_setrlimit
-static inline
+static __always_inline
_syscall2(int, __syscall_setrlimit, int, resource, const struct rlimit *, rlim)
int setrlimit(__rlimit_resource_t resource, const struct rlimit *rlimits)
diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c
index a9d59e602..7da17bc77 100644
--- a/libc/sysdeps/linux/common/sigprocmask.c
+++ b/libc/sysdeps/linux/common/sigprocmask.c
@@ -19,7 +19,7 @@ libc_hidden_proto(sigprocmask)
#ifdef __NR_rt_sigprocmask
# define __NR___rt_sigprocmask __NR_rt_sigprocmask
-static inline
+static __always_inline
_syscall4(int, __rt_sigprocmask, int, how, const sigset_t *, set,
sigset_t *, oldset, size_t, size)
@@ -46,7 +46,7 @@ int sigprocmask(int how, const sigset_t * set, sigset_t * oldset)
#else
# define __NR___syscall_sigprocmask __NR_sigprocmask
-static inline
+static __always_inline
_syscall3(int, __syscall_sigprocmask, int, how, const sigset_t *, set,
sigset_t *, oldset)
diff --git a/libc/sysdeps/linux/common/sysctl.c b/libc/sysdeps/linux/common/sysctl.c
index 1ba23c9c9..11d53cd8e 100644
--- a/libc/sysdeps/linux/common/sysctl.c
+++ b/libc/sysdeps/linux/common/sysctl.c
@@ -24,7 +24,7 @@ struct __sysctl_args {
unsigned long __unused[4];
};
-static inline
+static __always_inline
_syscall1(int, _sysctl, struct __sysctl_args *, args)
int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp,
diff --git a/libc/sysdeps/linux/e1/bits/fenvinline.h b/libc/sysdeps/linux/e1/bits/fenvinline.h
index a16fc0fb2..255624713 100644
--- a/libc/sysdeps/linux/e1/bits/fenvinline.h
+++ b/libc/sysdeps/linux/e1/bits/fenvinline.h
@@ -124,7 +124,7 @@ static __inline__ feclearexcept(int __excepts)
* excepts. You can test for an exception either after
* an FP instruction or within a SIGFPE handler
*/
-inline int fetestexcept(int __excepts)
+__inline__ int fetestexcept(int __excepts)
{
unsigned int G2, G2en, G2dis;
unsigned int enabled_excepts, disabled_excepts;
diff --git a/libc/sysdeps/linux/frv/bits/elf-fdpic.h b/libc/sysdeps/linux/frv/bits/elf-fdpic.h
index 905648054..b7e87b8e9 100644
--- a/libc/sysdeps/linux/frv/bits/elf-fdpic.h
+++ b/libc/sysdeps/linux/frv/bits/elf-fdpic.h
@@ -64,7 +64,7 @@ struct elf32_fdpic_loadaddr {
/* Map a pointer's VMA to its corresponding address according to the
load map. */
-inline static void *
+static __always_inline void *
__reloc_pointer (void *p,
const struct elf32_fdpic_loadmap *map)
{
diff --git a/libc/sysdeps/linux/frv/crtreloc.c b/libc/sysdeps/linux/frv/crtreloc.c
index e025b619f..ba934bc5a 100644
--- a/libc/sysdeps/linux/frv/crtreloc.c
+++ b/libc/sysdeps/linux/frv/crtreloc.c
@@ -34,7 +34,7 @@ Cambridge, MA 02139, USA. */
/* Compute the runtime address of pointer in the range [p,e), and then
map the pointer pointed by it. */
-inline static void ***
+static __always_inline void ***
reloc_range_indirect (void ***p, void ***e,
const struct elf32_fdpic_loadmap *map)
{
@@ -79,7 +79,7 @@ __self_reloc (const struct elf32_fdpic_loadmap *map,
need. */
/* Remap pointers in [p,e). */
-inline static void**
+static __always_inline void**
reloc_range (void **p, void **e,
const struct elf32_fdpic_loadmap *map)
{
diff --git a/libc/sysdeps/linux/powerpc/ioctl.c b/libc/sysdeps/linux/powerpc/ioctl.c
index 2c37dfb40..e12362783 100644
--- a/libc/sysdeps/linux/powerpc/ioctl.c
+++ b/libc/sysdeps/linux/powerpc/ioctl.c
@@ -31,7 +31,7 @@ libc_hidden_proto(tcgetattr)
using the new-style struct termios, and translate them to old-style. */
#define __NR___syscall_ioctl __NR_ioctl
-static inline
+static __always_inline
_syscall3(int, __syscall_ioctl, int, fd, unsigned long int, request, void *, arg)
diff --git a/libm/e_lgamma_r.c b/libm/e_lgamma_r.c
index 15b3583aa..42b48b3a6 100644
--- a/libm/e_lgamma_r.c
+++ b/libm/e_lgamma_r.c
@@ -164,7 +164,7 @@ static double zero= 0.00000000000000000000e+00;
static
#ifdef __GNUC__
-inline
+__inline__
#endif
#ifdef __STDC__
double sin_pi(double x)
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h
index f62f7d6e9..a3f303ca3 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h
@@ -19,7 +19,7 @@
#include <limits.h>
-extern inline int __libc_use_alloca (size_t size)
+__extern_always_inline int __libc_use_alloca (size_t size)
{
return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1)
|| __libc_alloca_cutoff (size));