[src/trunk]: src/sys/arch/amd64/amd64 Eliminate a '.text'.

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

details:   https://anonhg.NetBSD.org/src/rev/9c88362349e6
branches:  trunk
changeset: 829162:9c88362349e6
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Jan 20 13:45:15 2018 +0000

description:
Eliminate a '.text'.

diffstat:

 sys/arch/amd64/amd64/amd64_trap.S |  35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diffs (63 lines):

diff -r 3d59a4fa7205 -r 9c88362349e6 sys/arch/amd64/amd64/amd64_trap.S
--- a/sys/arch/amd64/amd64/amd64_trap.S Sat Jan 20 13:42:07 2018 +0000
+++ b/sys/arch/amd64/amd64/amd64_trap.S Sat Jan 20 13:45:15 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amd64_trap.S,v 1.20 2018/01/20 13:42:07 maxv Exp $     */
+/*     $NetBSD: amd64_trap.S,v 1.21 2018/01/20 13:45:15 maxv Exp $     */
 
 /*
  * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #if 0
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: amd64_trap.S,v 1.20 2018/01/20 13:42:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amd64_trap.S,v 1.21 2018/01/20 13:45:15 maxv Exp $");
 #endif
 
 /*
@@ -183,21 +183,6 @@
        /* Jump to the code hooked in by DTrace. */
        movq    dtrace_invop_jump_addr, %rax
        jmpq    *dtrace_invop_jump_addr
-
-       .bss
-       .globl  dtrace_invop_jump_addr
-       .align  8
-       .type   dtrace_invop_jump_addr, @object
-       .size   dtrace_invop_jump_addr, 8
-dtrace_invop_jump_addr:
-       .zero   8
-       .globl  dtrace_invop_calltrap_addr
-       .align  8
-       .type   dtrace_invop_calltrap_addr, @object
-       .size   dtrace_invop_calltrap_addr, 8
-dtrace_invop_calltrap_addr:
-       .zero   8
-       .text
 #endif
 IDTVEC_END(trap03)
 
@@ -493,6 +478,22 @@
 #endif
 END(alltraps)
 
+#ifdef KDTRACE_HOOKS
+       .bss
+       .globl  dtrace_invop_jump_addr
+       .align  8
+       .type   dtrace_invop_jump_addr, @object
+       .size   dtrace_invop_jump_addr, 8
+dtrace_invop_jump_addr:
+       .zero   8
+       .globl  dtrace_invop_calltrap_addr
+       .align  8
+       .type   dtrace_invop_calltrap_addr, @object
+       .size   dtrace_invop_calltrap_addr, 8
+dtrace_invop_calltrap_addr:
+       .zero   8
+#endif
+
        .section .rodata
 
 LABEL(x86_exceptions)