Commit 78e83700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 36d49bba 905c559e

scripts/gcc-plugins/gcc-common.h

+3 −1
Original line number Diff line number Diff line
@@ -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)