From 24f818725bb7eeffff055fe5b5a0cd0bdf490bca Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 16 Dec 2005 23:09:32 +0000 Subject: Remove all trailing ; after *_alias and change 2 to use weak_alias instead of __attribute__ ... --- ldso/ldso/dl-startup.c | 2 +- libc/inet/in6_addr.c | 2 +- libc/misc/internals/__uClibc_main.c | 2 +- libc/misc/internals/errno.c | 4 ++-- libc/misc/time/time.c | 2 +- libc/misc/wchar/wchar.c | 10 ++-------- libc/string/wstring.c | 4 ++-- libc/sysdeps/linux/common/fsync.c | 2 +- libc/sysdeps/linux/common/getpgid.c | 2 +- libc/sysdeps/linux/common/modify_ldt.c | 2 +- libc/sysdeps/linux/common/msync.c | 2 +- libc/sysdeps/linux/common/posix_fadvise.c | 2 +- libc/sysdeps/linux/common/write.c | 2 +- libc/sysdeps/linux/cris/fork.c | 3 +-- libm/fpmacros.c | 8 ++++---- libpthread/linuxthreads.old/ptfork.c | 4 ++-- 16 files changed, 23 insertions(+), 30 deletions(-) diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index c2686c733..ef8e71698 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -98,7 +98,7 @@ int (*_dl_elf_main) (int, char **, char **); static void* __rtld_stack_end; /* Points to argc on stack, e.g *((long *)__rtld_stackend) == argc */ -strong_alias(__rtld_stack_end, __libc_stack_end); /* Exported version of __rtld_stack_end */ +strong_alias(__rtld_stack_end, __libc_stack_end) /* Exported version of __rtld_stack_end */ /* When we enter this piece of code, the program stack looks like this: argc argument counter (integer) diff --git a/libc/inet/in6_addr.c b/libc/inet/in6_addr.c index de90555c9..7e52d2e39 100644 --- a/libc/inet/in6_addr.c +++ b/libc/inet/in6_addr.c @@ -27,7 +27,7 @@ const struct in6_addr __in6addr_any = weak_alias (__in6addr_any, in6addr_any) const struct in6_addr __in6addr_loopback = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }; -weak_alias(__in6addr_loopback, in6addr_loopback); +weak_alias(__in6addr_loopback, in6addr_loopback) #endif /* __UCLIBC_HAS_IPV6__ */ diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 6cd2eaa01..09922dbf4 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -72,7 +72,7 @@ extern void weak_function __pthread_initialize_minimal(void); * environ symbol is also included. */ char **__environ = 0; -weak_alias(__environ, environ); +weak_alias(__environ, environ) size_t __pagesize = 0; const char *__progname = 0; diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index f2424eae0..b08478d44 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -13,5 +13,5 @@ int _errno = 0; int _h_errno = 0; #endif -weak_alias (_errno, errno) -weak_alias(_h_errno, h_errno); +weak_alias(_errno, errno) +weak_alias(_h_errno, h_errno) diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index fac85638e..74b38f99e 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -754,7 +754,7 @@ time_t mktime(struct tm *timeptr) /* Another name for `mktime'. */ /* time_t timelocal(struct tm *tp) */ -weak_alias(mktime,timelocal); +weak_alias(mktime,timelocal) #endif /**********************************************************************/ diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 423bc4989..2535b5fff 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -788,10 +788,7 @@ size_t attribute_hidden __mbsnrtowcs(wchar_t *__restrict dst, const char **__res } return len - count; } - -size_t mbsnrtowcs(wchar_t *__restrict dst, const char **__restrict src, - size_t NMC, size_t len, mbstate_t *__restrict ps) - __attribute__ ((__weak__, __alias__("__mbsnrtowcs"))); +weak_alias(__mbsnrtowcs,mbsnrtowcs) #endif /**********************************************************************/ @@ -910,10 +907,7 @@ size_t attribute_hidden __wcsnrtombs(char *__restrict dst, const wchar_t **__res } return len - count; } - -size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src, - size_t NWC, size_t len, mbstate_t *__restrict ps) - __attribute__ ((__weak__, __alias__("__wcsnrtombs"))); +weak_alias(__wcsnrtombs,wcsnrtombs) #endif /**********************************************************************/ diff --git a/libc/string/wstring.c b/libc/string/wstring.c index baf99dbaf..89c533951 100644 --- a/libc/string/wstring.c +++ b/libc/string/wstring.c @@ -2362,9 +2362,9 @@ size_t attribute_hidden Wstrlcpy(register Wchar *__restrict dst, #if 0 /* def __LOCALE_C_ONLY */ #ifdef L___wcslcpy -weak_alias(__wcslcpy,wcsxfrm); +weak_alias(__wcslcpy,wcsxfrm) #else -weak_alias(strlcpy,strxfrm); +weak_alias(strlcpy,strxfrm) #endif #endif diff --git a/libc/sysdeps/linux/common/fsync.c b/libc/sysdeps/linux/common/fsync.c index 96764dbe2..e6f610751 100644 --- a/libc/sysdeps/linux/common/fsync.c +++ b/libc/sysdeps/linux/common/fsync.c @@ -12,4 +12,4 @@ #define __NR___libc_fsync __NR_fsync _syscall1(int, __libc_fsync, int, fd); -weak_alias(__libc_fsync, fsync); +weak_alias(__libc_fsync, fsync) diff --git a/libc/sysdeps/linux/common/getpgid.c b/libc/sysdeps/linux/common/getpgid.c index e8057b132..8de8516dc 100644 --- a/libc/sysdeps/linux/common/getpgid.c +++ b/libc/sysdeps/linux/common/getpgid.c @@ -16,4 +16,4 @@ pid_t __getpgid(pid_t pid) { return (__syscall_getpgid(pid)); } -weak_alias(__getpgid, getpgid); +weak_alias(__getpgid, getpgid) diff --git a/libc/sysdeps/linux/common/modify_ldt.c b/libc/sysdeps/linux/common/modify_ldt.c index 16df10c98..618681ad3 100644 --- a/libc/sysdeps/linux/common/modify_ldt.c +++ b/libc/sysdeps/linux/common/modify_ldt.c @@ -11,5 +11,5 @@ #ifdef __NR_modify_ldt _syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount); -weak_alias(modify_ldt, __modify_ldt); +weak_alias(modify_ldt, __modify_ldt) #endif diff --git a/libc/sysdeps/linux/common/msync.c b/libc/sysdeps/linux/common/msync.c index a821a936a..8de9f346e 100644 --- a/libc/sysdeps/linux/common/msync.c +++ b/libc/sysdeps/linux/common/msync.c @@ -13,4 +13,4 @@ #define __NR___libc_msync __NR_msync _syscall3(int, __libc_msync, void *, addr, size_t, length, int, flags); -weak_alias(__libc_msync, msync); +weak_alias(__libc_msync, msync) diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c index 52fc35700..70fd41ddd 100644 --- a/libc/sysdeps/linux/common/posix_fadvise.c +++ b/libc/sysdeps/linux/common/posix_fadvise.c @@ -21,7 +21,7 @@ _syscall4(int, posix_fadvise, int, fd, off_t, offset, off_t, len, int, advice); #if defined __UCLIBC_HAS_LFS__ && !defined __NR_fadvise64_64 -weak_alias(posix_fadvise, posix_fadvise64); +weak_alias(posix_fadvise, posix_fadvise64) #endif #else diff --git a/libc/sysdeps/linux/common/write.c b/libc/sysdeps/linux/common/write.c index d3b5fab93..8a1d57a82 100644 --- a/libc/sysdeps/linux/common/write.c +++ b/libc/sysdeps/linux/common/write.c @@ -17,5 +17,5 @@ weak_alias(__write,__libc_write) #if 0 /* Stupid libgcc.a from gcc 2.95.x uses __write in pure.o * which is a blatent GNU libc-ism... */ -weak_alias(__libc_write, __write); +weak_alias(__libc_write, __write) #endif diff --git a/libc/sysdeps/linux/cris/fork.c b/libc/sysdeps/linux/cris/fork.c index 0399edce8..4dd8e0269 100644 --- a/libc/sysdeps/linux/cris/fork.c +++ b/libc/sysdeps/linux/cris/fork.c @@ -8,5 +8,4 @@ SYSCALL__ (__libc_fork, 0) R0&-1==R0, and the child gets R0&0==0. */ /* i dunno what the blurb above is useful for. we just return. */ __asm__("ret\n\tnop"); -weak_alias(__libc_fork, fork); - +weak_alias(__libc_fork, fork) diff --git a/libm/fpmacros.c b/libm/fpmacros.c index 57c6b5a7a..2624054d0 100644 --- a/libm/fpmacros.c +++ b/libm/fpmacros.c @@ -248,7 +248,7 @@ int __isinfl ( long double x ) } return 0; } -weak_alias (__isinfl, isinfl); +weak_alias (__isinfl, isinfl) #endif /*********************************************************************** @@ -271,14 +271,14 @@ int __isnanf ( float x ) z.fval = x; return (((z.lval&FEXP_MASK) == FEXP_MASK) && ((z.lval&FFRAC_MASK) != 0)); } -weak_alias (__isnanf, isnanf); +weak_alias (__isnanf, isnanf) int __isnan ( double x ) { int class = __fpclassify(x); return ( class == FP_NAN ); } -weak_alias (__isnan, isnan); +weak_alias (__isnan, isnan) #if 0 int __isnanl ( long double x ) @@ -286,6 +286,6 @@ int __isnanl ( long double x ) int class = __fpclassify(x); return ( class == FP_NAN ); } -weak_alias (__isnanl, isnanl); +weak_alias (__isnanl, isnanl) #endif diff --git a/libpthread/linuxthreads.old/ptfork.c b/libpthread/linuxthreads.old/ptfork.c index eb544f34b..8c0b464d2 100644 --- a/libpthread/linuxthreads.old/ptfork.c +++ b/libpthread/linuxthreads.old/ptfork.c @@ -101,13 +101,13 @@ pid_t __fork(void) } return pid; } -weak_alias (__fork, fork); +weak_alias (__fork, fork) pid_t __vfork(void) { return __fork(); } -weak_alias (__vfork, vfork); +weak_alias (__vfork, vfork) #else -- cgit v1.2.3