summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorPeter Mamonov <pmamonov@gmail.com>2019-06-04 13:55:52 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2019-06-07 08:29:13 +0200
commitd85b94aac63eca3af6761e1c39746aba7d668194 (patch)
tree4378600f2a7f436f76ad557b5ba8751bbb258201 /arch/mips
parent786e5901a7566f7c94e57537231ac54c62df7c15 (diff)
downloadbarebox-d85b94aac63eca3af6761e1c39746aba7d668194.tar.gz
barebox-d85b94aac63eca3af6761e1c39746aba7d668194.tar.xz
MIPS: use anonymous labels in ENTRY_FUNCTION_END and STOP_WITH_DEBUG_EVENT macros
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@gmail.com> Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/asm.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
index a85467ceed..69931662ff 100644
--- a/arch/mips/include/asm/asm.h
+++ b/arch/mips/include/asm/asm.h
@@ -102,8 +102,8 @@ EXPORT(symbol)
nop; \
\
/* No return */ \
-__error: \
- b __error; \
+1: \
+ b 1b; \
nop;
/*
@@ -116,8 +116,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 \