History

Merge 5.15-rc6 into char-misc-next

We need the char/misc fixes in here for merging and testing.

Greg Kroah-Hartman committed 5 years ago

Commit 22d4f9b2 parents d0221a7 519d819648 files · +7117 −4345Browse files

Showing the changes to scripts (3 of 648 files). Show all

Unified · Split

3 files
  1. scripts/Makefile.gcc-plugins +4 −0
  2. scripts/checksyscalls.sh +4 −2
  3. scripts/recordmcount.pl +1 −1
scripts/Makefile.gcc-plugins+4−0
@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ · 18 unmodified lines
19 += -fplugin-arg-structleak_plugin-byref19 += -fplugin-arg-structleak_plugin-byref
20gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \20gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \
21 += -fplugin-arg-structleak_plugin-byref-all21 += -fplugin-arg-structleak_plugin-byref-all
22ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK
23 DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable
24endif
25export DISABLE_STRUCTLEAK_PLUGIN
22gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \26gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \
23 += -DSTRUCTLEAK_PLUGIN27 += -DSTRUCTLEAK_PLUGIN
24 28
scripts/checksyscalls.sh+4−2
@@ -82,10 +82,8 @@ cat << EOF · 81 unmodified lines
82#define __IGNORE_truncate6482#define __IGNORE_truncate64
83#define __IGNORE_stat6483#define __IGNORE_stat64
84#define __IGNORE_lstat6484#define __IGNORE_lstat64
85#define __IGNORE_fstat64
86#define __IGNORE_fcntl6485#define __IGNORE_fcntl64
87#define __IGNORE_fadvise64_6486#define __IGNORE_fadvise64_64
88#define __IGNORE_fstatat64
89#define __IGNORE_fstatfs6487#define __IGNORE_fstatfs64
90#define __IGNORE_statfs6488#define __IGNORE_statfs64
91#define __IGNORE_llseek89#define __IGNORE_llseek
@@ -253,6 +251,10 @@ cat << EOF · 161 unmodified lines
253#define __IGNORE_getpmsg251#define __IGNORE_getpmsg
254#define __IGNORE_putpmsg252#define __IGNORE_putpmsg
255#define __IGNORE_vserver253#define __IGNORE_vserver
254
255/* 64-bit ports never needed these, and new 32-bit ports can use statx */
256#define __IGNORE_fstat64
257#define __IGNORE_fstatat64
256EOF258EOF
257}259}
258 260
scripts/recordmcount.pl+1−1
@@ -189,7 +189,7 @@ if ($arch =~ /(x86(_64)?)|(i386)/) { · 188 unmodified lines
189$local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)";189$local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)";
190$weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";190$weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";
191$section_regex = "Disassembly of section\\s+(\\S+):";191$section_regex = "Disassembly of section\\s+(\\S+):";
192$function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";192$function_regex = "^([0-9a-fA-F]+)\\s+<([^^]*?)>:";
193$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$";193$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$";
194$section_type = '@progbits';194$section_type = '@progbits';
195$mcount_adjust = 0;195$mcount_adjust = 0;