Patchwork [rs6000] Preserve link stack for 476 cpus

login
register
mail settings
Submitter Peter Bergner
Date Nov. 3, 2011, 3:40 a.m.
Message ID <1320291621.2996.344.camel@otta>
Download mbox | patch
Permalink /patch/123391/
State New
Headers show

Comments

Peter Bergner - Nov. 3, 2011, 3:40 a.m.
On Wed, 2011-11-02 at 22:02 +0000, Iain Sandoe wrote:
> On 2 Nov 2011, at 19:39, Peter Bergner wrote:
> 
> > On Wed, 2011-11-02 at 19:33 +0000, Iain Sandoe wrote:
> >> I'm going to try this ....
> >>               char name[32];
> >> -             get_ppc64_thunk_name (name);
> >> +             get_ppc476_thunk_name (name);
> 
> This (together with the changes for HAVE_GAS_HIDDEN) fixes my  
> bootstrap problem.

Ok, I committed the following as obvious.  Sorry to you and David
for the breakage.

Peter


2011-11-02  Peter Bergner  <bergner@vnet.ibm.com>
	    Iain Sandoe  <iains@gcc.gnu.org>

	* config/rs6000/rs6000.c (USE_HIDDEN_LINKONCE): New define.
	(get_ppc476_thunk_name): Use it.
	(rs6000_code_end): Likewise.
	(macho_branch_islands): Fix typo.

Patch

Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c	(revision 180813)
+++ gcc/config/rs6000/rs6000.c	(working copy)
@@ -25071,7 +25071,7 @@  macho_branch_islands (void)
 	  if (TARGET_LINK_STACK)
 	    {
 	      char name[32];
-	      get_ppc64_thunk_name (name);
+	      get_ppc476_thunk_name (name);
 	      strcat (tmp_buf, ":\n\tmflr r0\n\tbl ");
 	      strcat (tmp_buf, name);
 	      strcat (tmp_buf, "\n");
@@ -27949,6 +27949,12 @@  rs6000_save_toc_in_prologue_p (void)
   return (cfun && cfun->machine && cfun->machine->save_toc_in_prologue);
 }
 
+#ifdef HAVE_GAS_HIDDEN
+# define USE_HIDDEN_LINKONCE 1
+#else
+# define USE_HIDDEN_LINKONCE 0
+#endif
+
 /* Fills in the label name that should be used for a 476 link stack thunk.  */
 
 void
@@ -27956,7 +27962,7 @@  get_ppc476_thunk_name (char name[32])
 {
   gcc_assert (TARGET_LINK_STACK);
 
-  if (HAVE_GAS_HIDDEN)
+  if (USE_HIDDEN_LINKONCE)
     sprintf (name, "__ppc476.get_thunk");
   else
     ASM_GENERATE_INTERNAL_LABEL (name, "LPPC476_", 0);
@@ -27983,7 +27989,7 @@  rs6000_code_end (void)
   TREE_PUBLIC (decl) = 1;
   TREE_STATIC (decl) = 1;
 
-  if (HAVE_GAS_HIDDEN)
+  if (USE_HIDDEN_LINKONCE)
     {
       DECL_COMDAT_GROUP (decl) = DECL_ASSEMBLER_NAME (decl);
       targetm.asm_out.unique_section (decl, 0);