Module Name: src
Committed By: joerg
Date: Sun Jan 12 20:31:50 UTC 2014
Modified Files:
src/sys/arch/amd64/amd64: spl.S
src/sys/arch/i386/i386: lock_stubs.S
Log Message:
Try to reserve space in a way that results in the same allocation for
both LLVM and GNU as.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/amd64/spl.S
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/lock_stubs.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/spl.S
diff -u src/sys/arch/amd64/amd64/spl.S:1.27 src/sys/arch/amd64/amd64/spl.S:1.28
--- src/sys/arch/amd64/amd64/spl.S:1.27 Sat Jun 22 06:57:30 2013
+++ src/sys/arch/amd64/amd64/spl.S Sun Jan 12 20:31:50 2014
@@ -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 */
/*
Index: src/sys/arch/i386/i386/lock_stubs.S
diff -u src/sys/arch/i386/i386/lock_stubs.S:1.25 src/sys/arch/i386/i386/lock_stubs.S:1.26
--- src/sys/arch/i386/i386/lock_stubs.S:1.25 Wed Jan 12 23:12:12 2011
+++ src/sys/arch/i386/i386/lock_stubs.S Sun Jan 12 20:31:50 2014
@@ -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)
