From 71713fa639cb04dcfa44d22035c6e056b6393b00 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sun, 27 Dec 2015 14:33:19 +0100 Subject: [PATCH] ipa-visibility.c (function_and_variable_visibility): Do not dissolve comdat groups when in LTO mode. * ipa-visibility.c (function_and_variable_visibility): Do not dissolve comdat groups when in LTO mode. From-SVN: r231965 --- gcc/ChangeLog | 5 +++++ gcc/ipa-visibility.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 87c03cdf16d8..663beb7cce0a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Jan Hubicka + + * ipa-visibility.c (function_and_variable_visibility): Do not + dissolve comdat groups when in LTO mode. + 2015-12-25 Andreas Tobler * config/rs6000/freebsd64.h: Delete FREEBSD_DYNAMIC_LINKER32/64 diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c index 4b48d6e5b8b2..1f8c2e8db692 100644 --- a/gcc/ipa-visibility.c +++ b/gcc/ipa-visibility.c @@ -493,8 +493,12 @@ function_and_variable_visibility (bool whole_program) DECL_COMDAT (node->decl) = 0; /* For external decls stop tracking same_comdat_group. It doesn't matter - what comdat group they are in when they won't be emitted in this TU. */ - if (node->same_comdat_group && DECL_EXTERNAL (node->decl)) + what comdat group they are in when they won't be emitted in this TU. + + An exception is LTO where we may end up with both external + and non-external declarations in the same comdat group in + the case declarations was not merged. */ + if (node->same_comdat_group && DECL_EXTERNAL (node->decl) && !in_lto_p) { if (flag_checking) { -- 2.39.2