Backport r272992

2019-07-04  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2019-07-03  Martin Liska  <mliska@suse.cz>

	PR middle-end/90899
	* multiple_target.c (create_dispatcher_calls): Add to comdat
	group only if set for ifunc.
2019-07-04  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2019-07-03  Martin Liska  <mliska@suse.cz>

	PR middle-end/90899
	* gcc.target/i386/pr90899.c: New test.

From-SVN: r273073

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31e404983f347ba8855759ecab96058001746a01..ae633153aa8fb1f4c60a6f97f8a689376534e30e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-07-04  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2019-07-03  Martin Liska  <mliska@suse.cz>
+
+       PR middle-end/90899
+       * multiple_target.c (create_dispatcher_calls): Add to comdat
+       group only if set for ifunc.
+
 2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
 
        * dwarf2out.c (add_scalar_info): Add back refererence to existing DIE

diff --git a/gcc/multiple_target.c b/gcc/multiple_target.c
index 0a87241b25191ae910289fc5fb3d296ae554ff19..e93c60e7adb32da3b7971bb59d43b68797f141d9 100644 (file)
--- a/gcc/multiple_target.c
+++ b/gcc/multiple_target.c
@@ -158,7 +158,8 @@ create_dispatcher_calls (struct cgraph_node *node)
            {
              symtab_node *source = ref->referring;
              source->create_reference (inode, IPA_REF_ALIAS);
-             source->add_to_same_comdat_group (inode);
+             if (inode->get_comdat_group ())
+               source->add_to_same_comdat_group (inode);
            }
          else
            gcc_unreachable ();

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c7a98744d39fef91e0d8bcc12e061d244853acb9..2a42f3c15b066341338808a642d6682b9e72de0d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-04  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2019-07-03  Martin Liska  <mliska@suse.cz>
+
+       PR middle-end/90899
+       * gcc.target/i386/pr90899.c: New test.
+
 2019-07-04  Chenghua Xu  <paul.hua.gm@gmail.com>
 
        * gcc.target/mips/mips-fmadd.c: Rename to ...

diff --git a/gcc/testsuite/gcc.target/i386/pr90899.c b/gcc/testsuite/gcc.target/i386/pr90899.c
new file mode 100644 (file)
index 0000000..e0e2d5a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr90899.c
@@ -0,0 +1,6 @@
+/* PR middle-end/90899 */
+/* { dg-do compile } */
+/* { dg-require-ifunc "" } */
+
+__attribute__ ((target_clones ("default", "arch=slm"))) static int f () { return 0; }
+__attribute__ ((alias ("f"))) __typeof (f) g;