On Tue, Jun 04, 2019 at 01:55:52PM +0300, Peter Mamonov wrote: > Use of global labels of the same name inside ENTRY_FUNCTION_END and > STOP_WITH_DEBUG_EVENT prevents simultaneous use of both macros. It also > prevents multiple use of one of them. > > Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx> > --- > arch/mips/include/asm/asm.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied, thanks Sascha > > diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h > index 019be4843b..be3a1bcdbc 100644 > --- a/arch/mips/include/asm/asm.h > +++ b/arch/mips/include/asm/asm.h > @@ -100,8 +100,8 @@ EXPORT(symbol) > nop; \ > \ > /* No return */ \ > -__error: \ > - b __error; \ > +1: \ > + b 1b; \ > nop; > > /* > @@ -114,8 +114,8 @@ __error: \ > /* trigger a soft breakpoint for OpenOCD */ \ > SDBBP; \ > /* position independent variant of dead loop */ \ > - __error: \ > - b __error; \ > +1: \ > + b 1b; \ > nop; \ > /* Call some code from .text section. \ > * It is needed to keep same linker script for \ > -- > 2.20.1 > > > _______________________________________________ > barebox mailing list > barebox@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
