summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-09-03 14:37:22 +0000
committerderaadt <deraadt@openbsd.org>2019-09-03 14:37:22 +0000
commitb152f6c832ff03ab486dc71e2ef7f7514e5e3be5 (patch)
tree40bcd5591d0c4dc97dd545ab2b4e76532818ab3f
parentdelete incorrect casts, and a bit if ansi functions; ok jcs (diff)
downloadwireguard-openbsd-b152f6c832ff03ab486dc71e2ef7f7514e5e3be5.tar.xz
wireguard-openbsd-b152f6c832ff03ab486dc71e2ef7f7514e5e3be5.zip
only need one start: label; ok kettenis
-rw-r--r--sys/arch/macppc/macppc/locore0.S3
-rw-r--r--sys/arch/macppc/macppc/ofwreal.S4
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/macppc/macppc/locore0.S b/sys/arch/macppc/macppc/locore0.S
index 3bc89c2a441..7358329e8d3 100644
--- a/sys/arch/macppc/macppc/locore0.S
+++ b/sys/arch/macppc/macppc/locore0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore0.S,v 1.1 2017/06/13 01:44:29 deraadt Exp $ */
+/* $OpenBSD: locore0.S,v 1.2 2019/09/03 14:37:22 deraadt Exp $ */
/* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */
/*
@@ -68,7 +68,6 @@ fwargsave:
* Startup entry
*/
_ENTRY(_C_LABEL(kernel_text))
-_ENTRY(_ASM_LABEL(start))
/* arguments to start
* r1 - stack provided by firmware/bootloader
* r3 - unused
diff --git a/sys/arch/macppc/macppc/ofwreal.S b/sys/arch/macppc/macppc/ofwreal.S
index a78e33ffe9c..72418c797d0 100644
--- a/sys/arch/macppc/macppc/ofwreal.S
+++ b/sys/arch/macppc/macppc/ofwreal.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofwreal.S,v 1.4 2015/11/15 17:11:29 miod Exp $ */
+/* $OpenBSD: ofwreal.S,v 1.5 2019/09/03 14:37:22 deraadt Exp $ */
/* $NetBSD: ofwreal.S,v 1.1 1996/09/30 16:34:51 ws Exp $ */
/*
@@ -406,7 +406,7 @@ _ENTRY(_C_LABEL(openfirmware))
* }
*/
.lcomm firmstk,NBPG,16
-.comm _C_LABEL(OF_buf),NBPG,PGOFSET
+.comm _C_LABEL(OF_buf),NBPG
_ENTRY(_C_LABEL(ofw_stack))
mfmsr %r8 /* turn off interrupts */