diff options
| author | Aditya Kumar <hiraditya@msn.com> | 2015-05-07 17:57:11 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-05-07 19:57:11 +0200 |
| commit | d57c99458933a21fdf94f508191f145ad8d5ec58 (patch) | |
| tree | f2315558beab8bcea20ad64ca963a395148c9821 /gcc | |
| parent | f7df4a840c47845783129279750f1c214e74e7d1 (diff) | |
| download | gcc-d57c99458933a21fdf94f508191f145ad8d5ec58.zip gcc-d57c99458933a21fdf94f508191f145ad8d5ec58.tar.gz gcc-d57c99458933a21fdf94f508191f145ad8d5ec58.tar.bz2 | |
gcov-tool.c (do_merge): Refactore to remove int ret.
* gcov-tool.c (do_merge): Refactore to remove int ret.
* ipa-icf.c (sem_item::hash_referenced_symbol_properties): Change
!type == FUNC to type != FUNC.
* reload.h (struct target_reload): Changee to type of
x_spill_indirect_levels from bool to unsigned char.
From-SVN: r222884
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/gcov-tool.c | 7 | ||||
| -rw-r--r-- | gcc/ipa-icf.c | 2 | ||||
| -rw-r--r-- | gcc/reload.h | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a14a4a5..f973501 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2015-05-06 Aditya Kumar <hiraditya@msn.com> + + * gcov-tool.c (do_merge): Refactore to remove int ret. + * ipa-icf.c (sem_item::hash_referenced_symbol_properties): Change + !type == FUNC to type != FUNC. + * reload.h (struct target_reload): Changee to type of + x_spill_indirect_levels from bool to unsigned char. + 2015-05-07 Richard Sandiford <richard.sandiford@arm.com> * rtl.h (always_void_p): New function. diff --git a/gcc/gcov-tool.c b/gcc/gcov-tool.c index fd27d7c..b2a4583 100644 --- a/gcc/gcov-tool.c +++ b/gcc/gcov-tool.c @@ -193,7 +193,6 @@ static int do_merge (int argc, char **argv) { int opt; - int ret; const char *output_dir = 0; int w1 = 1, w2 = 1; @@ -222,12 +221,10 @@ do_merge (int argc, char **argv) if (output_dir == NULL) output_dir = "merged_profile"; - if (argc - optind == 2) - ret = profile_merge (argv[optind], argv[optind+1], output_dir, w1, w2); - else + if (argc - optind != 2) merge_usage (); - return ret; + return profile_merge (argv[optind], argv[optind+1], output_dir, w1, w2); } /* If N_VAL is no-zero, normalize the profile by setting the largest counter diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index 1fbdf6d..3c4ac05 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -505,7 +505,7 @@ sem_item::hash_referenced_symbol_properties (symtab_node *ref, { if (is_a <cgraph_node *> (ref)) { - if ((!type == FUNC || address || !opt_for_fn (decl, optimize_size)) + if ((type != FUNC || address || !opt_for_fn (decl, optimize_size)) && !opt_for_fn (ref->decl, optimize_size) && !DECL_UNINLINABLE (ref->decl)) { diff --git a/gcc/reload.h b/gcc/reload.h index a58b902..a089faa 100644 --- a/gcc/reload.h +++ b/gcc/reload.h @@ -168,7 +168,7 @@ struct target_reload { value indicates the level of indirect addressing supported, e.g., two means that (MEM (MEM (REG n))) is also valid if (REG n) does not get a hard register. */ - bool x_spill_indirect_levels; + unsigned char x_spill_indirect_levels; /* True if caller-save has been reinitialized. */ bool x_caller_save_initialized_p; |