From ce5e361db2743fdb489da62fdd8becfa772fff22 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 6 Dec 2005 14:30:07 +0000 Subject: Guard __strcoll/strcoll for C locales and use the same logic as elsewhere --- libc/string/arm/strcmp.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libc/string/arm/strcmp.S b/libc/string/arm/strcmp.S index 6913906ee..4e2e3f5b5 100644 --- a/libc/string/arm/strcmp.S +++ b/libc/string/arm/strcmp.S @@ -29,6 +29,8 @@ * by Erik Andersen */ +#include + .global strcmp .set strcmp,__strcmp .text @@ -48,5 +50,7 @@ __strcmp: mov pc, lr .size __strcmp,.-__strcmp -.weak strcoll ; strcoll = strcmp -.global __strcoll ; __strcoll = strcoll +#ifdef __LOCALE_C_ONLY +.weak __strcoll ; __strcoll = __strcmp +.global strcoll ; .set strcoll,__strcoll +#endif -- cgit v1.2.3