mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-16 16:56:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[libc] Move off_t and stdio macros to proxy hdrs" (#98242)

Browse Source 
Reverts llvm/llvm-project#98215

Breaks linux bots
This commit is contained in:
Michael Jones 2024-07-09 16:22:38 -07:00 committed by GitHub
parent be9b1de1ab
commit 3a744283f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 27 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/config/gpu/api.td
View File

@ -59,6 +59,11 @@ def FenvAPI: PublicAPI<"fenv.h"> {
}
def StdIOAPI : PublicAPI<"stdio.h"> {
let Macros = [
SimpleMacroDef<"_IOFBF", "0">,
SimpleMacroDef<"_IOLBF", "1">,
SimpleMacroDef<"_IONBF", "2">,
];
let Types = [
"FILE",
"off_t",

3
libc/config/linux/api.td
View File

@ -76,6 +76,9 @@ def StdIOAPI : PublicAPI<"stdio.h"> {
SimpleMacroDef<"stderr", "stderr">,
SimpleMacroDef<"stdin", "stdin">,
SimpleMacroDef<"stdout", "stdout">,
SimpleMacroDef<"_IOFBF", "0">,
SimpleMacroDef<"_IOLBF", "1">,
SimpleMacroDef<"_IONBF", "2">,
];
let Types = [
"FILE",

10
libc/hdr/CMakeLists.txt
View File

@ -69,16 +69,6 @@ add_proxy_header_library(
libc.include.signal
)
add_proxy_header_library(
stdio_macros
HDRS
stdio_macros.h
FULL_BUILD_DEPENDS
libc.include.stdio
libc.include.llvm-libc-macros.stdio_macros
libc.include.llvm-libc-macros.file_seek_macros
)
add_proxy_header_library(
sys_epoll_macros
HDRS

23
libc/hdr/stdio_macros.h
View File

@ -1,23 +0,0 @@
//===-- Definition of macros from stdio.h --------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_LIBC_HDR_STDIO_MACROS_H
#define LLVM_LIBC_HDR_STDIO_MACROS_H
#ifdef LIBC_FULL_BUILD
#include "include/llvm-libc-macros/file-seek-macros.h"
#include "include/llvm-libc-macros/stdio-macros.h"
#else // Overlay mode
#include <stdio.h>
#endif // LLVM_LIBC_FULL_BUILD
#endif // LLVM_LIBC_HDR_STDIO_MACROS_H

9
libc/hdr/types/CMakeLists.txt
View File

@ -135,12 +135,3 @@ add_proxy_header_library(
libc.include.llvm-libc-types.struct_sigaction
libc.include.signal
)
add_proxy_header_library(
off_t
HDRS
off_t.h
FULL_BUILD_DEPENDS
libc.include.llvm-libc-types.off_t
libc.include.stdio
)

22
libc/hdr/types/off_t.h
View File

@ -1,22 +0,0 @@
//===-- Proxy for off_t ---------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_LIBC_HDR_TYPES_OFF_T_H
#define LLVM_LIBC_HDR_TYPES_OFF_T_H
#ifdef LIBC_FULL_BUILD
#include "include/llvm-libc-types/off_t.h"
#else // Overlay mode
#include <stdio.h>
#endif // LLVM_LIBC_FULL_BUILD
#endif // LLVM_LIBC_HDR_TYPES_OFF_T_H

4
libc/include/llvm-libc-macros/stdio-macros.h
View File

@ -15,8 +15,4 @@
#define BUFSIZ 1024
#define _IONBF 2
#define _IOLBF 1
#define _IOFBF 0
#endif // LLVM_LIBC_MACROS_STDIO_MACROS_H

6
libc/newhdrgen/yaml/stdio.yaml
View File

@ -1,5 +1,11 @@
header: stdio.h
macros:
- macro_name: _IONBF
macro_value: 2
- macro_name: _IOLBF
macro_value: 1
- macro_name: _IOFBF
macro_value: 0
- macro_name: stdout
macro_value: stdout
- macro_name: stdin

2
libc/src/__support/File/CMakeLists.txt
View File

@ -16,8 +16,6 @@ add_object_library(
libc.src.__support.CPP.span
libc.src.__support.threads.mutex
libc.src.__support.error_or
libc.hdr.types.off_t
libc.hdr.stdio_macros
)
add_object_library(

5
libc/src/__support/File/file.cpp
View File

@ -8,12 +8,13 @@
#include "file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/CPP/span.h"
#include "src/errno/libc_errno.h" // For error macros
#include <stdio.h>
#include <stdlib.h>
namespace LIBC_NAMESPACE {
FileIOResult File::write_unlocked(const void *data, size_t len) {

3
libc/src/__support/File/file.h
View File

@ -9,8 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FILE_FILE_H
#define LLVM_LIBC_SRC___SUPPORT_FILE_FILE_H
#include "hdr/stdio_macros.h"
#include "hdr/types/off_t.h"
#include "include/llvm-libc-types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/error_or.h"
#include "src/__support/macros/properties/architectures.h"

3
libc/src/__support/File/linux/CMakeLists.txt
View File

@ -5,7 +5,6 @@ add_object_library(
file.cpp
HDRS
file.h
lseekImpl.h
DEPENDS
libc.include.fcntl
libc.include.stdio
@ -16,8 +15,6 @@ add_object_library(
libc.src.errno.errno
libc.src.__support.error_or
libc.src.__support.File.file
libc.hdr.types.off_t
libc.hdr.stdio_macros
)
add_object_library(

5
libc/src/__support/File/linux/file.cpp
View File

@ -8,8 +8,6 @@
#include "file.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/File/file.h"
#include "src/__support/File/linux/lseekImpl.h"
@ -17,7 +15,8 @@
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/errno/libc_errno.h" // For error macros
#include <fcntl.h> // For mode_t and other flags to the open syscall
#include <fcntl.h> // For mode_t and other flags to the open syscall
#include <stdio.h>
#include <sys/stat.h> // For S_IS*, S_IF*, and S_IR* flags.
#include <sys/syscall.h> // For syscall numbers

1
libc/src/__support/File/linux/file.h
View File

@ -6,7 +6,6 @@
//
//===----------------------------------------------------------------------===//
#include "hdr/types/off_t.h"
#include "src/__support/File/file.h"
namespace LIBC_NAMESPACE {

2
libc/src/__support/File/linux/lseekImpl.h
View File

@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FILE_LINUX_LSEEKIMPL_H
#define LLVM_LIBC_SRC___SUPPORT_FILE_LINUX_LSEEKIMPL_H
#include "hdr/types/off_t.h"
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
#include "src/__support/common.h"
#include "src/__support/error_or.h"
@ -17,6 +16,7 @@
#include <stdint.h> // For uint64_t.
#include <sys/syscall.h> // For syscall numbers.
#include <unistd.h> // For off_t.
namespace LIBC_NAMESPACE {
namespace internal {

1
libc/src/__support/OSUtil/linux/CMakeLists.txt
View File

@ -21,5 +21,4 @@ add_object_library(
libc.hdr.types.struct_flock
libc.hdr.types.struct_flock64
libc.hdr.types.struct_f_owner_ex
libc.hdr.types.off_t
)

1
libc/src/__support/OSUtil/linux/fcntl.cpp
View File

@ -9,7 +9,6 @@
#include "src/__support/OSUtil/fcntl.h"
#include "hdr/fcntl_macros.h"
#include "hdr/types/off_t.h"
#include "hdr/types/struct_f_owner_ex.h"
#include "hdr/types/struct_flock.h"
#include "hdr/types/struct_flock64.h"

5
libc/src/stdio/CMakeLists.txt
View File

@ -61,8 +61,7 @@ add_entrypoint_object(
HDRS
fopencookie.h
DEPENDS
libc.hdr.stdio_macros
libc.hdr.types.off_t
libc.include.stdio
libc.src.__support.CPP.new
libc.src.__support.File.file
)
@ -75,7 +74,7 @@ add_entrypoint_object(
setbuf.h
DEPENDS
libc.src.errno.errno
libc.hdr.types.off_t
libc.include.stdio
libc.src.__support.File.file
libc.src.__support.File.platform_file
)

4
libc/src/stdio/fopencookie.cpp
View File

@ -7,12 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/stdio/fopencookie.h"
#include "hdr/stdio_macros.h"
#include "hdr/types/off_t.h"
#include "src/__support/CPP/new.h"
#include "src/__support/File/file.h"
#include "src/errno/libc_errno.h"
#include <stdio.h>
#include <stdlib.h>
namespace LIBC_NAMESPACE {

3
libc/src/stdio/setbuf.cpp
View File

@ -7,9 +7,10 @@
//===----------------------------------------------------------------------===//
#include "src/stdio/setbuf.h"
#include "hdr/stdio_macros.h"
#include "src/__support/File/file.h"
#include "src/errno/libc_errno.h"
#include <stdio.h>
namespace LIBC_NAMESPACE {

13
utils/bazel/llvm-project-overlay/libc/BUILD.bazel
View File

@ -138,11 +138,6 @@ libc_support_library(
hdrs = ["hdr/float_macros.h"],
)
libc_support_library(
name = "hdr_stdio_macros",
hdrs = ["hdr/stdio_macros.h"],
)
############################ Type Proxy Header Files ###########################
libc_support_library(
@ -185,11 +180,6 @@ libc_support_library(
hdrs = ["hdr/types/pid_t.h"],
)
libc_support_library(
name = "types_off_t",
hdrs = ["hdr/types/off_t.h"],
)
############################### Support libraries ##############################
libc_support_library(
@ -677,8 +667,6 @@ libc_support_library(
":__support_error_or",
":__support_threads_mutex",
":errno",
":hdr_stdio_macros",
":types_off_t",
],
)
@ -690,7 +678,6 @@ libc_support_library(
":__support_error_or",
":__support_osutil_syscall",
":errno",
":types_off_t",
],
)