[src/pgoyette-compat]: src/sys Include the cpu_ucode*.c files in the module f...

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

details:   https://anonhg.NetBSD.org/src/rev/1c4de8af45b8
branches:  pgoyette-compat
changeset: 360210:1c4de8af45b8
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Mar 25 08:50:58 2018 +0000

description:
Include the cpu_ucode*.c files in the module for x86 machines

diffstat:

 sys/compat/common/Makefile.sysio |   9 ++++++++-
 sys/modules/compat_60/Makefile   |  17 ++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 08da2046142c -r 1c4de8af45b8 sys/compat/common/Makefile.sysio
--- a/sys/compat/common/Makefile.sysio  Sun Mar 25 08:49:12 2018 +0000
+++ b/sys/compat/common/Makefile.sysio  Sun Mar 25 08:50:58 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sysio,v 1.7.18.12 2018/03/24 23:52:19 pgoyette Exp $
+#      $NetBSD: Makefile.sysio,v 1.7.18.13 2018/03/25 08:50:58 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -60,3 +60,10 @@
 # wsevent compatability code for NetBSD 5.0
 .PATH: ${S}/dev/wscons
 SRCS+= wsevent_50.c
+
+# 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+= cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
+.endif
diff -r 08da2046142c -r 1c4de8af45b8 sys/modules/compat_60/Makefile
--- a/sys/modules/compat_60/Makefile    Sun Mar 25 08:49:12 2018 +0000
+++ b/sys/modules/compat_60/Makefile    Sun Mar 25 08:50:58 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.8 2018/03/25 08:17:42 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.9 2018/03/25 08:50:58 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,11 +8,18 @@
 
 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
 
+# 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+=  cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c
+
+.endif
+
 .include <bsd.kmodule.mk>