Merge branch 'shrink'

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>

Conflicts:
	arm/tztest_common.c
	arm/tztest_mmu.c
	arm/tztest_mmu.h
	arm/tztest_nonsecure_svc.c
	arm/tztest_secure_svc.c

1 files changed, 15 insertions, 0 deletions

diff --git a/libcflat/include/string.h b/libcflat/include/string.h
new file mode 100644
index 0000000..dbab368
--- /dev/null
+++ b/libcflat/include/string.h
@@ -0,0 +1,15 @@
+#ifndef __STRING_H
+#define __STRING_H
+
+extern unsigned long strlen(const char *buf);
+extern char *strcat(char *dest, const char *src);
+extern char *strcpy(char *dest, const char *src);
+extern int strcmp(const char *a, const char *b);
+extern char *strchr(const char *s, int c);
+extern void *memset(void *s, int c, size_t n);
+extern void *memcpy(void *dest, const void *src, size_t n);
+extern int memcmp(const void *s1, const void *s2, size_t n);
+extern void *memmove(void *dest, const void *src, size_t n);
+extern void *memchr(const void *s, int c, size_t n);
+
+#endif /* _STRING_H */