mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gcc-plugins: consolidate on PASS_INFO macro

Browse source 
Now that PASS_INFO() exists, use it in the other existing gcc plugins,
instead of always open coding the same thing.

Based on updates to the grsecurity/PaX gcc plugins.

Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Kees Cook 2017-01-13 14:09:35 -08:00
parent 8d4973a1c0
commit 5a45a4c5c3
3 changed files with 5 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/gcc-plugins/cyc_complexity_plugin.c
View file

@ -52,12 +52,8 @@ static unsigned int cyc_complexity_execute(void)
__visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version) __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
{ {
const char * const plugin_name = plugin_info->base_name; const char * const plugin_name = plugin_info->base_name;
struct register_pass_info cyc_complexity_pass_info;
cyc_complexity_pass_info.pass = make_cyc_complexity_pass(); PASS_INFO(cyc_complexity, "ssa", 1, PASS_POS_INSERT_AFTER);
cyc_complexity_pass_info.reference_pass_name = "ssa";
cyc_complexity_pass_info.ref_pass_instance_number = 1;
cyc_complexity_pass_info.pos_op = PASS_POS_INSERT_AFTER;
if (!plugin_default_version_check(version, &gcc_version)) { if (!plugin_default_version_check(version, &gcc_version)) {
error(G_("incompatible gcc/plugin versions")); error(G_("incompatible gcc/plugin versions"));

8
scripts/gcc-plugins/latent_entropy_plugin.c
View file

@ -592,12 +592,6 @@ __visible int plugin_init(struct plugin_name_args *plugin_info,
const struct plugin_argument * const argv = plugin_info->argv; const struct plugin_argument * const argv = plugin_info->argv;
int i; int i;
struct register_pass_info latent_entropy_pass_info;
latent_entropy_pass_info.pass = make_latent_entropy_pass();
latent_entropy_pass_info.reference_pass_name = "optimized";
latent_entropy_pass_info.ref_pass_instance_number = 1;
latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = { static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
{ {
.base = &latent_entropy_decl, .base = &latent_entropy_decl,
@ -609,6 +603,8 @@ __visible int plugin_init(struct plugin_name_args *plugin_info,
LAST_GGC_ROOT_TAB LAST_GGC_ROOT_TAB
}; };
PASS_INFO(latent_entropy, "optimized", 1, PASS_POS_INSERT_BEFORE);
if (!plugin_default_version_check(version, &gcc_version)) { if (!plugin_default_version_check(version, &gcc_version)) {
error(G_("incompatible gcc/plugin versions")); error(G_("incompatible gcc/plugin versions"));
return 1; return 1;

8
scripts/gcc-plugins/sancov_plugin.c
View file

@ -89,7 +89,6 @@ static void sancov_start_unit(void __unused *gcc_data, void __unused *user_data)
__visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version) __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
{ {
int i; int i;
struct register_pass_info sancov_plugin_pass_info;
const char * const plugin_name = plugin_info->base_name; const char * const plugin_name = plugin_info->base_name;
const int argc = plugin_info->argc; const int argc = plugin_info->argc;
const struct plugin_argument * const argv = plugin_info->argv; const struct plugin_argument * const argv = plugin_info->argv;
@ -107,14 +106,11 @@ __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gc
}; };
/* BBs can be split afterwards?? */ /* BBs can be split afterwards?? */
sancov_plugin_pass_info.pass = make_sancov_pass();
#if BUILDING_GCC_VERSION >= 4009 #if BUILDING_GCC_VERSION >= 4009
sancov_plugin_pass_info.reference_pass_name = "asan"; PASS_INFO(sancov, "asan", 0, PASS_POS_INSERT_BEFORE);
#else #else
sancov_plugin_pass_info.reference_pass_name = "nrv"; PASS_INFO(sancov, "nrv", 1, PASS_POS_INSERT_BEFORE);
#endif #endif
sancov_plugin_pass_info.ref_pass_instance_number = 0;
sancov_plugin_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
if (!plugin_default_version_check(version, &gcc_version)) { if (!plugin_default_version_check(version, &gcc_version)) {
error(G_("incompatible gcc/plugin versions")); error(G_("incompatible gcc/plugin versions"));