shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libc] Fix overlay mode inclusion for fcntl.h header. (#119159)

Browse Source
This commit is contained in:
lntue 2024-12-08 19:14:32 -08:00 committed by GitHub
parent be2df95e92
commit 44c645fcc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/hdr/fcntl_overlay.h
View File

@ -20,6 +20,11 @@
// `__USE_FORTIFY_LEVEL`, which will be temporarily disabled // `__USE_FORTIFY_LEVEL`, which will be temporarily disabled
// with `_FORTIFY_SOURCE`. // with `_FORTIFY_SOURCE`.
#ifdef _FORTIFY_SOURCE
#define LIBC_OLD_FORTIFY_SOURCE _FORTIFY_SOURCE
#undef _FORTIFY_SOURCE
#endif
#ifdef __USE_FORTIFY_LEVEL #ifdef __USE_FORTIFY_LEVEL
#define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL #define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
#undef __USE_FORTIFY_LEVEL #undef __USE_FORTIFY_LEVEL
@ -28,6 +33,11 @@
#include <fcntl.h> #include <fcntl.h>
#ifdef LIBC_OLD_FORTIFY_SOURCE
#define _FORTIFY_SOURCE LIBC_OLD_FORTIFY_SOURCE
#undef LIBC_OLD_FORTIFY_SOURCE
#endif
#ifdef LIBC_OLD_USE_FORTIFY_LEVEL #ifdef LIBC_OLD_USE_FORTIFY_LEVEL
#undef __USE_FORTIFY_LEVEL #undef __USE_FORTIFY_LEVEL
#define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL #define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL

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

@ -51,6 +51,8 @@ add_proxy_header_library(
struct_flock struct_flock
HDRS HDRS
struct_flock.h struct_flock.h
DEPENDS
libc.hdr.fcntl_overlay
FULL_BUILD_DEPENDS FULL_BUILD_DEPENDS
libc.include.llvm-libc-types.struct_flock libc.include.llvm-libc-types.struct_flock
) )
@ -59,6 +61,8 @@ add_proxy_header_library(
struct_flock64 struct_flock64
HDRS HDRS
struct_flock64.h struct_flock64.h
DEPENDS
libc.hdr.fcntl_overlay
FULL_BUILD_DEPENDS FULL_BUILD_DEPENDS
libc.include.llvm-libc-types.struct_flock64 libc.include.llvm-libc-types.struct_flock64
) )
@ -67,6 +71,8 @@ add_proxy_header_library(
struct_f_owner_ex struct_f_owner_ex
HDRS HDRS
struct_f_owner_ex.h struct_f_owner_ex.h
DEPENDS
libc.hdr.fcntl_overlay
FULL_BUILD_DEPENDS FULL_BUILD_DEPENDS
libc.include.llvm-libc-types.struct_f_owner_ex libc.include.llvm-libc-types.struct_f_owner_ex
) )

2
libc/hdr/types/struct_f_owner_ex.h
View File

@ -14,7 +14,7 @@
#else #else
#include <fcntl.h> #include "hdr/fcntl_overlay.h"
#endif // LIBC_FULL_BUILD #endif // LIBC_FULL_BUILD

2
libc/hdr/types/struct_flock.h
View File

@ -14,7 +14,7 @@
#else #else
#include <fcntl.h> #include "hdr/fcntl_overlay.h"
#endif // LIBC_FULL_BUILD #endif // LIBC_FULL_BUILD

2
libc/hdr/types/struct_flock64.h
View File

@ -14,7 +14,7 @@
#else #else
#include <fcntl.h> #include "hdr/fcntl_overlay.h"
#endif // LIBC_FULL_BUILD #endif // LIBC_FULL_BUILD