Module Name:    src
Committed By:   pgoyette
Date:           Sun Mar 25 21:27:51 UTC 2018

Modified Files:
        src/sys/compat/common [pgoyette-compat]: Makefile.sysio

Log Message:
Don't add the compat_60_cpu_ucode.c file here.  It's already added in
the main Makefile, and doing again here results in trying to link it
twice (with resulting symbol redefinition errors).


To generate a diff of this commit:
cvs rdiff -u -r1.7.18.15 -r1.7.18.16 src/sys/compat/common/Makefile.sysio

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.15 src/sys/compat/common/Makefile.sysio:1.7.18.16
--- src/sys/compat/common/Makefile.sysio:1.7.18.15	Sun Mar 25 10:38:51 2018
+++ src/sys/compat/common/Makefile.sysio	Sun Mar 25 21:27:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7.18.15 2018/03/25 10:38:51 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.7.18.16 2018/03/25 21:27:51 pgoyette Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -61,9 +61,3 @@ SRCS+=	puffs_compat.c
 .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+=  compat_60_cpu_ucode.c
-.endif

Reply via email to