svn commit: r273206 - head/sys/modules/linux

[Warner Losh]

Author: imp
Date: Fri Oct 17 04:36:53 2014
New Revision: 273206
URL: https://svnweb.freebsd.org/changeset/base/273206

Log:
  move linux*_locore.s and linux*_support.s to SRCS, remove the OBJS
  entry and remove now-redunant dependencies. Add assym.s to
  linux*_locore.s build, as it depends on it.
  
  With this change, linux*.ko no longer builds every time through a
  KERNFAST run.
  
  Sponsored by: Netflix

Modified:
  head/sys/modules/linux/Makefile

Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile	Fri Oct 17 04:36:48 2014	(r273205)
+++ head/sys/modules/linux/Makefile	Fri Oct 17 04:36:53 2014	(r273206)
@@ -15,7 +15,8 @@ SRCS=	linux_fork.c linux${SFX}_dummy.c l
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
 	linux_timer.c \
 	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
-	device_if.h bus_if.h assym.s
+	device_if.h bus_if.h assym.s \
+	linux${SFX}_locore.s linux${SFX}_support.s
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
@@ -23,8 +24,6 @@ SRCS+=  opt_kstack_pages.h opt_nfs.h opt
 SRCS+=	opt_apic.h
 .endif
 
-OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
-
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	linux_ptrace.c imgact_linux.c opt_cpu.h
 .endif
@@ -45,15 +44,15 @@ linux${SFX}_assym.h: @/kern/genassym.sh
 .endif
 	sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
-linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h
+linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_support.o: linux${SFX}_support.s assym.s linux${SFX}_assym.h
+linux${SFX}_support.o: linux${SFX}_assym.h assym.s
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine x86
+linux${SFX}_genassym.o:
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)