From c9234bbc4d1ba5a0ad97d5d38b57af1077c38305 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 4 May 2006 14:44:13 +0000 Subject: use weak_alias() for data symbols, not strong_alias() --- libc/misc/error/error.c | 6 ++---- libc/misc/internals/__uClibc_main.c | 2 +- libc/misc/internals/errno.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index bad1843e6..08044ac83 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -64,6 +64,7 @@ void __error (int status, int errnum, const char *message, ...) if (status) exit (status); } +weak_alias(__error,error) extern __typeof(error_at_line) __error_at_line attribute_hidden; void __error_at_line (int status, int errnum, const char *file_name, @@ -101,7 +102,4 @@ void __error_at_line (int status, int errnum, const char *file_name, if (status) exit (status); } - -/* psm: keep this weak, too many use this in common code */ -weak_alias(__error,error) -strong_alias(__error_at_line,error_at_line) +weak_alias(__error_at_line,error_at_line) diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 869c9e178..41848775f 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -118,7 +118,7 @@ strong_alias (__progname_full, program_invocation_name) * environ symbol is also included. */ char **__environ = 0; -strong_alias(__environ,environ) +weak_alias(__environ, environ) /* TODO: don't export __pagesize; we cant now because libpthread uses it */ size_t __pagesize = 0; diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index ffacc8188..e06b3d228 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -16,7 +16,7 @@ int _errno = 0; int _h_errno = 0; #endif -strong_alias(_errno,errno) +weak_alias(_errno,errno) libc_hidden_def(errno) -strong_alias(_h_errno,h_errno) +weak_alias(_h_errno,h_errno) libc_hidden_def(h_errno) -- cgit v1.2.3