From ceca97e8eaee5878711eb2c2047859e4ced79be0 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 8 Dec 2005 15:02:02 +0000 Subject: Use hidden_strong_alias for alias(__x,__y), do not use recursive aliases --- libc/string/arm/strcmp.S | 4 ++-- libc/string/generic/strcmp.c | 4 ++-- libc/string/i386/strcmp.c | 4 ++-- libc/string/strcmp.c | 4 ++-- libc/string/strlcpy.c | 4 ++-- libc/string/wcscmp.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libc/string') diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index 4e2e3f5b5..2f45c2a58 100644 --- a/libc/string/arm/strcmp.S +++ b/libc/string/arm/strcmp.S @@ -51,6 +51,6 @@ __strcmp: .size __strcmp,.-__strcmp #ifdef __LOCALE_C_ONLY -.weak __strcoll ; __strcoll = __strcmp -.global strcoll ; .set strcoll,__strcoll +.global __strcoll ; .hidden __strcoll ; __strcoll = __strcmp +.global strcoll ; .set strcoll,__strcmp #endif diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c index e42ba9763..f12424243 100644 --- a/libc/string/generic/strcmp.c +++ b/libc/string/generic/strcmp.c @@ -47,6 +47,6 @@ int attribute_hidden __strcmp (const char *p1, const char *p2) strong_alias(__strcmp, strcmp) #ifdef __LOCALE_C_ONLY -weak_alias(__strcmp, __strcoll) -strong_alias(__strcoll, strcoll) +hidden_strong_alias(__strcmp, __strcoll) +strong_alias(__strcmp, strcoll) #endif /* __LOCALE_C_ONLY */ diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c index 4db824dbd..3786d5983 100644 --- a/libc/string/i386/strcmp.c +++ b/libc/string/i386/strcmp.c @@ -57,6 +57,6 @@ int attribute_hidden __strcmp(const char *cs, const char *ct) strong_alias(__strcmp, strcmp) #ifdef __LOCALE_C_ONLY -weak_alias(__strcmp, __strcoll) -strong_alias(__strcoll, strcoll) +hidden_strong_alias(__strcmp, __strcoll) +strong_alias(__strcmp, strcoll) #endif /* __LOCALE_C_ONLY */ diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c index 5cdbe6f73..fbcd6380c 100644 --- a/libc/string/strcmp.c +++ b/libc/string/strcmp.c @@ -12,8 +12,8 @@ strong_alias(__strcmp, strcmp) #ifdef __LOCALE_C_ONLY -weak_alias(__strcmp, __strcoll) -weak_alias(__strcmp, strcoll) +hidden_strong_alias(__strcmp, __strcoll) +strong_alias(__strcmp, strcoll) #endif #undef L_strcmp diff --git a/libc/string/strlcpy.c b/libc/string/strlcpy.c index 24786c31a..e8a435bce 100644 --- a/libc/string/strlcpy.c +++ b/libc/string/strlcpy.c @@ -12,8 +12,8 @@ strong_alias(__strlcpy, strlcpy) #ifdef __LOCALE_C_ONLY -weak_alias(__strlcpy, __strxfrm) -strong_alias(__strxfrm, strxfrm) +hidden_strong_alias(__strlcpy, __strxfrm) +strong_alias(__strlcpy, strxfrm) #endif #undef L_strlcpy diff --git a/libc/string/wcscmp.c b/libc/string/wcscmp.c index 505148140..b2f2916bc 100644 --- a/libc/string/wcscmp.c +++ b/libc/string/wcscmp.c @@ -13,8 +13,8 @@ strong_alias(__wcscmp, wcscmp) #ifdef __LOCALE_C_ONLY -weak_alias(__wcscmp, __wcscoll) -weak_alias(__wcscmp, wcscoll) +hidden_strong_alias(__wcscmp, __wcscoll) +strong_alias(__wcscmp, wcscoll) #endif #undef L_strcmp -- cgit v1.2.3