Module Name: src
Committed By: pgoyette
Date: Thu Nov 3 22:23:04 UTC 2016
Modified Files:
src/sys/compat/common: Makefile Makefile.sysio
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/compat/common/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/common/Makefile.sysio
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/Makefile
diff -u src/sys/compat/common/Makefile:1.58 src/sys/compat/common/Makefile:1.59
--- src/sys/compat/common/Makefile:1.58 Thu Nov 3 04:26:58 2016
+++ src/sys/compat/common/Makefile Thu Nov 3 22:23:03 2016
@@ -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 @@ CPPFLAGS= ${COMPATCPPFLAGS} ${SKIP_AUTOD
# 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"
Index: src/sys/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.5 src/sys/compat/common/Makefile.sysio:1.6
--- src/sys/compat/common/Makefile.sysio:1.5 Thu Nov 3 11:32:15 2016
+++ src/sys/compat/common/Makefile.sysio Thu Nov 3 22:23:03 2016
@@ -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
