[src/trunk]: src/lib/libc/arch Don't include sigtramp or foocontext routines ...

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

details:   https://anonhg.NetBSD.org/src/rev/727212a09ec7
branches:  trunk
changeset: 339350:727212a09ec7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jul 15 14:27:49 2015 +0000

description:
Don't include sigtramp or foocontext routines in rumprun mode.  They won't
work (since a rump kernel does not provide NetBSD _lwp syscalls nor
signals), but they cause unwanted symbols to be pulled in when the
resulting libc is linked.

problem reported by Robert Gifford on rumpkernel-users

diffstat:

 lib/libc/arch/i386/Makefile.inc       |  4 +++-
 lib/libc/arch/i386/gen/Makefile.inc   |  8 ++++++--
 lib/libc/arch/x86_64/Makefile.inc     |  4 +++-
 lib/libc/arch/x86_64/gen/Makefile.inc |  4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r c1475bfabff5 -r 727212a09ec7 lib/libc/arch/i386/Makefile.inc
--- a/lib/libc/arch/i386/Makefile.inc   Wed Jul 15 14:23:40 2015 +0000
+++ b/lib/libc/arch/i386/Makefile.inc   Wed Jul 15 14:27:49 2015 +0000
@@ -1,3 +1,5 @@
-#      $NetBSD: Makefile.inc,v 1.20 2006/06/17 18:04:23 uwe Exp $
+#      $NetBSD: Makefile.inc,v 1.21 2015/07/15 14:27:49 pooka Exp $
 
+.if ${RUMPRUN} != "yes"
 SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+.endif
diff -r c1475bfabff5 -r 727212a09ec7 lib/libc/arch/i386/gen/Makefile.inc
--- a/lib/libc/arch/i386/gen/Makefile.inc       Wed Jul 15 14:23:40 2015 +0000
+++ b/lib/libc/arch/i386/gen/Makefile.inc       Wed Jul 15 14:27:49 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.28 2015/07/15 14:23:40 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.29 2015/07/15 14:27:49 pooka Exp $
 
 # objects built from assembler sources (need lint stubs)
 SRCS+= alloca.S byte_swap_2.S byte_swap_4.S fabs.S \
@@ -8,8 +8,12 @@
 
 SRCS+= setjmp.S _setjmp.S sigsetjmp.S
 
+.if ${RUMPRUN} != "yes"
 SRCS+= resumecontext.S swapcontext.S
-SRCS+= bswap64.c _lwp.c makecontext.c
+SRCS+= _lwp.c makecontext.c
+.endif
+
+SRCS+= bswap64.c
 
 # Common ieee754 constants and functions
 SRCS+= infinityf_ieee754.c infinity_ieee754.c
diff -r c1475bfabff5 -r 727212a09ec7 lib/libc/arch/x86_64/Makefile.inc
--- a/lib/libc/arch/x86_64/Makefile.inc Wed Jul 15 14:23:40 2015 +0000
+++ b/lib/libc/arch/x86_64/Makefile.inc Wed Jul 15 14:27:49 2015 +0000
@@ -1,3 +1,5 @@
-#      $NetBSD: Makefile.inc,v 1.5 2006/06/17 18:04:24 uwe Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2015/07/15 14:27:49 pooka Exp $
 
+.if ${RUMPRUN} != "yes"
 SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+.endif
diff -r c1475bfabff5 -r 727212a09ec7 lib/libc/arch/x86_64/gen/Makefile.inc
--- a/lib/libc/arch/x86_64/gen/Makefile.inc     Wed Jul 15 14:23:40 2015 +0000
+++ b/lib/libc/arch/x86_64/gen/Makefile.inc     Wed Jul 15 14:27:49 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2015/07/15 14:23:40 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2015/07/15 14:27:49 pooka Exp $
 
 # objects built from assembler sources (need lint stubs)
 SRCS+= alloca.S byte_swap_2.S byte_swap_4.S byte_swap_8.S fabs.S \
@@ -10,8 +10,10 @@
 SRCS+= _setjmp.S
 SRCS+= __sigsetjmp14.S
 
+.if ${RUMPRUN} != "yes"
 SRCS+= resumecontext.S swapcontext.S
 SRCS+= _lwp.c makecontext.c
+.endif
 
 # Common ieee754 constants and functions
 SRCS+= infinityf_ieee754.c infinity_ieee754.c