From dc1b614bb8b0181f7443848633807f5fb934c6b2 Mon Sep 17 00:00:00 2001
From: Alex Brachet <abrachet@google.com>
Date: Mon, 9 Jan 2023 20:16:20 +0000
Subject: [PATCH] [libc] Move b* string functions to strings.h

Traditionally these functions are exposed in string*s*.h not string.h

Differential Revision: https://reviews.llvm.org/D141237
---
 libc/include/CMakeLists.txt |  9 +++++++++
 libc/include/strings.h.def  | 16 ++++++++++++++++
 libc/spec/llvm_libc_ext.td  |  6 +++---
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 libc/include/strings.h.def

diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 6fa2593..df61a559 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -96,6 +96,15 @@ add_gen_header(
 )
 
 add_gen_header(
+  strings
+  DEF_FILE strings.h.def
+  GEN_HDR strings.h
+  DEPENDS
+    .llvm_libc_common_h
+    .llvm-libc-types.size_t
+)
+
+add_gen_header(
   time
   DEF_FILE time.h.def
   GEN_HDR time.h
diff --git a/libc/include/strings.h.def b/libc/include/strings.h.def
new file mode 100644
index 0000000..f07ca30
--- /dev/null
+++ b/libc/include/strings.h.def
@@ -0,0 +1,16 @@
+//===-- C standard library header strings.h -------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_STRINGS_H
+#define LLVM_LIBC_STRINGS_H
+
+#include <__llvm-libc-common.h>
+
+%%public_api()
+
+#endif // LLVM_LIBC_STRINGS_H
diff --git a/libc/spec/llvm_libc_ext.td b/libc/spec/llvm_libc_ext.td
index 731671f..5e1ae2c 100644
--- a/libc/spec/llvm_libc_ext.td
+++ b/libc/spec/llvm_libc_ext.td
@@ -1,6 +1,6 @@
 def LLVMLibcExt : StandardSpec<"llvm_libc_ext"> {
-  HeaderSpec String = HeaderSpec<
-      "string.h",
+  HeaderSpec Strings = HeaderSpec<
+      "strings.h",
       [], // Macros
       [], // Types
       [], // Enumerations
@@ -52,7 +52,7 @@ def LLVMLibcExt : StandardSpec<"llvm_libc_ext"> {
   >;
 
   let Headers = [
-    String,
+    Strings,
     Sched,
     Assert,
   ];
-- 
2.7.4