From: Jan Hubicka <hubicka@ucw.cz>
Date: Tue, 4 Feb 2014 05:50:18 +0000 (+0100)
Subject: re PR ipa/59469 (LLVM build failure with gcc LTO)
X-Git-Tag: releases/gcc-4.9.0~1124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f876ae722d5a409960aef5ab4d3ea7630fd516c;p=thirdparty%2Fgcc.git

re PR ipa/59469 (LLVM build failure with gcc LTO)


	PR ipa/59469
	* lto-symtab.c (lto_cgraph_replace_node, lto_varpool_replace_node):
	merge force_output and forced_by_abi flags.

From-SVN: r207449
---

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 8eede88031c2..a0c1be1a0082 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-04  Jan Hubicka  <hubicka@ucw.cz>
+	    Markus Trippelsdorf
+
+	PR ipa/59469
+	* lto-symtab.c (lto_cgraph_replace_node, lto_varpool_replace_node):
+	merge force_output and forced_by_abi flags.
+
 2014-01-24  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
 	* lto-lang.c (lto_init): Replaced flag_enable_cilkplus with
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index f5f9d1318ee0..71242c8926f1 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -59,6 +59,8 @@ lto_cgraph_replace_node (struct cgraph_node *node,
   /* Merge node flags.  */
   if (node->force_output)
     cgraph_mark_force_output_node (prevailing_node);
+  if (node->forced_by_abi)
+    prevailing_node->forced_by_abi = true;
   if (node->address_taken)
     {
       gcc_assert (!prevailing_node->global.inlined_to);
@@ -110,6 +112,10 @@ lto_varpool_replace_node (varpool_node *vnode,
   gcc_assert (!vnode->analyzed || prevailing_node->analyzed);
 
   ipa_clone_referring (prevailing_node, &vnode->ref_list);
+  if (vnode->force_output)
+    prevailing_node->force_output = true;
+  if (vnode->forced_by_abi)
+    prevailing_node->forced_by_abi = true;
 
   /* Be sure we can garbage collect the initializer.  */
   if (DECL_INITIAL (vnode->decl)