Index: head/sys/modules/Makefile =================================================================== --- head/sys/modules/Makefile (revision 211689) +++ head/sys/modules/Makefile (revision 211690) @@ -1,684 +1,684 @@ # $FreeBSD$ .include SUBDIR= ${_3dfx} \ ${_3dfx_linux} \ ${_aac} \ accf_data \ accf_dns \ accf_http \ ${_acpi} \ ae \ ${_aesni} \ age \ ${_agp} \ aha \ ${_ahb} \ ahci \ ${_aic} \ aic7xxx \ aio \ alc \ ale \ alq \ ${_amd} \ ${_amdsbwd} \ ${_amdtemp} \ amr \ ${_an} \ ${_aout} \ ${_apm} \ ${_arcmsr} \ ${_arcnet} \ ${_asmc} \ ${_asr} \ ata \ ath \ ${_auxio} \ bce \ bfe \ bge \ ${_bios} \ ${_bktr} \ ${_bm} \ bridgestp \ bwi \ bwn \ cam \ ${_canbepm} \ ${_canbus} \ ${_cardbus} \ cas \ ${_cbb} \ cd9660 \ cd9660_iconv \ ${_ce} \ ${_ciss} \ ${_cm} \ ${_cmx} \ coda \ coda5 \ ${_coff} \ ${_coretemp} \ ${_cp} \ ${_cpuctl} \ ${_cpufreq} \ ${_crypto} \ ${_cryptodev} \ ${_cs} \ ${_ctau} \ ${_cxgb} \ ${_cyclic} \ dc \ dcons \ dcons_crom \ de \ ${_dpms} \ ${_dpt} \ ${_drm} \ ${_dtrace} \ dummynet \ ${_ed} \ ${_elink} \ ${_em} \ en \ ${_ep} \ ${_epic} \ ${_et} \ ${_ex} \ ${_exca} \ ${_ext2fs} \ fatm \ fdc \ fdescfs \ ${_fe} \ firewire \ firmware \ fxp \ gem \ geom \ ${_glxsb} \ hatm \ hifn \ hme \ ${_hptiop} \ ${_hptmv} \ ${_hptrr} \ hwpmc \ ${_i2c} \ ${_ibcs2} \ ${_ichwd} \ ${_ida} \ ${_ie} \ if_bridge \ if_carp \ if_disc \ if_edsc \ if_ef \ if_epair \ if_faith \ if_gif \ if_gre \ if_lagg \ ${_if_ndis} \ if_stf \ if_tap \ if_tun \ if_vlan \ ${_igb} \ ${_iir} \ ${_io} \ ipdivert \ ${_ipfilter} \ ipfw \ ipfw_nat \ ${_ipmi} \ ip_mroute_mod \ ${_ips} \ ${_ipw} \ ${_ipwfw} \ iscsi \ isp \ ispfw \ ${_iwi} \ ${_iwifw} \ ${_iwn} \ ${_iwnfw} \ ${_ixgb} \ ${_ixgbe} \ jme \ joy \ kbdmux \ krpc \ ksyms \ le \ lge \ libalias \ libiconv \ libmbpool \ libmchain \ ${_lindev} \ ${_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 \ malo \ mcd \ md \ mem \ mfi \ mii \ mlx \ ${_mly} \ mmc \ mmcsd \ mpt \ mqueue \ msdosfs \ msdosfs_iconv \ ${_mse} \ msk \ mvs \ mwl \ mwlfw \ mxge \ my \ ${_ncp} \ ${_ncv} \ ${_ndis} \ ${_netgraph} \ ${_nfe} \ nfs_common \ nfscl \ nfsclient \ nfscommon \ nfsd \ nfslock \ nfslockd \ nfsserver \ nfssvc \ nge \ nmdm \ ${_nsp} \ ntfs \ ntfs_iconv \ nullfs \ ${_nve} \ ${_nvram} \ ${_nwfs} \ ${_nxge} \ ${_opensolaris} \ ${_padlock} \ patm \ ${_pccard} \ ${_pcfclock} \ pcn \ ${_pf} \ ${_pflog} \ plip \ ${_pmc} \ portalfs \ ppbus \ ppc \ ppi \ pps \ procfs \ pseudofs \ ${_pst} \ pty \ puc \ ral \ ralfw \ ${_random} \ rc4 \ ${_rdma} \ re \ reiserfs \ rl \ runfw \ ${_s3} \ ${_safe} \ ${_sbni} \ scc \ scd \ ${_scsi_low} \ sdhci \ sem \ send \ sf \ sge \ siba_bwn \ siftr \ siis \ sis \ sk \ ${_smbfs} \ sn \ ${_snc} \ snp \ ${_sound} \ ${_speaker} \ ${_splash} \ ${_sppp} \ ste \ ${_stg} \ stge \ ${_streams} \ ${_svr4} \ ${_sym} \ ${_syscons} \ sysvipc \ ti \ tl \ tmpfs \ ${_tpm} \ trm \ ${_twa} \ twe \ tx \ txp \ uart \ ubsec \ udf \ udf_iconv \ ufs \ unionfs \ usb \ utopia \ ${_vesa} \ vge \ vkbd \ ${_vpo} \ vr \ vx \ wb \ ${_wi} \ wlan \ wlan_acl \ wlan_amrr \ wlan_ccmp \ wlan_rssadapt \ wlan_tkip \ wlan_wep \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ ${_x86bios} \ ${_xe} \ xfs \ xl \ ${_zfs} \ zlib \ -.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_ARCH} != "arm" && \ - ${MACHINE_ARCH} != "mips" +.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \ + ${MACHINE_CPUARCH} != "mips" _syscons= syscons _vpo= vpo .endif .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" # no BUS_SPACE_UNSPECIFIED # No barrier instruction support (specific to this driver) _sym= sym # intr_disable() is a macro, causes problems _cxgb= cxgb .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_NETGRAPH} != "no" || defined(ALL_MODULES) _netgraph= netgraph .endif .if ${MK_PF} != "no" || defined(ALL_MODULES) _pf= pf _pflog= pflog .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "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 _arcnet= arcnet _bktr= bktr _cardbus= cardbus _cbb= cbb _ce= ce _coff= coff _cp= cp _cpuctl= cpuctl _cpufreq= cpufreq _cs= cs .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _cyclic= cyclic .endif _dpms= dpms _drm= drm .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _dtrace= dtrace .endif _ed= ed _elink= elink _em= em _ep= ep _et= et _exca= exca _ext2fs= ext2fs _fe= fe _glxsb= glxsb _i2c= i2c _ibcs2= ibcs2 _ie= ie _if_ndis= if_ndis _igb= igb _io= io _lindev= lindev _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 .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif _pccard= pccard _pcfclock= pcfclock _pst= pst _rdma= rdma _safe= safe _sbni= sbni _scsi_low= scsi_low _smbfs= smbfs _sound= sound _speaker= speaker _splash= splash _sppp= sppp _stg= stg _streams= streams _svr4= svr4 _wi= wi _xe= xe .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif .if ${MACHINE} == "i386" _aac= aac _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _aesni= aesni .endif _ahb= ahb _amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr _asmc= asmc _asr= asr _bios= bios _ciss= ciss _cm= cm _cmx= cmx _coretemp= coretemp _ctau= ctau _dpt= dpt _ex= ex _hptiop= hptiop _hptmv= hptmv _hptrr= hptrr _ichwd= ichwd _ida= ida _iir= iir _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw _iwi= iwi _iwifw= iwifw _iwn= iwn _iwnfw= iwnfw _ixgb= ixgb _ixgbe= ixgbe _mly= mly _nfe= nfe _nve= nve _nvram= nvram _nxge= nxge _tpm= tpm _wpi= wpi _wpifw= wpifw .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock .endif _s3= s3 _twa= twa _vesa= vesa _x86bios= x86bios .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus _pmc= pmc _snc= snc .endif .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" _aac= aac _acpi= acpi .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _aesni= aesni .endif _agp= agp _an= an _amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr _asmc= asmc _cardbus= cardbus _cbb= cbb _cmx= cmx _ciss= ciss _coretemp= coretemp _cpuctl= cpuctl _cpufreq= cpufreq .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _cyclic= cyclic .endif _dpms= dpms _drm= drm .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _dtrace= dtrace .endif _ed= ed _et= et _em= em _exca= exca _ext2fs= ext2fs _hptiop= hptiop _hptmv= hptmv _hptrr= hptrr _i2c= i2c _ichwd= ichwd _ida= ida _if_ndis= if_ndis _igb= igb _iir= iir _io= io _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw _iwi= iwi _iwifw= iwifw _iwn= iwn _iwnfw= iwnfw _ixgb= ixgb _ixgbe= ixgbe _lindev= lindev _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux _mly= mly _ndis= ndis _nfe= nfe _nve= nve _nvram= nvram _nxge= nxge .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock .endif _pccard= pccard _rdma= rdma _s3= s3 _safe= safe _scsi_low= scsi_low _smbfs= smbfs _sound= sound _speaker= speaker _splash= splash _sppp= sppp _tpm= tpm _twa= twa _vesa= vesa _x86bios= x86bios _wi= wi _wpi= wpi _wpifw= wpifw .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" _aac= aac _aic= aic _an= an _arcnet= arcnet _asr= asr _bktr= bktr _cardbus= cardbus _cbb= cbb _ciss= ciss _cm= cm _cmx= cmx _coff= coff _cpufreq= cpufreq _dpt= dpt _em= em _ep= ep _et= et _exca= exca _fe= fe _hptiop= hptiop _ida= ida _igb= igb _iir= iir _ips= ips _mly= mly _pccard= pccard _scsi_low= scsi_low _smbfs= smbfs _sound= sound _splash= splash _sppp= sppp _streams= streams _tpm= tpm _twa= twa _wi= wi _xe= xe .endif .if ${MACHINE_CPUARCH} == "powerpc" _an= an _bm= bm _cpufreq= cpufreq _nvram= powermac_nvram _smbfs= smbfs _sound= sound .endif .if ${MACHINE_ARCH} == "powerpc64" .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" _auxio= auxio _em= em _epic= epic _i2c= i2c _igb= igb .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif _smbfs= smbfs _sound= sound .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif .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/aac/Makefile =================================================================== --- head/sys/modules/aac/Makefile (revision 211689) +++ head/sys/modules/aac/Makefile (revision 211690) @@ -1,18 +1,18 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/aac -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SUBDIR= aac_linux .endif KMOD= aac SRCS= aac.c aac_pci.c aac_disk.c aac_cam.c SRCS+= opt_scsi.h opt_cam.h opt_aac.h SRCS+= device_if.h bus_if.h pci_if.h # To enable debug output from the driver, uncomment these two lines. #CFLAGS+= -DAAC_DEBUG=2 #SRCS+= aac_debug.c .include Index: head/sys/modules/acpi/acpi/Makefile =================================================================== --- head/sys/modules/acpi/acpi/Makefile (revision 211689) +++ head/sys/modules/acpi/acpi/Makefile (revision 211690) @@ -1,126 +1,129 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" .error "ACPI can only be compiled into the kernel on the ia64 platform" .endif .if ${MACHINE} != "amd64" && ${MACHINE} != "i386" .error "The ACPI module is only for amd64 and i386" .endif .PATH: ${.CURDIR}/../../../contrib/dev/acpica/debugger \ ${.CURDIR}/../../../contrib/dev/acpica/disassembler \ ${.CURDIR}/../../../contrib/dev/acpica/dispatcher \ ${.CURDIR}/../../../contrib/dev/acpica/events \ ${.CURDIR}/../../../contrib/dev/acpica/executer \ ${.CURDIR}/../../../contrib/dev/acpica/hardware \ ${.CURDIR}/../../../contrib/dev/acpica/namespace \ ${.CURDIR}/../../../contrib/dev/acpica/parser \ ${.CURDIR}/../../../contrib/dev/acpica/resources \ ${.CURDIR}/../../../contrib/dev/acpica/tables \ ${.CURDIR}/../../../contrib/dev/acpica/utilities \ ${.CURDIR}/../../../pci \ ${.CURDIR}/../../../dev/acpica \ ${.CURDIR}/../../../dev/acpica/Osd \ - ${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica KMOD= acpi # ACPI CA sources SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c SRCS+= dbutils.c dbxface.c SRCS+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c SRCS+= dmresrcs.c dmutils.c dmwalk.c SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c SRCS+= dsutils.c dswexec.c dswload.c dswscope.c dswstate.c SRCS+= evevent.c evgpe.c evgpeblk.c evgpeinit.c evgpeutil.c evmisc.c SRCS+= evregion.c evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c SRCS+= exconfig.c exconvrt.c excreate.c exdebug.c exdump.c exfield.c SRCS+= exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c SRCS+= exoparg3.c exoparg6.c exprep.c exregion.c exresnte.c exresolv.c SRCS+= exresop.c exstore.c exstoren.c exstorob.c exsystem.c exutils.c SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c hwvalid.c hwxface.c SRCS+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c SRCS+= nsobject.c nsparse.c nspredef.c nsrepair.c nsrepair2.c nssearch.c SRCS+= nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c SRCS+= pswalk.c psxface.c SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c SRCS+= rsmemory.c rsmisc.c rsutils.c rsxface.c SRCS+= tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c uteval.c utglobal.c SRCS+= utids.c utinit.c utlock.c utmath.c utmisc.c utmutex.c utobject.c SRCS+= utosi.c utresrc.c utstate.c utxface.c # OSPM layer and core hardware drivers SRCS+= acpi.c acpi_button.c acpi_isab.c acpi_package.c acpi_pci.c acpi_pcib.c SRCS+= acpi_pcib_acpi.c acpi_pcib_pci.c acpi_powerres.c acpi_quirk.c SRCS+= acpi_resource.c acpi_timer.c acpi_pci_link.c acpi_thermal.c # ACPI hardware drivers, mostly used for mobile systems. SRCS+= acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c acpi_ec.c SRCS+= acpi_hpet.c acpi_lid.c acpi_perf.c acpi_smbat.c acpi_throttle.c # OSD layer SRCS+= OsdDebug.c SRCS+= OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c OsdStream.c SRCS+= OsdSynch.c OsdTable.c OsdEnvironment.c SRCS+= opt_acpi.h opt_bus.h opt_ddb.h acpi_if.h acpi_quirks.h bus_if.h SRCS+= cpufreq_if.h device_if.h isa_if.h pci_if.h pcib_if.h # XXX ACPI should not depend on the following headers but this is currently # needed for the build of assym.s. # This obviously needs a better and more structural fix. SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h .if !defined(KERNBUILDDIR) .if KTR CFLAGS+=-DKTR .endif .if ACPI_MAX_TASKS CFLAGS+=-DACPI_MAX_TASKS=${ACPI_MAX_TASKS} .endif .if ACPI_MAX_THREADS CFLAGS+=-DACPI_MAX_THREADS=${ACPI_MAX_THREADS} .endif .if ACPI_DEBUG CFLAGS+=-DACPI_DEBUG opt_ddb.h: Makefile echo "#define DDB 1" > ${.TARGET} .else opt_ddb.h: Makefile echo -n > ${.TARGET} .endif .endif # Machine-specific code such as sleep/wakeup SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c SRCS+= assym.s madt.c CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o -.if ${MACHINE_ARCH} == "amd64" +SRCS+= opt_global.h + +.if ${MACHINE_CPUARCH} == "amd64" +SRCS+= acpi_switch.S opt_global.h .if !defined(KERNBUILDDIR) CFLAGS+=-DSMP .endif SRCS+= acpi_switch.S acpi_wakedata.h CLEANFILES+= acpi_wakedata.h ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} acpi_switch.o: acpi_switch.S ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} acpi_wakecode.o: acpi_wakecode.S assym.s ${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC} acpi_wakecode.bin: acpi_wakecode.o objcopy -S -O binary acpi_wakecode.o ${.TARGET} acpi_wakecode.h: acpi_wakecode.bin file2c -sx 'static char wakecode[] = {' '};' < acpi_wakecode.bin > \ ${.TARGET} acpi_wakedata.h: acpi_wakecode.o nm -n --defined-only ${.ALLSRC} | while read offset dummy what; do \ echo "#define $${what} 0x$${offset}"; done > ${.TARGET} .else acpi_wakecode.h: acpi_wakecode.S assym.s - ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ - MAKESRCPATH=${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${MAKE} -f ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica/Makefile \ + MAKESRCPATH=${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica .endif .include Index: head/sys/modules/agp/Makefile =================================================================== --- head/sys/modules/agp/Makefile (revision 211689) +++ head/sys/modules/agp/Makefile (revision 211690) @@ -1,33 +1,33 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/agp KMOD= agp SRCS= agp.c agp_if.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "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} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= agp_amd64.c agp_i810.c agp_via.c .endif SRCS+= device_if.h bus_if.h agp_if.h pci_if.h SRCS+= opt_agp.h opt_bus.h MFILES= kern/device_if.m kern/bus_if.m dev/agp/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/amr/Makefile =================================================================== --- head/sys/modules/amr/Makefile (revision 211689) +++ head/sys/modules/amr/Makefile (revision 211690) @@ -1,19 +1,19 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/amr SUBDIR= amr_cam -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= amr_linux .endif KMOD= amr SRCS= amr.c amr_pci.c amr_disk.c device_if.h bus_if.h pci_if.h # Enable a questionable optimisation for newer adapters #CFLAGS+= -DAMR_QUARTZ_GOFASTER # Debugging #CFLAGS+= -DAMR_DEBUG=3 .include Index: head/sys/modules/asr/Makefile =================================================================== --- head/sys/modules/asr/Makefile (revision 211689) +++ head/sys/modules/asr/Makefile (revision 211690) @@ -1,14 +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} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_asr.h .endif .include Index: head/sys/modules/bge/Makefile =================================================================== --- head/sys/modules/bge/Makefile (revision 211689) +++ head/sys/modules/bge/Makefile (revision 211690) @@ -1,12 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/bge KMOD= if_bge SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h -.if ${MACHINE_ARCH} == sparc64 +.if ${MACHINE_CPUARCH} == sparc64 SRCS+= ofw_bus_if.h .endif .include Index: head/sys/modules/cpufreq/Makefile =================================================================== --- head/sys/modules/cpufreq/Makefile (revision 211689) +++ head/sys/modules/cpufreq/Makefile (revision 211690) @@ -1,26 +1,26 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/cpufreq \ - ${.CURDIR}/../../${MACHINE_ARCH}/cpufreq + ${.CURDIR}/../../${MACHINE_CPUARCH}/cpufreq KMOD= cpufreq SRCS= ichss.c SRCS+= bus_if.h cpufreq_if.h device_if.h pci_if.h .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" .PATH: ${.CURDIR}/../../x86/cpufreq SRCS+= acpi_if.h opt_acpi.h SRCS+= est.c hwpstate.c p4tcc.c powernow.c .endif .if ${MACHINE} == "i386" SRCS+= smist.c .endif .if ${MACHINE} == "powerpc" .PATH: ${.CURDIR}/../../powerpc/cpufreq SRCS+= dfs.c .endif .include Index: head/sys/modules/cxgb/Makefile =================================================================== --- head/sys/modules/cxgb/Makefile (revision 211689) +++ head/sys/modules/cxgb/Makefile (revision 211690) @@ -1,39 +1,39 @@ # $FreeBSD$ SUBDIR= cxgb SUBDIR+= ${_toecore} SUBDIR+= ${_tom} SUBDIR+= ${_iw_cxgb} SUBDIR+= cxgb_t3fw .if defined(SYSDIR) _sysdir = ${SYSDIR} .endif # Based on bsd.kmod.mk but we don't modify SYSDIR in this one. .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \ /sys /usr/src/sys .if !defined(_sysdir) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk) _sysdir = ${_dir} .endif .endfor .if !defined(_sysdir) || !exists(${_sysdir}/kern/) || \ !exists(${_sysdir}/conf/kmod.mk) .error "can't find kernel source tree" .endif _toe_header = ${_sysdir}/netinet/toedev.h .if exists(${_toe_header}) _toecore = toecore #_tom = tom .endif -.if ${MACHINE_ARCH} == "i386" && exists(${_toe_header}) +.if ${MACHINE_CPUARCH} == "i386" && exists(${_toe_header}) _iw_cxgb = iw_cxgb .endif -.if ${MACHINE_ARCH} == "amd64" && exists(${_toe_header}) +.if ${MACHINE_CPUARCH} == "amd64" && exists(${_toe_header}) _iw_cxgb = iw_cxgb .endif .include Index: head/sys/modules/cyclic/Makefile =================================================================== --- head/sys/modules/cyclic/Makefile (revision 211689) +++ head/sys/modules/cyclic/Makefile (revision 211690) @@ -1,19 +1,19 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../cddl/dev/cyclic KMOD= cyclic SRCS= cyclic.c - + SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. \ - -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH:S/amd64/i386/} + -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_CPUARCH:S/amd64/i386/} CFLAGS+= -DDEBUG=1 IGNORE_PRAGMA= 1 .include Index: head/sys/modules/dtrace/Makefile =================================================================== --- head/sys/modules/dtrace/Makefile (revision 211689) +++ head/sys/modules/dtrace/Makefile (revision 211690) @@ -1,21 +1,21 @@ # $FreeBSD$ .include .include "Makefile.inc" SUBDIR= dtmalloc \ dtnfsclient \ dtrace \ dtraceall \ dtrace_test \ lockstat \ profile \ prototype \ sdt \ systrace -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= fbt .endif .include Index: head/sys/modules/dtrace/Makefile.inc =================================================================== --- head/sys/modules/dtrace/Makefile.inc (revision 211689) +++ head/sys/modules/dtrace/Makefile.inc (revision 211690) @@ -1,29 +1,29 @@ # $FreeBSD$ IGNORE_PRAGMA= 1 load : -kldload cyclic -kldload dtrace -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldload sdt -kldload lockstat -kldload fbt -kldload prototype .endif -kldload profile -kldload systrace kldstat unload : -kldunload systrace -kldunload profile -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldunload prototype -kldunload fbt -kldunload lockstat -kldunload sdt .endif -kldunload dtrace -kldunload cyclic kldstat Index: head/sys/modules/dtrace/dtrace/Makefile =================================================================== --- head/sys/modules/dtrace/dtrace/Makefile (revision 211689) +++ head/sys/modules/dtrace/dtrace/Makefile (revision 211690) @@ -1,44 +1,44 @@ # $FreeBSD$ -ARCHDIR= ${MACHINE_ARCH} +ARCHDIR= ${MACHINE_CPUARCH} .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace .PATH: ${.CURDIR}/../../../cddl/kern .PATH: ${.CURDIR}/../../../cddl/dev/dtrace .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} KMOD= dtrace SRCS= dtrace.c \ dtrace_asm.S \ dtrace_subr.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SRCS+= dis_tables.c \ instr_size.c .endif SRCS+= bus_if.h device_if.h vnode_if.h # Needed for dtrace_asm.S SRCS+= assym.s # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/dev/dtrace \ -I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -DDIS_MEM CFLAGS+= -DSMP -DDEBUG EXPORT_SYMS= dtrace_register \ dtrace_unregister \ dtrace_probe_lookup .include Index: head/sys/modules/dtrace/fasttrap/Makefile =================================================================== --- head/sys/modules/dtrace/fasttrap/Makefile (revision 211689) +++ head/sys/modules/dtrace/fasttrap/Makefile (revision 211690) @@ -1,19 +1,19 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/dev/fasttrap KMOD= fasttrap SRCS= fasttrap.c SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel .endif CFLAGS+= -DSMP -DDEBUG .include Index: head/sys/modules/hptmv/Makefile =================================================================== --- head/sys/modules/hptmv/Makefile (revision 211689) +++ head/sys/modules/hptmv/Makefile (revision 211690) @@ -1,52 +1,52 @@ # # Makefile for RR182x FreeBSD driver # Copyright (c) 2004-2005 HighPoint Technologies, Inc. All rights reserved # # $FreeBSD$ HPTMV= ${.CURDIR}/../../dev/hptmv .PATH: ${HPTMV} KMOD= hptmv SRCS= opt_scsi.h opt_cam.h SRCS+= bus_if.h device_if.h pci_if.h SRCS+= mv.c entry.c ioctl.c hptproc.c gui_lib.c OBJS+= hptmvraid.o -.if $(MACHINE_ARCH) == "amd64" +.if $(MACHINE_CPUARCH) == "amd64" HPTMV_RAID_O = amd64-elf.raid.o.uu .else HPTMV_RAID_O = i386-elf.raid.o.uu .endif hptmvraid.o: ${HPTMV}/$(HPTMV_RAID_O) uudecode -p < ${HPTMV}/$(HPTMV_RAID_O) > ${.TARGET} # # Debug Options: # # -DDEBUG: include debug code # -DDEBUG_LEVEL=x: # 0 - No debug output message # 1 - print only error messages # 2 - print error and warning # 3 - print all messages (info, warning, error) # #DEBUGOPT = -O2 .if defined(DEBUG) && $(DEBUG) == 1 DEBUGOPT += -DDEBUG .if defined(DEBUG_LEVEL) DEBUGOPT += -DDEBUG_LEVEL=$(DEBUG_LEVEL) .else DEBUGOPT += -DDEBUG_LEVEL=1 .endif .endif .if defined(FOR_DEMO) && $(FOR_DEMO) == 1 DEBUGOPT += -DFOR_DEMO .endif CFLAGS = ${DEBUGOPT} - + .include Index: head/sys/modules/hptrr/Makefile =================================================================== --- head/sys/modules/hptrr/Makefile (revision 211689) +++ head/sys/modules/hptrr/Makefile (revision 211690) @@ -1,14 +1,14 @@ # $Id: Makefile.def,v 1.18 2007/03/22 11:20:15 gmm Exp $ # $FreeBSD$ HPTRR= ${.CURDIR}/../../dev/hptrr .PATH: ${HPTRR} KMOD = hptrr SRCS = opt_scsi.h opt_cam.h bus_if.h device_if.h pci_if.h os_bsd.h SRCS+= hptrr_os_bsd.c hptrr_osm_bsd.c hptrr_config.c OBJS = hptrr_lib.o hptrr_lib.o: - uudecode -p < ${HPTRR}/$(MACHINE_ARCH)-elf.hptrr_lib.o.uu > hptrr_lib.o + uudecode -p < ${HPTRR}/$(MACHINE_CPUARCH)-elf.hptrr_lib.o.uu > hptrr_lib.o .include Index: head/sys/modules/hwpmc/Makefile =================================================================== --- head/sys/modules/hwpmc/Makefile (revision 211689) +++ head/sys/modules/hwpmc/Makefile (revision 211690) @@ -1,39 +1,39 @@ # # $FreeBSD$ # .PATH: ${.CURDIR}/../../dev/hwpmc KMOD= hwpmc SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_tsc.c SRCS+= hwpmc_x86.c hwpmc_uncore.c SRCS+= device_if.h bus_if.h .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" SRCS+= hwpmc_arm.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_ppro.c SRCS+= hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c SRCS+= device_if.h bus_if.h .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" SRCS+= hwpmc_ia64.c .endif .if ${MACHINE_CPUARCH} == "powerpc" SRCS+= hwpmc_powerpc.c .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" SRCS+= hwpmc_sparc64.c .endif .include Index: head/sys/modules/i2c/controllers/pcf/Makefile =================================================================== --- head/sys/modules/i2c/controllers/pcf/Makefile (revision 211689) +++ head/sys/modules/i2c/controllers/pcf/Makefile (revision 211690) @@ -1,20 +1,20 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../dev/pcf KMOD= pcf SRCS= ${envctrl} pcf.c ${pcf_ebus} ${pcf_isa} SRCS+= bus_if.h device_if.h iicbus_if.h ${isa_if} ${ofw_bus_if} -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" isa_if= isa_if.h pcf_isa= pcf_isa.c .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" envctrl= envctrl.c ofw_bus_if= ofw_bus_if.h pcf_ebus= pcf_ebus.c .endif .include Index: head/sys/modules/io/Makefile =================================================================== --- head/sys/modules/io/Makefile (revision 211689) +++ head/sys/modules/io/Makefile (revision 211690) @@ -1,10 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/io -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= io SRCS= iodev.c io.c SRCS+= bus_if.h device_if.h .include Index: head/sys/modules/le/Makefile =================================================================== --- head/sys/modules/le/Makefile (revision 211689) +++ head/sys/modules/le/Makefile (revision 211690) @@ -1,26 +1,26 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/le KMOD= if_le SRCS= am7990.c am79900.c ${if_le_cbus} ${if_le_isa} ${if_le_lebuffer} SRCS+= ${if_le_ledma} if_le_pci.c lance.c ${lebuffer_sbus} SRCS+= bus_if.h device_if.h ${isa_if} ${ofw_bus_if} pci_if.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE} == "pc98" if_le_cbus= if_le_cbus.c .else if_le_isa= if_le_isa.c .endif isa_if= isa_if.h .endif .if ${MACHINE} == "sparc64" if_le_lebuffer= if_le_lebuffer.c if_le_ledma= if_le_ledma.c lebuffer_sbus= lebuffer_sbus.c ofw_bus_if= ofw_bus_if.h .endif .include Index: head/sys/modules/linprocfs/Makefile =================================================================== --- head/sys/modules/linprocfs/Makefile (revision 211689) +++ head/sys/modules/linprocfs/Makefile (revision 211690) @@ -1,15 +1,15 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../compat/linprocfs KMOD= linprocfs SRCS= vnode_if.h \ device_if.h bus_if.h \ linprocfs.c \ opt_compat.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+=-DCOMPAT_LINUX32 .endif .include Index: head/sys/modules/linsysfs/Makefile =================================================================== --- head/sys/modules/linsysfs/Makefile (revision 211689) +++ head/sys/modules/linsysfs/Makefile (revision 211690) @@ -1,15 +1,15 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../compat/linsysfs KMOD= linsysfs SRCS= vnode_if.h \ device_if.h bus_if.h pci_if.h \ linsysfs.c \ opt_compat.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+=-DCOMPAT_LINUX32 .endif .include Index: head/sys/modules/linux/Makefile =================================================================== --- head/sys/modules/linux/Makefile (revision 211689) +++ head/sys/modules/linux/Makefile (revision 211690) @@ -1,66 +1,66 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 .endif -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} +.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX} KMOD= linux SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \ opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \ device_if.h bus_if.h assym.s # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif OBJS= linux${SFX}_locore.o linux${SFX}_support.o -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace.c imgact_linux.c opt_cpu.h .endif EXPORT_SYMS= EXPORT_SYMS+= linux_emul_path EXPORT_SYMS+= linux_get_osname EXPORT_SYMS+= linux_get_osrelease EXPORT_SYMS+= linux_ifname EXPORT_SYMS+= linux_ioctl_register_handler 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} linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h ${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 ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .if !defined(KERNBUILDDIR) opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .if defined(KTR) CFLAGS+= -DKTR .endif .endif .include Index: head/sys/modules/mem/Makefile =================================================================== --- head/sys/modules/mem/Makefile (revision 211689) +++ head/sys/modules/mem/Makefile (revision 211690) @@ -1,34 +1,34 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/mem .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= mem SRCS= memdev.c mem.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SRCS+= memutil.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= i686_mem.c k6_mem.c .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= amd64_mem.c .endif SRCS+= bus_if.h device_if.h .if ${MACHINE} == "sun4v" SRCS+= opt_global.h .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h .else CFLAGS+= -include opt_global.h MKDEP= -include opt_global.h opt_global.h: echo "#define SUN4V 1" > ${.TARGET} .endif .endif .include Index: head/sys/modules/mfi/Makefile =================================================================== --- head/sys/modules/mfi/Makefile (revision 211689) +++ head/sys/modules/mfi/Makefile (revision 211690) @@ -1,18 +1,18 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/mfi SUBDIR= mfip -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= mfi_linux .endif KMOD= mfi SRCS= mfi.c mfi_pci.c mfi_disk.c mfi_debug.c SRCS+= opt_mfi.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS += -DMFI_DEBUG .include Index: head/sys/modules/ndis/Makefile =================================================================== --- head/sys/modules/ndis/Makefile (revision 211689) +++ head/sys/modules/ndis/Makefile (revision 211690) @@ -1,19 +1,19 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../compat/ndis KMOD= ndis SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c SRCS+= kern_windrv.c subr_usbd.c SRCS+= device_if.h bus_if.h pci_if.h vnode_if.h SRCS+= opt_bus.h opt_usb.h usb_if.h usbdevs.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= winx64_wrap.S .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= winx32_wrap.S .endif .include Index: head/sys/modules/ppc/Makefile =================================================================== --- head/sys/modules/ppc/Makefile (revision 211689) +++ head/sys/modules/ppc/Makefile (revision 211690) @@ -1,24 +1,24 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/ppc KMOD= ppc SRCS= bus_if.h device_if.h ppbus_if.h isa_if.h pci_if.h serdev_if.h \ opt_ppc.h opt_isa.h \ ppc.c ppc_pci.c ppc_puc.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= ppc_acpi.c ppc_isa.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE} != "pc98" SRCS+= ppc_acpi.c .endif SRCS+= ppc_isa.c .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" SRCS+= ppc_acpi.c .endif .include Index: head/sys/modules/procfs/Makefile =================================================================== --- head/sys/modules/procfs/Makefile (revision 211689) +++ head/sys/modules/procfs/Makefile (revision 211690) @@ -1,43 +1,43 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../fs/procfs KMOD= procfs SRCS= SRCS+= opt_compat.h SRCS+= vnode_if.h SRCS+= procfs_ctl.c SRCS+= procfs_dbregs.c SRCS+= procfs_fpregs.c SRCS+= procfs_ioctl.c SRCS+= procfs_map.c SRCS+= procfs_mem.c SRCS+= procfs_note.c SRCS+= procfs_osrel.c SRCS+= procfs_regs.c SRCS+= procfs_rlimit.c SRCS+= procfs_status.c SRCS+= procfs_type.c SRCS+= procfs.c EXPORT_SYMS= EXPORT_SYMS+= procfs_attr EXPORT_SYMS+= procfs_candebug EXPORT_SYMS+= procfs_docurproc EXPORT_SYMS+= procfs_doprocfile EXPORT_SYMS+= procfs_doprocmem EXPORT_SYMS+= procfs_notsystem .if !defined(KERNBUILDDIR) opt_compat.h: echo "#define COMPAT_43 1" > ${.TARGET} echo "#define COMPAT_FREEBSD4 1" >> ${.TARGET} echo "#define COMPAT_FREEBSD5 1" >> ${.TARGET} echo "#define COMPAT_FREEBSD6 1" >> ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET} echo "#define COMPAT_LINUX32 1" >> ${.TARGET} .endif .endif .include Index: head/sys/modules/smbfs/Makefile =================================================================== --- head/sys/modules/smbfs/Makefile (revision 211689) +++ head/sys/modules/smbfs/Makefile (revision 211690) @@ -1,54 +1,54 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../crypto/des \ - ${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \ + ${.CURDIR}/../../crypto/des/arch/${MACHINE_CPUARCH} \ ${.CURDIR}/../../kern \ ${.CURDIR}/../../libkern \ ${.CURDIR}/../../netsmb \ ${.CURDIR}/../../fs/smbfs KMOD= smbfs SRCS= vnode_if.h \ opt_inet.h opt_ipx.h \ opt_netsmb.h \ iconv_converter_if.h \ md4c.c \ smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \ smb_usr.c smb_crypt.c smb_iod.c \ smbfs_vfsops.c smbfs_node.c smbfs_io.c smbfs_vnops.c \ smbfs_subr.c smbfs_smb.c # NETSMBCRYPTO SRCS+= des_ecb.c des_setkey.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= des_enc.S .else SRCS+= des_enc.c .endif # Build with IPX support (1|0) SMB_IPX?= 0 # Build with INET support (1|0) SMB_INET?= 1 CFLAGS+= ${KDEBUG} .if defined(VNPRINT) CFLAGS+= -DVNPRINT .endif .if !defined(KERNBUILDDIR) .if ${SMB_INET} > 0 opt_inet.h: echo "#define INET 1" > ${.TARGET} .endif .if ${SMB_IPX} > 0 opt_ipx.h: echo "#define IPX 1" > ${.TARGET} .endif .endif .include Index: head/sys/modules/sound/driver/Makefile =================================================================== --- head/sys/modules/sound/driver/Makefile (revision 211689) +++ head/sys/modules/sound/driver/Makefile (revision 211690) @@ -1,22 +1,22 @@ # $FreeBSD$ SUBDIR= ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx SUBDIR+= envy24 envy24ht es137x ess fm801 hda ich maestro maestro3 SUBDIR+= neomagic sb16 sb8 sbc solo spicds t4dwave via8233 SUBDIR+= via82c686 vibes driver uaudio -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= cmi mss .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" .if ${MACHINE} == "sparc64" SUBDIR+= audiocs .endif .endif .if ${MACHINE_CPUARCH} == "powerpc" SUBDIR+= ai2s davbus .endif .include Index: head/sys/modules/svr4/Makefile =================================================================== --- head/sys/modules/svr4/Makefile (revision 211689) +++ head/sys/modules/svr4/Makefile (revision 211690) @@ -1,34 +1,34 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4 +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/svr4 ${.CURDIR}/../../compat/svr4 KMOD= svr4 SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \ vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c \ svr4_misc.c svr4_ioctl.c svr4_stat.c svr4_filio.c \ svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \ svr4_machdep.c svr4_resource.c svr4_ipc.c OBJS= svr4_locore.o 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} 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 ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .if !defined(KERNBUILDDIR) && defined(DEBUG) opt_svr4.h: echo "#define DEBUG_SVR4 1" > ${.TARGET} .endif .include Index: head/sys/modules/syscons/Makefile =================================================================== --- head/sys/modules/syscons/Makefile (revision 211689) +++ head/sys/modules/syscons/Makefile (revision 211690) @@ -1,33 +1,34 @@ # $FreeBSD$ SUBDIR= ${_apm} \ ${_beastie} \ blank \ ${_daemon} \ ${_dragon} \ fade \ ${_fire} \ green \ ${_logo} \ ${_rain} \ ${_snake} \ ${_star} \ ${_warp} -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" _apm= apm .endif -.if ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_CPUARCH} != "sparc64" +_beastie= beastie _beastie= beastie _daemon= daemon _dragon= dragon _fire= fire _logo= logo _rain= rain _snake= snake _star= star _warp= warp .endif .include Index: head/sys/modules/uart/Makefile =================================================================== --- head/sys/modules/uart/Makefile (revision 211689) +++ head/sys/modules/uart/Makefile (revision 211690) @@ -1,29 +1,29 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/uart -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" uart_bus_ebus= uart_bus_ebus.c ofw_bus_if= ofw_bus_if.h .endif KMOD= uart SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c uart_dbg.c \ uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \ uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c .elif exists(${.CURDIR}/../../dev/uart/uart_cpu_${MACHINE}.c) SRCS+= uart_cpu_${MACHINE}.c .endif SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \ power_if.h pccarddevs.h serdev_if.h MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \ kern/device_if.m kern/serdev_if.m .include Index: head/sys/modules/usb/Makefile =================================================================== --- head/sys/modules/usb/Makefile (revision 211689) +++ head/sys/modules/usb/Makefile (revision 211690) @@ -1,51 +1,51 @@ # # $FreeBSD$ # # Copyright (c) 2008 Hans Petter Selasky. All rights reserved. # # 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. # SUBDIR = usb SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci} SUBDIR += rum run uath upgt ural zyd ${_urtw} SUBDIR += atp uhid ukbd ums udbp ufm SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += uether aue axe cdce cue kue rue udav uhso SUBDIR += usfs umass urio SUBDIR += quirk template -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" _urtw= urtw .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" _at91dci= at91dci _atmegadci= atmegadci .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" _urtw= urtw .endif .include Index: head/sys/modules/vx/Makefile =================================================================== --- head/sys/modules/vx/Makefile (revision 211689) +++ head/sys/modules/vx/Makefile (revision 211690) @@ -1,12 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/vx KMOD= if_vx SRCS= if_vx.c if_vx_pci.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= if_vx_eisa.c .endif SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h .include