Skip to content

Commit cf4442e

Browse files
author
Job Henandez Lara
authored
[libc] temporaliy disable __USE_EXTERN_INLINES and set __USE_FORITFY_LEVEL to 1 before including in overlay mode (#113012)
1 parent 0a6def6 commit cf4442e

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

libc/hdr/stdio_overlay.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@
2727
#undef _FORTIFY_SOURCE
2828
#endif
2929

30+
#ifdef __USE_EXTERN_INLINES
31+
#define LIBC_OLD_USE_EXTERN_INLINES
32+
#undef __USE_EXTERN_INLINES
33+
#endif
34+
35+
#ifdef __USE_FORTIFY_LEVEL
36+
#define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
37+
#undef __USE_FORTIFY_LEVEL
38+
#define __USE_FORTIFY_LEVEL 0
39+
#endif
40+
3041
#ifndef __NO_INLINE__
3142
#define __NO_INLINE__ 1
3243
#define LIBC_SET_NO_INLINE
@@ -44,4 +55,15 @@
4455
#undef LIBC_SET_NO_INLINE
4556
#endif
4657

58+
#ifdef LIBC_OLD_USE_FORTIFY_LEVEL
59+
#undef __USE_FORTIFY_LEVEL
60+
#define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL
61+
#undef LIBC_OLD_USE_FORTIFY_LEVEL
62+
#endif
63+
64+
#ifdef LIBC_OLD_USE_EXTERN_INLINES
65+
#define __USE_EXTERN_INLINES
66+
#undef LIBC_OLD_USE_EXTERN_INLINES
67+
#endif
68+
4769
#endif // LLVM_LIBC_HDR_STDIO_OVERLAY_H

libc/hdr/wchar_overlay.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@
3232
#define LIBC_SET_NO_INLINE
3333
#endif
3434

35+
#ifdef __USE_EXTERN_INLINES
36+
#define LIBC_OLD_USE_EXTERN_INLINES
37+
#undef __USE_EXTERN_INLINES
38+
#endif
39+
40+
#ifdef __USE_FORTIFY_LEVEL
41+
#define LIBC_OLD_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
42+
#undef __USE_FORTIFY_LEVEL
43+
#define __USE_FORTIFY_LEVEL 0
44+
#endif
45+
3546
#include <wchar.h>
3647

3748
#ifdef LIBC_OLD_FORTIFY_SOURCE
@@ -44,4 +55,15 @@
4455
#undef LIBC_SET_NO_INLINE
4556
#endif
4657

58+
#ifdef LIBC_OLD_USE_FORTIFY_LEVEL
59+
#undef __USE_FORTIFY_LEVEL
60+
#define __USE_FORTIFY_LEVEL LIBC_OLD_USE_FORTIFY_LEVEL
61+
#undef LIBC_OLD_USE_FORTIFY_LEVEL
62+
#endif
63+
64+
#ifdef LIBC_OLD_USE_EXTERN_INLINES
65+
#define __USE_EXTERN_INLINES
66+
#undef LIBC_OLD_USE_EXTERN_INLINES
67+
#endif
68+
4769
#endif // LLVM_LIBC_HDR_WCHAR_OVERLAY_H

0 commit comments

Comments
 (0)