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/l-ipo.c | |
| parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
| download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip | |
[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/l-ipo.c')
| -rw-r--r-- | gcc-4.9/gcc/l-ipo.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/l-ipo.c b/gcc-4.9/gcc/l-ipo.c index 843ad557d..59a9636d2 100644 --- a/gcc-4.9/gcc/l-ipo.c +++ b/gcc-4.9/gcc/l-ipo.c @@ -1566,7 +1566,11 @@ resolve_cgraph_node (struct cgraph_sym **slot, struct cgraph_node *node) } has_prof1 = has_profile_info (decl1); - if (has_prof1) + bool is_aux1 = cgraph_is_auxiliary (decl1); + bool is_aux2 = cgraph_is_auxiliary (decl2); + /* Pick the copy from the primary module if multiple copies + have profile. */ + if (has_prof1 && (!is_aux1 || is_aux2)) return; has_prof2 = has_profile_info (decl2); if (has_prof2) |