From 1a29aba3673b753664e97fcfed1e3d38f138b3b7 Mon Sep 17 00:00:00 2001
From: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Date: Fri, 19 Oct 2018 00:57:10 +0100
Subject: [PATCH] libc: Integrate strrchr in libc

Change-Id: I3ddc07cb02d73cd7614af7a5b21827aae155f9a0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
---
 include/lib/libc/string.h | 1 +
 lib/libc/libc.mk          | 3 ++-
 lib/libc/strrchr.c        | 8 --------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/include/lib/libc/string.h b/include/lib/libc/string.h
index 050f64380..3c8e3b65e 100644
--- a/include/lib/libc/string.h
+++ b/include/lib/libc/string.h
@@ -27,5 +27,6 @@ char *strchr(const char *s, int c);
 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 */
diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk
index 554f36bb7..daa2ec102 100644
--- a/lib/libc/libc.mk
+++ b/lib/libc/libc.mk
@@ -21,7 +21,8 @@ LIBC_SRCS	:=	$(addprefix lib/libc/,	\
 			strcmp.c			\
 			strlen.c			\
 			strncmp.c			\
-			strnlen.c)
+			strnlen.c			\
+			strrchr.c)
 
 INCLUDES	+=	-Iinclude/lib/libc		\
 			-Iinclude/lib/libc/$(ARCH)	\
diff --git a/lib/libc/strrchr.c b/lib/libc/strrchr.c
index 6afb8c1a4..cd435ff3e 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 @@ strrchr(const char *p, int ch)
 	}
 	/* NOTREACHED */
 }
-
-__weak_reference(strrchr, rindex);