Browse Source

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

Peter S. Mazinger 19 years ago
parent
commit
ce5e361db2
1 changed files with 6 additions and 2 deletions
  1. 6 2
      libc/string/arm/strcmp.S

+ 6 - 2
libc/string/arm/strcmp.S

@@ -29,6 +29,8 @@
  * by Erik Andersen <andersen@codepoet.org>
  * by Erik Andersen <andersen@codepoet.org>
  */
  */
 
 
+#include <locale.h>
+
 .global strcmp
 .global strcmp
 .set strcmp,__strcmp
 .set strcmp,__strcmp
 .text
 .text
@@ -48,5 +50,7 @@ __strcmp:
 	mov	pc, lr
 	mov	pc, lr
 
 
 .size __strcmp,.-__strcmp
 .size __strcmp,.-__strcmp
-.weak strcoll ; strcoll = strcmp
+#ifdef __LOCALE_C_ONLY
-.global __strcoll ; __strcoll = strcoll
+.weak __strcoll ; __strcoll = __strcmp
+.global strcoll ; .set strcoll,__strcoll
+#endif