Patchwork [powerpc] fix helper routines

login
register
mail settings
Submitter Nathan Sidwell
Date June 17, 2010, 2:58 p.m.
Message ID <4C1A3807.6060102@codesourcery.com>
Download mbox | patch
Permalink /patch/56056/
State New
Headers show

Comments

Nathan Sidwell - June 17, 2010, 2:58 p.m.
This patch fixes two issues I found in updating vxworks support.

1) the e500crtsav assembly files had duplicated a typo in the jumps to the 
'done' label.

2) one of those files had omitted the FUNC_END macros.

I think these went undiscovered because gcc doesn't emit calls to these 
routines.  But I hit them when building libraries.

built & tested for powerpc-vxworks.

ok?
Nathan Sidwell - June 30, 2010, 3:38 p.m.
On 06/17/10 15:58, Nathan Sidwell wrote:
> This patch fixes two issues I found in updating vxworks support.
>
> 1) the e500crtsav assembly files had duplicated a typo in the jumps to
> the 'done' label.
>
> 2) one of those files had omitted the FUNC_END macros.
>
> I think these went undiscovered because gcc doesn't emit calls to these
> routines. But I hit them when building libraries.
>
> built & tested for powerpc-vxworks.

http://gcc.gnu.org/ml/gcc-patches/2010-06/msg01782.html

ping?

nathan

Patch

2010-06-17  Nathan Sidwell  <nathan@codesourcery.com>

	* config/rs6000/e500crtsavg64gprctr.asm: Correct done label name.
	* config/rs6000/e500crtsav64gprctr.asm: Likewise.
	* config/rs6000/e500crtres64gprctr.asm: Likewise. Add FUNC_END
	directives.

Index: config/rs6000/e500crtres64gprctr.asm
===================================================================
--- config/rs6000/e500crtres64gprctr.asm	(revision 160920)
+++ config/rs6000/e500crtres64gprctr.asm	(working copy)
@@ -33,40 +33,58 @@ 
    registers to be restored is passed in CTR, called by the compiler.  */
 
 HIDDEN_FUNC(_rest64gpr_ctr_14)	evldd 14,0(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_15)	evldd 15,8(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_16)	evldd 16,16(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_17)	evldd 17,24(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_18)	evldd 18,32(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_19)	evldd 19,40(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_20)	evldd 20,48(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_21)	evldd 21,56(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_22)	evldd 22,64(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_23)	evldd 23,72(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_24)	evldd 24,80(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_25)	evldd 25,88(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_26)	evldd 26,96(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_27)	evldd 27,104(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_28)	evldd 28,112(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_29)	evldd 29,120(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_30)	evldd 30,128(11)
-				bdz _rest64_gpr_ctr_done
+				bdz _rest64gpr_ctr_done
 HIDDEN_FUNC(_rest64gpr_ctr_31)	evldd 31,136(11)
 _rest64gpr_ctr_done:		blr
+FUNC_END(_rest64gpr_ctr_31)
+FUNC_END(_rest64gpr_ctr_30)
+FUNC_END(_rest64gpr_ctr_29)
+FUNC_END(_rest64gpr_ctr_28)
+FUNC_END(_rest64gpr_ctr_27)
+FUNC_END(_rest64gpr_ctr_26)
+FUNC_END(_rest64gpr_ctr_25)
+FUNC_END(_rest64gpr_ctr_24)
+FUNC_END(_rest64gpr_ctr_23)
+FUNC_END(_rest64gpr_ctr_22)
+FUNC_END(_rest64gpr_ctr_21)
+FUNC_END(_rest64gpr_ctr_20)
+FUNC_END(_rest64gpr_ctr_19)
+FUNC_END(_rest64gpr_ctr_18)
+FUNC_END(_rest64gpr_ctr_17)
+FUNC_END(_rest64gpr_ctr_16)
+FUNC_END(_rest64gpr_ctr_15)
+FUNC_END(_rest64gpr_ctr_14)
 
 #endif
Index: config/rs6000/e500crtsavg64gprctr.asm
===================================================================
--- config/rs6000/e500crtsavg64gprctr.asm	(revision 160920)
+++ config/rs6000/e500crtsavg64gprctr.asm	(working copy)
@@ -33,39 +33,39 @@ 
 /* "GOT" versions that load the address of the GOT into lr before returning.  */
 
 HIDDEN_FUNC(_save64gpr_ctr_14_g)	evstdd 14,0(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_15_g)	evstdd 15,8(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_16_g)	evstdd 16,16(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_17_g)	evstdd 17,24(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_18_g)	evstdd 18,32(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_19_g)	evstdd 19,40(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_20_g)	evstdd 20,48(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_21_g)	evstdd 21,56(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_22_g)	evstdd 22,64(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_23_g)	evstdd 23,72(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_24_g)	evstdd 24,80(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_25_g)	evstdd 25,88(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_26_g)	evstdd 26,96(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_27_g)	evstdd 27,104(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_28_g)	evstdd 28,112(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_29_g)	evstdd 29,120(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_30_g)	evstdd 30,128(11)
-				bdz _save64_gpr_ctr_g_done
+				bdz _save64gpr_ctr_g_done
 HIDDEN_FUNC(_save64gpr_ctr_31_g)	evstdd 31,136(11)
 _save64gpr_ctr_g_done:		b _GLOBAL_OFFSET_TABLE_-4
 FUNC_END(_save64gpr_ctr_31_g)
Index: config/rs6000/e500crtsav64gprctr.asm
===================================================================
--- config/rs6000/e500crtsav64gprctr.asm	(revision 160920)
+++ config/rs6000/e500crtsav64gprctr.asm	(working copy)
@@ -34,39 +34,39 @@ 
 /* "Bare" versions that return to their caller.  */
 
 HIDDEN_FUNC(_save64gpr_ctr_14)	evstdd 14,0(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_15)	evstdd 15,8(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_16)	evstdd 16,16(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_17)	evstdd 17,24(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_18)	evstdd 18,32(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_19)	evstdd 19,40(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_20)	evstdd 20,48(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_21)	evstdd 21,56(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_22)	evstdd 22,64(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_23)	evstdd 23,72(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_24)	evstdd 24,80(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_25)	evstdd 25,88(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_26)	evstdd 26,96(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_27)	evstdd 27,104(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_28)	evstdd 28,112(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_29)	evstdd 29,120(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_30)	evstdd 30,128(11)
-				bdz _save64_gpr_ctr_done
+				bdz _save64gpr_ctr_done
 HIDDEN_FUNC(_save64gpr_ctr_31)	evstdd 31,136(11)
 _save64gpr_ctr_done:		blr
 FUNC_END(_save64gpr_ctr_31)