aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/common.opt2
-rw-r--r--gcc/ipa-icf.c1
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c1
5 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aaf07f4..e0601576d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-10-25 H.J. Lu <hongjiu.lu@intel.com>
+ Martin Liska <mliska@suse.cz>
+
+ PR ipa/78099
+ * common.opt: Mark flag_ipa_icf_variables as Optimization flag.
+ * ipa-icf.c (sem_function::get_hash): Add target optimization
+ node to hash.
+
2016-10-25 Wilco Dijkstra <wdijkstr@arm.com>
PR target/78041
diff --git a/gcc/common.opt b/gcc/common.opt
index eefbb46..1872d51 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1597,7 +1597,7 @@ Common Report Var(flag_ipa_icf_functions) Optimization
Perform Identical Code Folding for functions.
fipa-icf-variables
-Common Report Var(flag_ipa_icf_variables)
+Common Report Var(flag_ipa_icf_variables) Optimization
Perform Identical Code Folding for variables.
fipa-reference
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 3886fa6..e8880cb 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -300,6 +300,7 @@ sem_function::get_hash (void)
(cl_target_option_hash
(TREE_TARGET_OPTION (DECL_FUNCTION_SPECIFIC_TARGET (decl))));
if (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl))
+ hstate.add_wide_int
(cl_optimization_hash
(TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl))));
hstate.add_flag (DECL_CXX_CONSTRUCTOR_P (decl));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02d8ac6..c7c233f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-25 Martin Liska <mliska@suse.cz>
+
+ * gcc.dg/ipa/ipa-icf-32.c: Removed one scanned pattern.
+
2016-10-25 Wilco Dijkstra <wdijkstr@arm.com>
PR target/78041
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
index 9f42918..df11ac5 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
@@ -19,5 +19,4 @@ int main()
return foo (0) + bar (0);
}
-/* { dg-final { scan-ipa-dump "optimization flags are different" "icf" } } */
/* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf" } } */