[src/trunk]: src/sys/arch/amd64/amd64 More END(). In linux_sigcode.S we only ...

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

details:   https://anonhg.NetBSD.org/src/rev/fcee90dcd2e0
branches:  trunk
changeset: 827533:fcee90dcd2e0
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Nov 01 09:38:43 2017 +0000

description:
More END(). In linux_sigcode.S we only provide symbols, not defined as
functions.

diffstat:

 sys/arch/amd64/amd64/linux32_sigcode.S  |   7 ++++---
 sys/arch/amd64/amd64/linux_sigcode.S    |  20 ++++++++------------
 sys/arch/amd64/amd64/netbsd32_sigcode.S |  19 +++++++++----------
 3 files changed, 21 insertions(+), 25 deletions(-)

diffs (111 lines):

diff -r 664738737445 -r fcee90dcd2e0 sys/arch/amd64/amd64/linux32_sigcode.S
--- a/sys/arch/amd64/amd64/linux32_sigcode.S    Wed Nov 01 09:31:24 2017 +0000
+++ b/sys/arch/amd64/amd64/linux32_sigcode.S    Wed Nov 01 09:38:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux32_sigcode.S,v 1.4 2017/10/30 17:06:42 maxv Exp $ */
+/*     $NetBSD: linux32_sigcode.S,v 1.5 2017/11/01 09:38:43 maxv Exp $ */
 
 #include "assym.h"
 #include <machine/asm.h>
@@ -6,7 +6,7 @@
        .code32
 NENTRY(linux32_sigcode)
        call    *LINUX32_SF_HANDLER(%esp)
-       leal    LINUX32_SF_SC(%esp),%ebx        # scp
+       leal    LINUX32_SF_SC(%esp),%ebx        /* scp */
        pushl   %eax
        movl    $LINUX32_SYS_sigreturn,%eax
        int     $0x80
@@ -17,7 +17,7 @@
        .balign 16
 NENTRY(linux32_rt_sigcode)
        call    *LINUX32_RT_SF_HANDLER(%esp)
-       leal    LINUX32_RT_SF_UC(%esp),%ebx     # scp
+       leal    LINUX32_RT_SF_UC(%esp),%ebx     /* scp */
        pushl   %eax
        movl    $LINUX32_SYS_rt_sigreturn,%eax
        int     $0x80
@@ -26,4 +26,5 @@
        .balign 16
        .globl  _C_LABEL(linux32_esigcode)
 _C_LABEL(linux32_esigcode):
+END(linux32_rt_sigcode)
 
diff -r 664738737445 -r fcee90dcd2e0 sys/arch/amd64/amd64/linux_sigcode.S
--- a/sys/arch/amd64/amd64/linux_sigcode.S      Wed Nov 01 09:31:24 2017 +0000
+++ b/sys/arch/amd64/amd64/linux_sigcode.S      Wed Nov 01 09:38:43 2017 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: linux_sigcode.S,v 1.3 2017/10/30 17:06:42 maxv Exp $ */
+/*     $NetBSD: linux_sigcode.S,v 1.4 2017/11/01 09:38:43 maxv Exp $ */
 
-/*-
+/*
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,16 +34,12 @@
 #include <machine/asm.h>
 
 /* 
- * The signal trampoline are not used on Linux/amd64: a
- * libc provided trampoline is always used.
- * We just provide the symbol so that the kernel builds.
+ * The signal trampoline are not used on Linux/amd64: a libc provided
+ * trampoline is always used. We just provide the symbol so that the kernel
+ * builds.
  */
 
-/* LINTSTUB: Var: char linux_sigcode[1], linux_esigcode[1]; */
-NENTRY(linux_sigcode)
-END(linux_sigcode)
+       .globl _C_LABEL(linux_sigcode), _C_LABEL(linux_esigcode)
+       .set _C_LABEL(linux_sigcode),0
+       .set _C_LABEL(linux_esigcode),0
 
-/* LINTSTUB: Var: char linux_rt_sigcode[1]; */
-NENTRY(linux_rt_sigcode)
-       .globl  _C_LABEL(linux_esigcode)
-_C_LABEL(linux_esigcode):
diff -r 664738737445 -r fcee90dcd2e0 sys/arch/amd64/amd64/netbsd32_sigcode.S
--- a/sys/arch/amd64/amd64/netbsd32_sigcode.S   Wed Nov 01 09:31:24 2017 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_sigcode.S   Wed Nov 01 09:38:43 2017 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: netbsd32_sigcode.S,v 1.7 2008/04/28 20:23:12 martin Exp $      */
+/*     $NetBSD: netbsd32_sigcode.S,v 1.8 2017/11/01 09:38:43 maxv Exp $        */
 
-/*-
+/*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -36,23 +36,22 @@
 /*
  * Signal trampoline for 1.6 compatibility; copied to top of user stack.
  */
-
+       .code32
 NENTRY(netbsd32_sigcode)
-
-       .code32
        /*
         * Handler has returned here as if we called it.  The sigcontext
         * is on the stack after the 3 args "we" pushed.
         */
-       leal    12(%esp),%eax           # get pointer to sigcontext
-       movl    %eax,4(%esp)            # put it in the argument slot
-                                       # fake return address already there
+       leal    12(%esp),%eax           /* get pointer to sigcontext */
+       movl    %eax,4(%esp)            /* put it in the argument slot */
+                                       /* fake return address already there */
        movl    $SYS_compat_16___sigreturn14,%eax
-       int     $0x80                   # enter kernel with args on stack
+       int     $0x80                   /* enter kernel with args on stack */
        movl    $SYS_exit,%eax
-       int     $0x80                   # exit if sigreturn fails
+       int     $0x80                   /* exit if sigreturn fails */
        .globl  _C_LABEL(netbsd32_esigcode)
 _C_LABEL(netbsd32_esigcode):
+END(netbsd32_sigcode)
 
 /*
  * There is no NetBSD-1.6 compatibility for native code.