Module Name: src
Committed By: pgoyette
Date: Sun Mar 25 09:16:07 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile.sysio
src/sys/modules/compat_60 [pgoyette-compat]: Makefile
Log Message:
Undo previous. Clearly this is not the right thing to do! The ucode
support should already be in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.7.18.13 -r1.7.18.14 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/modules/compat_60/Makefile
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.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7.18.13 src/sys/compat/common/Makefile.sysio:1.7.18.14
--- src/sys/compat/common/Makefile.sysio:1.7.18.13 Sun Mar 25 08:50:58 2018
+++ src/sys/compat/common/Makefile.sysio Sun Mar 25 09:16:07 2018
@@ -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 @@ 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
Index: src/sys/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.9 src/sys/modules/compat_60/Makefile:1.1.2.10
--- src/sys/modules/compat_60/Makefile:1.1.2.9 Sun Mar 25 08:50:58 2018
+++ src/sys/modules/compat_60/Makefile Sun Mar 25 09:16:07 2018
@@ -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 @@ KMOD= compat_60
CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
-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
+SRCS+= compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+ kern_cpu_60.c
+
.include <bsd.kmodule.mk>
