diff options
author | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
---|---|---|
committer | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
commit | f1c18afafc2b321465ae6b07ede127095942d7dc (patch) | |
tree | 812093eebfa8510367718c12c02f7da03c0e73bf /gcc-4.9/gcc/tree-profile.c | |
parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 |
[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch
Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.
Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2
Diffstat (limited to 'gcc-4.9/gcc/tree-profile.c')
-rw-r--r-- | gcc-4.9/gcc/tree-profile.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/tree-profile.c b/gcc-4.9/gcc/tree-profile.c index 4e2e874..b165251 100644 --- a/gcc-4.9/gcc/tree-profile.c +++ b/gcc-4.9/gcc/tree-profile.c @@ -256,6 +256,9 @@ static tree GTY(()) gcov_lipo_merge_modu_edges = NULL_TREE; /* extern gcov_unsigned_t __gcov_lipo_strict_inclusion */ static tree GTY(()) gcov_lipo_strict_inclusion = NULL_TREE; +/* extern gcov_unsigned_t __gcov_lipo_comdat_algorithm */ +static tree GTY(()) gcov_lipo_comdat_algorithm = NULL_TREE; + /* Insert STMT_IF around given sequence of consecutive statements in the same basic block starting with STMT_START, ending with STMT_END. PROB is the probability of the taken branch. */ @@ -493,6 +496,13 @@ tree_init_dyn_ipa_parameters (void) get_gcov_unsigned_t ()); init_comdat_decl (gcov_lipo_strict_inclusion, PARAM_LIPO_WEAK_INCLUSION); + gcov_lipo_comdat_algorithm = build_decl ( + UNKNOWN_LOCATION, + VAR_DECL, + get_identifier ("__gcov_lipo_comdat_algorithm"), + get_gcov_unsigned_t ()); + init_comdat_decl (gcov_lipo_comdat_algorithm, + PARAM_LIPO_COMDAT_ALGORITHM); } } @@ -1264,7 +1274,8 @@ tree_profiling (void) function body from being deleted) won't be needed. */ if (L_IPO_COMP_MODE) lipo_link_and_fixup (); - init_node_map (true); + else + init_node_map (true); FOR_EACH_DEFINED_FUNCTION (node) |