| author |  Andrew Kelley <andrew@ziglang.org> 2023-10-13 18:01:50-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2024-06-05 22:43:53-07:00 |
| log | 4c068c3be1e8501ba85d4b98f6b869474fc967df |
| tree | 6cb49c52e97df89515ba3ccacdbb102504539626 |
| parent | 9e76385afcc341f7366c733b28efb88f8bdd33d8 |
glibc patch: inline x86-lp_size.h
I could have just included the file from upstream glibc, but it was too
silly so I just inlined it. This patch could be dropped in a future
glibc update if desired. If omitted it will cause easily solvable
C compilation failures building glibc nonshared.2 files changed, 10 insertions(+), 2 deletions(-)
lib/libc/glibc/sysdeps/x86_64/sysdep.h+5-1
| ... | @@ -20,7 +20,11 @@ | ... | @@ -20,7 +20,11 @@ |
| 20 | #define _X86_64_SYSDEP_H 1 | 20 | #define _X86_64_SYSDEP_H 1 |
| 21 | 21 | ||
| 22 | #include <sysdeps/x86/sysdep.h> | 22 | #include <sysdeps/x86/sysdep.h> |
| 23 | #include <x86-lp_size.h> | 23 | #ifdef __ASSEMBLER__ |
| 24 | # define LP_SIZE 8 | ||
| 25 | #else | ||
| 26 | # define LP_SIZE "8" | ||
| 27 | #endif | ||
| 24 | 28 | ||
| 25 | /* __CET__ is defined by GCC with Control-Flow Protection values: | 29 | /* __CET__ is defined by GCC with Control-Flow Protection values: |
| 26 | 30 |
lib/libc/glibc/sysdeps/x86_64/x32/sysdep.h+5-1
| ... | @@ -17,7 +17,11 @@ | ... | @@ -17,7 +17,11 @@ |
| 17 | <https://www.gnu.org/licenses/>. */ | 17 | <https://www.gnu.org/licenses/>. */ |
| 18 | 18 | ||
| 19 | #include <sysdeps/x86_64/sysdep.h> | 19 | #include <sysdeps/x86_64/sysdep.h> |
| 20 | #include <x86-lp_size.h> | 20 | #ifdef __ASSEMBLER__ |
| 21 | # define LP_SIZE 4 | ||
| 22 | #else | ||
| 23 | # define LP_SIZE "4" | ||
| 24 | #endif | ||
| 21 | 25 | ||
| 22 | #undef LP_OP | 26 | #undef LP_OP |
| 23 | #undef ASM_ADDR | 27 | #undef ASM_ADDR |