Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
diff --git a/libc/include/string.h b/libc/include/string.h
index c0df686..b4cf70e 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -249,7 +249,7 @@
 
 __BIONIC_FORTIFY_INLINE
 char* strrchr(const char *s, int c) {
-    size_t bos = __builtin_object_size(s, 0);
+    size_t bos = __bos(s);
 
     // Compiler doesn't know destination size. Don't call __strrchr_chk
     if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {