[src/pgoyette-compat]: src/sys Include compat code in the modules

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

details:   https://anonhg.NetBSD.org/src/rev/a29d6c7bc0dc
branches:  pgoyette-compat
changeset: 830514:a29d6c7bc0dc
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Mar 25 10:38:51 2018 +0000

description:
Include compat code in the modules

diffstat:

 sys/compat/common/Makefile.sysio |   4 +++-
 sys/modules/compat_60/Makefile   |  13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 331c16d07343 -r a29d6c7bc0dc sys/compat/common/Makefile.sysio
--- a/sys/compat/common/Makefile.sysio  Sun Mar 25 09:16:07 2018 +0000
+++ b/sys/compat/common/Makefile.sysio  Sun Mar 25 10:38:51 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sysio,v 1.7.18.14 2018/03/25 09:16:07 pgoyette Exp $
+#      $NetBSD: Makefile.sysio,v 1.7.18.15 2018/03/25 10:38:51 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -64,4 +64,6 @@
 # x86-specific compatability code for NetBSD 6.0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=      -DCPU_UCODE
+.PATH:  ${S}/arch/x86/x86
+SRCS+=  compat_60_cpu_ucode.c
 .endif
diff -r 331c16d07343 -r a29d6c7bc0dc sys/modules/compat_60/Makefile
--- a/sys/modules/compat_60/Makefile    Sun Mar 25 09:16:07 2018 +0000
+++ b/sys/modules/compat_60/Makefile    Sun Mar 25 10:38:51 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.10 2018/03/25 09:16:07 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.11 2018/03/25 10:38:51 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,11 +8,14 @@
 
 CPPFLAGS+=     -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CPPFLAGS+=     -DCPU_UCODE
-.endif
-
 SRCS+= compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
        kern_cpu_60.c
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+=     -DCPU_UCODE
+
+.PATH: ${S}/arch/x86/x86
+SRCS+= compat_60_cpu_ucode.c
+.endif
+
 .include <bsd.kmodule.mk>