Skip to content

Commit 2f4232d

Browse files
committed
Revert " [libc] Add ctype.h locale variants (#102711)"
This reverts commit 8f005f8.
1 parent 8f005f8 commit 2f4232d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+31
-1738
lines changed

libc/config/gpu/entrypoints.txt

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,21 @@ set(TARGET_LIBC_ENTRYPOINTS
44

55
# ctype.h entrypoints
66
libc.src.ctype.isalnum
7-
libc.src.ctype.isalnum_l
87
libc.src.ctype.isalpha
9-
libc.src.ctype.isalpha_l
108
libc.src.ctype.isascii
119
libc.src.ctype.isblank
12-
libc.src.ctype.isblank_l
1310
libc.src.ctype.iscntrl
14-
libc.src.ctype.iscntrl_l
1511
libc.src.ctype.isdigit
16-
libc.src.ctype.isdigit_l
1712
libc.src.ctype.isgraph
18-
libc.src.ctype.isgraph_l
1913
libc.src.ctype.islower
20-
libc.src.ctype.islower_l
2114
libc.src.ctype.isprint
22-
libc.src.ctype.isprint_l
2315
libc.src.ctype.ispunct
24-
libc.src.ctype.ispunct_l
2516
libc.src.ctype.isspace
26-
libc.src.ctype.isspace_l
2717
libc.src.ctype.isupper
28-
libc.src.ctype.isupper_l
2918
libc.src.ctype.isxdigit
30-
libc.src.ctype.isxdigit_l
3119
libc.src.ctype.toascii
3220
libc.src.ctype.tolower
33-
libc.src.ctype.tolower_l
3421
libc.src.ctype.toupper
35-
libc.src.ctype.toupper_l
3622

3723
# string.h entrypoints
3824
libc.src.string.bcmp
@@ -247,15 +233,6 @@ set(TARGET_LIBC_ENTRYPOINTS
247233
# wchar.h entrypoints
248234
libc.src.wchar.wctob
249235

250-
# locale.h entrypoints
251-
libc.src.locale.localeconv
252-
libc.src.locale.duplocale
253-
libc.src.locale.freelocale
254-
libc.src.locale.localeconv
255-
libc.src.locale.newlocale
256-
libc.src.locale.setlocale
257-
libc.src.locale.uselocale
258-
259236
# gpu/rpc.h entrypoints
260237
libc.src.gpu.rpc_host_call
261238
)

libc/config/gpu/headers.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ set(TARGET_PUBLIC_HEADERS
1616
libc.include.wchar
1717
libc.include.uchar
1818
libc.include.features
19-
libc.include.locale
2019

2120
# Header for RPC extensions
2221
libc.include.gpu_rpc

libc/config/linux/x86_64/entrypoints.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -782,22 +782,6 @@ endif()
782782

783783
if(LLVM_LIBC_FULL_BUILD)
784784
list(APPEND TARGET_LIBC_ENTRYPOINTS
785-
# ctype.h entrypoints
786-
libc.src.ctype.isalnum_l
787-
libc.src.ctype.isalpha_l
788-
libc.src.ctype.isblank_l
789-
libc.src.ctype.iscntrl_l
790-
libc.src.ctype.isdigit_l
791-
libc.src.ctype.isgraph_l
792-
libc.src.ctype.islower_l
793-
libc.src.ctype.isprint_l
794-
libc.src.ctype.ispunct_l
795-
libc.src.ctype.isspace_l
796-
libc.src.ctype.isupper_l
797-
libc.src.ctype.isxdigit_l
798-
libc.src.ctype.tolower_l
799-
libc.src.ctype.toupper_l
800-
801785
# assert.h entrypoints
802786
libc.src.assert.__assert_fail
803787

@@ -998,15 +982,6 @@ if(LLVM_LIBC_FULL_BUILD)
998982
libc.src.time.nanosleep
999983
libc.src.time.time
1000984

1001-
# locale.h entrypoints
1002-
libc.src.locale.localeconv
1003-
libc.src.locale.duplocale
1004-
libc.src.locale.freelocale
1005-
libc.src.locale.localeconv
1006-
libc.src.locale.newlocale
1007-
libc.src.locale.setlocale
1008-
libc.src.locale.uselocale
1009-
1010985
# unistd.h entrypoints
1011986
libc.src.unistd.__llvm_libc_syscall
1012987
libc.src.unistd._exit

libc/config/linux/x86_64/headers.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ set(TARGET_PUBLIC_HEADERS
3333
libc.include.unistd
3434
libc.include.wchar
3535
libc.include.uchar
36-
libc.include.locale
3736

3837
libc.include.arpa_inet
3938

libc/hdr/types/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,3 @@ add_proxy_header_library(
162162
libc.include.llvm-libc-types.cookie_io_functions_t
163163
libc.include.stdio
164164
)
165-
166-
add_proxy_header_library(
167-
locale_t
168-
HDRS
169-
locale_t.h
170-
FULL_BUILD_DEPENDS
171-
libc.include.llvm-libc-types.locale_t
172-
libc.include.locale
173-
)

libc/hdr/types/locale_t.h

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

libc/include/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ add_header_macro(
4545
ctype.h
4646
DEPENDS
4747
.llvm_libc_common_h
48-
.llvm-libc-types.locale_t
4948
)
5049

5150
add_header_macro(
@@ -720,18 +719,6 @@ add_header_macro(
720719
.llvm-libc-types.wchar_t
721720
)
722721

723-
add_header_macro(
724-
locale
725-
../libc/newhdrgen/yaml/locale.yaml
726-
locale.h.def
727-
locale.h
728-
DEPENDS
729-
.llvm_libc_common_h
730-
.llvm-libc-macros.locale_macros
731-
.llvm-libc-types.locale_t
732-
.llvm-libc-types.struct_lconv
733-
)
734-
735722
if(LIBC_TARGET_OS_IS_GPU)
736723
file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/gpu)
737724

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,3 @@ add_macro_header(
295295
HDR
296296
elf-macros.h
297297
)
298-
299-
add_macro_header(
300-
locale_macros
301-
HDR
302-
locale-macros.h
303-
)

libc/include/llvm-libc-macros/locale-macros.h

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

libc/include/llvm-libc-types/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,3 @@ DEPENDS
142142
.fsblkcnt_t
143143
.fsfilcnt_t
144144
)
145-
add_header(locale_t HDR locale_t.h)
146-
add_header(struct_lconv HDR struct_lconv.h)

libc/include/llvm-libc-types/locale_t.h

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

libc/include/llvm-libc-types/struct_lconv.h

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

libc/include/locale.h.def

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

0 commit comments

Comments
 (0)