Revert "[libc][windows] start time API implementation (#117775)"

This reverts commit 0adff0a.

Breaks the GPU build

Author: jhuber6

libc/config/windows/entrypoints.txt

@@ -95,9 +95,6 @@ set(TARGET_LIBC_ENTRYPOINTS
 
     # errno.h entrypoints
     libc.src.errno.errno
-
-    # time.h entrypoints
-    libc.src.time.time
 )
 
 set(TARGET_LIBM_ENTRYPOINTS

libc/hdr/CMakeLists.txt

@@ -135,18 +135,10 @@ add_proxy_header_library(
     libc.include.llvm-libc-macros.unistd_macros
 )
 
-if (WIN32)
-  set(windows_addtional_time_macros libc.include.llvm-libc-macros.windows.time_macros_ext)
-else()
-  set(windows_addtional_time_macros "")
-endif()
-
 add_proxy_header_library(
   time_macros
   HDRS
     time_macros.h
-  DEPENDS
-    ${windows_addtional_time_macros}
   FULL_BUILD_DEPENDS
     libc.include.time
     libc.include.llvm-libc-macros.time_macros

libc/hdr/time_macros.h

@@ -19,10 +19,4 @@
 
 #endif // LLVM_LIBC_FULL_BUILD
 
-// TODO: For now, on windows, let's always include the extension header.
-// We will need to decide how to export this header.
-#ifdef _WIN32
-#include "include/llvm-libc-macros/windows/time-macros-ext.h"
-#endif // _WIN32
-
 #endif // LLVM_LIBC_HDR_TIME_MACROS_H

libc/hdr/types/clockid_t.h

@@ -9,8 +9,7 @@
 #ifndef LLVM_LIBC_HDR_TYPES_CLOCKID_T_H
 #define LLVM_LIBC_HDR_TYPES_CLOCKID_T_H
 
-// TODO: we will need to decide how to export extension to windows.
-#if defined(LIBC_FULL_BUILD) || defined(_WIN32)
+#ifdef LIBC_FULL_BUILD
 
 #include "include/llvm-libc-types/clockid_t.h"
 

libc/include/llvm-libc-macros/windows/CMakeLists.txt

@@ -13,7 +13,6 @@ add_subdirectory(stdio)
 add_subdirectory(stdlib)
 add_subdirectory(string)
 add_subdirectory(wchar)
-add_subdirectory(time)
 
 if(${LIBC_TARGET_OS} STREQUAL "linux")
   add_subdirectory(dirent)
@@ -41,4 +40,5 @@ add_subdirectory(setjmp)
 add_subdirectory(signal)
 add_subdirectory(spawn)
 add_subdirectory(threads)
+add_subdirectory(time)
 add_subdirectory(locale)

libc/include/llvm-libc-macros/windows/time-macros-ext.h

@@ -2,13 +2,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
   add_subdirectory(${LIBC_TARGET_OS})
 endif()
 
-add_object_library(
-  clock_gettime
-  ALIAS
-  DEPENDS
-    libc.src.__support.time.${LIBC_TARGET_OS}.clock_gettime
-)
-
 add_header_library(
   units
   HDRS

libc/src/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_object_library(
   clock_gettime
   HDRS
-    ../clock_gettime.h
+    clock_gettime.h
   SRCS
     clock_gettime.cpp
   DEPENDS

libc/src/__support/time/CMakeLists.txt

@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_CONVERSION_H
 
 #include "src/__support/macros/config.h"
-#include "src/__support/time/clock_gettime.h"
+#include "src/__support/time/linux/clock_gettime.h"
 #include "src/__support/time/units.h"
 
 namespace LIBC_NAMESPACE_DECL {

libc/src/__support/time/linux/CMakeLists.txt

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/time/clock_gettime.h"
+#include "src/__support/time/linux/clock_gettime.h"
 #include "hdr/types/clockid_t.h"
 #include "hdr/types/struct_timespec.h"
 #include "src/__support/OSUtil/linux/vdso.h"

libc/src/__support/time/linux/clock_conversion.h

@@ -6,17 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_CLOCK_GETTIME_H
-#define LLVM_LIBC_SRC___SUPPORT_TIME_CLOCK_GETTIME_H
+#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_GETTIME_H
+#define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_GETTIME_H
 
 #include "hdr/types/clockid_t.h"
 #include "hdr/types/struct_timespec.h"
 #include "src/__support/error_or.h"
 
+#if defined(SYS_clock_gettime64)
+#include <linux/time_types.h>
+#endif
+
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 ErrorOr<int> clock_gettime(clockid_t clockid, timespec *ts);
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif // LLVM_LIBC_SRC___SUPPORT_TIME_CLOCK_GETTIME_H
+#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_GETTIME_H

libc/src/__support/time/linux/clock_gettime.cpp

@@ -106,15 +106,9 @@ add_entrypoint_object(
 
 add_entrypoint_object(
   time
-  SRCS
-    time.cpp
-  HDRS
-    time_func.h
+  ALIAS
   DEPENDS
-    libc.hdr.time_macros
-    libc.hdr.types.time_t
-    libc.src.__support.time.clock_gettime
-    libc.src.errno.errno
+    .${LIBC_TARGET_OS}.time
 )
 
 add_entrypoint_object(

libc/src/__support/time/clock_gettime.h renamed to libc/src/__support/time/linux/clock_gettime.h

@@ -1,3 +1,16 @@
+add_entrypoint_object(
+  time
+  SRCS
+    time.cpp
+  HDRS
+    ../time_func.h
+  DEPENDS
+    libc.hdr.time_macros
+    libc.hdr.types.time_t
+    libc.src.__support.time.linux.clock_gettime
+    libc.src.errno.errno
+)
+
 add_entrypoint_object(
   timespec_get
   SRCS
@@ -7,7 +20,7 @@ add_entrypoint_object(
   DEPENDS
     libc.hdr.time_macros
     libc.hdr.types.struct_timespec
-    libc.src.__support.time.clock_gettime
+    libc.src.__support.time.linux.clock_gettime
     libc.src.errno.errno
 )
 
@@ -21,7 +34,7 @@ add_entrypoint_object(
     libc.hdr.time_macros
     libc.hdr.types.clock_t
     libc.src.__support.time.units
-    libc.src.__support.time.clock_gettime
+    libc.src.__support.time.linux.clock_gettime
     libc.src.__support.CPP.limits
     libc.src.errno.errno
 )
@@ -49,7 +62,7 @@ add_entrypoint_object(
   DEPENDS
     libc.hdr.types.clockid_t
     libc.hdr.types.struct_timespec
-    libc.src.__support.time.clock_gettime
+    libc.src.__support.time.linux.clock_gettime
     libc.src.errno.errno
 )
 
@@ -62,7 +75,7 @@ add_entrypoint_object(
   DEPENDS
     libc.hdr.time_macros
     libc.hdr.types.suseconds_t
-    libc.src.__support.time.clock_gettime
+    libc.src.__support.time.linux.clock_gettime
     libc.src.__support.time.units
     libc.src.errno.errno
 )