summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2014-01-12 20:31:50 +0000
committerjoerg <joerg@NetBSD.org>2014-01-12 20:31:50 +0000
commit60fb2869bebc51848b804e377e6d7cab14dfdbe9 (patch)
tree17ded04e940896ef2d705b5c857cba92f4f2626e /sys
parentd6c1b0e87409d835a935c2995e60c82e03c67162 (diff)
Try to reserve space in a way that results in the same allocation for
both LLVM and GNU as.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/amd64/spl.S11
-rw-r--r--sys/arch/i386/i386/lock_stubs.S7
2 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/amd64/amd64/spl.S b/sys/arch/amd64/amd64/spl.S
index 5bac4b56404..de8908dc9cc 100644
--- a/sys/arch/amd64/amd64/spl.S
+++ b/sys/arch/amd64/amd64/spl.S
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.27 2013/06/22 06:57:30 uebayasi Exp $ */
+/* $NetBSD: spl.S,v 1.28 2014/01/12 20:31:50 joerg Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -212,16 +212,11 @@ ENTRY(spllower)
2:
popf
jmp _C_LABEL(Xspllower)
- nop
- nop
- .align 16
-#ifdef GPROF
- nop
+3:
+ .space 16
.align 16
-#endif
END(spllower)
LABEL(spllower_end)
-
#endif /* !XEN */
/*
diff --git a/sys/arch/i386/i386/lock_stubs.S b/sys/arch/i386/i386/lock_stubs.S
index 12d56d04a27..5e04cbaacb7 100644
--- a/sys/arch/i386/i386/lock_stubs.S
+++ b/sys/arch/i386/i386/lock_stubs.S
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.25 2011/01/12 23:12:12 joerg Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.26 2014/01/12 20:31:50 joerg Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.25 2011/01/12 23:12:12 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.26 2014/01/12 20:31:50 joerg Exp $");
#include "opt_lockdebug.h"
@@ -264,7 +264,7 @@ ENTRY(mutex_spin_exit)
movl %ecx, CPUVAR(ILEVEL)
sti
1: ret
- nop /* XXX round up */
+ .space 32
.align 32
LABEL(mutex_spin_exit_end)
END(mutex_spin_exit)
@@ -295,6 +295,7 @@ ENTRY(i686_mutex_spin_exit)
movl %ecx,4(%esp)
LABEL(i686_mutex_spin_exit_patch)
jmp _C_LABEL(Xspllower)
+ .space 16
.align 32
LABEL(i686_mutex_spin_exit_end)
END(i686_mutex_spin_exit)