Index: head/sys/modules/osf1/Makefile =================================================================== --- head/sys/modules/osf1/Makefile (revision 160761) +++ head/sys/modules/osf1/Makefile (nonexistent) @@ -1,16 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../alpha/osf1 - -KMOD= osf1 -SRCS= osf1_ioctl.c osf1_misc.c osf1_signal.c osf1_sysent.c \ - osf1_mount.c imgact_osf1.c osf1_sysvec.c opt_compat.h \ - opt_ddb.h opt_mac.h opt_nfs.h device_if.h bus_if.h \ - vnode_if.h - -.if !defined(KERNBUILDDIR) -opt_compat.h: - echo "#define COMPAT_43 1" > ${.TARGET} -.endif - -.include Property changes on: head/sys/modules/osf1/Makefile ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/sys/modules/Makefile =================================================================== --- head/sys/modules/Makefile (revision 160761) +++ head/sys/modules/Makefile (revision 160762) @@ -1,564 +1,554 @@ # $FreeBSD$ .include SUBDIR= ${_3dfx} \ ${_3dfx_linux} \ ${_aac} \ accf_data \ accf_http \ ${_acpi} \ ${_agp} \ aha \ ${_ahb} \ ${_aic} \ aic7xxx \ aio \ ${_amd} \ amr \ ${_an} \ ${_aout} \ ${_apm} \ ${_ar} \ ${_arcmsr} \ ${_arcnet} \ ${_arl} \ ${_asr} \ ata \ ath \ ${_ath_hal} \ ath_rate_amrr \ ath_rate_onoe \ ath_rate_sample \ aue \ ${_auxio} \ ${_awi} \ axe \ bfe \ bge \ ${_bios} \ ${_bktr} \ bridgestp \ cam \ ${_canbepm} \ ${_canbus} \ ${_cardbus} \ ${_cbb} \ cd9660 \ cd9660_iconv \ cdce \ ${_ce} \ ${_ciss} \ ${_cm} \ coda \ coda5 \ ${_coff} \ ${_cp} \ ${_cpufreq} \ ${_crypto} \ ${_cryptodev} \ ${_cs} \ ${_ctau} \ cue \ ${_cx} \ dc \ dcons \ dcons_crom \ de \ ${_digi} \ ${_dpt} \ ${_drm} \ dummynet \ ${_ed} \ ${_elink} \ ${_em} \ en \ ${_ep} \ ${_ex} \ ${_exca} \ ${_ext2fs} \ fatm \ fdc \ fdescfs \ ${_fe} \ firewire \ firmware \ fxp \ ${_gem} \ geom \ harp \ hatm \ ${_hfa} \ hifn \ hme \ ${_hptmv} \ hwpmc \ ${_i2c} \ ${_ibcs2} \ ${_ichwd} \ ${_ida} \ ${_idt} \ ${_ie} \ if_bridge \ if_disc \ if_ef \ if_faith \ if_gif \ if_gre \ ${_if_ndis} \ if_ppp \ if_sl \ if_stf \ if_tap \ if_tun \ if_vlan \ ${_iir} \ ${_io} \ ipdivert \ ${_ipfilter} \ ipfw \ ip_mroute_mod \ ${_ipmi} \ ${_ips} \ ${_ipw} \ isp \ ispfw \ ${_iwi} \ joy \ kbdmux \ kue \ le \ lge \ libalias \ libiconv \ libmbpool \ libmchain \ ${_linprocfs} \ ${_linsysfs} \ ${_linux} \ lmc \ lpt \ mac_biba \ mac_bsdextended \ mac_ifoff \ mac_lomac \ mac_mls \ mac_none \ mac_partition \ mac_portacl \ mac_seeotheruids \ mac_stub \ mac_test \ mcd \ md \ mem \ mfi \ mii \ mlx \ ${_mly} \ mpt \ mqueue \ msdosfs \ msdosfs_iconv \ ${_mse} \ ${_mxge} \ my \ ${_ncp} \ ${_ncv} \ ${_ndis} \ netgraph \ ${_nfe} \ nfsclient \ nfsserver \ nge \ nmdm \ ${_nsp} \ ntfs \ ntfs_iconv \ nullfs \ ${_nve} \ ${_nwfs} \ ${_oltr} \ - ${_osf1} \ ${_padlock} \ patm \ ${_pccard} \ ${_pcfclock} \ pcn \ ${_pecoff} \ ${_pf} \ ${_pflog} \ plip \ ${_pmc} \ portalfs \ ppbus \ ppc \ ppi \ pps \ procfs \ pseudofs \ ${_pst} \ puc \ ral \ ${_random} \ ${_ray} \ rc \ rc4 \ re \ reiserfs \ rl \ rp \ ${_rr232x} \ rue \ ${_s3} \ ${_safe} \ ${_sbni} \ sbsh \ scc \ scd \ ${_scsi_low} \ sf \ ${_sio} \ sis \ sk \ ${_smbfs} \ sn \ ${_snc} \ snp \ ${_sound} \ ${_speaker} \ ${_splash} \ ${_sppp} \ ${_sr} \ ste \ ${_stg} \ stge \ ${_streams} \ sym \ ${_syscons} \ sysvipc \ ti \ tl \ trm \ ${_twa} \ twe \ tx \ txp \ uart \ ubsa \ ubsec \ ubser \ ucom \ ucycom \ udav \ udbp \ udf \ udf_iconv \ ufm \ ${_ufs} \ ufoma \ uftdi \ ugen \ uhid \ ukbd \ ulpt \ umass \ umct \ umodem \ ums \ unionfs \ uplcom \ ural \ urio \ usb \ uscanner \ utopia \ uvisor \ uvscom \ ${_vesa} \ vge \ vkbd \ ${_vpo} \ vr \ vx \ wb \ ${_wi} \ wlan \ wlan_acl \ wlan_ccmp \ wlan_tkip \ wlan_wep \ wlan_xauth \ ${_xe} \ xfs \ xl \ zlib .if ${MACHINE_ARCH} != "powerpc" _syscons= syscons _vpo= vpo .endif .if defined(ALL_MODULES) _ufs= ufs .endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev .endif .if exists(${.CURDIR}/../crypto) _random= random .endif .endif .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES) _ipfilter= ipfilter .endif .if ${MK_PF} != "no" || defined(ALL_MODULES) _pf= pf _pflog= pflog .endif .if ${MACHINE_ARCH} == "i386" # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. _3dfx= 3dfx _3dfx_linux= 3dfx_linux _agp= agp _aic= aic _amd= amd _an= an _aout= aout _apm= apm _ar= ar _arcnet= arcnet _ath_hal= ath_hal _awi= awi _bktr= bktr _cardbus= cardbus _cbb= cbb _ce= ce _coff= coff _cp= cp _cpufreq= cpufreq _cs= cs _digi= digi _drm= drm _ed= ed _elink= elink _em= em _ep= ep _exca= exca _ext2fs= ext2fs _fe= fe _hfa= hfa _i2c= i2c _ibcs2= ibcs2 _ie= ie _if_ndis= if_ndis _io= io _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux _mse= mse .if ${MK_NCP} != "no" _ncp= ncp .endif _ncv= ncv _ndis= ndis _nsp= nsp .if ${MK_NCP} != "no" _nwfs= nwfs .endif _oltr= oltr _pccard= pccard _pcfclock= pcfclock _pecoff= pecoff _pst= pst _ray= ray _safe= safe _sbni= sbni _scsi_low= scsi_low _sio= sio _smbfs= smbfs _sound= sound _speaker= speaker _splash= splash _sppp= sppp _sr= sr _stg= stg _streams= streams _wi= wi _xe= xe .if ${MACHINE} == "i386" _aac= aac _acpi= acpi _ahb= ahb _arcmsr= arcmsr _arl= arl _asr= asr _bios= bios _ciss= ciss _cm= cm _ctau= ctau _cx= cx _dpt= dpt _ex= ex _hptmv= hptmv _ichwd= ichwd _ida= ida _idt= idt _iir= iir _ipmi= ipmi _ips= ips _ipw= ipw _iwi= iwi _mly= mly _mxge= mxge _nfe= nfe _nve= nve .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../crypto/via) _padlock= padlock .endif .endif _rr232x= rr232x _s3= s3 _twa= twa _vesa= vesa .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus _pmc= pmc _snc= snc .endif -.endif - -.if ${MACHINE_ARCH} == "alpha" -_agp= agp -_ahb= ahb -_ext2fs= ext2fs -_osf1= osf1 -_sound= sound -_sppp= sppp .endif .if ${MACHINE_ARCH} == "amd64" _aac= aac #_acpi= acpi # doesn't work on amd64 yet as module _agp= agp _an= an _arcmsr= arcmsr _ath_hal= ath_hal _cardbus= cardbus _cbb= cbb _ciss= ciss _cpufreq= cpufreq _digi= digi _drm= drm _ed= ed _em= em _exca= exca _ext2fs= ext2fs _hptmv= hptmv _i2c= i2c _ichwd= ichwd _ida= ida _if_ndis= if_ndis _iir= iir _io= io _ipmi= ipmi _ips= ips _ipw= ipw _iwi= iwi _mly= mly _mxge= mxge _ndis= ndis _nfe= nfe _nve= nve _pccard= pccard _rr232x= rr232x _safe= safe _scsi_low= scsi_low _smbfs= smbfs _sound= sound _speaker= speaker _sppp= sppp _twa= twa _wi= wi .endif .if ${MACHINE_ARCH} == "ia64" # Modules not enabled on ia64 (as compared to i386) include: # aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv # nsp oltr pecoff s3 sbni stg vesa # acpi is not enabled because it is broken as a module on ia64 _aic= aic #_ar= ar not 64-bit clean _arcnet= arcnet _asr= asr _an= an _bktr= bktr _cardbus= cardbus _cbb= cbb _ciss= ciss _cm= cm _coff= coff _cpufreq= cpufreq _em= em _ep= ep _exca= exca _fe= fe _hfa= hfa _iir= iir _mly= mly _pccard= pccard _scsi_low= scsi_low _smbfs= smbfs _sound= sound _splash= splash _sppp= sppp #_sr= sr not 64bit clean _streams= streams _wi= wi _xe= xe .endif .if ${MACHINE_ARCH} == "powerpc" _an= an _ath_hal= ath_hal _gem= gem _smbfs= smbfs .endif .if ${MACHINE_ARCH} == "sparc64" _ath_hal= ath_hal _auxio= auxio _em= em _gem= gem _i2c= i2c _sound= sound .endif .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .endif .for reject in ${WITHOUT_MODULES} SUBDIR:= ${SUBDIR:N${reject}} .endfor # Calling kldxref(8) for each module is expensive. .if !defined(NO_XREF) .MAKEFLAGS+= -DNO_XREF afterinstall: @if type kldxref >/dev/null 2>&1; then \ ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ kldxref ${DESTDIR}${KMODDIR}; \ fi .endif .include Index: head/sys/modules/agp/Makefile =================================================================== --- head/sys/modules/agp/Makefile (revision 160761) +++ head/sys/modules/agp/Makefile (revision 160762) @@ -1,36 +1,33 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../pci KMOD= agp SRCS= agp.c agp_if.c .if ${MACHINE_ARCH} == "i386" SRCS+= agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c \ agp_nvidia.c agp_ati.c .endif .if ${MACHINE} == "i386" SRCS+= agp_amd64.c .endif -.if ${MACHINE_ARCH} == "alpha" -SRCS+= agp_amd.c -.endif .if ${MACHINE_ARCH} == "amd64" SRCS+= agp_amd64.c .endif SRCS+= device_if.h bus_if.h agp_if.h pci_if.h SRCS+= opt_bus.h MFILES= kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m WERROR= EXPORT_SYMS= agp_find_device \ agp_state \ agp_acquire \ agp_release \ agp_enable \ agp_alloc_memory \ agp_free_memory \ agp_bind_memory \ agp_unbind_memory \ agp_memory_info .include Index: head/sys/modules/asr/Makefile =================================================================== --- head/sys/modules/asr/Makefile (revision 160761) +++ head/sys/modules/asr/Makefile (revision 160762) @@ -1,18 +1,14 @@ # $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_ARCH} == "alpha" -CFLAGS+= -O0 -.endif - .if ${MACHINE_ARCH} == "i386" SRCS+= opt_asr.h .endif .include Index: head/sys/modules/hwpmc/Makefile =================================================================== --- head/sys/modules/hwpmc/Makefile (revision 160761) +++ head/sys/modules/hwpmc/Makefile (revision 160762) @@ -1,43 +1,39 @@ # # $FreeBSD$ # .PATH: ${.CURDIR}/../../dev/hwpmc KMOD= hwpmc SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h WARNS?= 2 -.if ${MACHINE_ARCH} == "alpha" -SRCS+= hwpmc_alpha.c -.endif - .if ${MACHINE_ARCH} == "amd64" SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c SRCS+= device_if.h bus_if.h .endif .if ${MACHINE_ARCH} == "arm" SRCS+= hwpmc_arm.c .endif .if ${MACHINE_ARCH} == "i386" SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_ppro.c hwpmc_pentium.c hwpmc_x86.c SRCS+= device_if.h bus_if.h .endif .if ${MACHINE_ARCH} == "ia64" SRCS+= hwpmc_ia64.c .endif .if ${MACHINE_ARCH} == "powerpc" SRCS+= hwpmc_powerpc.c .endif .if ${MACHINE_ARCH} == "sparc64" SRCS+= hwpmc_sparc64.c .endif .include