svn commit: trunk/uClibc/libc/string/arm

[psm at uclibc.org]

Author: psm
Date: 2005-12-06 06:30:07 -0800 (Tue, 06 Dec 2005)
New Revision: 12696

Log:
Guard __strcoll/strcoll for C locales and use the same logic as elsewhere

Modified:
   trunk/uClibc/libc/string/arm/strcmp.S


Changeset:
Modified: trunk/uClibc/libc/string/arm/strcmp.S
===================================================================
--- trunk/uClibc/libc/string/arm/strcmp.S	2005-12-06 14:26:43 UTC (rev 12695)
+++ trunk/uClibc/libc/string/arm/strcmp.S	2005-12-06 14:30:07 UTC (rev 12696)
@@ -29,6 +29,8 @@
  * by Erik Andersen <andersen at codepoet.org>
  */
 
+#include <locale.h>
+
 .global strcmp
 .set strcmp,__strcmp
 .text
@@ -48,5 +50,7 @@
 	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