From 8210cb6dfe8532f308dc14802adfe9c18d557dc5 Mon Sep 17 00:00:00 2001
From: Chen Wang <wangchen20@iscas.ac.cn>
Date: Thu, 5 May 2022 13:28:45 +0800
Subject: [PATCH] sync with RVI upstream

use strchr/strcmp/strlen/strnlen from original aosp source, don't
implement them by ourselves.
---
 libc/Android.bp                            | 10 ++++++----
 libc/arch-riscv64/generic/bionic/strchr.c  |  9 ---------
 libc/arch-riscv64/generic/bionic/strcmp.c  |  8 --------
 libc/arch-riscv64/generic/bionic/strlen.c  |  9 ---------
 libc/arch-riscv64/generic/bionic/strnlen.c |  7 -------
 5 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 libc/arch-riscv64/generic/bionic/strchr.c
 delete mode 100644 libc/arch-riscv64/generic/bionic/strcmp.c
 delete mode 100644 libc/arch-riscv64/generic/bionic/strlen.c
 delete mode 100644 libc/arch-riscv64/generic/bionic/strnlen.c

diff --git a/libc/Android.bp b/libc/Android.bp
index d58307690..cf1c49f4e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -653,6 +653,12 @@ cc_library_static {
                 "upstream-openbsd/lib/libc/string/strncmp.c",
             ],
         },
+        riscv64: {
+            srcs: [
+                "upstream-openbsd/lib/libc/string/strcmp.c",
+                "upstream-openbsd/lib/libc/string/strlen.c",
+            ],
+        },
         x86: {
             exclude_srcs: [
                 "upstream-openbsd/lib/libc/string/memchr.c",
@@ -901,10 +907,6 @@ cc_library_static {
         riscv64: {
             srcs: [
                 "arch-riscv64/generic/bionic/memcmp.c",
-                "arch-riscv64/generic/bionic/strnlen.c",
-                "arch-riscv64/generic/bionic/strchr.c",
-                "arch-riscv64/generic/bionic/strcmp.c",
-                "arch-riscv64/generic/bionic/strlen.c",
                 "arch-riscv64/generic/bionic/memset.c",
                 "arch-riscv64/generic/bionic/memcpy.c",
                 "arch-riscv64/bionic/__bionic_clone.S",
diff --git a/libc/arch-riscv64/generic/bionic/strchr.c b/libc/arch-riscv64/generic/bionic/strchr.c
deleted file mode 100644
index c311406d7..000000000
--- a/libc/arch-riscv64/generic/bionic/strchr.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "stdint.h"
-
-char *strchr (const char *s, int c)
-{
-  for (; *s != (char) c; ++s)
-    if (*s == '\0')
-      return NULL;
-  return (char *) s;
-}
diff --git a/libc/arch-riscv64/generic/bionic/strcmp.c b/libc/arch-riscv64/generic/bionic/strcmp.c
deleted file mode 100644
index db38ce915..000000000
--- a/libc/arch-riscv64/generic/bionic/strcmp.c
+++ /dev/null
@@ -1,8 +0,0 @@
-int
-strcmp (const char *s1, const char *s2)
-{
-  int ret;
-
-  while ((ret = *(unsigned char *) s1 - *(unsigned char*) s2++) == 0 && *s1++);
-  return ret;
-}
diff --git a/libc/arch-riscv64/generic/bionic/strlen.c b/libc/arch-riscv64/generic/bionic/strlen.c
deleted file mode 100644
index 5694f6783..000000000
--- a/libc/arch-riscv64/generic/bionic/strlen.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <string.h>
-
-size_t strlen(const char *s)
-{
-    const char *a = s;
-
-    for (; *s; s++);
-    return s-a;
-}
diff --git a/libc/arch-riscv64/generic/bionic/strnlen.c b/libc/arch-riscv64/generic/bionic/strnlen.c
deleted file mode 100644
index 65b9c2a30..000000000
--- a/libc/arch-riscv64/generic/bionic/strnlen.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int strnlen (const char *s, int maxlen)
-{
-  int i;
-
-  for (i = 0; i < maxlen && s[i]; ++i);
-  return i;
-}
-- 
Gitee