[src/trunk]: src/sys/arch Try to reserve space in a way that results in the s...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d1c47f2f501
branches:  trunk
changeset: 325941:9d1c47f2f501
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Jan 12 20:31:50 2014 +0000

description:
Try to reserve space in a way that results in the same allocation for
both LLVM and GNU as.

diffstat:

 sys/arch/amd64/amd64/spl.S      |  11 +++--------
 sys/arch/i386/i386/lock_stubs.S |   7 ++++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r 8830020c8f59 -r 9d1c47f2f501 sys/arch/amd64/amd64/spl.S
--- a/sys/arch/amd64/amd64/spl.S        Sun Jan 12 19:37:43 2014 +0000
+++ b/sys/arch/amd64/amd64/spl.S        Sun Jan 12 20:31:50 2014 +0000
@@ -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 @@
 2:
        popf
        jmp     _C_LABEL(Xspllower)
-       nop
-       nop
+3:
+       .space 16
        .align  16
-#ifdef GPROF
-       nop
-       .align  16
-#endif
 END(spllower)
 LABEL(spllower_end)
-
 #endif /* !XEN */
 
 /*
diff -r 8830020c8f59 -r 9d1c47f2f501 sys/arch/i386/i386/lock_stubs.S
--- a/sys/arch/i386/i386/lock_stubs.S   Sun Jan 12 19:37:43 2014 +0000
+++ b/sys/arch/i386/i386/lock_stubs.S   Sun Jan 12 20:31:50 2014 +0000
@@ -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 @@
        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 @@
        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)