summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvisa <visa@openbsd.org>2017-06-08 12:11:46 +0000
committervisa <visa@openbsd.org>2017-06-08 12:11:46 +0000
commit265f67a273c58738a30f8daf6b4d1e640a6e6c98 (patch)
treed3e5803255d7c1eeac4287433f99da670cf7889d
parentMove loongson/octeon/sgi unmap_startup() under arch/mips64. (diff)
downloadwireguard-openbsd-265f67a273c58738a30f8daf6b4d1e640a6e6c98.tar.xz
wireguard-openbsd-265f67a273c58738a30f8daf6b4d1e640a6e6c98.zip
Wrap startup code with .ent and .end for proper disassembly.
-rw-r--r--sys/arch/octeon/octeon/locore.S4
-rw-r--r--sys/arch/octeon/octeon/locore0.S6
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/octeon/octeon/locore.S b/sys/arch/octeon/octeon/locore.S
index c1e3e68ee92..928839b5d68 100644
--- a/sys/arch/octeon/octeon/locore.S
+++ b/sys/arch/octeon/octeon/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.15 2017/06/06 14:39:48 visa Exp $ */
+/* $OpenBSD: locore.S,v 1.16 2017/06/08 12:11:46 visa Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -45,6 +45,7 @@
.set noreorder # Noreorder is default style!
.set mips64r2
.globl locore_start
+ .ent locore_start, 0
locore_start:
/* initialize ebase */
dla t0, 0xffffffff80000000
@@ -144,6 +145,7 @@ locore_start:
PTR_L sp, 0(sp)
jr ra
nop
+ .end locore_start
#if defined(MULTIPROCESSOR)
LEAF(hw_cpu_spinup_trampoline, 0)
diff --git a/sys/arch/octeon/octeon/locore0.S b/sys/arch/octeon/octeon/locore0.S
index b57089fabb7..6aabe26d3c2 100644
--- a/sys/arch/octeon/octeon/locore0.S
+++ b/sys/arch/octeon/octeon/locore0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore0.S,v 1.1 2017/06/05 15:23:11 visa Exp $ */
+/* $OpenBSD: locore0.S,v 1.2 2017/06/08 12:11:46 visa Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -33,9 +33,11 @@
.set noreorder # Noreorder is default style!
.set mips64r2
- .globl start
.globl kernel_text
+ .globl start
+ .ent start, 0
kernel_text = start
start:
j locore_start
nop
+ .end start