Module Name: src
Committed By: thorpej
Date: Sun Oct 31 22:24:36 UTC 2021
Modified Files:
src/lib/libc/arch/aarch64: Makefile.inc
src/lib/libc/arch/alpha: Makefile.inc
src/lib/libc/arch/arm: Makefile.inc
src/lib/libc/arch/hppa: Makefile.inc
src/lib/libc/arch/i386: Makefile.inc
src/lib/libc/arch/ia64: Makefile.inc
src/lib/libc/arch/m68k: Makefile.inc
src/lib/libc/arch/mips: Makefile.inc
src/lib/libc/arch/or1k: Makefile.inc
src/lib/libc/arch/powerpc: Makefile.inc
src/lib/libc/arch/powerpc64: Makefile.inc
src/lib/libc/arch/riscv: Makefile.inc
src/lib/libc/arch/sh3: Makefile.inc
src/lib/libc/arch/sparc: Makefile.inc
src/lib/libc/arch/sparc64: Makefile.inc
src/lib/libc/arch/vax: Makefile.inc
src/lib/libc/arch/x86_64: Makefile.inc
src/lib/libc/sys: Makefile.inc
Log Message:
Tidy up how __sigaction14_sigtramp.c is added to SRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/aarch64/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/arch/alpha/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/arch/arm/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/hppa/Makefile.inc
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/arch/i386/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/ia64/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/arch/m68k/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/mips/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/or1k/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/powerpc/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/riscv/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sh3/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/sparc/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/vax/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/x86_64/Makefile.inc
cvs rdiff -u -r1.248 -r1.249 src/lib/libc/sys/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/aarch64/Makefile.inc
diff -u src/lib/libc/arch/aarch64/Makefile.inc:1.2 src/lib/libc/arch/aarch64/Makefile.inc:1.3
--- src/lib/libc/arch/aarch64/Makefile.inc:1.2 Wed Apr 15 19:13:46 2015
+++ src/lib/libc/arch/aarch64/Makefile.inc Sun Oct 31 22:24:34 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2015/04/15 19:13:46 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2021/10/31 22:24:34 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
#SRCS+= qdivrem.c
CPPFLAGS += -I.
Index: src/lib/libc/arch/alpha/Makefile.inc
diff -u src/lib/libc/arch/alpha/Makefile.inc:1.20 src/lib/libc/arch/alpha/Makefile.inc:1.21
--- src/lib/libc/arch/alpha/Makefile.inc:1.20 Sun Oct 26 07:43:07 2008
+++ src/lib/libc/arch/alpha/Makefile.inc Sun Oct 31 22:24:34 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.20 2008/10/26 07:43:07 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2021/10/31 22:24:34 thorpej Exp $
SRCS+= __longjmp14.c
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
# `source' files built from m4 source
SRCS+= __divqu.S __divq.S __divlu.S __divl.S
Index: src/lib/libc/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.28 src/lib/libc/arch/arm/Makefile.inc:1.29
--- src/lib/libc/arch/arm/Makefile.inc:1.28 Thu Aug 20 16:13:40 2015
+++ src/lib/libc/arch/arm/Makefile.inc Sun Oct 31 22:24:34 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.28 2015/08/20 16:13:40 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.29 2021/10/31 22:24:34 thorpej Exp $
.include <bsd.own.mk>
.if ${RUMPRUN} != "yes"
-SRCS+= __aeabi_read_tp.S __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __aeabi_read_tp.S __sigtramp2.S
.endif
.if empty(LIBC_MACHINE_ARCH:Mearmv7*)
Index: src/lib/libc/arch/hppa/Makefile.inc
diff -u src/lib/libc/arch/hppa/Makefile.inc:1.10 src/lib/libc/arch/hppa/Makefile.inc:1.11
--- src/lib/libc/arch/hppa/Makefile.inc:1.10 Wed Feb 19 13:01:51 2014
+++ src/lib/libc/arch/hppa/Makefile.inc Sun Oct 31 22:24:34 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.10 2014/02/19 13:01:51 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.11 2021/10/31 22:24:34 thorpej Exp $
# $OpenBSD: Makefile.inc,v 1.3 1999/12/25 06:02:10 mickey Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
SRCS+= bcopy.c
Index: src/lib/libc/arch/i386/Makefile.inc
diff -u src/lib/libc/arch/i386/Makefile.inc:1.22 src/lib/libc/arch/i386/Makefile.inc:1.23
--- src/lib/libc/arch/i386/Makefile.inc:1.22 Mon Oct 12 23:56:08 2020
+++ src/lib/libc/arch/i386/Makefile.inc Sun Oct 31 22:24:34 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.22 2020/10/12 23:56:08 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.23 2021/10/31 22:24:34 thorpej Exp $
.if ${RUMPRUN} != "yes"
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
.endif
CPPFLAGS+= -I.
Index: src/lib/libc/arch/ia64/Makefile.inc
diff -u src/lib/libc/arch/ia64/Makefile.inc:1.3 src/lib/libc/arch/ia64/Makefile.inc:1.4
--- src/lib/libc/arch/ia64/Makefile.inc:1.3 Sat Sep 23 17:39:34 2006
+++ src/lib/libc/arch/ia64/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.3 2006/09/23 17:39:34 cherry Exp $
+# $NetBSD: Makefile.inc,v 1.4 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
Index: src/lib/libc/arch/m68k/Makefile.inc
diff -u src/lib/libc/arch/m68k/Makefile.inc:1.17 src/lib/libc/arch/m68k/Makefile.inc:1.18
--- src/lib/libc/arch/m68k/Makefile.inc:1.17 Tue Mar 4 06:30:40 2014
+++ src/lib/libc/arch/m68k/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.17 2014/03/04 06:30:40 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S __m68k_read_tp.S __mmap.S
+SRCS+= __sigtramp2.S __m68k_read_tp.S __mmap.S
ASM+= _lwp_getprivate.S mremap.S
Index: src/lib/libc/arch/mips/Makefile.inc
diff -u src/lib/libc/arch/mips/Makefile.inc:1.15 src/lib/libc/arch/mips/Makefile.inc:1.16
--- src/lib/libc/arch/mips/Makefile.inc:1.15 Sun Apr 25 23:45:58 2021
+++ src/lib/libc/arch/mips/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.15 2021/04/25 23:45:58 christos Exp $
+# $NetBSD: Makefile.inc,v 1.16 2021/10/31 22:24:35 thorpej Exp $
.include <bsd.own.mk>
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
CPPFLAGS+= -I.
CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__ -D_KERNTYPES
Index: src/lib/libc/arch/or1k/Makefile.inc
diff -u src/lib/libc/arch/or1k/Makefile.inc:1.2 src/lib/libc/arch/or1k/Makefile.inc:1.3
--- src/lib/libc/arch/or1k/Makefile.inc:1.2 Fri Sep 5 18:09:37 2014
+++ src/lib/libc/arch/or1k/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/09/05 18:09:37 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
SRCS+= mulsi3.S
CPPFLAGS+= -I.
Index: src/lib/libc/arch/powerpc/Makefile.inc
diff -u src/lib/libc/arch/powerpc/Makefile.inc:1.14 src/lib/libc/arch/powerpc/Makefile.inc:1.15
--- src/lib/libc/arch/powerpc/Makefile.inc:1.14 Fri Aug 30 21:28:59 2013
+++ src/lib/libc/arch/powerpc/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/08/30 21:28:59 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
SRCS+= powerpc_initfini.c
CPPFLAGS+= -I.
Index: src/lib/libc/arch/powerpc64/Makefile.inc
diff -u src/lib/libc/arch/powerpc64/Makefile.inc:1.3 src/lib/libc/arch/powerpc64/Makefile.inc:1.4
--- src/lib/libc/arch/powerpc64/Makefile.inc:1.3 Sat Aug 23 02:24:22 2014
+++ src/lib/libc/arch/powerpc64/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/08/23 02:24:22 matt Exp $
+# $NetBSD: Makefile.inc,v 1.4 2021/10/31 22:24:35 thorpej Exp $
KMINCLUDES=
KMSRCS=
CPPFLAGS+= -I.
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
Index: src/lib/libc/arch/riscv/Makefile.inc
diff -u src/lib/libc/arch/riscv/Makefile.inc:1.1 src/lib/libc/arch/riscv/Makefile.inc:1.2
--- src/lib/libc/arch/riscv/Makefile.inc:1.1 Fri Sep 19 17:36:25 2014
+++ src/lib/libc/arch/riscv/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/19 17:36:25 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
CPPFLAGS+= -I.
Index: src/lib/libc/arch/sh3/Makefile.inc
diff -u src/lib/libc/arch/sh3/Makefile.inc:1.7 src/lib/libc/arch/sh3/Makefile.inc:1.8
--- src/lib/libc/arch/sh3/Makefile.inc:1.7 Wed Mar 22 23:11:08 2017
+++ src/lib/libc/arch/sh3/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.7 2017/03/22 23:11:08 chs Exp $
+# $NetBSD: Makefile.inc,v 1.8 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
.if ${MKSOFTFLOAT} != "no"
Index: src/lib/libc/arch/sparc/Makefile.inc
diff -u src/lib/libc/arch/sparc/Makefile.inc:1.15 src/lib/libc/arch/sparc/Makefile.inc:1.16
--- src/lib/libc/arch/sparc/Makefile.inc:1.15 Sat Jul 12 19:21:48 2014
+++ src/lib/libc/arch/sparc/Makefile.inc Sun Oct 31 22:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.15 2014/07/12 19:21:48 nakayama Exp $
+# $NetBSD: Makefile.inc,v 1.16 2021/10/31 22:24:35 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
.if ${MACHINE} != "sparc64"
# `source' files built from m4 source
Index: src/lib/libc/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.20 src/lib/libc/arch/sparc64/Makefile.inc:1.21
--- src/lib/libc/arch/sparc64/Makefile.inc:1.20 Wed Apr 15 19:13:46 2015
+++ src/lib/libc/arch/sparc64/Makefile.inc Sun Oct 31 22:24:36 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.20 2015/04/15 19:13:46 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2021/10/31 22:24:36 thorpej Exp $
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
# Some assembler files use v9a extensions.
AFLAGS+= -Wa,-Av9a
Index: src/lib/libc/arch/vax/Makefile.inc
diff -u src/lib/libc/arch/vax/Makefile.inc:1.9 src/lib/libc/arch/vax/Makefile.inc:1.10
--- src/lib/libc/arch/vax/Makefile.inc:1.9 Tue Jul 6 05:59:52 2010
+++ src/lib/libc/arch/vax/Makefile.inc Sun Oct 31 22:24:36 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.9 2010/07/06 05:59:52 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2021/10/31 22:24:36 thorpej Exp $
SRCS+= __longjmp14.c
-SRCS+= __sigaction14_sigtramp.c __sigtramp3.S
+SRCS+= __sigtramp3.S
CPPFLAGS+= -I.
CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__
Index: src/lib/libc/arch/x86_64/Makefile.inc
diff -u src/lib/libc/arch/x86_64/Makefile.inc:1.7 src/lib/libc/arch/x86_64/Makefile.inc:1.8
--- src/lib/libc/arch/x86_64/Makefile.inc:1.7 Mon Oct 12 17:55:53 2020
+++ src/lib/libc/arch/x86_64/Makefile.inc Sun Oct 31 22:24:36 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.7 2020/10/12 17:55:53 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.8 2021/10/31 22:24:36 thorpej Exp $
.if ${RUMPRUN} != "yes"
-SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+SRCS+= __sigtramp2.S
.endif
CPPFLAGS+= -I.
Index: src/lib/libc/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.248 src/lib/libc/sys/Makefile.inc:1.249
--- src/lib/libc/sys/Makefile.inc:1.248 Tue Oct 26 16:16:36 2021
+++ src/lib/libc/sys/Makefile.inc Sun Oct 31 22:24:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.248 2021/10/26 16:16:36 christos Exp $
+# $NetBSD: Makefile.inc,v 1.249 2021/10/31 22:24:36 thorpej Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -10,7 +10,7 @@ SRCS+= cpuset.c
SRCS+= accept4.c clock_getcpuclockid.c eventfd_read.c eventfd_write.c \
posix_fadvise.c posix_madvise.c ppoll.c sched.c sigqueue.c \
sigtimedwait.c sigwait.c sigwaitinfo.c statvfs.c swapon.c semctl.c \
- vadvise.c __sigaction14_sigtramp.c
+ vadvise.c
.if ${RUMPRUN} != "yes"
# modules with non-default implementations on at least one architecture:
@@ -90,6 +90,8 @@ ASM_GLUE+= tmp___${glue:.c=}50.S
.endfor
# modules with default implementations on all architectures:
+SRCS+= __sigaction14_sigtramp.c
+
ASM=\
__acl_get_link.S __acl_set_link.S __acl_delete_link.S \
__acl_aclcheck_link.S __acl_get_file.S __acl_set_file.S __acl_get_fd.S \
