diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-15 22:27:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-15 22:27:03 +0300 |
| commit | 78e8370033bfe08481212ceead113ccb668b83cb (patch) | |
| tree | 81b31f56c39b441af5dabc33d11d588c0f9e3582 | |
| parent | 36d49bba19f2c19c933d13b25dcf4eb607a030b3 (diff) | |
| parent | 905c559e51497b8bfdbb68df8be56d2f70f0de8e (diff) | |
| download | linux-78e8370033bfe08481212ceead113ccb668b83cb.tar.xz | |
Merge tag 'hardening-v7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fix from Kees Cook:
- gcc-plugins: Fix GCC 16 removal of CONST_CAST macros
* tag 'hardening-v7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
gcc-plugins: Always define CONST_CAST_GIMPLE and CONST_CAST_TREE
| -rw-r--r-- | scripts/gcc-plugins/gcc-common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h index 8f1b3500f8e2..abb1964c44d4 100644 --- a/scripts/gcc-plugins/gcc-common.h +++ b/scripts/gcc-plugins/gcc-common.h @@ -309,7 +309,9 @@ typedef const gimple *const_gimple_ptr; #define gimple gimple_ptr #define const_gimple const_gimple_ptr #undef CONST_CAST_GIMPLE -#define CONST_CAST_GIMPLE(X) CONST_CAST(gimple, (X)) +#define CONST_CAST_GIMPLE(X) const_cast<gimple>((X)) +#undef CONST_CAST_TREE +#define CONST_CAST_TREE(X) const_cast<tree>((X)) /* gimple related */ static inline gimple gimple_build_assign_with_ops(enum tree_code subcode, tree lhs, tree op1, tree op2 MEM_STAT_DECL) |