[src/trunk]: src/lib/libc Include compat in rumprun libc

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

details:   https://anonhg.NetBSD.org/src/rev/9ccc6ecce3ad
branches:  trunk
changeset: 336073:9ccc6ecce3ad
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Feb 09 22:44:34 2015 +0000

description:
Include compat in rumprun libc

Not including non-renamed symbols in libc caused all kinds of configure
scripts to do the wrong thing when they just tested linkage without
including headers.  So, go for the "least moving parts" bandaid for now.

diffstat:

 lib/libc/Makefile                        |  4 +---
 lib/libc/compat/arch/i386/Makefile.inc   |  4 +++-
 lib/libc/compat/arch/x86_64/Makefile.inc |  4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 614030cd28c6 -r 9ccc6ecce3ad lib/libc/Makefile
--- a/lib/libc/Makefile Mon Feb 09 21:59:30 2015 +0000
+++ b/lib/libc/Makefile Mon Feb 09 22:44:34 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.167 2014/12/10 00:37:30 pooka Exp $
+#      $NetBSD: Makefile,v 1.168 2015/02/09 22:44:34 pooka Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -41,7 +41,6 @@
        mv -f assym.h.tmp assym.h
 .endif
 
-.if ${RUMPRUN} != "yes"
 # The following controls how to build compatibility code for old NetBSD
 # binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
 # we include the code in libc.
@@ -55,7 +54,6 @@
 # Marker for compat code that can't be easily isolated
 CPPFLAGS+=     -D__BUILD_LEGACY
 .endif
-.endif
 
 .include "${.CURDIR}/../../common/lib/libc/Makefile.inc"
 .include "${.CURDIR}/atomic/Makefile.inc"
diff -r 614030cd28c6 -r 9ccc6ecce3ad lib/libc/compat/arch/i386/Makefile.inc
--- a/lib/libc/compat/arch/i386/Makefile.inc    Mon Feb 09 21:59:30 2015 +0000
+++ b/lib/libc/compat/arch/i386/Makefile.inc    Mon Feb 09 22:44:34 2015 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2015/02/09 22:44:34 pooka Exp $
 
 .include "${COMPATARCHDIR}/gen/Makefile.inc"
+.if ${RUMPRUN} != "yes"
 .include "${COMPATARCHDIR}/sys/Makefile.inc"
+.endif
diff -r 614030cd28c6 -r 9ccc6ecce3ad lib/libc/compat/arch/x86_64/Makefile.inc
--- a/lib/libc/compat/arch/x86_64/Makefile.inc  Mon Feb 09 21:59:30 2015 +0000
+++ b/lib/libc/compat/arch/x86_64/Makefile.inc  Mon Feb 09 22:44:34 2015 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile.inc,v 1.4 2006/07/03 13:13:53 drochner Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2015/02/09 22:44:34 pooka Exp $
 
 .include "${COMPATARCHDIR}/gen/Makefile.inc"
+.if ${RUMPRUN} != "yes"
 .include "${COMPATARCHDIR}/sys/Makefile.inc"
+.endif