Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 May 2010 20:24:03 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r208468 - in head/sys/modules: ata/atadisk cam
Message-ID:  <201005232024.o4NKO3Wd081059@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sun May 23 20:24:03 2010
New Revision: 208468
URL: http://svn.freebsd.org/changeset/base/208468

Log:
  At least on sparc64 these modules require ata_machdep.c.
  
  MFC after:	3 days

Modified:
  head/sys/modules/ata/atadisk/Makefile
  head/sys/modules/cam/Makefile

Modified: head/sys/modules/ata/atadisk/Makefile
==============================================================================
--- head/sys/modules/ata/atadisk/Makefile	Sun May 23 20:23:34 2010	(r208467)
+++ head/sys/modules/ata/atadisk/Makefile	Sun May 23 20:24:03 2010	(r208468)
@@ -1,9 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../dev/ata
+.PATH: ${.CURDIR}/../../../dev/ata ${.CURDIR}/../../../${MACHINE}/${MACHINE}
 
 KMOD=	atadisk
-SRCS=	ata-disk.c
+SRCS=	ata-disk.c ${ata_machdep}
 SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
 
+.if exists(${.CURDIR}/../../../${MACHINE}/${MACHINE}/ata_machdep.c)
+ata_machdep=	ata_machdep.c
+.endif
+
 .include <bsd.kmod.mk>

Modified: head/sys/modules/cam/Makefile
==============================================================================
--- head/sys/modules/cam/Makefile	Sun May 23 20:23:34 2010	(r208467)
+++ head/sys/modules/cam/Makefile	Sun May 23 20:24:03 2010	(r208468)
@@ -2,7 +2,7 @@
 
 S=	${.CURDIR}/../..
 
-.PATH: $S/cam $S/cam/scsi $S/cam/ata
+.PATH: $S/cam $S/cam/scsi $S/cam/ata $S/${MACHINE}/${MACHINE}
 
 KMOD=	cam
 
@@ -28,6 +28,9 @@ SRCS+=	scsi_xpt.c
 SRCS+=	ata_all.c
 SRCS+=	ata_xpt.c
 SRCS+=	ata_da.c
+.if exists($S/${MACHINE}/${MACHINE}/ata_machdep.c)
+SRCS+=  ata_machdep.c
+.endif
 SRCS+=	ata_pmp.c
 
 EXPORT_SYMS=	YES	# XXX evaluate



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005232024.o4NKO3Wd081059>