[src/pgoyette-compat]: src/sys Undo previous. Clearly this is not the right ...

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

details:   https://anonhg.NetBSD.org/src/rev/50a85e0d8b33
branches:  pgoyette-compat
changeset: 321101:50a85e0d8b33
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Mar 25 09:16:07 2018 +0000

description:
Undo previous.  Clearly this is not the right thing to do!  The ucode
support should already be in the kernel.

diffstat:

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

diffs (48 lines):

diff -r be501c151568 -r 50a85e0d8b33 sys/compat/common/Makefile.sysio
--- a/sys/compat/common/Makefile.sysio  Sun Mar 25 08:52:54 2018 +0000
+++ b/sys/compat/common/Makefile.sysio  Sun Mar 25 09:16:07 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sysio,v 1.7.18.13 2018/03/25 08:50:58 pgoyette Exp $
+#      $NetBSD: Makefile.sysio,v 1.7.18.14 2018/03/25 09:16:07 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -64,6 +64,4 @@
 # 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 be501c151568 -r 50a85e0d8b33 sys/modules/compat_60/Makefile
--- a/sys/modules/compat_60/Makefile    Sun Mar 25 08:52:54 2018 +0000
+++ b/sys/modules/compat_60/Makefile    Sun Mar 25 09:16:07 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.2.9 2018/03/25 08:50:58 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.1.2.10 2018/03/25 09:16:07 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,18 +8,11 @@
 
 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>