Update to gcc-4.10-20140608 snapshot

D-Programming-GDC · Jun 9, 2014 · eb915d6 · eb915d6
1 parent 879968a
commit eb915d6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/gcc.version b/gcc.version
@@ -1 +1 @@
-gcc-4.10-20140525
+gcc-4.10-20140608
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-09  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-objfile.cc(d_comdat_group): Return a decl.
+	* d-decl.cc(FuncDeclaration::toThunkSymbol): Don't set comdat group.
+
 2014-05-31  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* d-todt.cc(dt_container): Properly handle zero length static arrays.

diff --git a/gcc/d/d-decls.cc b/gcc/d/d-decls.cc
@@ -526,7 +526,6 @@ FuncDeclaration::toThunkSymbol (int offset)
       /* Needed on some targets to avoid "causes a section type conflict".  */
       D_DECL_ONE_ONLY (thunk_decl) = D_DECL_ONE_ONLY (target_func_decl);
       DECL_COMDAT (thunk_decl) = DECL_COMDAT (target_func_decl);
-      DECL_COMDAT_GROUP (thunk_decl) = DECL_COMDAT_GROUP (target_func_decl);
       DECL_WEAK (thunk_decl) = DECL_WEAK (target_func_decl);
 
       DECL_NAME (thunk_decl) = get_identifier (sthunk->Sident);

diff --git a/gcc/d/d-objfile.cc b/gcc/d/d-objfile.cc
@@ -1687,7 +1687,7 @@ d_comdat_group (tree decl)
   if (DECL_COMDAT_GROUP (decl))
     return DECL_COMDAT_GROUP (decl);
 
-  return DECL_ASSEMBLER_NAME (decl);
+  return decl;
 }
 
 // Set DECL up to have the closest approximation of "initialized common"