commit 12f0a0f2de6ba158f69c986beb5ddbdbb7f899ec
author Antonio Nino Diaz <antonio.ninodiaz@arm.com> Fri Oct 19 00:57:10 2018 +0100
committer Antonio Nino Diaz <antonio.ninodiaz@arm.com> Tue Oct 23 18:27:45 2018 +0100
tree 4a68aa87267ee6ad8bfc52dc78f24d72d7044b07
parent 3aa06f0c1e95a80d1d02d5685d7534a4bbff8b64

libc: Integrate strrchr in libc

Change-Id: I3ddc07cb02d73cd7614af7a5b21827aae155f9a0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

include/lib/libc/string.h

diff --git a/include/lib/libc/string.h b/include/lib/libc/string.h
index 050f643..3c8e3b6 100644
--- a/include/lib/libc/string.h
+++ b/include/lib/libc/string.h
@@ -27,5 +27,6 @@
 void *memset(void *dst, int val, size_t count);
 size_t strlen(const char *s);
 size_t strnlen(const char *s, size_t maxlen);
+char *strrchr(const char *p, int ch);
 
 #endif /* STRING_H */

lib/libc/libc.mk

diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk
index 554f36b..daa2ec1 100644
--- a/lib/libc/libc.mk
+++ b/lib/libc/libc.mk
@@ -21,7 +21,8 @@
 			strcmp.c			\
 			strlen.c			\
 			strncmp.c			\
-			strnlen.c)
+			strnlen.c			\
+			strrchr.c)
 
 INCLUDES	+=	-Iinclude/lib/libc		\
 			-Iinclude/lib/libc/$(ARCH)	\

lib/libc/strrchr.c

diff --git a/lib/libc/strrchr.c b/lib/libc/strrchr.c
index 6afb8c1..cd435ff 100644
--- a/lib/libc/strrchr.c
+++ b/lib/libc/strrchr.c
@@ -29,12 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <stddef.h>
 #include <string.h>
 
@@ -53,5 +47,3 @@
 	}
 	/* NOTREACHED */
 }
-
-__weak_reference(strrchr, rindex);