diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89f4e04943f81bd03b2d8f5b29a7ca1f027f90a4..e127291e1b103ceb2c36fa2a62b20af2368b143e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,7 +1,9 @@ -2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de> +2014-04-10 Jan Hubicka <hubicka@ucw.cz> + Jakub Jelinek <jakub@redhat.com> - * fortran/class.c (gfc_build_class_symbol): Append "_t" to target class - names to make the generated type names unique. + PR lto/60567 + * ipa.c (function_and_variable_visibility): Copy forced_by_abi flag from + decl_node to node. 2014-04-10 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dcc84fd84fb699475ff21ce4fc7a5cd56202ded8..386a2f21e0e68f0e52bc642946224e128406ab7c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de> + + * class.c (gfc_build_class_symbol): Append "_t" to target class + names to make the generated type names unique. + 2014-04-04 Tobias Burnus <burnus@net-b.de> * check.c (gfc_check_cmplx): Fix typo. diff --git a/gcc/ipa.c b/gcc/ipa.c index c76687604ddafce712306662f6913e54e68e4aff..26e9b03b9bdbd0029fb97987251d98645eb90b9d 100644 --- a/gcc/ipa.c +++ b/gcc/ipa.c @@ -1032,6 +1032,7 @@ function_and_variable_visibility (bool whole_program) == DECL_COMDAT_GROUP (decl_node->decl)); gcc_checking_assert (node->same_comdat_group); } + node->forced_by_abi = decl_node->forced_by_abi; if (DECL_EXTERNAL (decl_node->decl)) DECL_EXTERNAL (node->decl) = 1; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4db6ed06ad9fddcb15759e48bce417b0e9ce97b8..4e2bb478825c98a43ed4131cf3af32e4b1c5ddb6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-04-10 Jakub Jelinek <jakub@redhat.com> + + PR lto/60567 + * g++.dg/lto/pr60567_0.C: New test. + 2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de> * gfortran.dg/class_nameclash.f90: New test. diff --git a/gcc/testsuite/g++.dg/lto/pr60567_0.C b/gcc/testsuite/g++.dg/lto/pr60567_0.C new file mode 100644 index 0000000000000000000000000000000000000000..966a3c3bc7421775613f7e37c02562e0326aef42 --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr60567_0.C @@ -0,0 +1,23 @@ +// PR lto/60567 +// { dg-lto-do link } +// { dg-lto-options { { -flto -fno-use-linker-plugin } } } +// { dg-extra-ld-options "-r -nostdlib" } + +#pragma implementation +struct S {}; + +#pragma interface +struct T +{ + virtual void foo (const S &) = 0; +}; + +struct U +{ + virtual void bar (const S &) = 0; +}; + +struct V : public T, public U +{ + virtual void bar (const S &) {} +};