Skip to content

Commit 9fd052a

Browse files
committed
Revert "[libc][windows] start time API implementation (llvm#117775)"
This reverts commit 0adff0a. Breaks the GPU build
1 parent 0550480 commit 9fd052a

File tree

26 files changed

+47
-248
lines changed

26 files changed

+47
-248
lines changed

libc/config/windows/entrypoints.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ set(TARGET_LIBC_ENTRYPOINTS
9595

9696
# errno.h entrypoints
9797
libc.src.errno.errno
98-
99-
# time.h entrypoints
100-
libc.src.time.time
10198
)
10299

103100
set(TARGET_LIBM_ENTRYPOINTS

libc/hdr/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,10 @@ add_proxy_header_library(
135135
libc.include.llvm-libc-macros.unistd_macros
136136
)
137137

138-
if (WIN32)
139-
set(windows_addtional_time_macros libc.include.llvm-libc-macros.windows.time_macros_ext)
140-
else()
141-
set(windows_addtional_time_macros "")
142-
endif()
143-
144138
add_proxy_header_library(
145139
time_macros
146140
HDRS
147141
time_macros.h
148-
DEPENDS
149-
${windows_addtional_time_macros}
150142
FULL_BUILD_DEPENDS
151143
libc.include.time
152144
libc.include.llvm-libc-macros.time_macros

libc/hdr/time_macros.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,4 @@
1919

2020
#endif // LLVM_LIBC_FULL_BUILD
2121

22-
// TODO: For now, on windows, let's always include the extension header.
23-
// We will need to decide how to export this header.
24-
#ifdef _WIN32
25-
#include "include/llvm-libc-macros/windows/time-macros-ext.h"
26-
#endif // _WIN32
27-
2822
#endif // LLVM_LIBC_HDR_TIME_MACROS_H

libc/hdr/types/clockid_t.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#ifndef LLVM_LIBC_HDR_TYPES_CLOCKID_T_H
1010
#define LLVM_LIBC_HDR_TYPES_CLOCKID_T_H
1111

12-
// TODO: we will need to decide how to export extension to windows.
13-
#if defined(LIBC_FULL_BUILD) || defined(_WIN32)
12+
#ifdef LIBC_FULL_BUILD
1413

1514
#include "include/llvm-libc-types/clockid_t.h"
1615

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

libc/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ add_subdirectory(stdio)
1313
add_subdirectory(stdlib)
1414
add_subdirectory(string)
1515
add_subdirectory(wchar)
16-
add_subdirectory(time)
1716

1817
if(${LIBC_TARGET_OS} STREQUAL "linux")
1918
add_subdirectory(dirent)
@@ -41,4 +40,5 @@ add_subdirectory(setjmp)
4140
add_subdirectory(signal)
4241
add_subdirectory(spawn)
4342
add_subdirectory(threads)
43+
add_subdirectory(time)
4444
add_subdirectory(locale)

libc/src/__support/time/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS})
22
add_subdirectory(${LIBC_TARGET_OS})
33
endif()
44

5-
add_object_library(
6-
clock_gettime
7-
ALIAS
8-
DEPENDS
9-
libc.src.__support.time.${LIBC_TARGET_OS}.clock_gettime
10-
)
11-
125
add_header_library(
136
units
147
HDRS

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
add_object_library(
22
clock_gettime
33
HDRS
4-
../clock_gettime.h
4+
clock_gettime.h
55
SRCS
66
clock_gettime.cpp
77
DEPENDS

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_CLOCK_CONVERSION_H
1111

1212
#include "src/__support/macros/config.h"
13-
#include "src/__support/time/clock_gettime.h"
13+
#include "src/__support/time/linux/clock_gettime.h"
1414
#include "src/__support/time/units.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {

0 commit comments

Comments
 (0)