summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2012-08-30 20:53:10 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2012-08-30 20:53:10 +0000
commitb2771f92dab5427a6f633e3a766f0f67fe096ac0 (patch)
treeddb505e4e88a289757d46b73b757ae745b58a6bc
parent19977425d47c02a035a26e4f89975bbcfbc142cb (diff)
Slightly tweak the way we set up the code patch sections such that we can
use them to patch inline assembly in C code as well.
-rw-r--r--sys/arch/sparc64/sparc64/locore.s34
1 files changed, 16 insertions, 18 deletions
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index 3b10fa2c9a9..c4af3c6eda1 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.165 2012/08/29 20:33:16 kettenis Exp $ */
+/* $OpenBSD: locore.s,v 1.166 2012/08/30 20:53:09 kettenis Exp $ */
/* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */
/*
@@ -101,16 +101,31 @@
_C_LABEL(sun4v_patch):
.previous
+ .section .sun4v_patch_end, "ax"
+ .globl _C_LABEL(sun4v_patch_end)
+_C_LABEL(sun4v_patch_end):
+ .previous
+
#ifdef MULTIPROCESSOR
.section .sun4v_mp_patch, "ax"
.globl _C_LABEL(sun4v_mp_patch)
_C_LABEL(sun4v_mp_patch):
.previous
+ .section .sun4v_mp_patch_end, "ax"
+ .globl _C_LABEL(sun4v_mp_patch_end)
+_C_LABEL(sun4v_mp_patch_end):
+ .previous
+
.section .sun4u_mtp_patch, "ax"
.globl _C_LABEL(sun4u_mtp_patch)
_C_LABEL(sun4u_mtp_patch):
.previous
+
+ .section .sun4u_mtp_patch_end, "ax"
+ .globl _C_LABEL(sun4u_mtp_patch_end)
+_C_LABEL(sun4u_mtp_patch_end):
+ .previous
#endif
/*
@@ -9179,20 +9194,3 @@ _C_LABEL(dlflush_start):
.xword dlflush4
.xword dlflush5
.xword 0
-
- .section .sun4v_patch, "ax"
- .globl _C_LABEL(sun4v_patch_end)
-_C_LABEL(sun4v_patch_end):
- .previous
-
-#ifdef MULTIPROCESSOR
- .section .sun4v_mp_patch, "ax"
- .globl _C_LABEL(sun4v_mp_patch_end)
-_C_LABEL(sun4v_mp_patch_end):
- .previous
-
- .section .sun4u_mtp_patch, "ax"
- .globl _C_LABEL(sun4u_mtp_patch_end)
-_C_LABEL(sun4u_mtp_patch_end):
- .previous
-#endif