mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
Merge 5.15-rc6 into char-misc-next
We need the char/misc fixes in here for merging and testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \
|
||||
+= -fplugin-arg-structleak_plugin-byref
|
||||
gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \
|
||||
+= -fplugin-arg-structleak_plugin-byref-all
|
||||
ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK
|
||||
DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable
|
||||
endif
|
||||
export DISABLE_STRUCTLEAK_PLUGIN
|
||||
gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \
|
||||
+= -DSTRUCTLEAK_PLUGIN
|
||||
|
||||
|
||||
@@ -82,10 +82,8 @@ cat << EOF
|
||||
#define __IGNORE_truncate64
|
||||
#define __IGNORE_stat64
|
||||
#define __IGNORE_lstat64
|
||||
#define __IGNORE_fstat64
|
||||
#define __IGNORE_fcntl64
|
||||
#define __IGNORE_fadvise64_64
|
||||
#define __IGNORE_fstatat64
|
||||
#define __IGNORE_fstatfs64
|
||||
#define __IGNORE_statfs64
|
||||
#define __IGNORE_llseek
|
||||
@@ -253,6 +251,10 @@ cat << EOF
|
||||
#define __IGNORE_getpmsg
|
||||
#define __IGNORE_putpmsg
|
||||
#define __IGNORE_vserver
|
||||
|
||||
/* 64-bit ports never needed these, and new 32-bit ports can use statx */
|
||||
#define __IGNORE_fstat64
|
||||
#define __IGNORE_fstatat64
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ if ($arch =~ /(x86(_64)?)|(i386)/) {
|
||||
$local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)";
|
||||
$weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";
|
||||
$section_regex = "Disassembly of section\\s+(\\S+):";
|
||||
$function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
|
||||
$function_regex = "^([0-9a-fA-F]+)\\s+<([^^]*?)>:";
|
||||
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$";
|
||||
$section_type = '@progbits';
|
||||
$mcount_adjust = 0;
|
||||
|
||||
Reference in New Issue
Block a user