diff options
| author | gjb <gjb@FreeBSD.org> | 2015-01-13 21:29:24 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-01-13 21:29:24 +0000 |
| commit | 4bf303e5af1834cdd3092175eeca7676420229c4 (patch) | |
| tree | accce800a23406d946f94129ba725630eaac6766 /sys/modules | |
| parent | 7f08d7ffb1a5607d815a518dada617cec8b841b4 (diff) | |
| parent | df2eab9144b347f4ccb70222cebe87ba099e2349 (diff) | |
| download | FreeBSD-src-4bf303e5af1834cdd3092175eeca7676420229c4.zip FreeBSD-src-4bf303e5af1834cdd3092175eeca7676420229c4.tar.gz | |
Reintegrate head revisions r273096-r277147
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/modules')
70 files changed, 200 insertions, 311 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index a510658..f7caa8d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -44,7 +44,6 @@ SUBDIR= \ ${_arcmsr} \ ${_arcnet} \ ${_asmc} \ - ${_asr} \ ata \ ath \ ath_pci \ @@ -90,7 +89,6 @@ SUBDIR= \ cuse \ ${_cxgb} \ ${_cxgbe} \ - ${_cyclic} \ dc \ dcons \ dcons_crom \ @@ -145,15 +143,16 @@ SUBDIR= \ if_disc \ if_edsc \ if_epair \ - if_faith \ - if_gif \ + ${_if_gif} \ ${_if_gre} \ + ${_if_me} \ if_lagg \ ${_if_ndis} \ if_stf \ if_tap \ if_tun \ if_vlan \ + if_vxlan \ ${_igb} \ ${_iir} \ imgact_binmisc \ @@ -248,14 +247,11 @@ SUBDIR= \ netfpga10g \ ${_netgraph} \ ${_nfe} \ - nfs_common \ nfscl \ - nfsclient \ nfscommon \ nfsd \ nfslock \ nfslockd \ - nfsserver \ nfssvc \ nge \ nmdm \ @@ -269,6 +265,7 @@ SUBDIR= \ ${_opensolaris} \ oce \ ${_padlock} \ + ${_padlock_rng} \ patm \ ${_pccard} \ ${_pcfclock} \ @@ -296,6 +293,7 @@ SUBDIR= \ ${_random} \ rc4 \ ${_rdma} \ + ${_rdrand_rng} \ re \ reiserfs \ rl \ @@ -400,10 +398,12 @@ _random= random defined(ALL_MODULES) _carp= carp _toecore= toecore +_if_gif= if_gif +_if_gre= if_gre .endif .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) -_if_gre= if_gre +_if_me= if_me _ipdivert= ipdivert _ipfw= ipfw .endif @@ -432,7 +432,6 @@ _pfsync= pfsync .if ${MK_SOURCELESS_UCODE} != "no" _bce= bce -_cxgbe= cxgbe _fatm= fatm _fxp= fxp _ispfw= ispfw @@ -444,6 +443,9 @@ _ti= ti _txp= txp .endif +.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} == "amd64" +_cxgbe= cxgbe +.endif .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \ ${MACHINE_CPUARCH} != "powerpc" @@ -471,9 +473,6 @@ _cardbus= cardbus _cbb= cbb _cpuctl= cpuctl _cpufreq= cpufreq -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_cyclic= cyclic -.endif _dpms= dpms _drm= drm _drm2= drm2 @@ -582,6 +581,8 @@ _nvram= nvram _nxge= nxge .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock +_padlock_rng= padlock_rng +_rdrand_rng= rdrand_rng .endif _s3= s3 _tpm= tpm @@ -647,7 +648,6 @@ _xe= xe .if ${MK_EISA} != "no" _ahb= ahb .endif -_asr= asr _bios= bios _cm= cm .if ${MK_SOURCELESS_UCODE} != "no" @@ -679,9 +679,6 @@ _cardbus= cardbus _cbb= cbb _cfi= cfi _cpufreq= cpufreq -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_cyclic= cyclic -.endif _drm= drm .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _dtrace= dtrace diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile index 26dbedc..6fdfc7e 100644 --- a/sys/modules/aesni/Makefile +++ b/sys/modules/aesni/Makefile @@ -7,13 +7,18 @@ SRCS= aesni.c SRCS+= aeskeys_${MACHINE_CPUARCH}.S SRCS+= device_if.h bus_if.h opt_bus.h cryptodev_if.h -OBJS+= aesni_wrap.o +OBJS+= aesni_ghash.o aesni_wrap.o # Remove -nostdinc so we can get the intrinsics. +aesni_ghash.o: aesni_ghash.c + # XXX - gcc won't understand -mpclmul + ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \ + -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC} + ${CTFCONVERT_CMD} + aesni_wrap.o: aesni_wrap.c ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \ - -mmmx -msse -maes ${.IMPSRC} + -mmmx -msse -msse4 -maes ${.IMPSRC} ${CTFCONVERT_CMD} .include <bsd.kmod.mk> - diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index beca748..432d3c0 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -35,7 +35,11 @@ ${GENSRCS}: \ ${REG_PRINT_OPT} \ -i ${SYSDIR}/dev/aic7xxx/aic7xxx_osm.h \ ${SYSDIR}/dev/aic7xxx/aic7xxx.seq -.else +.elif defined(.MAKE.LEVEL) +# This target interfers with fmake's world view and causes this message +# to appear when building the tree from 8.x worlds where fmake is the +# default. fmake doens't define .MAKE.LEVEL so key off that to omit it, +# while still allowing more-modern makes to theoretically update things. ${GENSRCS}: @echo "Error: ${.TARGET} is missing. Run 'make ahcfirmware'" .endif diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile index 6535d2e..729b566 100644 --- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile @@ -13,4 +13,3 @@ CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. .include <bsd.kmod.mk> CWARNFLAGS.ahc_pci.c= ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile index 0b900e9..455d002 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -44,4 +44,3 @@ CLEANFILES= ${GENSRCS} .include <bsd.kmod.mk> CWARNFLAGS.ahd_pci.c= ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/asr/Makefile b/sys/modules/asr/Makefile deleted file mode 100644 index c225b25..0000000 --- a/sys/modules/asr/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../dev/asr - -KMOD= asr -SRCS= asr.c -SRCS+= opt_scsi.h opt_cam.h -SRCS+= device_if.h bus_if.h pci_if.h - -.if ${MACHINE_CPUARCH} == "i386" -SRCS+= opt_asr.h -.endif - -.include <bsd.kmod.mk> - -CWARNFLAGS.asr.c= ${NO_WARRAY_BOUNDS} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 33a1650..c5a40c9 100644 --- a/sys/modules/ath/Makefile +++ b/sys/modules/ath/Makefile @@ -162,7 +162,6 @@ opt_ah.h: CWARNFLAGS.ah_regdomain.c= ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW} # XXX Work around clang warnings, until maintainer approves fix. CWARNFLAGS.if_ath.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} # AR9300 HAL build overrides, as there's still some code to tidy up CWARNFLAGS.ar9300_eeprom.c= ${NO_WCONSTANT_CONVERSION} diff --git a/sys/modules/bios/smapi/Makefile b/sys/modules/bios/smapi/Makefile index 1b850e4..f55ab5a 100644 --- a/sys/modules/bios/smapi/Makefile +++ b/sys/modules/bios/smapi/Makefile @@ -9,6 +9,4 @@ SRCS= smapi.c smapi_bios.S \ .include <bsd.kmod.mk> -# XXX: clang integrated-as doesn't grok 16-bit assembly yet -CFLAGS.smapi_bios.S= ${CLANG_NO_IAS} -CFLAGS+= ${CFLAGS.${.IMPSRC:T}} +CFLAGS.smapi_bios.S= ${CLANG_NO_IAS34} diff --git a/sys/modules/bwn/Makefile b/sys/modules/bwn/Makefile index 4362387..e04ab0b 100644 --- a/sys/modules/bwn/Makefile +++ b/sys/modules/bwn/Makefile @@ -10,4 +10,3 @@ SRCS+= device_if.h bus_if.h pci_if.h # XXX Work around clang warning, until maintainer approves fix. CWARNFLAGS.if_bwn.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile index 7b851f5..7f4e94e 100644 --- a/sys/modules/cc/Makefile +++ b/sys/modules/cc/Makefile @@ -3,6 +3,7 @@ SUBDIR= cc_cdg \ cc_chd \ cc_cubic \ + cc_dctcp \ cc_hd \ cc_htcp \ cc_vegas diff --git a/sys/modules/cc/cc_dctcp/Makefile b/sys/modules/cc/cc_dctcp/Makefile new file mode 100644 index 0000000..7ba6cf1 --- /dev/null +++ b/sys/modules/cc/cc_dctcp/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../netinet/cc +KMOD= cc_dctcp +SRCS= cc_dctcp.c + +.include <bsd.kmod.mk> diff --git a/sys/modules/ce/Makefile b/sys/modules/ce/Makefile index 2d54680..87d06b0 100644 --- a/sys/modules/ce/Makefile +++ b/sys/modules/ce/Makefile @@ -28,4 +28,3 @@ opt_ng_cronyx.h: .include <bsd.kmod.mk> CWARNFLAGS.tau32-ddk.c= ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 0e3c8eb..9153445 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -18,6 +18,7 @@ SRCS += camellia.c camellia-api.c SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c sha256c.c SRCS += siphash.c +SRCS += gmac.c gfmult.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h SRCS += opt_ddb.h diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile index a82517d..cc5ca12 100644 --- a/sys/modules/cryptodev/Makefile +++ b/sys/modules/cryptodev/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../opencrypto KMOD = cryptodev SRCS = cryptodev.c -SRCS += bus_if.h device_if.h opt_compat.h +SRCS += bus_if.h device_if.h opt_compat.h opt_kdtrace.h .include <bsd.kmod.mk> diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile index 64eecaf..0316cce 100644 --- a/sys/modules/cxgb/tom/Makefile +++ b/sys/modules/cxgb/tom/Makefile @@ -6,7 +6,7 @@ CXGB = ${.CURDIR}/../../../dev/cxgb KMOD= t3_tom SRCS= cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_l2t.c SRCS+= opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h -SRCS+= opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h +SRCS+= opt_tcpdebug.h opt_ddb.h opt_sched.h opt_ktr.h SRCS+= device_if.h bus_if.h pci_if.h CFLAGS+= -g -I${CXGB} diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index e4828f7..a66e45a 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -15,6 +15,7 @@ SRCS+= pci_if.h SRCS+= t4_hw.c SRCS+= t4_l2t.c SRCS+= t4_main.c +SRCS+= t4_mp_ring.c SRCS+= t4_netmap.c SRCS+= t4_sge.c SRCS+= t4_tracer.c diff --git a/sys/modules/cyclic/Makefile b/sys/modules/cyclic/Makefile deleted file mode 100644 index 985b514..0000000 --- a/sys/modules/cyclic/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -SYSDIR?= ${.CURDIR}/../.. - -.PATH: ${SYSDIR}/cddl/dev/cyclic - -KMOD= cyclic -SRCS= cyclic.c - -SRCS+= vnode_if.h - -CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ - -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ - -I${SYSDIR} \ - -I${SYSDIR}/cddl/dev/cyclic/i386 - -IGNORE_PRAGMA= 1 - -.include <bsd.kmod.mk> - -CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile index 15019e0..21b3b08 100644 --- a/sys/modules/dpt/Makefile +++ b/sys/modules/dpt/Makefile @@ -20,7 +20,6 @@ opt_eisa.h: .else .if !defined(KERNBUILDDIR) SRCS+= dpt_eisa.c eisa_if.h -#SRCS+= dpt_isa.c isa_if.h opt_eisa.h: echo "#define DEV_EISA 1" > ${.TARGET} @@ -29,7 +28,6 @@ DEV_EISA!= sed -n '/DEV_EISA/p' ${KERNBUILDDIR}/opt_eisa.h .if !empty(DEV_EISA) SRCS+= dpt_eisa.c eisa_if.h .endif -#SRCS+= dpt_isa.c isa_if.h .endif .endif diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile index 5c4b99c..2114f54 100644 --- a/sys/modules/drm/Makefile +++ b/sys/modules/drm/Makefile @@ -21,7 +21,9 @@ SUBDIR = \ .if ${MK_SOURCELESS_UCODE} != "no" _mga= mga _r128= r128 +.if ${MACHINE_CPUARCH} != "powerpc" _radeon= radeon .endif +.endif .include <bsd.subdir.mk> diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile index 2cf9000..6882c3d 100644 --- a/sys/modules/drm/r128/Makefile +++ b/sys/modules/drm/r128/Makefile @@ -9,4 +9,3 @@ SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h CWARNFLAGS.r128_cce.c= -Wno-unused ${NO_WCONSTANT_CONVERSION} CWARNFLAGS.r128_state.c= -Wno-unused -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile index 88e7ccf..e24875a 100644 --- a/sys/modules/drm/radeon/Makefile +++ b/sys/modules/drm/radeon/Makefile @@ -10,4 +10,3 @@ SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h CWARNFLAGS.r600_cp.c= -Wno-unused ${NO_WCONSTANT_CONVERSION} CWARNFLAGS.radeon_cp.c= -Wno-unused ${NO_WCONSTANT_CONVERSION} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/drm/via/Makefile b/sys/modules/drm/via/Makefile index 4b694f7..a419beb 100644 --- a/sys/modules/drm/via/Makefile +++ b/sys/modules/drm/via/Makefile @@ -24,4 +24,3 @@ opt_drm.h: CWARNFLAGS.via_dma.c= -Wno-unused-value CWARNFLAGS.via_dmablit.c= -Wno-unused-value -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/drm2/drm2/Makefile b/sys/modules/drm2/drm2/Makefile index 1d6baab..3bbccb5 100644 --- a/sys/modules/drm2/drm2/Makefile +++ b/sys/modules/drm2/drm2/Makefile @@ -35,6 +35,7 @@ SRCS = \ drm_stub.c \ drm_sysctl.c \ drm_vm.c \ + ttm_agp_backend.c \ ttm_lock.c \ ttm_object.c \ ttm_tt.c \ @@ -46,7 +47,6 @@ SRCS = \ ttm_page_alloc.c \ ttm_bo_vm.c \ ati_pcigart.c -#ttm_agp_backend.c #ttm_page_alloc_dma.c .if ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile index 61657c6..4b4a595 100644 --- a/sys/modules/drm2/i915kms/Makefile +++ b/sys/modules/drm2/i915kms/Makefile @@ -53,4 +53,3 @@ SRCS += \ CWARNFLAGS.i915_debug.c= -Wno-unused-function CWARNFLAGS.intel_lvds.c= -Wno-unused CWARNFLAGS.intel_tv.c= -Wno-unused -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/dtb/atmel/Makefile b/sys/modules/dtb/atmel/Makefile new file mode 100644 index 0000000..99ae4cb --- /dev/null +++ b/sys/modules/dtb/atmel/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ +# All the dts files for the boards we might likely support made by Atmel, +# plus the SAMA5 offerings. +DTS=at91-sama5d3_xplained.dts at91sam9g20ek.dts ethernut5.dts \ + at91-qil_a9260.dts sama5d31ek.dts sama5d33ek.dts sama5d34ek.dts \ + sama5d35ek.dts sama5d36ek.dts tny_a9260.dts tny_a9g20.dts \ + usb_a9260.dts usb_a9g20.dts + +.include <bsd.dtb.mk> diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index b84c632..08b6937 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -4,7 +4,6 @@ SUBDIR= dtmalloc \ dtnfscl \ - dtnfsclient \ dtrace \ dtraceall \ dtrace_test \ diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc index db32960..204e046 100644 --- a/sys/modules/dtrace/Makefile.inc +++ b/sys/modules/dtrace/Makefile.inc @@ -3,7 +3,6 @@ IGNORE_PRAGMA= 1 load : - -kldload cyclic -kldload dtrace .if ${MACHINE_CPUARCH} == "i386" -kldload sdt @@ -25,5 +24,4 @@ unload : -kldunload sdt .endif -kldunload dtrace - -kldunload cyclic kldstat diff --git a/sys/modules/dtrace/dtnfsclient/Makefile b/sys/modules/dtrace/dtnfsclient/Makefile deleted file mode 100644 index 1c5208f..0000000 --- a/sys/modules/dtrace/dtnfsclient/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -SYSDIR?= ${.CURDIR}/../../.. - -.PATH: ${SYSDIR}/nfsclient - -KMOD= dtnfsclient -SRCS= nfs_kdtrace.c -SRCS+= vnode_if.h - -CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ - -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ - -I${SYSDIR} - -.include <bsd.kmod.mk> - -CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c index b8eb0fc..734abc6 100644 --- a/sys/modules/dtrace/dtraceall/dtraceall.c +++ b/sys/modules/dtrace/dtraceall/dtraceall.c @@ -63,13 +63,11 @@ DEV_MODULE(dtraceall, dtraceall_modevent, NULL); MODULE_VERSION(dtraceall, 1); /* All the DTrace modules should be dependencies here: */ -MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1); MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1); MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1); MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); +#if defined(NFSCL) MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); -#if defined(NFSCLIENT) -MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1); #endif #if defined(__amd64__) || defined(__i386__) || defined(__powerpc__) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile index 90e1277..260e495 100644 --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -28,5 +28,6 @@ CFLAGS+= -DSMP .include <bsd.kmod.mk> CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h + CWARNFLAGS+= -Wno-cast-qual CWARNFLAGS+= -Wno-unused diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile index 2a10b34..9a6e76d 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${.CURDIR}/../../../../geom/part ${.CURDIR}/../../../../geom KMOD= geom_part_bsd -SRCS= g_part_bsd.c +SRCS= g_part_bsd.c geom_bsd_enc.c SRCS+= bus_if.h device_if.h g_part_if.h diff --git a/sys/modules/geom/geom_sched/gs_sched/Makefile b/sys/modules/geom/geom_sched/gs_sched/Makefile index 5739365..13bb91b 100644 --- a/sys/modules/geom/geom_sched/gs_sched/Makefile +++ b/sys/modules/geom/geom_sched/gs_sched/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= geom_sched -SRCS= g_sched.c subr_disk.c +SRCS= g_sched.c # ../Makefile.inc automatically included .include <bsd.kmod.mk> diff --git a/sys/modules/geom/geom_sched/gsched_rr/Makefile b/sys/modules/geom/geom_sched/gsched_rr/Makefile index 4209277..44cc566 100644 --- a/sys/modules/geom/geom_sched/gsched_rr/Makefile +++ b/sys/modules/geom/geom_sched/gsched_rr/Makefile @@ -2,8 +2,6 @@ KMOD= gsched_rr SRCS= gs_rr.c -# hash.h on 6.x has a (char *) cast on a const pointer -#CWARNFLAGS= # ../Makefile.inc automatically included .include <bsd.kmod.mk> diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile index b667ef8..730aa0a 100644 --- a/sys/modules/ibcore/Makefile +++ b/sys/modules/ibcore/Makefile @@ -21,4 +21,3 @@ CFLAGS+= -DINET6 -DINET -DOFED CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} CWARNFLAGS.cm.c= -Wno-unused-function -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index af8c3c7..3b3a172 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -6,13 +6,10 @@ SYSDIR?=${.CURDIR}/../.. .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 KMOD= if_gif -SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h +SRCS= if_gif.c opt_inet.h opt_inet6.h -.if defined(KERNBUILDDIR) -OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo -.if empty(OPT_INET6) -MK_INET6_SUPPORT=no -.endif +.if ${MK_INET_SUPPORT} != "no" +SRCS+= in_gif.c .endif .if ${MK_INET6_SUPPORT} != "no" diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile index 9c618d3..b1d370a 100644 --- a/sys/modules/if_gre/Makefile +++ b/sys/modules/if_gre/Makefile @@ -1,8 +1,18 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 +SYSDIR?=${.CURDIR}/../.. +.PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 +.include "${SYSDIR}/conf/kern.opts.mk" KMOD= if_gre -SRCS= if_gre.c ip_gre.c opt_inet.h opt_inet6.h +SRCS= if_gre.c opt_inet.h opt_inet6.h + +.if ${MK_INET_SUPPORT} != "no" +SRCS+= ip_gre.c +.endif + +.if ${MK_INET6_SUPPORT} != "no" +SRCS+= ip6_gre.c +.endif .include <bsd.kmod.mk> diff --git a/sys/modules/if_faith/Makefile b/sys/modules/if_me/Makefile index fe78ec9..1fa716f 100644 --- a/sys/modules/if_faith/Makefile +++ b/sys/modules/if_me/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../net -KMOD= if_faith -SRCS= if_faith.c opt_inet.h opt_inet6.h +KMOD= if_me +SRCS= if_me.c .include <bsd.kmod.mk> diff --git a/sys/modules/if_vxlan/Makefile b/sys/modules/if_vxlan/Makefile new file mode 100644 index 0000000..5d27eb3 --- /dev/null +++ b/sys/modules/if_vxlan/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../net + +KMOD= if_vxlan +SRCS= if_vxlan.c +SRCS+= opt_inet.h opt_inet6.h + +.include <bsd.kmod.mk> diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index 0d8fa8a..f89588f 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -31,4 +31,3 @@ CWARNFLAGS.ip_proxy.c= ${NO_WSELF_ASSIGN} -Wno-unused CWARNFLAGS.ip_scan.c= -Wno-unused CWARNFLAGS.ip_state.c= -Wno-unused CWARNFLAGS.ip_sync.c= -Wno-unused -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile index d7ccd64..0be0e2a 100644 --- a/sys/modules/ips/Makefile +++ b/sys/modules/ips/Makefile @@ -9,4 +9,3 @@ SRCS = ips.c ips_pci.c ips.h ips_disk.c ips_disk.h ips_commands.c \ # XXX Work around clang warning, until maintainer approves fix. CWARNFLAGS.ips.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/ixl/Makefile b/sys/modules/ixl/Makefile index 94189d0..7d2fca9 100755 --- a/sys/modules/ixl/Makefile +++ b/sys/modules/ixl/Makefile @@ -4,7 +4,7 @@ KMOD = if_ixl SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h -SRCS += opt_inet.h opt_inet6.h +SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += if_ixl.c ixl_txrx.c i40e_osdep.c # Shared source diff --git a/sys/modules/ixlv/Makefile b/sys/modules/ixlv/Makefile index 785cab3..2e51bb8 100755 --- a/sys/modules/ixlv/Makefile +++ b/sys/modules/ixlv/Makefile @@ -4,11 +4,11 @@ KMOD = if_ixlv SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h -SRCS += opt_inet.h opt_inet6.h +SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += if_ixlv.c ixlvc.c ixl_txrx.c i40e_osdep.c # Shared source -SRCS += i40e_common.c i40e_adminq.c i40e_lan_hmc.c i40e_hmc.c +SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c i40e_lan_hmc.c i40e_hmc.c CFLAGS += -DSMP diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile index 71ba7f1..826ea6f 100644 --- a/sys/modules/joy/Makefile +++ b/sys/modules/joy/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../dev/joy KMOD= joy -SRCS= bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c \ - pccarddevs.h +SRCS= bus_if.h device_if.h isa_if.h joy.c joy_isa.c .include <bsd.kmod.mk> diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index e02ac88..a671a33 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -15,7 +15,9 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \ 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 +DPSRCS= linux${SFX}_genassym.c # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h @@ -23,8 +25,6 @@ SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h 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 @@ -40,20 +40,17 @@ EXPORT_SYMS+= linux_ioctl_unregister_handler CLEANFILES= linux${SFX}_assym.h linux${SFX}_genassym.o linux${SFX}_assym.h: linux${SFX}_genassym.o -.if exists(@) -linux${SFX}_assym.h: @/kern/genassym.sh -.endif - sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET} + sh ${SYSDIR}/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) diff --git a/sys/modules/lmc/Makefile b/sys/modules/lmc/Makefile index 7a53f3e..66fc0e6 100644 --- a/sys/modules/lmc/Makefile +++ b/sys/modules/lmc/Makefile @@ -7,12 +7,9 @@ SRCS = if_lmc.c if_lmc.h SRCS += device_if.h bus_if.h pci_if.h SRCS += opt_inet.h opt_inet6.h SRCS += opt_netgraph.h -SRCS += opt_global.h SRCS += opt_bpf.h opt_netgraph.h: echo "#define NETGRAPH 1" > ${.TARGET} -opt_global.h: - echo "#define ALTQ 1" > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile index 1087123..969a806 100644 --- a/sys/modules/mlx4/Makefile +++ b/sys/modules/mlx4/Makefile @@ -15,4 +15,3 @@ CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} CFLAGS+= -fms-extensions CWARNFLAGS.mcg.c= -Wno-unused -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile index 2fb7a391..426c202 100644 --- a/sys/modules/mpr/Makefile +++ b/sys/modules/mpr/Makefile @@ -15,4 +15,3 @@ SRCS+= device_if.h bus_if.h pci_if.h CWARNFLAGS.mpr_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL} # XXX Work around clang warning, until maintainer approves fix. CWARNFLAGS.mpr_mapping.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile index f644fe4..bd9a524 100644 --- a/sys/modules/mps/Makefile +++ b/sys/modules/mps/Makefile @@ -15,4 +15,3 @@ SRCS+= device_if.h bus_if.h pci_if.h CWARNFLAGS.mps_sas.c= ${NO_WUNNEEDED_INTERNAL_DECL} # XXX Work around clang warning, until maintainer approves fix. CWARNFLAGS.mps_mapping.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/mrsas/Makefile b/sys/modules/mrsas/Makefile index 5976b98..02bb520 100644 --- a/sys/modules/mrsas/Makefile +++ b/sys/modules/mrsas/Makefile @@ -27,4 +27,3 @@ cscope: clean_cscope /usr/local/bin/cscope -b *.[ch] cleanall: clean clean_cscope - rm -f '@' machine diff --git a/sys/modules/nfs_common/Makefile b/sys/modules/nfs_common/Makefile deleted file mode 100644 index 8f51f18..0000000 --- a/sys/modules/nfs_common/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../nfs - -KMOD= nfs_common -SRCS= nfs_common.c opt_nfs.h vnode_if.h - -.include <bsd.kmod.mk> diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile deleted file mode 100644 index a015f34..0000000 --- a/sys/modules/nfsclient/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs ${.CURDIR}/../../rpc - -KMOD= nfsclient -SRCS= vnode_if.h \ - nfs_bio.c nfs_node.c nfs_subs.c nfs_nfsiod.c \ - nfs_vfsops.c nfs_vnops.c nfs_krpc.c \ - opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h -SRCS+= opt_inet6.h opt_kgssapi.h - -.if !defined(KERNBUILDDIR) -NFS_ROOT?= 1 # 0/1 - requires NFS_ROOT to be configured in kernel - -.if ${NFS_ROOT} > 0 -opt_nfsroot.h: - echo "#define NFS_ROOT 1" > ${.TARGET} -.endif -.else -OPT_NFS_ROOT!= cat ${KERNBUILDDIR}/opt_nfsroot.h -.if empty(OPT_NFS_ROOT) -NFS_ROOT= 0 -.else -NFS_ROOT= 1 -.endif -.endif - -.if ${NFS_ROOT} > 0 -SRCS+= nfs_diskless.c -.endif - -.include <bsd.kmod.mk> diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile deleted file mode 100644 index d00fe47..0000000 --- a/sys/modules/nfsserver/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs -KMOD= nfsserver -SRCS= vnode_if.h \ - nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \ - opt_mac.h \ - opt_kgssapi.h \ - opt_nfs.h -SRCS+= opt_inet6.h - -.include <bsd.kmod.mk> diff --git a/sys/modules/nxge/Makefile b/sys/modules/nxge/Makefile index 98119c9..b7ffc49 100644 --- a/sys/modules/nxge/Makefile +++ b/sys/modules/nxge/Makefile @@ -48,4 +48,3 @@ CWARNFLAGS.xgehal-channel.c= ${NO_WSELF_ASSIGN} CWARNFLAGS.xgehal-fifo.c= ${NO_WSELF_ASSIGN} CWARNFLAGS.xgehal-stats.c= ${NO_WSELF_ASSIGN} CWARNFLAGS.xgehal-mgmt.c= ${NO_WSELF_ASSIGN} -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/padlock_rng/Makefile b/sys/modules/padlock_rng/Makefile new file mode 100644 index 0000000..25bf24f --- /dev/null +++ b/sys/modules/padlock_rng/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../dev/random + +KMOD= padlock_rng +SRCS= nehemiah.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${.CURDIR}/../.. + +.include <bsd.kmod.mk> diff --git a/sys/modules/qlxgb/Makefile b/sys/modules/qlxgb/Makefile index 330cef9..caea34a 100644 --- a/sys/modules/qlxgb/Makefile +++ b/sys/modules/qlxgb/Makefile @@ -35,9 +35,4 @@ KMOD= if_qlxgb SRCS= qla_os.c qla_dbg.c qla_hw.c qla_misc.c qla_isr.c qla_ioctl.c SRCS+= device_if.h bus_if.h pci_if.h -clean: - rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms - rm -f *.o *.kld *.ko - rm -f @ machine - .include <bsd.kmod.mk> diff --git a/sys/modules/qlxgbe/Makefile b/sys/modules/qlxgbe/Makefile index 2cf7d9d..2c6d743 100644 --- a/sys/modules/qlxgbe/Makefile +++ b/sys/modules/qlxgbe/Makefile @@ -41,10 +41,4 @@ SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS += -DQL_DBG -clean: - rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms - rm -f *.o *.kld *.ko - rm -f @ machine x86 - .include <bsd.kmod.mk> - diff --git a/sys/modules/qlxge/Makefile b/sys/modules/qlxge/Makefile index 98b40fd..b34488a 100644 --- a/sys/modules/qlxge/Makefile +++ b/sys/modules/qlxge/Makefile @@ -41,10 +41,5 @@ SRCS+= device_if.h bus_if.h pci_if.h CFLAGS += -DQL_DBG -clean: - rm -f opt_bdg.h device_if.h bus_if.h pci_if.h export_syms - rm -f *.o *.kld *.ko - rm -f @ machine x86 - .include <bsd.kmod.mk> diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile index 6bf47f2..b42eac7 100644 --- a/sys/modules/random/Makefile +++ b/sys/modules/random/Makefile @@ -5,13 +5,8 @@ .PATH: ${.CURDIR}/../../crypto/sha2 KMOD= random -SRCS= randomdev.c -.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" -SRCS+= nehemiah.c -SRCS+= ivy.c -.endif -SRCS+= randomdev_soft.c yarrow.c hash.c -SRCS+= random_harvestq.c live_entropy_sources.c rwfile.c +SRCS= randomdev_soft.c +SRCS+= yarrow.c fortuna.c hash.c SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile new file mode 100644 index 0000000..9d5adc3 --- /dev/null +++ b/sys/modules/rdrand_rng/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../dev/random + +KMOD= rdrand_rng +SRCS= ivy.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${.CURDIR}/../.. + +.include <bsd.kmod.mk> diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 9650adf..ff9c48e 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/sound -.PATH: ${.CURDIR}/../../../dev/sound/pcm -.PATH: ${.CURDIR}/../../../dev/sound/midi -.PATH: ${.CURDIR}/../../../dev/sound/isa +SYSDIR?=${.CURDIR}/../../.. + +.PATH: ${SYSDIR}/dev/sound +.PATH: ${SYSDIR}/dev/sound/pcm +.PATH: ${SYSDIR}/dev/sound/midi +.PATH: ${SYSDIR}/dev/sound/isa KMOD= sound SRCS= device_if.h bus_if.h isa_if.h pci_if.h opt_isa.h @@ -19,26 +21,14 @@ SRCS+= ac97.c ac97_patch.c buffer.c channel.c clone.c dsp.c SRCS+= mixer.c sndstat.c sound.c unit.c vchan.c SRCS+= midi.c mpu401.c sequencer.c -.if !exists(@) -feeder_eq_gen.h: @ -.else -feeder_eq_gen.h: @/tools/sound/feeder_eq_mkfilter.awk -.endif - ${AWK} -f @/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} +feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk + ${AWK} -f ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} -.if !exists(@) -feeder_rate_gen.h: @ -.else -feeder_rate_gen.h: @/tools/sound/feeder_rate_mkfilter.awk -.endif - ${AWK} -f @/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET} +feeder_rate_gen.h: ${SYSDIR}/tools/sound/feeder_rate_mkfilter.awk + ${AWK} -f ${SYSDIR}/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET} -.if !exists(@) -snd_fxdiv_gen.h: @ -.else -snd_fxdiv_gen.h: @/tools/sound/snd_fxdiv_gen.awk -.endif - ${AWK} -f @/tools/sound/snd_fxdiv_gen.awk -- > ${.TARGET} +snd_fxdiv_gen.h: ${SYSDIR}/tools/sound/snd_fxdiv_gen.awk + ${AWK} -f ${SYSDIR}/tools/sound/snd_fxdiv_gen.awk -- > ${.TARGET} CLEANFILES+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile index 9fc0901..85725a2 100644 --- a/sys/modules/svr4/Makefile +++ b/sys/modules/svr4/Makefile @@ -14,16 +14,13 @@ SRCS+= opt_ktrace.h opt_sysvipc.h CLEANFILES= svr4_assym.h svr4_genassym.o svr4_assym.h: svr4_genassym.o -.if exists(@) -svr4_assym.h: @/kern/genassym.sh -.endif - sh @/kern/genassym.sh svr4_genassym.o > ${.TARGET} + sh ${SYSDIR}/kern/genassym.sh svr4_genassym.o > ${.TARGET} svr4_locore.o: svr4_locore.s svr4_assym.h ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} -svr4_genassym.o: svr4_genassym.c svr4.h @ machine +svr4_genassym.o: svr4_genassym.c svr4.h ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .if !defined(KERNBUILDDIR) && defined(DEBUG) diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README deleted file mode 100644 index 47ab660d..0000000 --- a/sys/modules/svr4/README +++ /dev/null @@ -1,38 +0,0 @@ -This is a SysVR4 emulator derived from work done as part of the NetBSD -Project by Christos Zoulas. It has been ported to FreeBSD by Mark Newton. - -To use it: - -1. Choose one of: - a. Add "device streams" to your kernel config file and rebuild, - reboot; or - b. Build and install the streams module in /sys/modules/streams - -2. Build and install the svr4 module in /sys/modules/svr4 - -3. Type "kldload svr4" to start it up. - -4. Grab compat_sol26.tar.gz or compat_svr4.tar.gz from - http://www.freebsd.org/~newton/freebsd-svr4 and install them in - /compat/svr4 - -5. Run "sh SVR4_MAKEDEV all" in /compat/svr4/dev - -6. Mount a Solaris/x86 v2.6 or v7 CD-ROM on /cdrom (also works with - v2.4 and v2.5.1, but you need different symlinks in /compat/svr4) - -7. Brand any executables you want to run, and/or set the - kern.fallback_elf_brand sysctl to 'SVR4' to establish this as the - default emulator for unbranded executables. - -8. See if your SysVR4 programs work. - -It's early days yet, folks -- You'll probably have trouble getting 100% -functionality out of most things (specifically, poll() on a socket doesn't -look like it works at the moment, so Netscape doesn't work (among other -things)). Patches will be appreciated. - - - Mark Newton - newton@atdot.dotat.org - -$FreeBSD$ diff --git a/sys/modules/svr4/TO-DO b/sys/modules/svr4/TO-DO deleted file mode 100644 index 078b80d..0000000 --- a/sys/modules/svr4/TO-DO +++ /dev/null @@ -1,15 +0,0 @@ -TO-DO list ----------- - - * svr4_getdents64() doesn't work properly in 'large' directories. - - * signals are still suspect - - * networking is notworking - - * VM86 and USER_LDT are currently disabled (low-priority) - - * Make SysV emulator use SysV shared memory support (duh) - - -$FreeBSD$ diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index e869f01..6e7e9cac 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -10,7 +10,8 @@ uart_bus_ebus= uart_bus_ebus.c uart_dev_lpc= uart_dev_lpc.c .endif -.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64" || \ + ${MACHINE_CPUARCH} == "powerpc" ofw_bus_if= ofw_bus_if.h .endif diff --git a/sys/modules/usb/template/Makefile b/sys/modules/usb/template/Makefile index 61406c1..fc1cca9 100644 --- a/sys/modules/usb/template/Makefile +++ b/sys/modules/usb/template/Makefile @@ -39,6 +39,7 @@ SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \ usb_template_mouse.c \ usb_template_msc.c \ usb_template_mtp.c \ - usb_template_phone.c + usb_template_phone.c \ + usb_template_serialnet.c .include <bsd.kmod.mk> diff --git a/sys/modules/virtio/Makefile b/sys/modules/virtio/Makefile index ecf9441..4a823d6 100644 --- a/sys/modules/virtio/Makefile +++ b/sys/modules/virtio/Makefile @@ -23,6 +23,6 @@ # SUCH DAMAGE. # -SUBDIR= virtio pci network block balloon scsi random +SUBDIR= virtio pci network block balloon scsi random console .include <bsd.subdir.mk> diff --git a/sys/modules/virtio/console/Makefile b/sys/modules/virtio/console/Makefile new file mode 100644 index 0000000..062e049 --- /dev/null +++ b/sys/modules/virtio/console/Makefile @@ -0,0 +1,36 @@ +# +# $FreeBSD$ +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +.PATH: ${.CURDIR}/../../../dev/virtio/console + +KMOD= virtio_console +SRCS= virtio_console.c +SRCS+= virtio_bus_if.h virtio_if.h +SRCS+= bus_if.h device_if.h + +MFILES= kern/bus_if.m kern/device_if.m \ + dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m + +.include <bsd.kmod.mk> diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 702587b..e81c243 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -3,11 +3,14 @@ KMOD= vmm SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h +SRCS+= vmx_assym.h svm_assym.h +DPSRCS= vmx_genassym.c svm_genassym.c CFLAGS+= -DVMM_KEEP_STATS -DSMP CFLAGS+= -I${.CURDIR}/../../amd64/vmm CFLAGS+= -I${.CURDIR}/../../amd64/vmm/io CFLAGS+= -I${.CURDIR}/../../amd64/vmm/intel +CFLAGS+= -I${.CURDIR}/../../amd64/vmm/amd # generic vmm support .PATH: ${.CURDIR}/../../amd64/vmm @@ -31,35 +34,48 @@ SRCS+= iommu.c \ vatpit.c \ vhpet.c \ vioapic.c \ - vlapic.c + vlapic.c \ + vpmtmr.c \ + vrtc.c # intel-specific files .PATH: ${.CURDIR}/../../amd64/vmm/intel SRCS+= ept.c \ vmcs.c \ vmx_msr.c \ + vmx_support.S \ vmx.c \ vtd.c # amd-specific files .PATH: ${.CURDIR}/../../amd64/vmm/amd -SRCS+= amdv.c +SRCS+= vmcb.c \ + svm.c \ + svm_support.S \ + npt.c \ + amdv.c \ + svm_msr.c -OBJS= vmx_support.o +CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o -CLEANFILES= vmx_assym.s vmx_genassym.o +vmx_assym.h: vmx_genassym.o + sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET} -vmx_assym.s: vmx_genassym.o -.if exists(@) -vmx_assym.s: @/kern/genassym.sh -.endif - sh @/kern/genassym.sh vmx_genassym.o > ${.TARGET} +svm_assym.h: svm_genassym.o + sh ${SYSDIR}/kern/genassym.sh svm_genassym.o > ${.TARGET} -vmx_support.o: vmx_support.S vmx_assym.s +vmx_support.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} -vmx_genassym.o: vmx_genassym.c @ machine x86 +svm_support.o: + ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ + ${.IMPSRC} -o ${.TARGET} + +vmx_genassym.o: + ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} + +svm_genassym.o: ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .include <bsd.kmod.mk> diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index 7c5a419..344ff4e 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -7,7 +7,7 @@ SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c \ ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_mesh.c ieee80211_node.c ieee80211_output.c ieee80211_phy.c \ - ieee80211_power.c ieee80211_proto.c ieee80211_scan.c \ + ieee80211_power.c ieee80211_proto.c ieee80211_scan.c ieee80211_scan_sw.c \ ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_ratectl.c \ ieee80211_ratectl_none.c ieee80211_regdomain.c \ ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \ @@ -23,4 +23,3 @@ CWARNFLAGS.ieee80211_crypto.c= -Wno-unused-function CWARNFLAGS.ieee80211_hostap.c= -Wno-unused-function CWARNFLAGS.ieee80211_mesh.c= -Wno-unused-function CWARNFLAGS.ieee80211_sta.c= -Wno-unused-function -CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ad9f398..29f4ae0 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -103,7 +103,6 @@ DEBUG_FLAGS=-g CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h -CWARNFLAGS+=-Wno-unknown-pragmas CWARNFLAGS+=-Wno-missing-prototypes CWARNFLAGS+=-Wno-undef CWARNFLAGS+=-Wno-strict-prototypes |
