summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-02 14:40:30 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-02 14:40:30 +0000
commitb2b553d3c4dbb075783208957f279d3ec14af911 (patch)
treedfafc156070d7ad034818961feafb2b6c41cf20c
parent4720ef43b31a5b03526814a1b51e2e729eb28996 (diff)
use new __always_inline define
-rw-r--r--ldso/include/dl-elf.h2
-rw-r--r--ldso/include/dl-string.h20
2 files changed, 11 insertions, 11 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
index 77dc7fb14..a5651b45a 100644
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
@@ -87,7 +87,7 @@ extern void _dl_protect_relro (struct elf_resolve *l);
extern void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off);
-static inline __attribute__((always_inline))
+static __always_inline
void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off)
{
for (; dpnt->d_tag; dpnt++) {
diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
index c1195e96f..c243296c4 100644
--- a/ldso/include/dl-string.h
+++ b/ldso/include/dl-string.h
@@ -43,7 +43,7 @@ static __always_inline char * _dl_strcat(char *dst, const char *src)
return dst;
}
-static inline char * __attribute__((__always_inline__)) _dl_strcpy(char * dst,const char *src)
+static __always_inline char * _dl_strcpy(char * dst,const char *src)
{
register char *ptr = dst;
@@ -53,7 +53,7 @@ static inline char * __attribute__((__always_inline__)) _dl_strcpy(char * dst,co
return ptr;
}
-static inline int __attribute__((__always_inline__)) _dl_strcmp(const char * s1,const char * s2)
+static __always_inline int _dl_strcmp(const char * s1,const char * s2)
{
register unsigned char c1, c2;
s1--;s2--;
@@ -68,7 +68,7 @@ static inline int __attribute__((__always_inline__)) _dl_strcmp(const char * s1,
return c1 - c2;
}
-static inline int __attribute__((__always_inline__)) _dl_strncmp(const char * s1,const char * s2,size_t len)
+static __always_inline int _dl_strncmp(const char * s1,const char * s2,size_t len)
{
register unsigned char c1 = '\0';
register unsigned char c2 = '\0';
@@ -84,7 +84,7 @@ static inline int __attribute__((__always_inline__)) _dl_strncmp(const char * s1
return c1 - c2;
}
-static inline char * __attribute__((__always_inline__)) _dl_strchr(const char * str,int c)
+static __always_inline char * _dl_strchr(const char * str,int c)
{
register char ch;
str--;
@@ -145,7 +145,7 @@ static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
return dst;
}
-static inline int __attribute__((__always_inline__)) _dl_memcmp(const void * s1,const void * s2,size_t len)
+static __always_inline int _dl_memcmp(const void * s1,const void * s2,size_t len)
{
unsigned char *c1 = (unsigned char *)s1-1;
unsigned char *c2 = (unsigned char *)s2-1;
@@ -160,7 +160,7 @@ static inline int __attribute__((__always_inline__)) _dl_memcmp(const void * s1,
#if defined(powerpc)
/* Will generate smaller and faster code due to loop unrolling.*/
-static inline void * __attribute__((__always_inline__)) _dl_memset(void *to, int c, size_t n)
+static __always_inline void * _dl_memset(void *to, int c, size_t n)
{
unsigned long chunks;
unsigned long *tmp_to;
@@ -185,7 +185,7 @@ static inline void * __attribute__((__always_inline__)) _dl_memset(void *to, int
return to;
}
#else
-static inline void * __attribute__((__always_inline__)) _dl_memset(void * str,int c,size_t len)
+static __always_inline void * _dl_memset(void * str,int c,size_t len)
{
register char *a = str;
@@ -196,7 +196,7 @@ static inline void * __attribute__((__always_inline__)) _dl_memset(void * str,in
}
#endif
-static inline char * __attribute__((__always_inline__)) _dl_get_last_path_component(char *path)
+static __always_inline char * _dl_get_last_path_component(char *path)
{
register char *ptr = path-1;
@@ -217,7 +217,7 @@ static inline char * __attribute__((__always_inline__)) _dl_get_last_path_compon
/* Early on, we can't call printf, so use this to print out
* numbers using the SEND_STDERR() macro. Avoid using mod
* or using long division */
-static inline char * __attribute__((__always_inline__)) _dl_simple_ltoa(char * local, unsigned long i)
+static __always_inline char * _dl_simple_ltoa(char * local, unsigned long i)
{
/* 20 digits plus a null terminator should be good for
* 64-bit or smaller ints (2^64 - 1)*/
@@ -232,7 +232,7 @@ static inline char * __attribute__((__always_inline__)) _dl_simple_ltoa(char * l
return p;
}
-static inline char * __attribute__((__always_inline__)) _dl_simple_ltoahex(char * local, unsigned long i)
+static __always_inline char * _dl_simple_ltoahex(char * local, unsigned long i)
{
/* 16 digits plus a leading "0x" plus a null terminator,
* should be good for 64-bit or smaller ints */