Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
pgoyette 2016-11-03 22:23:03 +00:00
parent e887dd50b2
commit d671bf9bca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/compat/common/Makefile
View File

@ -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_AUTODEP::=}
# 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"

4
sys/compat/common/Makefile.sysio
View File

@ -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