diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
| commit | 9184de4614953897215e989b8720ad7fe6cfde86 (patch) | |
| tree | 3fbdd8c59ed45fee7162fc51241cb59ee51afcf2 /libc/string | |
| parent | f335b8c0ffb5fd7ae44d154900d78988b6abf769 (diff) | |
| download | uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.bz2 uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.xz | |
Finish merge from trunk, again, no really.
Diffstat (limited to 'libc/string')
| -rw-r--r-- | libc/string/arm/strcmp.S | 8 | ||||
| -rw-r--r-- | libc/string/i386/strcmp.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index 4e2e3f5b5..33acc14cf 100644 --- a/libc/string/arm/strcmp.S +++ b/libc/string/arm/strcmp.S @@ -29,7 +29,7 @@ * by Erik Andersen <andersen@codepoet.org> */ -#include <locale.h> +#include <features.h> .global strcmp .set strcmp,__strcmp @@ -50,7 +50,7 @@ __strcmp: mov pc, lr .size __strcmp,.-__strcmp -#ifdef __LOCALE_C_ONLY -.weak __strcoll ; __strcoll = __strcmp -.global strcoll ; .set strcoll,__strcoll +#ifndef __UCLIBC_HAS_LOCALE__ +.global __strcoll ; .hidden __strcoll ; __strcoll = __strcmp +.global strcoll ; .set strcoll,__strcmp #endif 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 */ |