Skip to content

Commit 04a9c62

Browse files
michaelrj-googlemichaelrj-google
committed
[libc] move stdlib and stdio to new errno pattern
Fixes #61071 Reviewed By: sivachandra Differential Revision: https://reviews.llvm.org/D145191
1 parent 56e8fd6 commit 04a9c62

Some content is hidden

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

67 files changed

+302
-276
lines changed

‎libc/src/__support/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ add_header_library(
6464
DEPENDS
6565
.ctype_utils
6666
.str_to_num_result
67-
libc.include.errno
6867
libc.src.errno.errno
6968
libc.src.__support.CPP.limits
7069
libc.src.__support.common

‎libc/src/__support/File/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_object_library(
1111
HDRS
1212
file.h
1313
DEPENDS
14-
libc.include.errno
14+
1515
libc.src.__support.CPP.new
1616
libc.src.__support.CPP.span
1717
libc.src.__support.threads.mutex
@@ -37,7 +37,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS}_file.cpp)
3737
${LIBC_TARGET_OS}_file.cpp
3838
DEPENDS
3939
.file
40-
libc.include.errno
40+
4141
libc.include.fcntl
4242
libc.include.stdio
4343
libc.include.sys_syscall
@@ -55,10 +55,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LIBC_TARGET_OS}_dir.cpp)
5555
${LIBC_TARGET_OS}_dir.cpp
5656
DEPENDS
5757
.dir
58-
libc.include.errno
5958
libc.include.fcntl
6059
libc.include.sys_syscall
6160
libc.src.__support.OSUtil.osutil
6261
libc.src.__support.error_or
62+
libc.src.errno.errno
6363
)
6464
endif()

‎libc/src/__support/File/dir.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "src/__support/CPP/new.h"
1212
#include "src/__support/error_or.h"
13+
#include "src/errno/libc_errno.h" // For error macros
1314

14-
#include <errno.h>
1515
#include <stdlib.h>
1616

1717
namespace __llvm_libc {

‎libc/src/__support/File/file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "src/__support/CPP/new.h"
1212
#include "src/__support/CPP/span.h"
13+
#include "src/errno/libc_errno.h" // For error macros
1314

14-
#include <errno.h> // For error macros
1515
#include <stdio.h>
1616
#include <stdlib.h>
1717

‎libc/src/__support/File/linux_file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "src/__support/CPP/new.h"
1212
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
13+
#include "src/errno/libc_errno.h" // For error macros
1314

14-
#include <errno.h> // For error macros
1515
#include <fcntl.h> // For mode_t and other flags to the open syscall
1616
#include <stdio.h>
1717
#include <sys/syscall.h> // For syscall numbers

‎libc/src/__support/StringUtil/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ add_object_library(
1515
error_to_string.cpp
1616
DEPENDS
1717
.message_mapper
18-
libc.include.errno
18+
libc.src.errno.errno
1919
libc.src.__support.CPP.span
2020
libc.src.__support.CPP.string_view
2121
libc.src.__support.CPP.stringstream

‎libc/src/__support/StringUtil/error_to_string.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include "src/__support/CPP/stringstream.h"
1414
#include "src/__support/StringUtil/message_mapper.h"
1515
#include "src/__support/integer_to_string.h"
16+
#include "src/errno/libc_errno.h" // For error macros
1617

17-
#include <errno.h>
1818
#include <stddef.h>
1919

2020
namespace __llvm_libc {

‎libc/src/__support/str_to_float.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "src/__support/high_precision_decimal.h"
2222
#include "src/__support/str_to_integer.h"
2323
#include "src/__support/str_to_num_result.h"
24-
#include <errno.h>
24+
#include "src/errno/libc_errno.h" // For ERANGE
2525

2626
namespace __llvm_libc {
2727
namespace internal {

‎libc/src/__support/str_to_integer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "src/__support/common.h"
1414
#include "src/__support/ctype_utils.h"
1515
#include "src/__support/str_to_num_result.h"
16-
#include <errno.h>
16+
#include "src/errno/libc_errno.h" // For ERANGE
1717
#include <limits.h>
1818

1919
namespace __llvm_libc {

‎libc/src/__support/threads/linux/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ add_object_library(
2828
.futex_word_type
2929
libc.config.linux.app_h
3030
libc.include.sys_syscall
31+
libc.src.errno.errno
3132
libc.src.__support.CPP.atomic
3233
libc.src.__support.CPP.stringstream
3334
libc.src.__support.CPP.string_view

‎libc/src/__support/threads/linux/thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
#include "src/__support/common.h"
1616
#include "src/__support/error_or.h"
1717
#include "src/__support/threads/linux/futex_word.h" // For FutexWordType
18+
#include "src/errno/libc_errno.h" // For error macros
1819

1920
#ifdef LIBC_TARGET_ARCH_IS_AARCH64
2021
#include <arm_acle.h>
2122
#endif
2223

23-
#include <errno.h>
2424
#include <fcntl.h>
2525
#include <linux/futex.h>
2626
#include <linux/prctl.h> // For PR_SET_NAME

‎libc/src/stdio/CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ add_entrypoint_object(
2525
fclose.h
2626
DEPENDS
2727
libc.include.stdio
28-
libc.include.errno
28+
libc.src.errno.errno
2929
libc.src.__support.File.file
3030
libc.src.__support.File.platform_file
3131
)
@@ -109,7 +109,7 @@ add_entrypoint_object(
109109
HDRS
110110
fgetc.h
111111
DEPENDS
112-
libc.include.errno
112+
libc.src.errno.errno
113113
libc.include.stdio
114114
libc.src.__support.File.file
115115
libc.src.__support.File.platform_file
@@ -122,7 +122,7 @@ add_entrypoint_object(
122122
HDRS
123123
fgetc_unlocked.h
124124
DEPENDS
125-
libc.include.errno
125+
libc.src.errno.errno
126126
libc.include.stdio
127127
libc.src.__support.File.file
128128
libc.src.__support.File.platform_file
@@ -135,7 +135,7 @@ add_entrypoint_object(
135135
HDRS
136136
getc.h
137137
DEPENDS
138-
libc.include.errno
138+
libc.src.errno.errno
139139
libc.include.stdio
140140
libc.src.__support.File.file
141141
libc.src.__support.File.platform_file
@@ -148,7 +148,7 @@ add_entrypoint_object(
148148
HDRS
149149
getc_unlocked.h
150150
DEPENDS
151-
libc.include.errno
151+
libc.src.errno.errno
152152
libc.include.stdio
153153
libc.src.__support.File.file
154154
libc.src.__support.File.platform_file
@@ -161,7 +161,7 @@ add_entrypoint_object(
161161
HDRS
162162
fgets.h
163163
DEPENDS
164-
libc.include.errno
164+
libc.src.errno.errno
165165
libc.include.stdio
166166
libc.src.__support.File.file
167167
libc.src.__support.File.platform_file
@@ -174,7 +174,7 @@ add_entrypoint_object(
174174
HDRS
175175
fflush.h
176176
DEPENDS
177-
libc.include.errno
177+
libc.src.errno.errno
178178
libc.include.stdio
179179
libc.src.__support.File.file
180180
libc.src.__support.File.platform_file
@@ -211,7 +211,7 @@ add_entrypoint_object(
211211
HDRS
212212
fread_unlocked.h
213213
DEPENDS
214-
libc.include.errno
214+
libc.src.errno.errno
215215
libc.include.stdio
216216
libc.src.__support.File.file
217217
libc.src.__support.File.platform_file
@@ -224,7 +224,7 @@ add_entrypoint_object(
224224
HDRS
225225
fread.h
226226
DEPENDS
227-
libc.include.errno
227+
libc.src.errno.errno
228228
libc.include.stdio
229229
libc.src.__support.File.file
230230
libc.src.__support.File.platform_file
@@ -237,7 +237,7 @@ add_entrypoint_object(
237237
HDRS
238238
fwrite_unlocked.h
239239
DEPENDS
240-
libc.include.errno
240+
libc.src.errno.errno
241241
libc.include.stdio
242242
libc.src.__support.File.file
243243
libc.src.__support.File.platform_file
@@ -250,7 +250,7 @@ add_entrypoint_object(
250250
HDRS
251251
fwrite.h
252252
DEPENDS
253-
libc.include.errno
253+
libc.src.errno.errno
254254
libc.include.stdio
255255
libc.src.__support.File.file
256256
libc.src.__support.File.platform_file
@@ -263,7 +263,7 @@ add_entrypoint_object(
263263
HDRS
264264
fputc.h
265265
DEPENDS
266-
libc.include.errno
266+
libc.src.errno.errno
267267
libc.include.stdio
268268
libc.src.__support.File.file
269269
libc.src.__support.File.platform_file
@@ -276,7 +276,7 @@ add_entrypoint_object(
276276
HDRS
277277
putc.h
278278
DEPENDS
279-
libc.include.errno
279+
libc.src.errno.errno
280280
libc.include.stdio
281281
libc.src.__support.File.file
282282
libc.src.__support.File.platform_file
@@ -289,7 +289,7 @@ add_entrypoint_object(
289289
HDRS
290290
putchar.h
291291
DEPENDS
292-
libc.include.errno
292+
libc.src.errno.errno
293293
libc.include.stdio
294294
libc.src.__support.File.file
295295
libc.src.__support.File.platform_file
@@ -302,7 +302,7 @@ add_entrypoint_object(
302302
HDRS
303303
fputs.h
304304
DEPENDS
305-
libc.include.errno
305+
libc.src.errno.errno
306306
libc.include.stdio
307307
libc.src.__support.File.file
308308
libc.src.__support.File.platform_file
@@ -316,7 +316,7 @@ add_entrypoint_object(
316316
HDRS
317317
puts.h
318318
DEPENDS
319-
libc.include.errno
319+
libc.src.errno.errno
320320
libc.include.stdio
321321
libc.src.__support.File.file
322322
libc.src.__support.File.platform_file
@@ -329,7 +329,7 @@ add_entrypoint_object(
329329
HDRS
330330
fseek.h
331331
DEPENDS
332-
libc.include.errno
332+
libc.src.errno.errno
333333
libc.include.stdio
334334
libc.src.__support.File.file
335335
libc.src.__support.File.platform_file
@@ -402,7 +402,7 @@ add_entrypoint_object(
402402
HDRS
403403
setbuf.h
404404
DEPENDS
405-
libc.include.errno
405+
libc.src.errno.errno
406406
libc.include.stdio
407407
libc.src.__support.File.file
408408
libc.src.__support.File.platform_file
@@ -415,7 +415,7 @@ add_entrypoint_object(
415415
HDRS
416416
setvbuf.h
417417
DEPENDS
418-
libc.include.errno
418+
libc.src.errno.errno
419419
libc.include.stdio
420420
libc.src.__support.File.file
421421
libc.src.__support.File.platform_file
@@ -512,7 +512,7 @@ add_entrypoint_object(
512512
HDRS
513513
ftell.h
514514
DEPENDS
515-
libc.include.errno
515+
libc.src.errno.errno
516516
libc.include.stdio
517517
libc.src.__support.File.file
518518
libc.src.__support.File.platform_file

‎libc/src/stdio/fclose.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "src/stdio/fclose.h"
1010
#include "src/__support/File/file.h"
1111

12-
#include <errno.h>
12+
#include "src/errno/libc_errno.h"
1313
#include <stdio.h>
1414

1515
namespace __llvm_libc {
@@ -18,7 +18,7 @@ LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
1818
auto *file = reinterpret_cast<__llvm_libc::File *>(stream);
1919
int result = File::cleanup(file);
2020
if (result != 0) {
21-
errno = result;
21+
libc_errno = result;
2222
return EOF;
2323
}
2424
return 0;

‎libc/src/stdio/fflush.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
#include "src/stdio/fflush.h"
1010
#include "src/__support/File/file.h"
1111

12-
#include <errno.h>
12+
#include "src/errno/libc_errno.h"
1313
#include <stdio.h>
1414

1515
namespace __llvm_libc {
1616

1717
LLVM_LIBC_FUNCTION(int, fflush, (::FILE * stream)) {
1818
int result = reinterpret_cast<__llvm_libc::File *>(stream)->flush();
1919
if (result != 0) {
20-
errno = result;
20+
libc_errno = result;
2121
return EOF;
2222
}
2323
return 0;

‎libc/src/stdio/fgetc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "src/stdio/fgetc.h"
1010
#include "src/__support/File/file.h"
1111

12-
#include <errno.h>
12+
#include "src/errno/libc_errno.h"
1313
#include <stdio.h>
1414

1515
namespace __llvm_libc {
@@ -19,7 +19,7 @@ LLVM_LIBC_FUNCTION(int, fgetc, (::FILE * stream)) {
1919
auto result = reinterpret_cast<__llvm_libc::File *>(stream)->read(&c, 1);
2020
size_t r = result.value;
2121
if (result.has_error())
22-
errno = result.error;
22+
libc_errno = result.error;
2323

2424
if (r != 1)
2525
return EOF;

‎libc/src/stdio/fgetc_unlocked.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "src/stdio/fgetc_unlocked.h"
1010
#include "src/__support/File/file.h"
1111

12-
#include <errno.h>
12+
#include "src/errno/libc_errno.h"
1313
#include <stdio.h>
1414

1515
namespace __llvm_libc {
@@ -20,7 +20,7 @@ LLVM_LIBC_FUNCTION(int, fgetc_unlocked, (::FILE * stream)) {
2020
reinterpret_cast<__llvm_libc::File *>(stream)->read_unlocked(&c, 1);
2121
size_t r = result.value;
2222
if (result.has_error())
23-
errno = result.error;
23+
libc_errno = result.error;
2424
if (r != 1)
2525
return EOF;
2626
return c;

‎libc/src/stdio/fgets.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "src/stdio/fgets.h"
1010
#include "src/__support/File/file.h"
1111

12-
#include <errno.h>
12+
#include "src/errno/libc_errno.h"
1313
#include <stddef.h>
1414
#include <stdio.h>
1515

@@ -32,7 +32,7 @@ LLVM_LIBC_FUNCTION(char *, fgets,
3232
auto result = stream->read_unlocked(&c, 1);
3333
size_t r = result.value;
3434
if (result.has_error())
35-
errno = result.error;
35+
libc_errno = result.error;
3636

3737
if (r != 1)
3838
break;

0 commit comments

Comments
 (0)