diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-07 17:57:11 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-07 17:57:11 +0000 |
| commit | e58b5f40ac976b65acb3827b16afa10ab7a11eb6 (patch) | |
| tree | f2315558beab8bcea20ad64ca963a395148c9821 | |
| parent | d1f9b275e42cf5c753e9f05789d89cc132726607 (diff) | |
| download | gcc-e58b5f40ac976b65acb3827b16afa10ab7a11eb6.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222884 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 a14a4a5bd15..f9735014b63 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 fd27d7c11ad..b2a4583d43b 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 1fbdf6ddaff..3c4ac05681b 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 a58b9025bf5..a089faafffe 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; |