Module Name: src
Committed By: maxv
Date: Wed Nov 1 09:38:43 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64: linux32_sigcode.S linux_sigcode.S
netbsd32_sigcode.S
Log Message:
More END(). In linux_sigcode.S we only provide symbols, not defined as
functions.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/amd64/linux32_sigcode.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/amd64/linux_sigcode.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/amd64/netbsd32_sigcode.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/linux32_sigcode.S
diff -u src/sys/arch/amd64/amd64/linux32_sigcode.S:1.4 src/sys/arch/amd64/amd64/linux32_sigcode.S:1.5
--- src/sys/arch/amd64/amd64/linux32_sigcode.S:1.4 Mon Oct 30 17:06:42 2017
+++ src/sys/arch/amd64/amd64/linux32_sigcode.S Wed Nov 1 09:38:43 2017
@@ -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 @@ END(linux32_sigcode)
.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 @@ NENTRY(linux32_rt_sigcode)
.balign 16
.globl _C_LABEL(linux32_esigcode)
_C_LABEL(linux32_esigcode):
+END(linux32_rt_sigcode)
Index: src/sys/arch/amd64/amd64/linux_sigcode.S
diff -u src/sys/arch/amd64/amd64/linux_sigcode.S:1.3 src/sys/arch/amd64/amd64/linux_sigcode.S:1.4
--- src/sys/arch/amd64/amd64/linux_sigcode.S:1.3 Mon Oct 30 17:06:42 2017
+++ src/sys/arch/amd64/amd64/linux_sigcode.S Wed Nov 1 09:38:43 2017
@@ -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):
Index: src/sys/arch/amd64/amd64/netbsd32_sigcode.S
diff -u src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.7 src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.8
--- src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.7 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amd64/amd64/netbsd32_sigcode.S Wed Nov 1 09:38:43 2017
@@ -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.
*/
-
-NENTRY(netbsd32_sigcode)
-
.code32
+NENTRY(netbsd32_sigcode)
/*
* 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.
