commit 53e43292aac91bf62995788cd5ca2ceb7caea283
author Elliott Hughes <enh@google.com> Mon Feb 24 18:00:43 2014 -0800
committer Elliott Hughes <enh@google.com> Mon Feb 24 18:02:05 2014 -0800
tree 003679a1e2288bad947f714ee45bfa6febf479b6
parent ba40a560176e6ea753d09a6a71343b81ea4c8c1e

More OpenBSD cleanup (primarily string).

This patch removes the string/ and wchar/ directories.

Change-Id: Ia489904bc67047e4bc79acb1f3eec21aa3fe5f0d

libc/arch-x86/x86.mk

diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk
index b024acb..846bb42 100644
--- a/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@ -58,15 +58,16 @@
     arch-x86/string/strncmp.S \
     arch-x86/string/strcat.S \
     arch-x86/string/memcmp.S \
-    string/memcmp16.c \
-    string/strcpy.c \
-    string/strncat.c \
-    string/strncpy.c \
-    string/strlcat.c \
-    string/strlcpy.c \
+    bionic/__memcmp16.cpp \
     upstream-freebsd/lib/libc/string/wcscpy.c \
     upstream-freebsd/lib/libc/string/wcscat.c \
-    upstream-freebsd/lib/libc/string/wmemcmp.c
+    upstream-freebsd/lib/libc/string/wmemcmp.c \
+    upstream-openbsd/lib/libc/string/strcpy.c \
+    upstream-openbsd/lib/libc/string/strlcat.c \
+    upstream-openbsd/lib/libc/string/strlcpy.c \
+    upstream-openbsd/lib/libc/string/strncat.c \
+    upstream-openbsd/lib/libc/string/strncpy.c \
+
 endif
 
 libc_bionic_src_files_x86 += \