llvm · nickdesaulniers · Jan 30, 2024
diff --git a/libc/include/llvm-libc-macros/stdbit-macros.h b/libc/include/llvm-libc-macros/stdbit-macros.h
diff --git a/libc/include/stdbit.h.def b/libc/include/stdbit.h.def
@@ -10,7 +10,6 @@
 #define LLVM_LIBC_STDBIT_H
 
 #include <__llvm-libc-common.h>
-#include <llvm-libc-macros/stdbit-macros.h>
 
 %%public_api()
 

diff --git a/libc/test/include/CMakeLists.txt b/libc/test/include/CMakeLists.txt
@@ -14,26 +14,3 @@ add_libc_test(
     # This is needed because the __containerof macro uses statement expression.
     -Wno-gnu-statement-expression-from-macro-expansion
 )
-
-# stdbit_test only tests our generated stdbit.h, which is not generated in
-# overlay mode.
-if (LLVM_LIBC_FULL_BUILD)
-  add_libc_test(
-    stdbit_test
-    SUITE
-      libc_include_tests
-    SRCS
-      stdbit_test.cpp
-    DEPENDS
-      libc.include.llvm-libc-macros.stdbit_macros
-      libc.include.stdbit
-      # Intentionally do not depend on libc.src.stdbit.*. The include test is
-      # simply testing the macros provided by stdbit.h, not the implementation
-      # of the underlying functions which the type generic macros may dispatch
-      # to.
-    COMPILE_OPTIONS
-      # stdbit.h is full of type generic macros implemented via C11 _Generic.
-      # Clang will produce -Wno-c11-extensions when using _Generic in C++ mode.
-      -Wno-c11-extensions
-  )
-endif()
diff --git a/libc/test/include/stdbit_test.cpp b/libc/test/include/stdbit_test.cpp