[PATCH] libgcc: rs6000: tramp.S: fix placement of .cfi_endproc for __trampoline_setup

Segher Boessenkool segher@kernel.crashing.org
Thu Dec 13 01:18:00 GMT 2018


On Wed, Dec 12, 2018 at 07:30:08PM +1030, Alan Modra wrote:
> On Wed, Dec 12, 2018 at 08:43:41AM +0100, Rasmus Villemoes wrote:
> > diff --git a/libgcc/config/rs6000/tramp.S b/libgcc/config/rs6000/tramp.S
> > index 637f4510146..a9f0f3826dc 100644
> > --- a/libgcc/config/rs6000/tramp.S
> > +++ b/libgcc/config/rs6000/tramp.S
> > @@ -114,11 +114,10 @@ FUNC_START(__trampoline_setup)
> >  	addi	r30,r30,_GLOBAL_OFFSET_TABLE_-1b@l
> >  #endif
> >  	bl	JUMP_TARGET(abort)
> > +#endif
> >  	.cfi_endproc
> >  FUNC_END(__trampoline_setup)
> >  
> > -#endif
> > -
> >  #elif _CALL_ELF == 2
> >  	.type	trampoline_initial,@object
> >  	.align	3
> 
> Looks good to me.  I hadn't noticed the bad #endif placement with
> respect to FUNC_END when I added .cfi_endproc, which naturally goes
> with FUNC_END.

Yes, this is fine for trunk.  Or commit it as obvious ;-)


Segher



More information about the Gcc-patches mailing list