Revert "[libc][NFC] adjust time related implementations" (#91657)

Reverts #91485. It breaks GPU and fuchisa.
llvm · May 9, 2024 · 5a0e0b6 · 5a0e0b6
1 parent ca39175
commit 5a0e0b6
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 335 deletions.
diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt
@@ -68,13 +68,4 @@ add_proxy_header_library(
     libc.include.llvm-libc-macros.sys_epoll_macros
 )
 
-add_proxy_header_library(
-  time_macros
-  HDRS
-    time_macros.h
-  FULL_BUILD_DEPENDS
-    libc.include.time
-    libc.include.llvm-libc-macros.time_macros
-)
-
 add_subdirectory(types)
diff --git a/libc/hdr/time_macros.h b/libc/hdr/time_macros.h
diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt
@@ -63,48 +63,3 @@ add_proxy_header_library(
     libc.include.llvm-libc-types.fexcept_t
     libc.include.fenv
 )
-
-add_proxy_header_library(
-  time_t
-  HDRS
-    time_t.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-types.time_t
-    libc.include.time
-)
-
-add_proxy_header_library(
-  clockid_t
-  HDRS
-    clockid_t.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-types.clockid_t
-    libc.include.sys_types
-)
-
-add_proxy_header_library(
-  clock_t
-  HDRS
-    clock_t.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-types.clock_t
-    libc.include.time
-)
-
-add_proxy_header_library(
-  suseconds_t
-  HDRS
-    suseconds_t.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-types.suseconds_t
-    libc.include.sys_time
-)
-
-add_proxy_header_library(
-  struct_timeval
-  HDRS
-    struct_timeval.h
-  FULL_BUILD_DEPENDS
-    libc.include.llvm-libc-types.struct_timeval
-    libc.include.sys_time
-)
diff --git a/libc/hdr/types/clock_t.h b/libc/hdr/types/clock_t.h
diff --git a/libc/hdr/types/clockid_t.h b/libc/hdr/types/clockid_t.h
diff --git a/libc/hdr/types/struct_timeval.h b/libc/hdr/types/struct_timeval.h
diff --git a/libc/hdr/types/suseconds_t.h b/libc/hdr/types/suseconds_t.h
diff --git a/libc/hdr/types/time_t.h b/libc/hdr/types/time_t.h
diff --git a/libc/src/__support/CMakeLists.txt b/libc/src/__support/CMakeLists.txt
@@ -281,5 +281,3 @@ add_subdirectory(File)
 add_subdirectory(HashTable)
 
 add_subdirectory(fixed_point)
-
-add_subdirectory(time)
diff --git a/libc/src/__support/time/CMakeLists.txt b/libc/src/__support/time/CMakeLists.txt
diff --git a/libc/src/__support/time/clock_gettime.h b/libc/src/__support/time/clock_gettime.h
diff --git a/libc/src/__support/time/linux/CMakeLists.txt b/libc/src/__support/time/linux/CMakeLists.txt
diff --git a/libc/src/__support/time/units.h b/libc/src/__support/time/units.h
diff --git a/libc/src/time/clock.h b/libc/src/time/clock.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SRC_TIME_CLOCK_H
 #define LLVM_LIBC_SRC_TIME_CLOCK_H
 
-#include "hdr/types/clock_t.h"
+#include <time.h>
 
 namespace LIBC_NAMESPACE {
 

diff --git a/libc/src/time/clock_gettime.h b/libc/src/time/clock_gettime.h
@@ -9,12 +9,11 @@
 #ifndef LLVM_LIBC_SRC_TIME_CLOCK_GETTIME_H
 #define LLVM_LIBC_SRC_TIME_CLOCK_GETTIME_H
 
-#include "hdr/types/clockid_t.h"
-#include "hdr/types/struct_timespec.h"
+#include <time.h>
 
 namespace LIBC_NAMESPACE {
 
-int clock_gettime(clockid_t clockid, timespec *tp);
+int clock_gettime(clockid_t clockid, struct timespec *tp);
 
 } // namespace LIBC_NAMESPACE
 

diff --git a/libc/src/time/gettimeofday.h b/libc/src/time/gettimeofday.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SRC_TIME_GETTIMEOFDAY_H
 #define LLVM_LIBC_SRC_TIME_GETTIMEOFDAY_H
 
-#include "hdr/types/struct_timeval.h"
+#include <time.h>
 
 namespace LIBC_NAMESPACE {