Merge "Implement mblen(3)."
diff --git a/libc/Android.bp b/libc/Android.bp
index c5a513c..9c521d1 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -195,7 +195,6 @@
cflags: [
"-DANDROID_CHANGES",
"-DINET6",
- "-fvisibility=hidden",
"-Wno-unused-parameter",
"-include netbsd-compat.h",
],
diff --git a/libc/Android.mk b/libc/Android.mk
index ac7cd75..a8581ac 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -751,7 +751,6 @@
$(libc_common_cflags) \
-DANDROID_CHANGES \
-DINET6 \
- -fvisibility=hidden \
-Wno-unused-parameter \
-include netbsd-compat.h \
diff --git a/libc/arch-mips/string/memset.S b/libc/arch-mips/string/memset.S
index 6344af1..7ea6753 100644
--- a/libc/arch-mips/string/memset.S
+++ b/libc/arch-mips/string/memset.S
@@ -209,11 +209,14 @@
LEAF(__memset_chk)
#endif
.set noreorder
- bgtu a2, a3, __memset_chk_fail
- la t9, __memset_chk_fail
- .set reorder
-
- // Fall through to memset...
+ sltu t2, a3, a2
+ beq t2, zero, memset
+ nop
+ .cpsetup t9, t8, __memset_chk
+ LA t9, __memset_chk_fail
+ jr t9
+ nop
+ .set reorder
END(__memset_chk)
#ifdef __ANDROID__