[libc][NFC] Move blockstore out of the CPP folder

libc/src/__support/CMakeLists.txt

@@ -1,5 +1,11 @@
 add_subdirectory(CPP)
 
+add_header_library(
+  blockstore
+  HDRS
+    blockstore.h
+)
+
 add_header_library(
   common
   HDRS

libc/src/__support/CPP/CMakeLists.txt

@@ -102,12 +102,6 @@ add_header_library(
     atomic.h
 )
 
-add_header_library(
-  blockstore
-  HDRS
-    blockstore.h
-)
-
 add_header_library(
   error
   HDRS

libc/src/stdlib/CMakeLists.txt

@@ -287,7 +287,7 @@ add_entrypoint_object(
     20 # For constinit of the atexit callback list.
   DEPENDS
     libc.src.__support.fixedvector
-    libc.src.__support.CPP.blockstore
+    libc.src.__support.blockstore
     libc.src.__support.threads.mutex
 )
 

libc/src/stdlib/atexit.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "src/stdlib/atexit.h"
-#include "src/__support/CPP/blockstore.h"
+#include "src/__support/blockstore.h"
 #include "src/__support/common.h"
 #include "src/__support/fixedvector.h"
 #include "src/__support/threads/mutex.h"

libc/test/src/__support/CMakeLists.txt

@@ -1,5 +1,15 @@
 add_libc_testsuite(libc_support_unittests)
 
+add_libc_unittest(
+  blockstore_test
+  SUITE
+    libc_support_unittests
+  SRCS
+    blockstore_test.cpp
+  DEPENDS
+    libc.src.__support.blockstore
+)
+
 add_libc_unittest(
   endian_test
   SUITE

libc/test/src/__support/CPP/CMakeLists.txt

@@ -71,16 +71,6 @@ add_libc_unittest(
     libc.src.__support.CPP.atomic
 )
 
-add_libc_unittest(
-  blockstore_test
-  SUITE
-    libc_cpp_utils_unittests
-  SRCS
-    blockstore_test.cpp
-  DEPENDS
-    libc.src.__support.CPP.blockstore
-)
-
 add_libc_unittest(
   stringstream_test
   SUITE

libc/test/src/__support/blockstore_test.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/blockstore.h"
+#include "src/__support/blockstore.h"
 #include "utils/UnitTest/Test.h"
 
 struct Element {