[src/trunk]: src/sys/compat/common Move if_43.c out of Makefile.sysio and int...

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

details:   https://anonhg.NetBSD.org/src/rev/5703ca46f995
branches:  trunk
changeset: 348718:5703ca46f995
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Nov 03 22:23:03 2016 +0000

description:
Move if_43.c out of Makefile.sysio and into the main Makefile.

The former location gets included in both libcompat and the compat
module, leading to redefined symbols when the module is loaded.  By
moving it to the main Makefile, it gets included only in libcompat.

XXX This still isn't an ideal solution, but it will suffice until
XXX PR kern/51598 is addressed.

diffstat:

 sys/compat/common/Makefile       |  7 ++++++-
 sys/compat/common/Makefile.sysio |  4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 7e02b074b1ce -r 5703ca46f995 sys/compat/common/Makefile
--- a/sys/compat/common/Makefile        Thu Nov 03 22:18:29 2016 +0000
+++ b/sys/compat/common/Makefile        Thu Nov 03 22:23:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.58 2016/11/03 04:26:58 riastradh Exp $
+#      $NetBSD: Makefile,v 1.59 2016/11/03 22:23:03 pgoyette Exp $
 
 LIB=           compat
 NOPIC=         # defined
@@ -11,6 +11,11 @@
 # Common compatibility code, used by all emulations
 SRCS=  compat_exec.c compat_util.c
 
+# Compatability code for 4.3BSD 
+SRCS+= if_43.c
+
+# Include compatability code common to libcompat and the compat module
+
 .include "Makefile.sysio"
 .include "Makefile.sysv"
 
diff -r 7e02b074b1ce -r 5703ca46f995 sys/compat/common/Makefile.sysio
--- a/sys/compat/common/Makefile.sysio  Thu Nov 03 22:18:29 2016 +0000
+++ b/sys/compat/common/Makefile.sysio  Thu Nov 03 22:23:03 2016 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.sysio,v 1.5 2016/11/03 11:32:15 pgoyette Exp $
+#      $NetBSD: Makefile.sysio,v 1.6 2016/11/03 22:23:03 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
 # Compatibility code for 4.3BSD
 SRCS+= kern_exit_43.c kern_info_43.c kern_resource_43.c kern_sig_43.c \
-       tty_43.c uipc_syscalls_43.c vfs_syscalls_43.c vm_43.c if_43.c
+       tty_43.c uipc_syscalls_43.c vfs_syscalls_43.c vm_43.c
 
 # Compatibility code for NetBSD 0.9
 SRCS+= kern_info_09.c