summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--Makefile.inc138
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--bin/csh/Makefile.depend222
-rw-r--r--bin/expr/Makefile.depend2
-rw-r--r--bin/rmail/Makefile.depend2
-rw-r--r--bin/sh/Makefile.depend94
-rw-r--r--bin/sh/input.c3
-rw-r--r--bin/sh/tests/parser/Makefile1
-rw-r--r--bin/sh/tests/parser/set-v1.08
-rw-r--r--bin/sh/tests/parser/set-v1.0.stderr5
-rw-r--r--cddl/lib/libdtrace/Makefile.depend27
-rw-r--r--contrib/libarchive/libarchive/archive_read.c7
-rw-r--r--etc/defaults/rc.conf1
-rw-r--r--etc/rc.subr26
-rw-r--r--gnu/lib/csu/Makefile.depend30
-rw-r--r--gnu/lib/libgcc/Makefile4
-rw-r--r--gnu/lib/libgcc/Makefile.depend270
-rw-r--r--gnu/lib/libgcov/Makefile.depend112
-rw-r--r--gnu/lib/libgomp/Makefile.depend66
-rw-r--r--gnu/lib/libregex/Makefile.depend3
-rw-r--r--gnu/lib/libstdc++/Makefile.depend48
-rw-r--r--gnu/lib/libsupc++/Makefile.depend45
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.depend21
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.depend.amd6455
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.depend.host34
-rw-r--r--gnu/usr.bin/binutils/libbfd/Makefile.depend13
-rw-r--r--gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64121
-rw-r--r--gnu/usr.bin/binutils/libbfd/Makefile.depend.host108
-rw-r--r--gnu/usr.bin/binutils/libbinutils/Makefile.depend6
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile.depend4
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile.depend230
-rw-r--r--gnu/usr.bin/cc/libcpp/Makefile.depend2
-rw-r--r--gnu/usr.bin/diff3/Makefile.depend2
-rw-r--r--gnu/usr.bin/dtc/Makefile.depend8
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile.depend6
-rw-r--r--gnu/usr.bin/gdb/gdbtui/Makefile.depend6
-rw-r--r--gnu/usr.bin/gdb/kgdb/Makefile.depend (renamed from gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64)30
-rw-r--r--gnu/usr.bin/gdb/libgdb/Makefile.depend19
-rw-r--r--gnu/usr.bin/gdb/libgdb/Makefile.depend.amd641211
-rw-r--r--gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend2
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend4
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile.depend4
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile.depend2
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile.depend2
-rw-r--r--gnu/usr.bin/sdiff/Makefile.depend2
-rw-r--r--kerberos5/lib/libasn1/Makefile5
-rw-r--r--kerberos5/lib/libasn1/Makefile.depend173
-rw-r--r--kerberos5/lib/libgssapi_krb5/Makefile.depend163
-rw-r--r--kerberos5/lib/libgssapi_spnego/Makefile.depend100
-rw-r--r--kerberos5/lib/libhdb/Makefile5
-rw-r--r--kerberos5/lib/libhdb/Makefile.depend251
-rw-r--r--kerberos5/lib/libheimntlm/Makefile2
-rw-r--r--kerberos5/lib/libheimntlm/Makefile.depend7
-rw-r--r--kerberos5/lib/libhx509/Makefile5
-rw-r--r--kerberos5/lib/libhx509/Makefile.depend422
-rw-r--r--kerberos5/lib/libkadm5clnt/Makefile.depend61
-rw-r--r--kerberos5/lib/libkadm5srv/Makefile.depend85
-rw-r--r--kerberos5/lib/libkafs5/Makefile.depend1
-rw-r--r--kerberos5/lib/libkrb5/Makefile.depend1072
-rw-r--r--kerberos5/lib/libroken/Makefile.depend157
-rw-r--r--kerberos5/lib/libvers/Makefile.depend3
-rw-r--r--kerberos5/lib/libwind/Makefile.depend40
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile.depend5
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile.depend5
-rw-r--r--kerberos5/libexec/kdigest/Makefile.depend7
-rw-r--r--kerberos5/tools/asn1_compile/Makefile.depend35
-rw-r--r--kerberos5/tools/make-roken/Makefile.depend2
-rw-r--r--kerberos5/tools/slc/Makefile.depend9
-rw-r--r--kerberos5/usr.bin/hxtool/Makefile.depend7
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile.depend37
-rw-r--r--kerberos5/usr.bin/kcc/Makefile.depend13
-rw-r--r--kerberos5/usr.sbin/iprop-log/Makefile.depend10
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile.depend25
-rw-r--r--lib/clang/clang.build.mk4
-rw-r--r--lib/clang/libclanganalysis/Makefile.depend174
-rw-r--r--lib/clang/libclangarcmigrate/Makefile.depend270
-rw-r--r--lib/clang/libclangast/Makefile.depend608
-rw-r--r--lib/clang/libclangbasic/Makefile.depend52
-rw-r--r--lib/clang/libclangcodegen/Makefile.depend618
-rw-r--r--lib/clang/libclangdriver/Makefile.depend58
-rw-r--r--lib/clang/libclangedit/Makefile.depend10
-rw-r--r--lib/clang/libclangfrontend/Makefile.depend208
-rw-r--r--lib/clang/libclangfrontendtool/Makefile.depend12
-rw-r--r--lib/clang/libclanglex/Makefile.depend68
-rw-r--r--lib/clang/libclangparse/Makefile.depend238
-rw-r--r--lib/clang/libclangrewrite/Makefile.depend4
-rw-r--r--lib/clang/libclangrewritefrontend/Makefile.depend34
-rw-r--r--lib/clang/libclangsema/Makefile.depend706
-rw-r--r--lib/clang/libclangserialization/Makefile.depend116
-rw-r--r--lib/clang/libclangstaticanalyzercheckers/Makefile.depend766
-rw-r--r--lib/clang/libclangstaticanalyzercore/Makefile.depend326
-rw-r--r--lib/clang/libclangstaticanalyzerfrontend/Makefile.depend50
-rw-r--r--lib/clang/liblldbAPI/Makefile.depend148
-rw-r--r--lib/clang/liblldbBreakpoint/Makefile.depend26
-rw-r--r--lib/clang/liblldbCommands/Makefile.depend58
-rw-r--r--lib/clang/liblldbCore/Makefile.depend112
-rw-r--r--lib/clang/liblldbDataFormatters/Makefile.depend206
-rw-r--r--lib/clang/liblldbExpression/Makefile.depend158
-rw-r--r--lib/clang/liblldbInterpreter/Makefile.depend114
-rw-r--r--lib/clang/liblldbPluginABISysV_arm/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_arm64/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_i386/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_mips/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_mips64/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_ppc/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend8
-rw-r--r--lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend2
-rw-r--r--lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend2
-rw-r--r--lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend2
-rw-r--r--lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend2
-rw-r--r--lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend4
-rw-r--r--lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend14
-rw-r--r--lib/clang/liblldbPluginProcessUtility/Makefile.depend32
-rw-r--r--lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend182
-rw-r--r--lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend4
-rw-r--r--lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend2
-rw-r--r--lib/clang/liblldbSymbol/Makefile.depend104
-rw-r--r--lib/clang/liblldbTarget/Makefile.depend78
-rw-r--r--lib/clang/libllvmaarch64asmparser/Makefile.depend8
-rw-r--r--lib/clang/libllvmaarch64codegen/Makefile.depend190
-rw-r--r--lib/clang/libllvmaarch64desc/Makefile.depend32
-rw-r--r--lib/clang/libllvmaarch64disassembler/Makefile.depend14
-rw-r--r--lib/clang/libllvmaarch64utils/Makefile.depend6
-rw-r--r--lib/clang/libllvmanalysis/Makefile.depend48
-rw-r--r--lib/clang/libllvmarmasmparser/Makefile.depend8
-rw-r--r--lib/clang/libllvmarmcodegen/Makefile.depend194
-rw-r--r--lib/clang/libllvmarmdesc/Makefile.depend50
-rw-r--r--lib/clang/libllvmarmdisassembler/Makefile.depend8
-rw-r--r--lib/clang/libllvmarminfo/Makefile.depend6
-rw-r--r--lib/clang/libllvmasmprinter/Makefile.depend2
-rw-r--r--lib/clang/libllvmbitreader/Makefile.depend2
-rw-r--r--lib/clang/libllvmcodegen/Makefile.depend30
-rw-r--r--lib/clang/libllvmcore/Makefile.depend26
-rw-r--r--lib/clang/libllvminstcombine/Makefile.depend26
-rw-r--r--lib/clang/libllvminstrumentation/Makefile.depend16
-rw-r--r--lib/clang/libllvminterpreter/Makefile.depend6
-rw-r--r--lib/clang/libllvmipo/Makefile.depend20
-rw-r--r--lib/clang/libllvmlibdriver/Makefile.depend2
-rw-r--r--lib/clang/libllvmlto/Makefile.depend2
-rw-r--r--lib/clang/libllvmmipsasmparser/Makefile.depend8
-rw-r--r--lib/clang/libllvmmipscodegen/Makefile.depend248
-rw-r--r--lib/clang/libllvmmipsdesc/Makefile.depend56
-rw-r--r--lib/clang/libllvmmipsdisassembler/Makefile.depend8
-rw-r--r--lib/clang/libllvmmipsinfo/Makefile.depend6
-rw-r--r--lib/clang/libllvmobjcarcopts/Makefile.depend2
-rw-r--r--lib/clang/libllvmpasses/Makefile.depend2
-rw-r--r--lib/clang/libllvmpowerpcasmparser/Makefile.depend8
-rw-r--r--lib/clang/libllvmpowerpccodegen/Makefile.depend156
-rw-r--r--lib/clang/libllvmpowerpcdesc/Makefile.depend32
-rw-r--r--lib/clang/libllvmpowerpcdisassembler/Makefile.depend8
-rw-r--r--lib/clang/libllvmpowerpcinfo/Makefile.depend6
-rw-r--r--lib/clang/libllvmscalaropts/Makefile.depend76
-rw-r--r--lib/clang/libllvmselectiondag/Makefile.depend14
-rw-r--r--lib/clang/libllvmsparcasmparser/Makefile.depend8
-rw-r--r--lib/clang/libllvmsparccodegen/Makefile.depend66
-rw-r--r--lib/clang/libllvmsparcdesc/Makefile.depend26
-rw-r--r--lib/clang/libllvmsparcdisassembler/Makefile.depend8
-rw-r--r--lib/clang/libllvmsparcinfo/Makefile.depend6
-rw-r--r--lib/clang/libllvmtarget/Makefile.depend4
-rw-r--r--lib/clang/libllvmtransformutils/Makefile.depend30
-rw-r--r--lib/clang/libllvmvectorize/Makefile.depend6
-rw-r--r--lib/clang/libllvmx86asmparser/Makefile.depend14
-rw-r--r--lib/clang/libllvmx86codegen/Makefile.depend130
-rw-r--r--lib/clang/libllvmx86desc/Makefile.depend54
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile.depend8
-rw-r--r--lib/clang/libllvmx86info/Makefile.depend6
-rw-r--r--lib/libc++/Makefile.depend18
-rw-r--r--lib/libc/Makefile.depend153
-rw-r--r--lib/libc/db/btree/bt_split.c18
-rw-r--r--lib/libc/db/hash/hash.c6
-rw-r--r--lib/libc/db/recno/rec_put.c5
-rw-r--r--lib/libcxxrt/Makefile.depend.host1
-rw-r--r--lib/libdwarf/Makefile.depend33
-rw-r--r--lib/libedit/Makefile.depend45
-rw-r--r--lib/libelf/Makefile.depend9
-rw-r--r--lib/libfetch/Makefile.depend6
-rw-r--r--lib/libipsec/Makefile.depend9
-rw-r--r--lib/libmd/Makefile.depend24
-rw-r--r--lib/libmilter/Makefile.depend36
-rw-r--r--lib/libpcap/Makefile.depend15
-rw-r--r--lib/librpcsvc/Makefile.depend42
-rw-r--r--lib/libsm/Makefile.depend138
-rw-r--r--lib/libsmdb/Makefile.depend8
-rw-r--r--lib/libsmutil/Makefile.depend12
-rw-r--r--lib/libstand/Makefile.depend42
-rw-r--r--lib/libsysdecode/Makefile4
-rw-r--r--lib/libsysdecode/Makefile.depend3
-rw-r--r--lib/libsysdecode/errno.c209
-rw-r--r--lib/libsysdecode/sysdecode.31
-rw-r--r--lib/libsysdecode/sysdecode.h2
-rw-r--r--lib/libsysdecode/sysdecode_abi_to_freebsd_errno.394
-rw-r--r--lib/libsysdecode/sysdecode_syscallnames.35
-rw-r--r--lib/libunbound/Makefile.depend12
-rw-r--r--lib/libypclnt/Makefile.depend33
-rw-r--r--lib/ncurses/form/Makefile.depend117
-rw-r--r--lib/ncurses/formw/Makefile.depend117
-rw-r--r--lib/ncurses/menu/Makefile.depend78
-rw-r--r--lib/ncurses/menuw/Makefile.depend78
-rw-r--r--lib/ncurses/ncurses/Makefile.depend1779
-rw-r--r--lib/ncurses/ncursesw/Makefile.depend2511
-rw-r--r--lib/ncurses/panel/Makefile.depend45
-rw-r--r--lib/ncurses/panelw/Makefile.depend45
-rw-r--r--libexec/dma/dmagent/Makefile.depend8
-rw-r--r--libexec/ftpd/Makefile.depend2
-rw-r--r--libexec/mail.local/Makefile.depend2
-rw-r--r--libexec/smrsh/Makefile.depend2
-rw-r--r--libexec/ypxfr/Makefile.depend8
-rw-r--r--sbin/atm/atmconfig/Makefile.depend2
-rw-r--r--sbin/devd/Makefile.depend6
-rw-r--r--sbin/gbde/Makefile.depend2
-rw-r--r--sbin/hastctl/Makefile.depend6
-rw-r--r--sbin/hastd/Makefile.depend6
-rw-r--r--sbin/ipf/ipf/Makefile.depend10
-rw-r--r--sbin/ipf/ipftest/Makefile.depend36
-rw-r--r--sbin/ipf/ipmon/Makefile.depend10
-rw-r--r--sbin/ipf/ipnat/Makefile.depend10
-rw-r--r--sbin/ipf/ippool/Makefile.depend10
-rw-r--r--sbin/ipfw/ipfw2.c2
-rw-r--r--sbin/pfctl/Makefile.depend2
-rw-r--r--sbin/route/Makefile.depend2
-rw-r--r--sbin/setkey/Makefile.depend6
-rw-r--r--secure/lib/libcrypto/Makefile.depend3
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--share/man/man4/geom.41
-rw-r--r--share/man/man4/geom_map.42
-rw-r--r--share/man/man4/geom_uncompress.4118
-rw-r--r--share/man/man4/geom_uzip.490
-rw-r--r--share/man/man5/make.conf.512
-rw-r--r--share/man/man5/src.conf.538
-rw-r--r--share/man/man8/rc.subr.812
-rw-r--r--share/man/man9/vrele.910
-rw-r--r--share/mk/bsd.dep.mk78
-rw-r--r--share/mk/bsd.lib.mk25
-rw-r--r--share/mk/bsd.opts.mk9
-rw-r--r--share/mk/bsd.prog.mk11
-rw-r--r--share/mk/bsd.progs.mk17
-rw-r--r--share/mk/bsd.subdir.mk6
-rw-r--r--share/mk/local.meta.sys.mk1
-rw-r--r--sys/amd64/amd64/support.S1
-rw-r--r--sys/arm/arm/cpu_asm-v6.S11
-rw-r--r--sys/arm/freescale/imx/imx6_machdep.c72
-rw-r--r--sys/arm/include/cpu-v6.h3
-rw-r--r--sys/arm64/cavium/thunder_pcie.c425
-rw-r--r--sys/arm64/cavium/thunder_pcie_common.c39
-rw-r--r--sys/arm64/cavium/thunder_pcie_common.h30
-rw-r--r--sys/arm64/cavium/thunder_pcie_fdt.c301
-rw-r--r--sys/arm64/cavium/thunder_pcie_pem.c10
-rw-r--r--sys/arm64/cavium/thunder_pcie_pem.h2
-rw-r--r--sys/arm64/cavium/thunder_pcie_pem_fdt.c7
-rw-r--r--sys/boot/efi/loader/Makefile.depend2
-rw-r--r--sys/boot/fdt/dts/riscv/qemu.dts2
-rw-r--r--sys/boot/fdt/dts/riscv/spike.dts19
-rw-r--r--sys/boot/ficl/Makefile.depend2
-rw-r--r--sys/boot/ficl32/Makefile.depend2
-rw-r--r--sys/boot/forth/loader.conf1
-rw-r--r--sys/boot/i386/loader/Makefile.depend2
-rw-r--r--sys/boot/i386/zfsloader/Makefile.depend2
-rw-r--r--sys/boot/libstand32/Makefile.depend42
-rw-r--r--sys/boot/userboot/ficl/Makefile.depend2
-rw-r--r--sys/boot/userboot/libstand/Makefile.depend42
-rw-r--r--sys/boot/userboot/userboot/Makefile.depend2
-rw-r--r--sys/compat/cloudabi/cloudabi_mem.c36
-rw-r--r--sys/compat/cloudabi/cloudabi_sock.c2
-rw-r--r--sys/conf/NOTES1
-rw-r--r--sys/conf/files16
-rw-r--r--sys/conf/files.amd643
-rw-r--r--sys/conf/files.arm641
-rw-r--r--sys/conf/files.i3863
-rw-r--r--sys/conf/files.riscv6
-rw-r--r--sys/conf/kern.opts.mk6
-rw-r--r--sys/conf/kern.post.mk51
-rw-r--r--sys/conf/kmod.mk10
-rw-r--r--sys/conf/options3
-rw-r--r--sys/dev/acpica/acpi_ec.c4
-rw-r--r--sys/dev/acpica/acpi_video.c19
-rw-r--r--sys/dev/e1000/if_em.c4
-rw-r--r--sys/dev/e1000/if_em.h2
-rw-r--r--sys/dev/e1000/if_igb.c6
-rw-r--r--sys/dev/e1000/if_igb.h2
-rw-r--r--sys/dev/e1000/if_lem.h4
-rw-r--r--sys/dev/hyperv/include/hyperv.h35
-rw-r--r--sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c116
-rw-r--r--sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c4
-rw-r--r--sys/dev/hyperv/utilities/hv_heartbeat.c129
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.c531
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.h13
-rw-r--r--sys/dev/hyperv/utilities/hv_shutdown.c151
-rw-r--r--sys/dev/hyperv/utilities/hv_timesync.c216
-rw-r--r--sys/dev/hyperv/utilities/hv_util.c401
-rw-r--r--sys/dev/hyperv/utilities/hv_util.h55
-rw-r--r--sys/dev/hyperv/vmbus/hv_connection.c7
-rw-r--r--sys/dev/ixl/if_ixl.c103
-rw-r--r--sys/dev/ixl/ixl_txrx.c1
-rw-r--r--sys/dev/nvme/nvme_ctrlr.c2
-rw-r--r--sys/dev/pci/pci_host_generic.c270
-rw-r--r--sys/dev/pci/pci_host_generic.h71
-rw-r--r--sys/dev/uart/uart_cpu_fdt.c17
-rw-r--r--sys/dev/uart/uart_dev_lpc.c7
-rw-r--r--sys/dev/usb/controller/xhci.c13
-rw-r--r--sys/dev/usb/controller/xhci.h1
-rw-r--r--sys/dev/usb/usb_hid.c3
-rw-r--r--sys/dev/usb/usbdevs1
-rw-r--r--sys/dev/usb/wlan/if_urtwn.c1
-rw-r--r--sys/geom/uncompress/g_uncompress.c684
-rw-r--r--sys/geom/uzip/g_uzip.c527
-rw-r--r--sys/geom/uzip/g_uzip.h37
-rw-r--r--sys/geom/uzip/g_uzip_cloop.h55
-rw-r--r--sys/geom/uzip/g_uzip_dapi.h41
-rw-r--r--sys/geom/uzip/g_uzip_lzma.c111
-rw-r--r--sys/geom/uzip/g_uzip_lzma.h32
-rw-r--r--sys/geom/uzip/g_uzip_softc.h56
-rw-r--r--sys/geom/uzip/g_uzip_wrkthr.c71
-rw-r--r--sys/geom/uzip/g_uzip_wrkthr.h (renamed from usr.bin/truss/cloudabi.h)6
-rw-r--r--sys/geom/uzip/g_uzip_zlib.c137
-rw-r--r--sys/geom/uzip/g_uzip_zlib.h33
-rw-r--r--sys/kern/kern_mib.c2
-rw-r--r--sys/kern/uipc_usrreq.c2
-rw-r--r--sys/kern/vfs_cache.c2
-rw-r--r--sys/kern/vfs_subr.c27
-rw-r--r--sys/mips/conf/ALFA_HORNET_UB6
-rw-r--r--sys/mips/conf/AP1216
-rw-r--r--sys/mips/conf/AP1356
-rw-r--r--sys/mips/conf/AP1436
-rw-r--r--sys/mips/conf/AP916
-rw-r--r--sys/mips/conf/AP936
-rw-r--r--sys/mips/conf/AP966
-rw-r--r--sys/mips/conf/CARAMBOLA26
-rw-r--r--sys/mips/conf/DB1206
-rw-r--r--sys/mips/conf/DIR-655A16
-rw-r--r--sys/mips/conf/DIR-825B16
-rw-r--r--sys/mips/conf/DIR-825C16
-rw-r--r--sys/mips/conf/ENH2006
-rw-r--r--sys/mips/conf/MT76204
-rw-r--r--sys/mips/conf/ONIONOMEGA6
-rw-r--r--sys/mips/conf/PB476
-rw-r--r--sys/mips/conf/PB926
-rw-r--r--sys/mips/conf/PICOSTATION_M2HP6
-rw-r--r--sys/mips/conf/ROUTERSTATION6
-rw-r--r--sys/mips/conf/RSPRO6
-rw-r--r--sys/mips/conf/RT305X2
-rw-r--r--sys/mips/conf/RT53506
-rw-r--r--sys/mips/conf/TL-ARCHERC7V26
-rw-r--r--sys/mips/conf/TL-WDR43006
-rw-r--r--sys/mips/conf/TL-WR1043NDv26
-rw-r--r--sys/mips/conf/TL-WR740Nv46
-rw-r--r--sys/mips/conf/TP-WN1043ND6
-rw-r--r--sys/mips/conf/WZR-300HP4
-rw-r--r--sys/mips/conf/WZR-HPAG300H4
-rw-r--r--sys/modules/filemon/Makefile.depend2
-rw-r--r--sys/modules/geom/Makefile1
-rw-r--r--sys/modules/geom/geom_uncompress/Makefile17
-rw-r--r--sys/modules/geom/geom_uzip/Makefile15
-rw-r--r--sys/modules/hyperv/utilities/Makefile2
-rw-r--r--sys/net80211/ieee80211_node.c1
-rw-r--r--sys/netinet/tcp_stacks/fastpath.c2
-rw-r--r--sys/netinet/tcp_subr.c17
-rw-r--r--sys/netinet6/sctp6_usrreq.c2
-rw-r--r--sys/netipsec/key.c3
-rw-r--r--sys/netpfil/ipfw/ip_fw2.c2
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.c3
-rw-r--r--sys/riscv/conf/GENERIC8
-rw-r--r--sys/riscv/htif/htif.c8
-rw-r--r--sys/riscv/htif/htif_block.c8
-rw-r--r--sys/riscv/htif/htif_console.c10
-rw-r--r--sys/riscv/include/intr.h14
-rw-r--r--sys/riscv/include/param.h2
-rw-r--r--sys/riscv/include/pcpu.h14
-rw-r--r--sys/riscv/include/riscvreg.h25
-rw-r--r--sys/riscv/include/smp.h56
-rw-r--r--sys/riscv/riscv/cpufunc_asm.S13
-rw-r--r--sys/riscv/riscv/exception.S179
-rw-r--r--sys/riscv/riscv/genassym.c3
-rw-r--r--sys/riscv/riscv/intr_machdep.c90
-rw-r--r--sys/riscv/riscv/locore.S206
-rw-r--r--sys/riscv/riscv/machdep.c23
-rw-r--r--sys/riscv/riscv/mp_machdep.c453
-rw-r--r--sys/riscv/riscv/pmap.c6
-rw-r--r--sys/riscv/riscv/swtch.S12
-rw-r--r--sys/sys/vnode.h2
-rw-r--r--sys/ufs/ffs/ffs_inode.c77
-rw-r--r--sys/x86/isa/clock.c2
-rw-r--r--targets/Makefile.xtras4
-rw-r--r--targets/pseudo/hosttools/Makefile.depend11
-rw-r--r--targets/pseudo/kernel/Makefile1
-rw-r--r--targets/pseudo/userland/Makefile.depend1
-rw-r--r--tools/tools/ath/ath_ee_9300_print/Makefile.depend2
-rw-r--r--tools/tools/net80211/w00t/Makefile.inc5
-rw-r--r--usr.bin/Makefile1
-rw-r--r--usr.bin/ar/Makefile.depend6
-rw-r--r--usr.bin/awk/Makefile.depend20
-rw-r--r--usr.bin/bc/Makefile.depend6
-rw-r--r--usr.bin/clang/bugpoint/Makefile.depend2
-rw-r--r--usr.bin/clang/clang/Makefile.depend22
-rw-r--r--usr.bin/clang/llc/Makefile.depend2
-rw-r--r--usr.bin/clang/llvm-dis/Makefile.depend2
-rw-r--r--usr.bin/clang/llvm-lto/Makefile.depend2
-rw-r--r--usr.bin/clang/opt/Makefile.depend8
-rw-r--r--usr.bin/colldef/Makefile.depend6
-rw-r--r--usr.bin/compile_et/Makefile.depend8
-rw-r--r--usr.bin/find/Makefile.depend2
-rw-r--r--usr.bin/getconf/Makefile.depend10
-rw-r--r--usr.bin/iscsictl/Makefile.depend6
-rw-r--r--usr.bin/kdump/Makefile.depend6
-rw-r--r--usr.bin/kdump/kdump.c71
-rw-r--r--usr.bin/lex/Makefile.depend10
-rw-r--r--usr.bin/localedef/Makefile.depend20
-rw-r--r--usr.bin/m4/Makefile.depend6
-rw-r--r--usr.bin/mkcsmapper/Makefile.depend6
-rw-r--r--usr.bin/mkcsmapper_static/Makefile4
-rw-r--r--usr.bin/mkcsmapper_static/Makefile.depend9
-rw-r--r--usr.bin/mkesdb/Makefile.depend6
-rw-r--r--usr.bin/mkesdb_static/Makefile4
-rw-r--r--usr.bin/mkesdb_static/Makefile.depend (renamed from usr.bin/mkulzma/Makefile.depend)4
-rw-r--r--usr.bin/mklocale/Makefile.depend6
-rw-r--r--usr.bin/mkulzma/Makefile8
-rw-r--r--usr.bin/mkulzma/mkulzma.8107
-rw-r--r--usr.bin/mkulzma/mkulzma.c330
-rw-r--r--usr.bin/mkuzip/Makefile3
-rw-r--r--usr.bin/mkuzip/Makefile.depend3
-rw-r--r--usr.bin/mkuzip/mkuz_blockcache.c97
-rw-r--r--usr.bin/mkuzip/mkuz_blockcache.h36
-rw-r--r--usr.bin/mkuzip/mkuz_cloop.h50
-rw-r--r--usr.bin/mkuzip/mkuz_lzma.c110
-rw-r--r--usr.bin/mkuzip/mkuz_lzma.h42
-rw-r--r--usr.bin/mkuzip/mkuz_zlib.c81
-rw-r--r--usr.bin/mkuzip/mkuz_zlib.h36
-rw-r--r--usr.bin/mkuzip/mkuzip.882
-rw-r--r--usr.bin/mkuzip/mkuzip.c221
-rw-r--r--usr.bin/mkuzip/mkuzip.h29
-rw-r--r--usr.bin/netstat/Makefile.depend10
-rw-r--r--usr.bin/top/Makefile.depend8
-rw-r--r--usr.bin/truss/Makefile2
-rw-r--r--usr.bin/truss/aarch64-cloudabi64.c4
-rw-r--r--usr.bin/truss/amd64-cloudabi64.c4
-rw-r--r--usr.bin/truss/amd64-linux32.c27
-rw-r--r--usr.bin/truss/cloudabi.c122
-rw-r--r--usr.bin/truss/extern.h1
-rw-r--r--usr.bin/truss/i386-linux.c27
-rw-r--r--usr.bin/truss/main.c5
-rw-r--r--usr.bin/truss/setup.c90
-rw-r--r--usr.bin/truss/syscalls.c31
-rw-r--r--usr.bin/truss/truss.112
-rw-r--r--usr.bin/truss/truss.h1
-rw-r--r--usr.bin/vacation/Makefile.depend2
-rw-r--r--usr.bin/xlint/lint1/Makefile.depend10
-rw-r--r--usr.sbin/acpi/iasl/Makefile.depend88
-rw-r--r--usr.sbin/amd/amd/Makefile.depend8
-rw-r--r--usr.sbin/amd/fsinfo/Makefile.depend8
-rw-r--r--usr.sbin/amd/libamu/Makefile.depend4
-rw-r--r--usr.sbin/apmd/Makefile.depend6
-rw-r--r--usr.sbin/auditdistd/Makefile.depend6
-rw-r--r--usr.sbin/autofs/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile.depend6
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile.depend6
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile.depend6
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile.depend12
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile.depend10
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend28
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend12
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend20
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend14
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend56
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend50
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend10
-rw-r--r--usr.sbin/config/Makefile.depend16
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile.depend2
-rw-r--r--usr.sbin/ctld/Makefile.depend6
-rw-r--r--usr.sbin/editmap/Makefile.depend2
-rw-r--r--usr.sbin/fifolog/lib/Makefile.depend2
-rw-r--r--usr.sbin/gssd/Makefile.depend12
-rw-r--r--usr.sbin/jail/Makefile.depend6
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/keyserv/Makefile.depend6
-rw-r--r--usr.sbin/mailstats/Makefile.depend2
-rw-r--r--usr.sbin/makemap/Makefile.depend2
-rw-r--r--usr.sbin/ndiscvt/Makefile.depend6
-rw-r--r--usr.sbin/ntp/libntp/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntpd/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend2
-rw-r--r--usr.sbin/praliases/Makefile.depend2
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c8
-rw-r--r--usr.sbin/rpc.lockd/Makefile.depend2
-rw-r--r--usr.sbin/rpc.statd/Makefile.depend10
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile.depend24
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile.depend8
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile.depend8
-rw-r--r--usr.sbin/rrenumd/Makefile.depend6
-rw-r--r--usr.sbin/sendmail/Makefile.depend80
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile.depend2
-rw-r--r--usr.sbin/traceroute/Makefile.depend2
-rw-r--r--usr.sbin/yppush/Makefile.depend8
-rw-r--r--usr.sbin/ypserv/Makefile.depend12
504 files changed, 5290 insertions, 23117 deletions
diff --git a/Makefile b/Makefile
index 09d1c9b..0be017d 100644
--- a/Makefile
+++ b/Makefile
@@ -297,11 +297,9 @@ kernel: buildkernel installkernel
# Perform a few tests to determine if the installed tools are adequate
# for building the world.
#
-# Note: if we ever need to care about the version of bmake, simply testing
-# MAKE_VERSION against a required version should suffice.
-#
upgrade_checks:
-.if ${HAVE_MAKE} != ${WANT_MAKE}
+.if ${HAVE_MAKE} != ${WANT_MAKE} || \
+ (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
@(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
.endif
diff --git a/Makefile.inc1 b/Makefile.inc1
index d34d940..a2d3306 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -145,6 +145,16 @@ CLEANDIR= clean cleandepend
CLEANDIR= cleandir
.endif
+# FAST_DEPEND can skip depend tree-walks.
+.if ${MK_FAST_DEPEND} == "yes"
+NO_DEPEND= t
+NO_KERNELDEPEND=t
+.endif
+# Ensure shell checks later have a value.
+.if defined(NO_DEPEND)
+NO_DEPEND= t
+.endif
+
LOCAL_TOOL_DIRS?=
PACKAGEDIR?= ${DESTDIR}/${DISTDIR}
@@ -772,7 +782,11 @@ WMAKE_TGTS+= _worldtmp _legacy
WMAKE_TGTS+= _bootstrap-tools
.endif
WMAKE_TGTS+= _cleanobj _obj _build-tools _cross-tools
-WMAKE_TGTS+= _includes _libraries _depend everything
+WMAKE_TGTS+= _includes _libraries
+.if !defined(NO_DEPEND)
+WMAKE_TGTS+= _depend
+.endif
+WMAKE_TGTS+= everything
.if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE)
WMAKE_TGTS+= build32
.endif
@@ -1403,7 +1417,7 @@ legacy:
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
${MAKE} DIRPRFX=${_tool}/ all; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
.endfor
@@ -1551,7 +1565,7 @@ ${_bt}-${_tool}: .PHONY .MAKE
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
${MAKE} DIRPRFX=${_tool}/ all; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
@@ -1600,7 +1614,7 @@ build-tools_${_tool}: .PHONY
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
${MAKE} DIRPRFX=${_tool}/ all
build-tools: build-tools_${_tool}
.endfor
@@ -1684,7 +1698,7 @@ cross-tools: .MAKE .PHONY
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
- ${MAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} DIRPRFX=${_tool}/ depend; fi; \
${MAKE} DIRPRFX=${_tool}/ all; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
.endfor
@@ -1716,7 +1730,7 @@ native-xtools: .PHONY
${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_gperf}; \
${NXBMAKE} DIRPRFX=${_gperf}/ obj; \
- ${NXBMAKE} DIRPRFX=${_gperf}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_gperf}/ depend; fi; \
${NXBMAKE} DIRPRFX=${_gperf}/ all; \
${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install
.endif
@@ -1791,7 +1805,7 @@ native-xtools: .PHONY
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${NXBMAKE} DIRPRFX=${_tool}/ obj; \
- ${NXBMAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${NXBMAKE} DIRPRFX=${_tool}/ depend; fi; \
${NXBMAKE} DIRPRFX=${_tool}/ all; \
${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install
.endfor
@@ -2021,7 +2035,7 @@ ${_lib}__PL: .PHONY .MAKE
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib}; \
${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
- ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \
${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
DIRPRFX=${_lib}/ all; \
${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
@@ -2035,7 +2049,7 @@ ${_lib}__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_lib}; \
${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj; \
- ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend; fi; \
${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all; \
${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
.endif
@@ -2048,7 +2062,7 @@ lib/libpam__L: .PHONY .MAKE
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
cd ${.CURDIR}/lib/libpam; \
${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj; \
- ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend; fi; \
${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
-D_NO_LIBPAM_SO_YET all; \
${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
@@ -2346,7 +2360,7 @@ _xb-bootstrap-tools: .PHONY
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${CDMAKE} DIRPRFX=${_tool}/ obj; \
- ${CDMAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \
${CDMAKE} DIRPRFX=${_tool}/ all; \
${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
.endfor
@@ -2366,7 +2380,7 @@ _xb-cross-tools: .PHONY
${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
${CDMAKE} DIRPRFX=${_tool}/ obj; \
- ${CDMAKE} DIRPRFX=${_tool}/ depend; \
+ if [ -z "${NO_DEPEND}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ depend; fi; \
${CDMAKE} DIRPRFX=${_tool}/ all
.endfor
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index c04300d..b11557e 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -121,6 +121,8 @@ OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_
OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.7.1/lib
OLD_DIRS+=usr/lib/clang/3.7.1
+# 20160223: functionality from mkulzma(1) merged into mkuzip(1)
+OLD_FILES+=usr/bin/mkulzma
# 20160211: Remove obsolete unbound-control-setup
OLD_FILES+=usr/sbin/unbound-control-setup
# 20160116: Update mandoc to cvs snapshot 20160116
diff --git a/bin/csh/Makefile.depend b/bin/csh/Makefile.depend
index ab84f40..c7bb5b0 100644
--- a/bin/csh/Makefile.depend
+++ b/bin/csh/Makefile.depend
@@ -18,226 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ed.chared.o: ed.defns.h
-ed.chared.o: sh.err.h
-ed.chared.o: tc.const.h
-ed.chared.po: ed.defns.h
-ed.chared.po: sh.err.h
-ed.chared.po: tc.const.h
-ed.defns.o: sh.err.h
-ed.defns.o: tc.const.h
-ed.defns.po: sh.err.h
-ed.defns.po: tc.const.h
-ed.init.o: ed.defns.h
-ed.init.o: sh.err.h
-ed.init.o: tc.const.h
-ed.init.po: ed.defns.h
-ed.init.po: sh.err.h
-ed.init.po: tc.const.h
-ed.inputl.o: ed.defns.h
-ed.inputl.o: sh.err.h
-ed.inputl.o: tc.const.h
-ed.inputl.po: ed.defns.h
-ed.inputl.po: sh.err.h
-ed.inputl.po: tc.const.h
-ed.refresh.o: sh.err.h
-ed.refresh.o: tc.const.h
-ed.refresh.po: sh.err.h
-ed.refresh.po: tc.const.h
-ed.screen.o: ed.defns.h
-ed.screen.o: sh.err.h
-ed.screen.o: tc.const.h
-ed.screen.po: ed.defns.h
-ed.screen.po: sh.err.h
-ed.screen.po: tc.const.h
-ed.term.o: sh.err.h
-ed.term.o: tc.const.h
-ed.term.po: sh.err.h
-ed.term.po: tc.const.h
-ed.xmap.o: ed.defns.h
-ed.xmap.o: sh.err.h
-ed.xmap.o: tc.const.h
-ed.xmap.po: ed.defns.h
-ed.xmap.po: sh.err.h
-ed.xmap.po: tc.const.h
-glob.o: sh.err.h
-glob.o: tc.const.h
-glob.po: sh.err.h
-glob.po: tc.const.h
-mi.termios.o: sh.err.h
-mi.termios.o: tc.const.h
-mi.termios.po: sh.err.h
-mi.termios.po: tc.const.h
-sh.char.o: sh.err.h
-sh.char.o: tc.const.h
-sh.char.po: sh.err.h
-sh.char.po: tc.const.h
-sh.dir.o: sh.err.h
-sh.dir.o: tc.const.h
-sh.dir.po: sh.err.h
-sh.dir.po: tc.const.h
-sh.dol.o: sh.err.h
-sh.dol.o: tc.const.h
-sh.dol.po: sh.err.h
-sh.dol.po: tc.const.h
-sh.err.o: sh.err.h
-sh.err.o: tc.const.h
-sh.err.po: sh.err.h
-sh.err.po: tc.const.h
-sh.exec.o: sh.err.h
-sh.exec.o: tc.const.h
-sh.exec.po: sh.err.h
-sh.exec.po: tc.const.h
-sh.exp.o: sh.err.h
-sh.exp.o: tc.const.h
-sh.exp.po: sh.err.h
-sh.exp.po: tc.const.h
-sh.file.o: sh.err.h
-sh.file.o: tc.const.h
-sh.file.po: sh.err.h
-sh.file.po: tc.const.h
-sh.func.o: sh.err.h
-sh.func.o: tc.const.h
-sh.func.po: sh.err.h
-sh.func.po: tc.const.h
-sh.glob.o: sh.err.h
-sh.glob.o: tc.const.h
-sh.glob.po: sh.err.h
-sh.glob.po: tc.const.h
-sh.hist.o: sh.err.h
-sh.hist.o: tc.const.h
-sh.hist.po: sh.err.h
-sh.hist.po: tc.const.h
-sh.init.o: sh.err.h
-sh.init.o: tc.const.h
-sh.init.po: sh.err.h
-sh.init.po: tc.const.h
-sh.lex.o: sh.err.h
-sh.lex.o: tc.const.h
-sh.lex.po: sh.err.h
-sh.lex.po: tc.const.h
-sh.misc.o: sh.err.h
-sh.misc.o: tc.const.h
-sh.misc.po: sh.err.h
-sh.misc.po: tc.const.h
-sh.o: sh.err.h
-sh.o: tc.const.h
-sh.parse.o: sh.err.h
-sh.parse.o: tc.const.h
-sh.parse.po: sh.err.h
-sh.parse.po: tc.const.h
-sh.po: sh.err.h
-sh.po: tc.const.h
-sh.print.o: sh.err.h
-sh.print.o: tc.const.h
-sh.print.po: sh.err.h
-sh.print.po: tc.const.h
-sh.proc.o: sh.err.h
-sh.proc.o: tc.const.h
-sh.proc.po: sh.err.h
-sh.proc.po: tc.const.h
-sh.sem.o: sh.err.h
-sh.sem.o: tc.const.h
-sh.sem.po: sh.err.h
-sh.sem.po: tc.const.h
-sh.set.o: sh.err.h
-sh.set.o: tc.const.h
-sh.set.po: sh.err.h
-sh.set.po: tc.const.h
-sh.time.o: sh.err.h
-sh.time.o: tc.const.h
-sh.time.po: sh.err.h
-sh.time.po: tc.const.h
-tc.alloc.o: sh.err.h
-tc.alloc.o: tc.const.h
-tc.alloc.po: sh.err.h
-tc.alloc.po: tc.const.h
-tc.bind.o: ed.defns.h
-tc.bind.o: sh.err.h
-tc.bind.o: tc.const.h
-tc.bind.po: ed.defns.h
-tc.bind.po: sh.err.h
-tc.bind.po: tc.const.h
-tc.const.o: sh.err.h
-tc.const.o: tc.const.h
-tc.const.po: sh.err.h
-tc.const.po: tc.const.h
-tc.defs.o: sh.err.h
-tc.defs.o: tc.const.h
-tc.defs.o: tc.defs.c
-tc.defs.po: sh.err.h
-tc.defs.po: tc.const.h
-tc.defs.po: tc.defs.c
-tc.disc.o: sh.err.h
-tc.disc.o: tc.const.h
-tc.disc.po: sh.err.h
-tc.disc.po: tc.const.h
-tc.func.o: ed.defns.h
-tc.func.o: sh.err.h
-tc.func.o: tc.const.h
-tc.func.po: ed.defns.h
-tc.func.po: sh.err.h
-tc.func.po: tc.const.h
-tc.nls.o: sh.err.h
-tc.nls.o: tc.const.h
-tc.nls.po: sh.err.h
-tc.nls.po: tc.const.h
-tc.os.o: ed.defns.h
-tc.os.o: sh.err.h
-tc.os.o: tc.const.h
-tc.os.po: ed.defns.h
-tc.os.po: sh.err.h
-tc.os.po: tc.const.h
-tc.printf.o: sh.err.h
-tc.printf.o: tc.const.h
-tc.printf.po: sh.err.h
-tc.printf.po: tc.const.h
-tc.prompt.o: sh.err.h
-tc.prompt.o: tc.const.h
-tc.prompt.po: sh.err.h
-tc.prompt.po: tc.const.h
-tc.sched.o: sh.err.h
-tc.sched.o: tc.const.h
-tc.sched.po: sh.err.h
-tc.sched.po: tc.const.h
-tc.sig.o: sh.err.h
-tc.sig.o: tc.const.h
-tc.sig.po: sh.err.h
-tc.sig.po: tc.const.h
-tc.str.o: sh.err.h
-tc.str.o: tc.const.h
-tc.str.po: sh.err.h
-tc.str.po: tc.const.h
-tc.vers.o: sh.err.h
-tc.vers.o: tc.const.h
-tc.vers.po: sh.err.h
-tc.vers.po: tc.const.h
-tc.who.o: sh.err.h
-tc.who.o: tc.const.h
-tc.who.po: sh.err.h
-tc.who.po: tc.const.h
-tw.color.o: sh.err.h
-tw.color.o: tc.const.h
-tw.color.po: sh.err.h
-tw.color.po: tc.const.h
-tw.comp.o: sh.err.h
-tw.comp.o: tc.const.h
-tw.comp.po: sh.err.h
-tw.comp.po: tc.const.h
-tw.help.o: sh.err.h
-tw.help.o: tc.const.h
-tw.help.po: sh.err.h
-tw.help.po: tc.const.h
-tw.init.o: sh.err.h
-tw.init.o: tc.const.h
-tw.init.po: sh.err.h
-tw.init.po: tc.const.h
-tw.parse.o: sh.err.h
-tw.parse.o: tc.const.h
-tw.parse.po: sh.err.h
-tw.parse.po: tc.const.h
-tw.spell.o: sh.err.h
-tw.spell.o: tc.const.h
-tw.spell.po: sh.err.h
-tw.spell.po: tc.const.h
.endif
diff --git a/bin/expr/Makefile.depend b/bin/expr/Makefile.depend
index 9d55364..ca0b2f9 100644
--- a/bin/expr/Makefile.depend
+++ b/bin/expr/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-expr.o: expr.c
-expr.po: expr.c
.endif
diff --git a/bin/rmail/Makefile.depend b/bin/rmail/Makefile.depend
index de5f45e..0cb1420 100644
--- a/bin/rmail/Makefile.depend
+++ b/bin/rmail/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-rmail.o: sm_os.h
-rmail.po: sm_os.h
.endif
diff --git a/bin/sh/Makefile.depend b/bin/sh/Makefile.depend
index 9eb4fba..3d92039 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -17,98 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-alias.o: builtins.h
-alias.po: builtins.h
-arith_yylex.o: syntax.h
-arith_yylex.po: syntax.h
-builtins.o: builtins.c
-builtins.o: builtins.h
-builtins.po: builtins.c
-builtins.po: builtins.h
-cd.o: builtins.h
-cd.o: nodes.h
-cd.po: builtins.h
-cd.po: nodes.h
-echo.o: builtins.h
-echo.po: builtins.h
-error.o: nodes.h
-error.po: nodes.h
-eval.o: builtins.h
-eval.o: nodes.h
-eval.o: syntax.h
-eval.po: builtins.h
-eval.po: nodes.h
-eval.po: syntax.h
-exec.o: builtins.h
-exec.o: nodes.h
-exec.o: syntax.h
-exec.po: builtins.h
-exec.po: nodes.h
-exec.po: syntax.h
-expand.o: builtins.h
-expand.o: nodes.h
-expand.o: syntax.h
-expand.po: builtins.h
-expand.po: nodes.h
-expand.po: syntax.h
-histedit.o: builtins.h
-histedit.po: builtins.h
-input.o: syntax.h
-input.po: syntax.h
-jobs.o: builtins.h
-jobs.o: nodes.h
-jobs.o: syntax.h
-jobs.po: builtins.h
-jobs.po: nodes.h
-jobs.po: syntax.h
-kill.o: builtins.h
-kill.po: builtins.h
-main.o: builtins.h
-main.o: nodes.h
-main.po: builtins.h
-main.po: nodes.h
-miscbltin.o: syntax.h
-miscbltin.po: syntax.h
-mystring.o: syntax.h
-mystring.po: syntax.h
-nodes.o: nodes.c
-nodes.o: nodes.h
-nodes.po: nodes.c
-nodes.po: nodes.h
-options.o: builtins.h
-options.o: nodes.h
-options.po: builtins.h
-options.po: nodes.h
-output.o: syntax.h
-output.po: syntax.h
-parser.o: nodes.h
-parser.o: syntax.h
-parser.o: token.h
-parser.po: nodes.h
-parser.po: syntax.h
-parser.po: token.h
-printf.o: builtins.h
-printf.po: builtins.h
-redir.o: nodes.h
-redir.po: nodes.h
-show.o: nodes.h
-show.po: nodes.h
-syntax.o: syntax.c
-syntax.o: syntax.h
-syntax.po: syntax.c
-syntax.po: syntax.h
-test.o: builtins.h
-test.po: builtins.h
-trap.o: builtins.h
-trap.o: nodes.h
-trap.o: syntax.h
-trap.po: builtins.h
-trap.po: nodes.h
-trap.po: syntax.h
-var.o: builtins.h
-var.o: nodes.h
-var.o: syntax.h
-var.po: builtins.h
-var.po: nodes.h
-var.po: syntax.h
.endif
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 27b835a..3292f99 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -242,7 +242,8 @@ again:
parsenleft = parselleft;
parselleft = 0;
} else /* *q == '\n' */ {
- parsenleft = q - parsenextc + 1;
+ q++;
+ parsenleft = q - parsenextc;
parselleft -= parsenleft;
}
parsenleft--;
diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
index eb1e6f5..dd126ee 100644
--- a/bin/sh/tests/parser/Makefile
+++ b/bin/sh/tests/parser/Makefile
@@ -79,6 +79,7 @@ FILES+= only-redir2.0
FILES+= only-redir3.0
FILES+= only-redir4.0
FILES+= pipe-not1.0
+FILES+= set-v1.0 set-v1.0.stderr
FILES+= var-assign1.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/parser/set-v1.0 b/bin/sh/tests/parser/set-v1.0
new file mode 100644
index 0000000..687cb83
--- /dev/null
+++ b/bin/sh/tests/parser/set-v1.0
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+${SH} <<\EOF
+echo one >&2
+set -v
+echo two >&2
+echo three >&2
+EOF
diff --git a/bin/sh/tests/parser/set-v1.0.stderr b/bin/sh/tests/parser/set-v1.0.stderr
new file mode 100644
index 0000000..d904fa5
--- /dev/null
+++ b/bin/sh/tests/parser/set-v1.0.stderr
@@ -0,0 +1,5 @@
+one
+echo two >&2
+two
+echo three >&2
+three
diff --git a/cddl/lib/libdtrace/Makefile.depend b/cddl/lib/libdtrace/Makefile.depend
index 50ab52c..ff38bcc 100644
--- a/cddl/lib/libdtrace/Makefile.depend
+++ b/cddl/lib/libdtrace/Makefile.depend
@@ -22,31 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-dt_cc.So: dt_grammar.h
-dt_cc.o: dt_grammar.h
-dt_cc.po: dt_grammar.h
-dt_cg.So: dt_grammar.h
-dt_cg.o: dt_grammar.h
-dt_cg.po: dt_grammar.h
-dt_errtags.So: dt_errtags.c
-dt_errtags.o: dt_errtags.c
-dt_errtags.po: dt_errtags.c
-dt_grammar.So: dt_grammar.c
-dt_grammar.o: dt_grammar.c
-dt_grammar.po: dt_grammar.c
-dt_lex.So: dt_grammar.h
-dt_lex.So: dt_lex.c
-dt_lex.o: dt_grammar.h
-dt_lex.o: dt_lex.c
-dt_lex.po: dt_grammar.h
-dt_lex.po: dt_lex.c
-dt_names.So: dt_names.c
-dt_names.o: dt_names.c
-dt_names.po: dt_names.c
-dt_parser.So: dt_grammar.h
-dt_parser.o: dt_grammar.h
-dt_parser.po: dt_grammar.h
-dt_xlator.So: dt_grammar.h
-dt_xlator.o: dt_grammar.h
-dt_xlator.po: dt_grammar.h
.endif
diff --git a/contrib/libarchive/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c
index 9513729..1d4c9bb 100644
--- a/contrib/libarchive/libarchive/archive_read.c
+++ b/contrib/libarchive/libarchive/archive_read.c
@@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
static int
choose_filters(struct archive_read *a)
{
- int number_bidders, i, bid, best_bid;
+ int number_bidders, i, bid, best_bid, n;
struct archive_read_filter_bidder *bidder, *best_bidder;
struct archive_read_filter *filter;
ssize_t avail;
int r;
- for (;;) {
+ for (n = 0; n < 25; ++n) {
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
best_bid = 0;
@@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
return (ARCHIVE_FATAL);
}
}
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Input requires too many filters for decoding");
+ return (ARCHIVE_FATAL);
}
/*
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b9c6b5c..12bf3f2 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -253,6 +253,7 @@ hostapd_enable="NO" # Run hostap daemon.
syslogd_enable="YES" # Run syslog daemon (or NO).
syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
syslogd_flags="-s" # Flags to syslogd (if enabled).
+syslogd_oomprotect="YES" # Don't kill syslogd when swap space is exhausted.
altlog_proglist="" # List of chrooted applicatioins in /var
inetd_enable="NO" # Run the network daemon dispatcher (YES/NO).
inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one.
diff --git a/etc/rc.subr b/etc/rc.subr
index a6de452..cdec9a2 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -45,6 +45,7 @@ _rc_subr_loaded="YES"
SYSCTL="/sbin/sysctl"
SYSCTL_N="${SYSCTL} -n"
SYSCTL_W="${SYSCTL}"
+PROTECT="/usr/bin/protect"
ID="/usr/bin/id"
IDCMD="if [ -x $ID ]; then $ID -un; fi"
PS="/bin/ps -ww"
@@ -755,6 +756,8 @@ check_startmsgs()
#
# ${name}_nice n Nice level to run ${command} at.
#
+# ${name}_oomprotect n Don't kill ${command} when swap space is exhausted.
+#
# ${name}_user n User to run ${command} as, using su(1) if not
# using ${name}_chroot.
# Requires /usr to be mounted.
@@ -944,7 +947,8 @@ run_rc_command()
_nice=\$${name}_nice _user=\$${name}_user \
_group=\$${name}_group _groups=\$${name}_groups \
_fib=\$${name}_fib _env=\$${name}_env \
- _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon}
+ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \
+ _oomprotect=\$${name}_oomprotect
if [ -n "$_user" ]; then # unset $_user if running as that user
if [ "$_user" = "$(eval $IDCMD)" ]; then
@@ -1182,6 +1186,26 @@ $command $rc_flags $command_args"
;;
esac
+
+ # Apply protect(1) to the PID if ${name}_oomprotect is set.
+ case "$rc_arg" in
+ start)
+ if [ -n "$_oomprotect" ]; then
+ if [ -f "${PROTECT}" ]; then
+ pid=$(check_process $command)
+ case $_oomprotect in
+ [Aa][Ll][Ll])
+ ${PROTECT} -i -p ${pid}
+ ;;
+ [Yy][Ee][Ss])
+ ${PROTECT} -p ${pid}
+ ;;
+ esac
+ fi
+ fi
+ ;;
+ esac
+
return $_return
done
diff --git a/gnu/lib/csu/Makefile.depend b/gnu/lib/csu/Makefile.depend
index e5634d5..18be76b 100644
--- a/gnu/lib/csu/Makefile.depend
+++ b/gnu/lib/csu/Makefile.depend
@@ -10,34 +10,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-crtbegin.o: options.h
-crtbegin.o: tconfig.h
-crtbegin.o: tm.h
-crtbegin.po: options.h
-crtbegin.po: tconfig.h
-crtbegin.po: tm.h
-crtbeginS.o: options.h
-crtbeginS.o: tconfig.h
-crtbeginS.o: tm.h
-crtbeginS.po: options.h
-crtbeginS.po: tconfig.h
-crtbeginS.po: tm.h
-crtbeginT.o: options.h
-crtbeginT.o: tconfig.h
-crtbeginT.o: tm.h
-crtbeginT.po: options.h
-crtbeginT.po: tconfig.h
-crtbeginT.po: tm.h
-crtend.o: options.h
-crtend.o: tconfig.h
-crtend.o: tm.h
-crtend.po: options.h
-crtend.po: tconfig.h
-crtend.po: tm.h
-crtendS.o: options.h
-crtendS.o: tconfig.h
-crtendS.o: tm.h
-crtendS.po: options.h
-crtendS.po: tconfig.h
-crtendS.po: tm.h
.endif
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 05f7961..12a6226 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -380,7 +380,7 @@ CLEANFILES += libgcc.map
libgcc_eh.a: ${EH_OBJS_T}
@${ECHO} building static gcc_eh library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
+ ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
_LIBS+= libgcc_eh.a
@@ -389,7 +389,7 @@ _LIBS+= libgcc_eh.a
libgcc_eh_p.a: ${EH_OBJS_P}
@${ECHO} building profiled gcc_eh library
@rm -f ${.TARGET}
- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
+ ${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
${RANLIB} ${RANLIBFLAGS} ${.TARGET}
_LIBS+= libgcc_eh_p.a
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index ce72494..2f6d8d1 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -13,274 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-__main.So: options.h
-__main.So: tconfig.h
-__main.So: tm.h
-_absvdi2.So: options.h
-_absvdi2.So: tconfig.h
-_absvdi2.So: tm.h
-_absvsi2.So: options.h
-_absvsi2.So: tconfig.h
-_absvsi2.So: tm.h
-_addvdi3.So: options.h
-_addvdi3.So: tconfig.h
-_addvdi3.So: tm.h
-_addvsi3.So: options.h
-_addvsi3.So: tconfig.h
-_addvsi3.So: tm.h
-_ashldi3.So: options.h
-_ashldi3.So: tconfig.h
-_ashldi3.So: tm.h
-_ashrdi3.So: options.h
-_ashrdi3.So: tconfig.h
-_ashrdi3.So: tm.h
-_bswapdi2.So: options.h
-_bswapdi2.So: tconfig.h
-_bswapdi2.So: tm.h
-_bswapsi2.So: options.h
-_bswapsi2.So: tconfig.h
-_bswapsi2.So: tm.h
-_clear_cache.So: options.h
-_clear_cache.So: tconfig.h
-_clear_cache.So: tm.h
-_clz.So: options.h
-_clz.So: tconfig.h
-_clz.So: tm.h
-_clzdi2.So: options.h
-_clzdi2.So: tconfig.h
-_clzdi2.So: tm.h
-_clzsi2.So: options.h
-_clzsi2.So: tconfig.h
-_clzsi2.So: tm.h
-_cmpdi2.So: options.h
-_cmpdi2.So: tconfig.h
-_cmpdi2.So: tm.h
-_ctors.So: options.h
-_ctors.So: tconfig.h
-_ctors.So: tm.h
-_ctzdi2.So: options.h
-_ctzdi2.So: tconfig.h
-_ctzdi2.So: tm.h
-_ctzsi2.So: options.h
-_ctzsi2.So: tconfig.h
-_ctzsi2.So: tm.h
-_divdc3.So: options.h
-_divdc3.So: tconfig.h
-_divdc3.So: tm.h
-_divdi3.So: options.h
-_divdi3.So: tconfig.h
-_divdi3.So: tm.h
-_divsc3.So: options.h
-_divsc3.So: tconfig.h
-_divsc3.So: tm.h
-_divtc3.So: options.h
-_divtc3.So: tconfig.h
-_divtc3.So: tm.h
-_divxc3.So: options.h
-_divxc3.So: tconfig.h
-_divxc3.So: tm.h
-_enable_execute_stack.So: options.h
-_enable_execute_stack.So: tconfig.h
-_enable_execute_stack.So: tm.h
-_ffsdi2.So: options.h
-_ffsdi2.So: tconfig.h
-_ffsdi2.So: tm.h
-_ffssi2.So: options.h
-_ffssi2.So: tconfig.h
-_ffssi2.So: tm.h
-_fixdfdi.So: options.h
-_fixdfdi.So: tconfig.h
-_fixdfdi.So: tm.h
-_fixsfdi.So: options.h
-_fixsfdi.So: tconfig.h
-_fixsfdi.So: tm.h
-_fixtfdi.So: options.h
-_fixtfdi.So: tconfig.h
-_fixtfdi.So: tm.h
-_fixunsdfdi.So: options.h
-_fixunsdfdi.So: tconfig.h
-_fixunsdfdi.So: tm.h
-_fixunsdfsi.So: options.h
-_fixunsdfsi.So: tconfig.h
-_fixunsdfsi.So: tm.h
-_fixunssfdi.So: options.h
-_fixunssfdi.So: tconfig.h
-_fixunssfdi.So: tm.h
-_fixunssfsi.So: options.h
-_fixunssfsi.So: tconfig.h
-_fixunssfsi.So: tm.h
-_fixunstfdi.So: options.h
-_fixunstfdi.So: tconfig.h
-_fixunstfdi.So: tm.h
-_fixunsxfdi.So: options.h
-_fixunsxfdi.So: tconfig.h
-_fixunsxfdi.So: tm.h
-_fixunsxfsi.So: options.h
-_fixunsxfsi.So: tconfig.h
-_fixunsxfsi.So: tm.h
-_fixxfdi.So: options.h
-_fixxfdi.So: tconfig.h
-_fixxfdi.So: tm.h
-_floatdidf.So: options.h
-_floatdidf.So: tconfig.h
-_floatdidf.So: tm.h
-_floatdisf.So: options.h
-_floatdisf.So: tconfig.h
-_floatdisf.So: tm.h
-_floatditf.So: options.h
-_floatditf.So: tconfig.h
-_floatditf.So: tm.h
-_floatdixf.So: options.h
-_floatdixf.So: tconfig.h
-_floatdixf.So: tm.h
-_floatundidf.So: options.h
-_floatundidf.So: tconfig.h
-_floatundidf.So: tm.h
-_floatundisf.So: options.h
-_floatundisf.So: tconfig.h
-_floatundisf.So: tm.h
-_floatunditf.So: options.h
-_floatunditf.So: tconfig.h
-_floatunditf.So: tm.h
-_floatundixf.So: options.h
-_floatundixf.So: tconfig.h
-_floatundixf.So: tm.h
-_lshrdi3.So: options.h
-_lshrdi3.So: tconfig.h
-_lshrdi3.So: tm.h
-_moddi3.So: options.h
-_moddi3.So: tconfig.h
-_moddi3.So: tm.h
-_muldc3.So: options.h
-_muldc3.So: tconfig.h
-_muldc3.So: tm.h
-_muldi3.So: options.h
-_muldi3.So: tconfig.h
-_muldi3.So: tm.h
-_mulsc3.So: options.h
-_mulsc3.So: tconfig.h
-_mulsc3.So: tm.h
-_multc3.So: options.h
-_multc3.So: tconfig.h
-_multc3.So: tm.h
-_mulvdi3.So: options.h
-_mulvdi3.So: tconfig.h
-_mulvdi3.So: tm.h
-_mulvsi3.So: options.h
-_mulvsi3.So: tconfig.h
-_mulvsi3.So: tm.h
-_mulxc3.So: options.h
-_mulxc3.So: tconfig.h
-_mulxc3.So: tm.h
-_negdi2.So: options.h
-_negdi2.So: tconfig.h
-_negdi2.So: tm.h
-_negvdi2.So: options.h
-_negvdi2.So: tconfig.h
-_negvdi2.So: tm.h
-_negvsi2.So: options.h
-_negvsi2.So: tconfig.h
-_negvsi2.So: tm.h
-_paritydi2.So: options.h
-_paritydi2.So: tconfig.h
-_paritydi2.So: tm.h
-_paritysi2.So: options.h
-_paritysi2.So: tconfig.h
-_paritysi2.So: tm.h
-_popcount_tab.So: options.h
-_popcount_tab.So: tconfig.h
-_popcount_tab.So: tm.h
-_popcountdi2.So: options.h
-_popcountdi2.So: tconfig.h
-_popcountdi2.So: tm.h
-_popcountsi2.So: options.h
-_popcountsi2.So: tconfig.h
-_popcountsi2.So: tm.h
-_powidf2.So: options.h
-_powidf2.So: tconfig.h
-_powidf2.So: tm.h
-_powisf2.So: options.h
-_powisf2.So: tconfig.h
-_powisf2.So: tm.h
-_powitf2.So: options.h
-_powitf2.So: tconfig.h
-_powitf2.So: tm.h
-_powixf2.So: options.h
-_powixf2.So: tconfig.h
-_powixf2.So: tm.h
-_subvdi3.So: options.h
-_subvdi3.So: tconfig.h
-_subvdi3.So: tm.h
-_subvsi3.So: options.h
-_subvsi3.So: tconfig.h
-_subvsi3.So: tm.h
-_trampoline.So: options.h
-_trampoline.So: tconfig.h
-_trampoline.So: tm.h
-_ucmpdi2.So: options.h
-_ucmpdi2.So: tconfig.h
-_ucmpdi2.So: tm.h
-_udiv_w_sdiv.So: options.h
-_udiv_w_sdiv.So: tconfig.h
-_udiv_w_sdiv.So: tm.h
-_udivdi3.So: options.h
-_udivdi3.So: tconfig.h
-_udivdi3.So: tm.h
-_udivmoddi4.So: options.h
-_udivmoddi4.So: tconfig.h
-_udivmoddi4.So: tm.h
-_umoddi3.So: options.h
-_umoddi3.So: tconfig.h
-_umoddi3.So: tm.h
-unwind-c.So: tconfig.h
-unwind-c.So: unwind.h
-unwind-c.o: tconfig.h
-unwind-c.o: unwind.h
-unwind-c.po: tconfig.h
-unwind-c.po: unwind.h
-unwind-dw2-fde-glibc.So: gthr-default.h
-unwind-dw2-fde-glibc.So: options.h
-unwind-dw2-fde-glibc.So: tconfig.h
-unwind-dw2-fde-glibc.So: tm.h
-unwind-dw2-fde-glibc.So: unwind.h
-unwind-dw2-fde-glibc.o: gthr-default.h
-unwind-dw2-fde-glibc.o: options.h
-unwind-dw2-fde-glibc.o: tconfig.h
-unwind-dw2-fde-glibc.o: tm.h
-unwind-dw2-fde-glibc.o: unwind.h
-unwind-dw2-fde-glibc.po: gthr-default.h
-unwind-dw2-fde-glibc.po: options.h
-unwind-dw2-fde-glibc.po: tconfig.h
-unwind-dw2-fde-glibc.po: tm.h
-unwind-dw2-fde-glibc.po: unwind.h
-unwind-dw2.So: gthr-default.h
-unwind-dw2.So: options.h
-unwind-dw2.So: tconfig.h
-unwind-dw2.So: tm.h
-unwind-dw2.So: unwind.h
-unwind-dw2.o: gthr-default.h
-unwind-dw2.o: options.h
-unwind-dw2.o: tconfig.h
-unwind-dw2.o: tm.h
-unwind-dw2.o: unwind.h
-unwind-dw2.po: gthr-default.h
-unwind-dw2.po: options.h
-unwind-dw2.po: tconfig.h
-unwind-dw2.po: tm.h
-unwind-dw2.po: unwind.h
-unwind-sjlj.So: gthr-default.h
-unwind-sjlj.So: options.h
-unwind-sjlj.So: tconfig.h
-unwind-sjlj.So: tm.h
-unwind-sjlj.So: unwind.h
-unwind-sjlj.o: gthr-default.h
-unwind-sjlj.o: options.h
-unwind-sjlj.o: tconfig.h
-unwind-sjlj.o: tm.h
-unwind-sjlj.o: unwind.h
-unwind-sjlj.po: gthr-default.h
-unwind-sjlj.po: options.h
-unwind-sjlj.po: tconfig.h
-unwind-sjlj.po: tm.h
-unwind-sjlj.po: unwind.h
.endif
diff --git a/gnu/lib/libgcov/Makefile.depend b/gnu/lib/libgcov/Makefile.depend
index e6424fd..18be76b 100644
--- a/gnu/lib/libgcov/Makefile.depend
+++ b/gnu/lib/libgcov/Makefile.depend
@@ -10,116 +10,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-_gcov.o: gcov-iov.h
-_gcov.o: options.h
-_gcov.o: tconfig.h
-_gcov.o: tm.h
-_gcov.po: gcov-iov.h
-_gcov.po: options.h
-_gcov.po: tconfig.h
-_gcov.po: tm.h
-_gcov_execl.o: gcov-iov.h
-_gcov_execl.o: options.h
-_gcov_execl.o: tconfig.h
-_gcov_execl.o: tm.h
-_gcov_execl.po: gcov-iov.h
-_gcov_execl.po: options.h
-_gcov_execl.po: tconfig.h
-_gcov_execl.po: tm.h
-_gcov_execle.o: gcov-iov.h
-_gcov_execle.o: options.h
-_gcov_execle.o: tconfig.h
-_gcov_execle.o: tm.h
-_gcov_execle.po: gcov-iov.h
-_gcov_execle.po: options.h
-_gcov_execle.po: tconfig.h
-_gcov_execle.po: tm.h
-_gcov_execlp.o: gcov-iov.h
-_gcov_execlp.o: options.h
-_gcov_execlp.o: tconfig.h
-_gcov_execlp.o: tm.h
-_gcov_execlp.po: gcov-iov.h
-_gcov_execlp.po: options.h
-_gcov_execlp.po: tconfig.h
-_gcov_execlp.po: tm.h
-_gcov_execv.o: gcov-iov.h
-_gcov_execv.o: options.h
-_gcov_execv.o: tconfig.h
-_gcov_execv.o: tm.h
-_gcov_execv.po: gcov-iov.h
-_gcov_execv.po: options.h
-_gcov_execv.po: tconfig.h
-_gcov_execv.po: tm.h
-_gcov_execve.o: gcov-iov.h
-_gcov_execve.o: options.h
-_gcov_execve.o: tconfig.h
-_gcov_execve.o: tm.h
-_gcov_execve.po: gcov-iov.h
-_gcov_execve.po: options.h
-_gcov_execve.po: tconfig.h
-_gcov_execve.po: tm.h
-_gcov_execvp.o: gcov-iov.h
-_gcov_execvp.o: options.h
-_gcov_execvp.o: tconfig.h
-_gcov_execvp.o: tm.h
-_gcov_execvp.po: gcov-iov.h
-_gcov_execvp.po: options.h
-_gcov_execvp.po: tconfig.h
-_gcov_execvp.po: tm.h
-_gcov_fork.o: gcov-iov.h
-_gcov_fork.o: options.h
-_gcov_fork.o: tconfig.h
-_gcov_fork.o: tm.h
-_gcov_fork.po: gcov-iov.h
-_gcov_fork.po: options.h
-_gcov_fork.po: tconfig.h
-_gcov_fork.po: tm.h
-_gcov_interval_profiler.o: gcov-iov.h
-_gcov_interval_profiler.o: options.h
-_gcov_interval_profiler.o: tconfig.h
-_gcov_interval_profiler.o: tm.h
-_gcov_interval_profiler.po: gcov-iov.h
-_gcov_interval_profiler.po: options.h
-_gcov_interval_profiler.po: tconfig.h
-_gcov_interval_profiler.po: tm.h
-_gcov_merge_add.o: gcov-iov.h
-_gcov_merge_add.o: options.h
-_gcov_merge_add.o: tconfig.h
-_gcov_merge_add.o: tm.h
-_gcov_merge_add.po: gcov-iov.h
-_gcov_merge_add.po: options.h
-_gcov_merge_add.po: tconfig.h
-_gcov_merge_add.po: tm.h
-_gcov_merge_delta.o: gcov-iov.h
-_gcov_merge_delta.o: options.h
-_gcov_merge_delta.o: tconfig.h
-_gcov_merge_delta.o: tm.h
-_gcov_merge_delta.po: gcov-iov.h
-_gcov_merge_delta.po: options.h
-_gcov_merge_delta.po: tconfig.h
-_gcov_merge_delta.po: tm.h
-_gcov_merge_single.o: gcov-iov.h
-_gcov_merge_single.o: options.h
-_gcov_merge_single.o: tconfig.h
-_gcov_merge_single.o: tm.h
-_gcov_merge_single.po: gcov-iov.h
-_gcov_merge_single.po: options.h
-_gcov_merge_single.po: tconfig.h
-_gcov_merge_single.po: tm.h
-_gcov_one_value_profiler.o: gcov-iov.h
-_gcov_one_value_profiler.o: options.h
-_gcov_one_value_profiler.o: tconfig.h
-_gcov_one_value_profiler.o: tm.h
-_gcov_one_value_profiler.po: gcov-iov.h
-_gcov_one_value_profiler.po: options.h
-_gcov_one_value_profiler.po: tconfig.h
-_gcov_one_value_profiler.po: tm.h
-_gcov_pow2_profiler.o: gcov-iov.h
-_gcov_pow2_profiler.o: options.h
-_gcov_pow2_profiler.o: tconfig.h
-_gcov_pow2_profiler.o: tm.h
-_gcov_pow2_profiler.po: gcov-iov.h
-_gcov_pow2_profiler.po: options.h
-_gcov_pow2_profiler.po: tconfig.h
-_gcov_pow2_profiler.po: tm.h
.endif
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index fd53a3f..3646e2e 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -15,70 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-affinity.So: gstdint.h
-affinity.o: gstdint.h
-affinity.po: gstdint.h
-alloc.So: gstdint.h
-alloc.o: gstdint.h
-alloc.po: gstdint.h
-bar.So: gstdint.h
-bar.o: gstdint.h
-bar.po: gstdint.h
-barrier.So: gstdint.h
-barrier.o: gstdint.h
-barrier.po: gstdint.h
-critical.So: gstdint.h
-critical.o: gstdint.h
-critical.po: gstdint.h
-env.So: gstdint.h
-env.So: libgomp_f.h
-env.o: gstdint.h
-env.o: libgomp_f.h
-env.po: gstdint.h
-env.po: libgomp_f.h
-error.So: gstdint.h
-error.o: gstdint.h
-error.po: gstdint.h
-fortran.So: gstdint.h
-fortran.So: libgomp_f.h
-fortran.o: gstdint.h
-fortran.o: libgomp_f.h
-fortran.po: gstdint.h
-fortran.po: libgomp_f.h
-iter.So: gstdint.h
-iter.o: gstdint.h
-iter.po: gstdint.h
-lock.So: gstdint.h
-lock.o: gstdint.h
-lock.po: gstdint.h
-loop.So: gstdint.h
-loop.o: gstdint.h
-loop.po: gstdint.h
-ordered.So: gstdint.h
-ordered.o: gstdint.h
-ordered.po: gstdint.h
-parallel.So: gstdint.h
-parallel.o: gstdint.h
-parallel.po: gstdint.h
-proc.So: gstdint.h
-proc.o: gstdint.h
-proc.po: gstdint.h
-sections.So: gstdint.h
-sections.o: gstdint.h
-sections.po: gstdint.h
-sem.So: gstdint.h
-sem.o: gstdint.h
-sem.po: gstdint.h
-single.So: gstdint.h
-single.o: gstdint.h
-single.po: gstdint.h
-team.So: gstdint.h
-team.o: gstdint.h
-team.po: gstdint.h
-time.So: gstdint.h
-time.o: gstdint.h
-time.po: gstdint.h
-work.So: gstdint.h
-work.o: gstdint.h
-work.po: gstdint.h
.endif
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index 2defba8..3646e2e 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -15,7 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-gnuregex.So: gnuregex.c
-gnuregex.o: gnuregex.c
-gnuregex.po: gnuregex.c
.endif
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index 0e1a73c..c9f9d52 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -16,52 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-atomicity.So: atomicity.cc
-atomicity.o: atomicity.cc
-atomicity.po: atomicity.cc
-eh_alloc.So: unwind.h
-eh_alloc.o: unwind.h
-eh_alloc.po: unwind.h
-eh_arm.So: unwind.h
-eh_arm.o: unwind.h
-eh_arm.po: unwind.h
-eh_aux_runtime.So: unwind.h
-eh_aux_runtime.o: unwind.h
-eh_aux_runtime.po: unwind.h
-eh_call.So: unwind.h
-eh_call.o: unwind.h
-eh_call.po: unwind.h
-eh_catch.So: unwind.h
-eh_catch.o: unwind.h
-eh_catch.po: unwind.h
-eh_exception.So: unwind.h
-eh_exception.o: unwind.h
-eh_exception.po: unwind.h
-eh_globals.So: unwind.h
-eh_globals.o: unwind.h
-eh_globals.po: unwind.h
-eh_personality.So: unwind.h
-eh_personality.o: unwind.h
-eh_personality.po: unwind.h
-eh_term_handler.So: unwind.h
-eh_term_handler.o: unwind.h
-eh_term_handler.po: unwind.h
-eh_terminate.So: unwind.h
-eh_terminate.o: unwind.h
-eh_terminate.po: unwind.h
-eh_throw.So: unwind.h
-eh_throw.o: unwind.h
-eh_throw.po: unwind.h
-eh_type.So: unwind.h
-eh_type.o: unwind.h
-eh_type.po: unwind.h
-eh_unex_handler.So: unwind.h
-eh_unex_handler.o: unwind.h
-eh_unex_handler.po: unwind.h
-pure.So: unwind.h
-pure.o: unwind.h
-pure.po: unwind.h
-vec.So: unwind.h
-vec.o: unwind.h
-vec.po: unwind.h
.endif
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 5584517..7ad7a32 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -16,49 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-eh_alloc.So: unwind.h
-eh_alloc.o: unwind.h
-eh_alloc.po: unwind.h
-eh_arm.So: unwind.h
-eh_arm.o: unwind.h
-eh_arm.po: unwind.h
-eh_aux_runtime.So: unwind.h
-eh_aux_runtime.o: unwind.h
-eh_aux_runtime.po: unwind.h
-eh_call.So: unwind.h
-eh_call.o: unwind.h
-eh_call.po: unwind.h
-eh_catch.So: unwind.h
-eh_catch.o: unwind.h
-eh_catch.po: unwind.h
-eh_exception.So: unwind.h
-eh_exception.o: unwind.h
-eh_exception.po: unwind.h
-eh_globals.So: unwind.h
-eh_globals.o: unwind.h
-eh_globals.po: unwind.h
-eh_personality.So: unwind.h
-eh_personality.o: unwind.h
-eh_personality.po: unwind.h
-eh_term_handler.So: unwind.h
-eh_term_handler.o: unwind.h
-eh_term_handler.po: unwind.h
-eh_terminate.So: unwind.h
-eh_terminate.o: unwind.h
-eh_terminate.po: unwind.h
-eh_throw.So: unwind.h
-eh_throw.o: unwind.h
-eh_throw.po: unwind.h
-eh_type.So: unwind.h
-eh_type.o: unwind.h
-eh_type.po: unwind.h
-eh_unex_handler.So: unwind.h
-eh_unex_handler.o: unwind.h
-eh_unex_handler.po: unwind.h
-pure.So: unwind.h
-pure.o: unwind.h
-pure.po: unwind.h
-vec.So: unwind.h
-vec.o: unwind.h
-vec.po: unwind.h
.endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend b/gnu/usr.bin/binutils/ld/Makefile.depend
new file mode 100644
index 0000000..995eda7
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/Makefile.depend
@@ -0,0 +1,21 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ gnu/usr.bin/binutils/libbfd \
+ gnu/usr.bin/binutils/libiberty \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/yacc.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
deleted file mode 100644
index 72682c3..0000000
--- a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
+++ /dev/null
@@ -1,55 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- gnu/usr.bin/binutils/libbfd \
- gnu/usr.bin/binutils/libiberty \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
- usr.bin/yacc.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-eelf_i386_fbsd.o: eelf_i386_fbsd.c
-eelf_i386_fbsd.o: ldgram.h
-eelf_i386_fbsd.po: eelf_i386_fbsd.c
-eelf_i386_fbsd.po: ldgram.h
-eelf_x86_64_fbsd.o: eelf_x86_64_fbsd.c
-eelf_x86_64_fbsd.o: ldgram.h
-eelf_x86_64_fbsd.po: eelf_x86_64_fbsd.c
-eelf_x86_64_fbsd.po: ldgram.h
-ldctor.o: ldgram.h
-ldctor.po: ldgram.h
-ldemul.o: ldemul-list.h
-ldemul.po: ldemul-list.h
-ldexp.o: ldgram.h
-ldexp.po: ldgram.h
-ldfile.o: ldgram.h
-ldfile.po: ldgram.h
-ldgram.o: ldgram.c
-ldgram.po: ldgram.c
-ldlang.o: ldgram.h
-ldlang.po: ldgram.h
-ldlex.o: ldgram.h
-ldlex.o: ldlex.c
-ldlex.po: ldgram.h
-ldlex.po: ldlex.c
-ldmain.o: ldgram.h
-ldmain.po: ldgram.h
-ldmisc.o: ldgram.h
-ldmisc.po: ldgram.h
-ldwrite.o: ldgram.h
-ldwrite.po: ldgram.h
-lexsup.o: ldgram.h
-lexsup.po: ldgram.h
-mri.o: ldgram.h
-mri.po: ldgram.h
-.endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend.host b/gnu/usr.bin/binutils/ld/Makefile.depend.host
index cd760a0..fea8e8e 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.depend.host
+++ b/gnu/usr.bin/binutils/ld/Makefile.depend.host
@@ -11,38 +11,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-eelf_i386_fbsd.o: eelf_i386_fbsd.c
-eelf_i386_fbsd.o: ldgram.h
-eelf_i386_fbsd.po: eelf_i386_fbsd.c
-eelf_i386_fbsd.po: ldgram.h
-eelf_x86_64_fbsd.o: eelf_x86_64_fbsd.c
-eelf_x86_64_fbsd.o: ldgram.h
-eelf_x86_64_fbsd.po: eelf_x86_64_fbsd.c
-eelf_x86_64_fbsd.po: ldgram.h
-ldctor.o: ldgram.h
-ldctor.po: ldgram.h
-ldemul.o: ldemul-list.h
-ldemul.po: ldemul-list.h
-ldexp.o: ldgram.h
-ldexp.po: ldgram.h
-ldfile.o: ldgram.h
-ldfile.po: ldgram.h
-ldgram.o: ldgram.c
-ldgram.po: ldgram.c
-ldlang.o: ldgram.h
-ldlang.po: ldgram.h
-ldlex.o: ldgram.h
-ldlex.o: ldlex.c
-ldlex.po: ldgram.h
-ldlex.po: ldlex.c
-ldmain.o: ldgram.h
-ldmain.po: ldgram.h
-ldmisc.o: ldgram.h
-ldmisc.po: ldgram.h
-ldwrite.o: ldgram.h
-ldwrite.po: ldgram.h
-lexsup.o: ldgram.h
-lexsup.po: ldgram.h
-mri.o: ldgram.h
-mri.po: ldgram.h
.endif
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.depend b/gnu/usr.bin/binutils/libbfd/Makefile.depend
new file mode 100644
index 0000000..18be76b
--- /dev/null
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.depend
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ include \
+ include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 b/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64
deleted file mode 100644
index 7a87c5d..0000000
--- a/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64
+++ /dev/null
@@ -1,121 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- include \
- include/xlocale \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-archive.o: config.h
-archive.po: config.h
-archive64.o: config.h
-archive64.po: config.h
-archures.o: config.h
-archures.po: config.h
-bfd.o: bfdver.h
-bfd.o: config.h
-bfd.po: bfdver.h
-bfd.po: config.h
-bfdio.o: config.h
-bfdio.po: config.h
-bfdwin.o: config.h
-bfdwin.po: config.h
-binary.o: config.h
-binary.po: config.h
-cache.o: config.h
-cache.po: config.h
-coffgen.o: config.h
-coffgen.po: config.h
-cofflink.o: config.h
-cofflink.po: config.h
-corefile.o: config.h
-corefile.po: config.h
-cpu-i386.o: config.h
-cpu-i386.po: config.h
-dwarf1.o: config.h
-dwarf1.po: config.h
-dwarf2.o: config.h
-dwarf2.po: config.h
-efi-app-ia32.o: config.h
-efi-app-ia32.po: config.h
-efi-app-x86_64.o: config.h
-efi-app-x86_64.po: config.h
-elf-attrs.o: config.h
-elf-attrs.po: config.h
-elf-eh-frame.o: config.h
-elf-eh-frame.po: config.h
-elf-strtab.o: config.h
-elf-strtab.po: config.h
-elf-vxworks.o: config.h
-elf-vxworks.po: config.h
-elf.o: config.h
-elf.po: config.h
-elf32-i386.o: config.h
-elf32-i386.o: elf32-target.h
-elf32-i386.po: config.h
-elf32-i386.po: elf32-target.h
-elf32.o: config.h
-elf32.po: config.h
-elf64-gen.o: config.h
-elf64-gen.o: elf64-target.h
-elf64-gen.po: config.h
-elf64-gen.po: elf64-target.h
-elf64-x86-64.o: config.h
-elf64-x86-64.o: elf64-target.h
-elf64-x86-64.po: config.h
-elf64-x86-64.po: elf64-target.h
-elf64.o: config.h
-elf64.po: config.h
-elflink.o: config.h
-elflink.po: config.h
-format.o: config.h
-format.po: config.h
-hash.o: config.h
-hash.po: config.h
-ihex.o: config.h
-ihex.po: config.h
-init.o: config.h
-init.po: config.h
-libbfd.o: config.h
-libbfd.po: config.h
-linker.o: config.h
-linker.po: config.h
-merge.o: config.h
-merge.po: config.h
-opncls.o: config.h
-opncls.po: config.h
-peigen.o: config.h
-peigen.o: peigen.c
-peigen.po: config.h
-peigen.po: peigen.c
-pepigen.o: config.h
-pepigen.o: pepigen.c
-pepigen.po: config.h
-pepigen.po: pepigen.c
-pex64igen.o: config.h
-pex64igen.o: pex64igen.c
-pex64igen.po: config.h
-pex64igen.po: pex64igen.c
-reloc.o: config.h
-reloc.po: config.h
-section.o: config.h
-section.po: config.h
-simple.o: config.h
-simple.po: config.h
-srec.o: config.h
-srec.po: config.h
-stabs.o: config.h
-stabs.po: config.h
-syms.o: config.h
-syms.po: config.h
-targets.o: config.h
-targets.o: targmatch.h
-targets.po: config.h
-targets.po: targmatch.h
-tekhex.o: config.h
-tekhex.po: config.h
-.endif
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.depend.host b/gnu/usr.bin/binutils/libbfd/Makefile.depend.host
index 1be848f..f80275d 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.depend.host
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.depend.host
@@ -8,112 +8,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-archive.o: config.h
-archive.po: config.h
-archive64.o: config.h
-archive64.po: config.h
-archures.o: config.h
-archures.po: config.h
-bfd.o: bfdver.h
-bfd.o: config.h
-bfd.po: bfdver.h
-bfd.po: config.h
-bfdio.o: config.h
-bfdio.po: config.h
-bfdwin.o: config.h
-bfdwin.po: config.h
-binary.o: config.h
-binary.po: config.h
-cache.o: config.h
-cache.po: config.h
-coffgen.o: config.h
-coffgen.po: config.h
-cofflink.o: config.h
-cofflink.po: config.h
-corefile.o: config.h
-corefile.po: config.h
-cpu-i386.o: config.h
-cpu-i386.po: config.h
-dwarf1.o: config.h
-dwarf1.po: config.h
-dwarf2.o: config.h
-dwarf2.po: config.h
-efi-app-ia32.o: config.h
-efi-app-ia32.po: config.h
-efi-app-x86_64.o: config.h
-efi-app-x86_64.po: config.h
-elf-attrs.o: config.h
-elf-attrs.po: config.h
-elf-eh-frame.o: config.h
-elf-eh-frame.po: config.h
-elf-strtab.o: config.h
-elf-strtab.po: config.h
-elf-vxworks.o: config.h
-elf-vxworks.po: config.h
-elf.o: config.h
-elf.po: config.h
-elf32-i386.o: config.h
-elf32-i386.o: elf32-target.h
-elf32-i386.po: config.h
-elf32-i386.po: elf32-target.h
-elf32.o: config.h
-elf32.po: config.h
-elf64-gen.o: config.h
-elf64-gen.o: elf64-target.h
-elf64-gen.po: config.h
-elf64-gen.po: elf64-target.h
-elf64-x86-64.o: config.h
-elf64-x86-64.o: elf64-target.h
-elf64-x86-64.po: config.h
-elf64-x86-64.po: elf64-target.h
-elf64.o: config.h
-elf64.po: config.h
-elflink.o: config.h
-elflink.po: config.h
-format.o: config.h
-format.po: config.h
-hash.o: config.h
-hash.po: config.h
-ihex.o: config.h
-ihex.po: config.h
-init.o: config.h
-init.po: config.h
-libbfd.o: config.h
-libbfd.po: config.h
-linker.o: config.h
-linker.po: config.h
-merge.o: config.h
-merge.po: config.h
-opncls.o: config.h
-opncls.po: config.h
-peigen.o: config.h
-peigen.o: peigen.c
-peigen.po: config.h
-peigen.po: peigen.c
-pepigen.o: config.h
-pepigen.o: pepigen.c
-pepigen.po: config.h
-pepigen.po: pepigen.c
-pex64igen.o: config.h
-pex64igen.o: pex64igen.c
-pex64igen.po: config.h
-pex64igen.po: pex64igen.c
-reloc.o: config.h
-reloc.po: config.h
-section.o: config.h
-section.po: config.h
-simple.o: config.h
-simple.po: config.h
-srec.o: config.h
-srec.po: config.h
-stabs.o: config.h
-stabs.po: config.h
-syms.o: config.h
-syms.po: config.h
-targets.o: config.h
-targets.o: targmatch.h
-targets.po: config.h
-targets.po: targmatch.h
-tekhex.o: config.h
-tekhex.po: config.h
.endif
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.depend b/gnu/usr.bin/binutils/libbinutils/Makefile.depend
index f3e9e22..89b9045 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.depend
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.depend
@@ -12,10 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-arlex.o: arlex.c
-arlex.o: arparse.h
-arlex.po: arlex.c
-arlex.po: arparse.h
-arparse.o: arparse.c
-arparse.po: arparse.c
.endif
diff --git a/gnu/usr.bin/cc/cc1/Makefile.depend b/gnu/usr.bin/cc/cc1/Makefile.depend
index 00ebeb0..6c2e732 100644
--- a/gnu/usr.bin/cc/cc1/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cc1-checksum.o: cc1-checksum.c
-cc1-checksum.po: cc1-checksum.c
.endif
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile.depend b/gnu/usr.bin/cc/cc1plus/Makefile.depend
index 3e8b125..6c2e732 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1plus/Makefile.depend
@@ -18,8 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cc1plus-checksum.o: cc1plus-checksum.c
-cc1plus-checksum.po: cc1plus-checksum.c
-except.o: cfns.h
-except.po: cfns.h
.endif
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.depend b/gnu/usr.bin/cc/cc_tools/Makefile.depend
index 2b92e28..fbd66b1 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile.depend
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.depend
@@ -17,234 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-errors.o: bconfig.h
-errors.po: bconfig.h
-genattr.o: bconfig.h
-genattr.o: insn-modes.h
-genattr.o: options.h
-genattr.o: tm.h
-genattr.po: bconfig.h
-genattr.po: insn-modes.h
-genattr.po: options.h
-genattr.po: tm.h
-genattrtab.o: bconfig.h
-genattrtab.o: insn-modes.h
-genattrtab.o: options.h
-genattrtab.o: tm.h
-genattrtab.po: bconfig.h
-genattrtab.po: insn-modes.h
-genattrtab.po: options.h
-genattrtab.po: tm.h
-genautomata.o: bconfig.h
-genautomata.o: insn-modes.h
-genautomata.o: options.h
-genautomata.o: tm.h
-genautomata.po: bconfig.h
-genautomata.po: insn-modes.h
-genautomata.po: options.h
-genautomata.po: tm.h
-gencheck.o: bconfig.h
-gencheck.o: gencheck.h
-gencheck.o: options.h
-gencheck.o: tm.h
-gencheck.po: bconfig.h
-gencheck.po: gencheck.h
-gencheck.po: options.h
-gencheck.po: tm.h
-genchecksum.o: bconfig.h
-genchecksum.po: bconfig.h
-gencodes.o: bconfig.h
-gencodes.o: insn-modes.h
-gencodes.o: options.h
-gencodes.o: tm.h
-gencodes.po: bconfig.h
-gencodes.po: insn-modes.h
-gencodes.po: options.h
-gencodes.po: tm.h
-genconditions.o: bconfig.h
-genconditions.o: insn-modes.h
-genconditions.o: options.h
-genconditions.o: tm.h
-genconditions.po: bconfig.h
-genconditions.po: insn-modes.h
-genconditions.po: options.h
-genconditions.po: tm.h
-gencondmd.o: bconfig.h
-gencondmd.o: gencondmd.c
-gencondmd.o: insn-constants.h
-gencondmd.o: insn-modes.h
-gencondmd.o: options.h
-gencondmd.o: tm-constrs.h
-gencondmd.o: tm-preds.h
-gencondmd.o: tm.h
-gencondmd.o: tm_p.h
-gencondmd.o: tree-check.h
-gencondmd.po: bconfig.h
-gencondmd.po: gencondmd.c
-gencondmd.po: insn-constants.h
-gencondmd.po: insn-modes.h
-gencondmd.po: options.h
-gencondmd.po: tm-constrs.h
-gencondmd.po: tm-preds.h
-gencondmd.po: tm.h
-gencondmd.po: tm_p.h
-gencondmd.po: tree-check.h
-genconfig.o: bconfig.h
-genconfig.o: insn-modes.h
-genconfig.o: options.h
-genconfig.o: tm.h
-genconfig.po: bconfig.h
-genconfig.po: insn-modes.h
-genconfig.po: options.h
-genconfig.po: tm.h
-genconstants.o: bconfig.h
-genconstants.o: insn-modes.h
-genconstants.o: options.h
-genconstants.o: tm.h
-genconstants.po: bconfig.h
-genconstants.po: insn-modes.h
-genconstants.po: options.h
-genconstants.po: tm.h
-genemit.o: bconfig.h
-genemit.o: insn-modes.h
-genemit.o: options.h
-genemit.o: tm.h
-genemit.po: bconfig.h
-genemit.po: insn-modes.h
-genemit.po: options.h
-genemit.po: tm.h
-genextract.o: bconfig.h
-genextract.o: insn-modes.h
-genextract.o: options.h
-genextract.o: tm.h
-genextract.po: bconfig.h
-genextract.po: insn-modes.h
-genextract.po: options.h
-genextract.po: tm.h
-genflags.o: bconfig.h
-genflags.o: insn-modes.h
-genflags.o: options.h
-genflags.o: tm.h
-genflags.po: bconfig.h
-genflags.po: insn-modes.h
-genflags.po: options.h
-genflags.po: tm.h
-gengenrtl.o: bconfig.h
-gengenrtl.po: bconfig.h
-gengtype-lex.o: bconfig.h
-gengtype-lex.o: gengtype-lex.c
-gengtype-lex.o: gengtype-yacc.h
-gengtype-lex.po: bconfig.h
-gengtype-lex.po: gengtype-lex.c
-gengtype-lex.po: gengtype-yacc.h
-gengtype-yacc+%DIKED.o: bconfig.h
-gengtype-yacc+%DIKED.o: gengtype-yacc+%DIKED.c
-gengtype-yacc+%DIKED.o: options.h
-gengtype-yacc+%DIKED.o: tm.h
-gengtype-yacc+%DIKED.po: bconfig.h
-gengtype-yacc+%DIKED.po: gengtype-yacc+%DIKED.c
-gengtype-yacc+%DIKED.po: options.h
-gengtype-yacc+%DIKED.po: tm.h
-gengtype.o: bconfig.h
-gengtype.o: gtyp-gen.h
-gengtype.o: options.h
-gengtype.o: tm.h
-gengtype.po: bconfig.h
-gengtype.po: gtyp-gen.h
-gengtype.po: options.h
-gengtype.po: tm.h
-genmodes.o: bconfig.h
-genmodes.po: bconfig.h
-genopinit.o: bconfig.h
-genopinit.o: insn-modes.h
-genopinit.o: options.h
-genopinit.o: tm.h
-genopinit.po: bconfig.h
-genopinit.po: insn-modes.h
-genopinit.po: options.h
-genopinit.po: tm.h
-genoutput.o: bconfig.h
-genoutput.o: insn-modes.h
-genoutput.o: options.h
-genoutput.o: tm.h
-genoutput.po: bconfig.h
-genoutput.po: insn-modes.h
-genoutput.po: options.h
-genoutput.po: tm.h
-genpeep.o: bconfig.h
-genpeep.o: insn-modes.h
-genpeep.o: options.h
-genpeep.o: tm.h
-genpeep.po: bconfig.h
-genpeep.po: insn-modes.h
-genpeep.po: options.h
-genpeep.po: tm.h
-genpreds.o: bconfig.h
-genpreds.o: insn-modes.h
-genpreds.o: options.h
-genpreds.o: tm.h
-genpreds.po: bconfig.h
-genpreds.po: insn-modes.h
-genpreds.po: options.h
-genpreds.po: tm.h
-genrecog.o: bconfig.h
-genrecog.o: insn-modes.h
-genrecog.o: options.h
-genrecog.o: tm.h
-genrecog.po: bconfig.h
-genrecog.po: insn-modes.h
-genrecog.po: options.h
-genrecog.po: tm.h
-gensupport.o: bconfig.h
-gensupport.o: insn-modes.h
-gensupport.o: options.h
-gensupport.o: tm.h
-gensupport.po: bconfig.h
-gensupport.po: insn-modes.h
-gensupport.po: options.h
-gensupport.po: tm.h
-ggc-none.o: bconfig.h
-ggc-none.o: gtype-desc.h
-ggc-none.po: bconfig.h
-ggc-none.po: gtype-desc.h
-min-insn-modes.o: bconfig.h
-min-insn-modes.o: insn-modes.h
-min-insn-modes.o: min-insn-modes.c
-min-insn-modes.po: bconfig.h
-min-insn-modes.po: insn-modes.h
-min-insn-modes.po: min-insn-modes.c
-print-rtl.o: bconfig.h
-print-rtl.o: insn-modes.h
-print-rtl.o: options.h
-print-rtl.o: tm.h
-print-rtl.po: bconfig.h
-print-rtl.po: insn-modes.h
-print-rtl.po: options.h
-print-rtl.po: tm.h
-read-rtl.o: bconfig.h
-read-rtl.o: insn-modes.h
-read-rtl.o: options.h
-read-rtl.o: tm.h
-read-rtl.po: bconfig.h
-read-rtl.po: insn-modes.h
-read-rtl.po: options.h
-read-rtl.po: tm.h
-rtl.o: bconfig.h
-rtl.o: gtype-desc.h
-rtl.o: insn-modes.h
-rtl.o: options.h
-rtl.o: tm.h
-rtl.po: bconfig.h
-rtl.po: gtype-desc.h
-rtl.po: insn-modes.h
-rtl.po: options.h
-rtl.po: tm.h
-vec.o: bconfig.h
-vec.o: gtype-desc.h
-vec.o: insn-modes.h
-vec.o: tree-check.h
-vec.po: bconfig.h
-vec.po: gtype-desc.h
-vec.po: insn-modes.h
-vec.po: tree-check.h
.endif
diff --git a/gnu/usr.bin/cc/libcpp/Makefile.depend b/gnu/usr.bin/cc/libcpp/Makefile.depend
index 075613d..18be76b 100644
--- a/gnu/usr.bin/cc/libcpp/Makefile.depend
+++ b/gnu/usr.bin/cc/libcpp/Makefile.depend
@@ -10,6 +10,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-init.o: localedir.h
-init.po: localedir.h
.endif
diff --git a/gnu/usr.bin/diff3/Makefile.depend b/gnu/usr.bin/diff3/Makefile.depend
index 1931f06..3646e2e 100644
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ b/gnu/usr.bin/diff3/Makefile.depend
@@ -15,6 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-diff3.o: diff3.c
-diff3.po: diff3.c
.endif
diff --git a/gnu/usr.bin/dtc/Makefile.depend b/gnu/usr.bin/dtc/Makefile.depend
index 93a3a02..ca0b2f9 100644
--- a/gnu/usr.bin/dtc/Makefile.depend
+++ b/gnu/usr.bin/dtc/Makefile.depend
@@ -16,12 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-dtc-lexer.lex.o: dtc-lexer.lex.c
-dtc-lexer.lex.o: dtc-parser.tab.h
-dtc-lexer.lex.po: dtc-lexer.lex.c
-dtc-lexer.lex.po: dtc-parser.tab.h
-dtc-parser.tab.o: dtc-parser.tab.c
-dtc-parser.tab.po: dtc-parser.tab.c
-util.o: version_gen.h
-util.po: version_gen.h
.endif
diff --git a/gnu/usr.bin/gdb/gdb/Makefile.depend b/gnu/usr.bin/gdb/gdb/Makefile.depend
index f2e2bfa..10de637 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdb/Makefile.depend
@@ -23,10 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-gdb.o: nm.h
-gdb.o: tm.h
-gdb.o: xm.h
-gdb.po: nm.h
-gdb.po: tm.h
-gdb.po: xm.h
.endif
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile.depend b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
index ad14e4c..10de637 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
@@ -23,10 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-tui-main.o: nm.h
-tui-main.o: tm.h
-tui-main.o: xm.h
-tui-main.po: nm.h
-tui-main.po: tm.h
-tui-main.po: xm.h
.endif
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/kgdb/Makefile.depend
index 3c60b31..c39552f 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
+++ b/gnu/usr.bin/gdb/kgdb/Makefile.depend
@@ -25,34 +25,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-kld.o: nm.h
-kld.o: tm.h
-kld.o: xm.h
-kld.po: nm.h
-kld.po: tm.h
-kld.po: xm.h
-kthr.o: nm.h
-kthr.o: tm.h
-kthr.o: xm.h
-kthr.po: nm.h
-kthr.po: tm.h
-kthr.po: xm.h
-main.o: nm.h
-main.o: tm.h
-main.o: xm.h
-main.po: nm.h
-main.po: tm.h
-main.po: xm.h
-trgt.o: nm.h
-trgt.o: tm.h
-trgt.o: xm.h
-trgt.po: nm.h
-trgt.po: tm.h
-trgt.po: xm.h
-trgt_amd64.o: nm.h
-trgt_amd64.o: tm.h
-trgt_amd64.o: xm.h
-trgt_amd64.po: nm.h
-trgt_amd64.po: tm.h
-trgt_amd64.po: xm.h
.endif
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.depend b/gnu/usr.bin/gdb/libgdb/Makefile.depend
new file mode 100644
index 0000000..80f12f7
--- /dev/null
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.depend
@@ -0,0 +1,19 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/libreadline/readline \
+ include \
+ include/arpa \
+ include/xlocale \
+ lib/libthread_db \
+ lib/msun \
+ lib/ncurses/ncursesw \
+ usr.bin/yacc.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
deleted file mode 100644
index 4c60635..0000000
--- a/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
+++ /dev/null
@@ -1,1211 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/libreadline/readline \
- include \
- include/arpa \
- include/xlocale \
- lib/libthread_db \
- lib/msun \
- lib/ncurses/ncursesw \
- usr.bin/yacc.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-amd64-nat.o: nm.h
-amd64-nat.o: tm.h
-amd64-nat.o: xm.h
-amd64-nat.po: nm.h
-amd64-nat.po: tm.h
-amd64-nat.po: xm.h
-amd64-tdep.o: nm.h
-amd64-tdep.o: tm.h
-amd64-tdep.o: xm.h
-amd64-tdep.po: nm.h
-amd64-tdep.po: tm.h
-amd64-tdep.po: xm.h
-amd64bsd-nat.o: nm.h
-amd64bsd-nat.o: tm.h
-amd64bsd-nat.o: xm.h
-amd64bsd-nat.po: nm.h
-amd64bsd-nat.po: tm.h
-amd64bsd-nat.po: xm.h
-amd64fbsd-nat.o: nm.h
-amd64fbsd-nat.o: tm.h
-amd64fbsd-nat.o: xm.h
-amd64fbsd-nat.po: nm.h
-amd64fbsd-nat.po: tm.h
-amd64fbsd-nat.po: xm.h
-amd64fbsd-tdep.o: nm.h
-amd64fbsd-tdep.o: tm.h
-amd64fbsd-tdep.o: xm.h
-amd64fbsd-tdep.po: nm.h
-amd64fbsd-tdep.po: tm.h
-amd64fbsd-tdep.po: xm.h
-annotate.o: nm.h
-annotate.o: tm.h
-annotate.o: xm.h
-annotate.po: nm.h
-annotate.po: tm.h
-annotate.po: xm.h
-arch-utils.o: nm.h
-arch-utils.o: tm.h
-arch-utils.o: xm.h
-arch-utils.po: nm.h
-arch-utils.po: tm.h
-arch-utils.po: xm.h
-auxv.o: nm.h
-auxv.o: tm.h
-auxv.o: xm.h
-auxv.po: nm.h
-auxv.po: tm.h
-auxv.po: xm.h
-ax-gdb.o: nm.h
-ax-gdb.o: tm.h
-ax-gdb.o: xm.h
-ax-gdb.po: nm.h
-ax-gdb.po: tm.h
-ax-gdb.po: xm.h
-ax-general.o: nm.h
-ax-general.o: tm.h
-ax-general.o: xm.h
-ax-general.po: nm.h
-ax-general.po: tm.h
-ax-general.po: xm.h
-bcache.o: nm.h
-bcache.o: tm.h
-bcache.o: xm.h
-bcache.po: nm.h
-bcache.po: tm.h
-bcache.po: xm.h
-bfd-target.o: nm.h
-bfd-target.o: tm.h
-bfd-target.o: xm.h
-bfd-target.po: nm.h
-bfd-target.po: tm.h
-bfd-target.po: xm.h
-block.o: nm.h
-block.o: tm.h
-block.o: xm.h
-block.po: nm.h
-block.po: tm.h
-block.po: xm.h
-blockframe.o: nm.h
-blockframe.o: tm.h
-blockframe.o: xm.h
-blockframe.po: nm.h
-blockframe.po: tm.h
-blockframe.po: xm.h
-breakpoint.o: nm.h
-breakpoint.o: tm.h
-breakpoint.o: xm.h
-breakpoint.po: nm.h
-breakpoint.po: tm.h
-breakpoint.po: xm.h
-buildsym.o: nm.h
-buildsym.o: tm.h
-buildsym.o: xm.h
-buildsym.po: nm.h
-buildsym.po: tm.h
-buildsym.po: xm.h
-c-exp.o: c-exp.c
-c-exp.o: nm.h
-c-exp.o: tm.h
-c-exp.o: xm.h
-c-exp.po: c-exp.c
-c-exp.po: nm.h
-c-exp.po: tm.h
-c-exp.po: xm.h
-c-lang.o: nm.h
-c-lang.o: tm.h
-c-lang.o: xm.h
-c-lang.po: nm.h
-c-lang.po: tm.h
-c-lang.po: xm.h
-c-typeprint.o: nm.h
-c-typeprint.o: tm.h
-c-typeprint.o: xm.h
-c-typeprint.po: nm.h
-c-typeprint.po: tm.h
-c-typeprint.po: xm.h
-c-valprint.o: nm.h
-c-valprint.o: tm.h
-c-valprint.o: xm.h
-c-valprint.po: nm.h
-c-valprint.po: tm.h
-c-valprint.po: xm.h
-charset.o: nm.h
-charset.o: tm.h
-charset.o: xm.h
-charset.po: nm.h
-charset.po: tm.h
-charset.po: xm.h
-cli-cmds.o: nm.h
-cli-cmds.o: tm.h
-cli-cmds.o: xm.h
-cli-cmds.po: nm.h
-cli-cmds.po: tm.h
-cli-cmds.po: xm.h
-cli-decode.o: nm.h
-cli-decode.o: tm.h
-cli-decode.o: xm.h
-cli-decode.po: nm.h
-cli-decode.po: tm.h
-cli-decode.po: xm.h
-cli-dump.o: nm.h
-cli-dump.o: tm.h
-cli-dump.o: xm.h
-cli-dump.po: nm.h
-cli-dump.po: tm.h
-cli-dump.po: xm.h
-cli-interp.o: nm.h
-cli-interp.o: tm.h
-cli-interp.o: xm.h
-cli-interp.po: nm.h
-cli-interp.po: tm.h
-cli-interp.po: xm.h
-cli-logging.o: nm.h
-cli-logging.o: tm.h
-cli-logging.o: xm.h
-cli-logging.po: nm.h
-cli-logging.po: tm.h
-cli-logging.po: xm.h
-cli-out.o: nm.h
-cli-out.o: tm.h
-cli-out.o: xm.h
-cli-out.po: nm.h
-cli-out.po: tm.h
-cli-out.po: xm.h
-cli-script.o: nm.h
-cli-script.o: tm.h
-cli-script.o: xm.h
-cli-script.po: nm.h
-cli-script.po: tm.h
-cli-script.po: xm.h
-cli-setshow.o: nm.h
-cli-setshow.o: tm.h
-cli-setshow.o: xm.h
-cli-setshow.po: nm.h
-cli-setshow.po: tm.h
-cli-setshow.po: xm.h
-cli-utils.o: nm.h
-cli-utils.o: tm.h
-cli-utils.o: xm.h
-cli-utils.po: nm.h
-cli-utils.po: tm.h
-cli-utils.po: xm.h
-coff-pe-read.o: nm.h
-coff-pe-read.o: tm.h
-coff-pe-read.o: xm.h
-coff-pe-read.po: nm.h
-coff-pe-read.po: tm.h
-coff-pe-read.po: xm.h
-coffread.o: nm.h
-coffread.o: tm.h
-coffread.o: xm.h
-coffread.po: nm.h
-coffread.po: tm.h
-coffread.po: xm.h
-complaints.o: nm.h
-complaints.o: tm.h
-complaints.o: xm.h
-complaints.po: nm.h
-complaints.po: tm.h
-complaints.po: xm.h
-completer.o: nm.h
-completer.o: tm.h
-completer.o: xm.h
-completer.po: nm.h
-completer.po: tm.h
-completer.po: xm.h
-copying.o: nm.h
-copying.o: tm.h
-copying.o: xm.h
-copying.po: nm.h
-copying.po: tm.h
-copying.po: xm.h
-corefile.o: nm.h
-corefile.o: tm.h
-corefile.o: xm.h
-corefile.po: nm.h
-corefile.po: tm.h
-corefile.po: xm.h
-corelow.o: nm.h
-corelow.o: tm.h
-corelow.o: xm.h
-corelow.po: nm.h
-corelow.po: tm.h
-corelow.po: xm.h
-cp-abi.o: nm.h
-cp-abi.o: tm.h
-cp-abi.o: xm.h
-cp-abi.po: nm.h
-cp-abi.po: tm.h
-cp-abi.po: xm.h
-cp-namespace.o: nm.h
-cp-namespace.o: tm.h
-cp-namespace.o: xm.h
-cp-namespace.po: nm.h
-cp-namespace.po: tm.h
-cp-namespace.po: xm.h
-cp-support.o: nm.h
-cp-support.o: tm.h
-cp-support.o: xm.h
-cp-support.po: nm.h
-cp-support.po: tm.h
-cp-support.po: xm.h
-cp-valprint.o: nm.h
-cp-valprint.o: tm.h
-cp-valprint.o: xm.h
-cp-valprint.po: nm.h
-cp-valprint.po: tm.h
-cp-valprint.po: xm.h
-dbxread.o: nm.h
-dbxread.o: tm.h
-dbxread.o: xm.h
-dbxread.po: nm.h
-dbxread.po: tm.h
-dbxread.po: xm.h
-dcache.o: nm.h
-dcache.o: tm.h
-dcache.o: xm.h
-dcache.po: nm.h
-dcache.po: tm.h
-dcache.po: xm.h
-demangle.o: nm.h
-demangle.o: tm.h
-demangle.o: xm.h
-demangle.po: nm.h
-demangle.po: tm.h
-demangle.po: xm.h
-dictionary.o: nm.h
-dictionary.o: tm.h
-dictionary.o: xm.h
-dictionary.po: nm.h
-dictionary.po: tm.h
-dictionary.po: xm.h
-disasm.o: nm.h
-disasm.o: tm.h
-disasm.o: xm.h
-disasm.po: nm.h
-disasm.po: tm.h
-disasm.po: xm.h
-doublest.o: nm.h
-doublest.o: tm.h
-doublest.o: xm.h
-doublest.po: nm.h
-doublest.po: tm.h
-doublest.po: xm.h
-dummy-frame.o: nm.h
-dummy-frame.o: tm.h
-dummy-frame.o: xm.h
-dummy-frame.po: nm.h
-dummy-frame.po: tm.h
-dummy-frame.po: xm.h
-dwarf2-frame.o: nm.h
-dwarf2-frame.o: tm.h
-dwarf2-frame.o: xm.h
-dwarf2-frame.po: nm.h
-dwarf2-frame.po: tm.h
-dwarf2-frame.po: xm.h
-dwarf2expr.o: nm.h
-dwarf2expr.o: tm.h
-dwarf2expr.o: xm.h
-dwarf2expr.po: nm.h
-dwarf2expr.po: tm.h
-dwarf2expr.po: xm.h
-dwarf2loc.o: nm.h
-dwarf2loc.o: tm.h
-dwarf2loc.o: xm.h
-dwarf2loc.po: nm.h
-dwarf2loc.po: tm.h
-dwarf2loc.po: xm.h
-dwarf2read.o: nm.h
-dwarf2read.o: tm.h
-dwarf2read.o: xm.h
-dwarf2read.po: nm.h
-dwarf2read.po: tm.h
-dwarf2read.po: xm.h
-dwarfread.o: nm.h
-dwarfread.o: tm.h
-dwarfread.o: xm.h
-dwarfread.po: nm.h
-dwarfread.po: tm.h
-dwarfread.po: xm.h
-elfread.o: nm.h
-elfread.o: tm.h
-elfread.o: xm.h
-elfread.po: nm.h
-elfread.po: tm.h
-elfread.po: xm.h
-environ.o: nm.h
-environ.o: tm.h
-environ.o: xm.h
-environ.po: nm.h
-environ.po: tm.h
-environ.po: xm.h
-eval.o: nm.h
-eval.o: tm.h
-eval.o: xm.h
-eval.po: nm.h
-eval.po: tm.h
-eval.po: xm.h
-event-loop.o: nm.h
-event-loop.o: tm.h
-event-loop.o: xm.h
-event-loop.po: nm.h
-event-loop.po: tm.h
-event-loop.po: xm.h
-event-top.o: nm.h
-event-top.o: tm.h
-event-top.o: xm.h
-event-top.po: nm.h
-event-top.po: tm.h
-event-top.po: xm.h
-exec.o: nm.h
-exec.o: tm.h
-exec.o: xm.h
-exec.po: nm.h
-exec.po: tm.h
-exec.po: xm.h
-expprint.o: nm.h
-expprint.o: tm.h
-expprint.o: xm.h
-expprint.po: nm.h
-expprint.po: tm.h
-expprint.po: xm.h
-f-exp.o: f-exp.c
-f-exp.o: nm.h
-f-exp.o: tm.h
-f-exp.o: xm.h
-f-exp.po: f-exp.c
-f-exp.po: nm.h
-f-exp.po: tm.h
-f-exp.po: xm.h
-f-lang.o: nm.h
-f-lang.o: tm.h
-f-lang.o: xm.h
-f-lang.po: nm.h
-f-lang.po: tm.h
-f-lang.po: xm.h
-f-typeprint.o: nm.h
-f-typeprint.o: tm.h
-f-typeprint.o: xm.h
-f-typeprint.po: nm.h
-f-typeprint.po: tm.h
-f-typeprint.po: xm.h
-f-valprint.o: nm.h
-f-valprint.o: tm.h
-f-valprint.o: xm.h
-f-valprint.po: nm.h
-f-valprint.po: tm.h
-f-valprint.po: xm.h
-fbsd-proc.o: nm.h
-fbsd-proc.o: tm.h
-fbsd-proc.o: xm.h
-fbsd-proc.po: nm.h
-fbsd-proc.po: tm.h
-fbsd-proc.po: xm.h
-fbsd-threads.o: nm.h
-fbsd-threads.o: tm.h
-fbsd-threads.o: xm.h
-fbsd-threads.po: nm.h
-fbsd-threads.po: tm.h
-fbsd-threads.po: xm.h
-findvar.o: nm.h
-findvar.o: tm.h
-findvar.o: xm.h
-findvar.po: nm.h
-findvar.po: tm.h
-findvar.po: xm.h
-fork-child.o: nm.h
-fork-child.o: tm.h
-fork-child.o: xm.h
-fork-child.po: nm.h
-fork-child.po: tm.h
-fork-child.po: xm.h
-frame-base.o: nm.h
-frame-base.o: tm.h
-frame-base.o: xm.h
-frame-base.po: nm.h
-frame-base.po: tm.h
-frame-base.po: xm.h
-frame-unwind.o: nm.h
-frame-unwind.o: tm.h
-frame-unwind.o: xm.h
-frame-unwind.po: nm.h
-frame-unwind.po: tm.h
-frame-unwind.po: xm.h
-frame.o: nm.h
-frame.o: tm.h
-frame.o: xm.h
-frame.po: nm.h
-frame.po: tm.h
-frame.po: xm.h
-gcore.o: nm.h
-gcore.o: tm.h
-gcore.o: xm.h
-gcore.po: nm.h
-gcore.po: tm.h
-gcore.po: xm.h
-gdb-events.o: nm.h
-gdb-events.o: tm.h
-gdb-events.o: xm.h
-gdb-events.po: nm.h
-gdb-events.po: tm.h
-gdb-events.po: xm.h
-gdbarch.o: nm.h
-gdbarch.o: tm.h
-gdbarch.o: xm.h
-gdbarch.po: nm.h
-gdbarch.po: tm.h
-gdbarch.po: xm.h
-gdbtypes.o: nm.h
-gdbtypes.o: tm.h
-gdbtypes.o: xm.h
-gdbtypes.po: nm.h
-gdbtypes.po: tm.h
-gdbtypes.po: xm.h
-gnu-v2-abi.o: nm.h
-gnu-v2-abi.o: tm.h
-gnu-v2-abi.o: xm.h
-gnu-v2-abi.po: nm.h
-gnu-v2-abi.po: tm.h
-gnu-v2-abi.po: xm.h
-gnu-v3-abi.o: nm.h
-gnu-v3-abi.o: tm.h
-gnu-v3-abi.o: xm.h
-gnu-v3-abi.po: nm.h
-gnu-v3-abi.po: tm.h
-gnu-v3-abi.po: xm.h
-hpacc-abi.o: nm.h
-hpacc-abi.o: tm.h
-hpacc-abi.o: xm.h
-hpacc-abi.po: nm.h
-hpacc-abi.po: tm.h
-hpacc-abi.po: xm.h
-i386-tdep.o: nm.h
-i386-tdep.o: tm.h
-i386-tdep.o: xm.h
-i386-tdep.po: nm.h
-i386-tdep.po: tm.h
-i386-tdep.po: xm.h
-i386bsd-tdep.o: nm.h
-i386bsd-tdep.o: tm.h
-i386bsd-tdep.o: xm.h
-i386bsd-tdep.po: nm.h
-i386bsd-tdep.po: tm.h
-i386bsd-tdep.po: xm.h
-i386fbsd-tdep-fixed.o: i386fbsd-tdep-fixed.c
-i386fbsd-tdep-fixed.o: nm.h
-i386fbsd-tdep-fixed.o: tm.h
-i386fbsd-tdep-fixed.o: xm.h
-i386fbsd-tdep-fixed.po: i386fbsd-tdep-fixed.c
-i386fbsd-tdep-fixed.po: nm.h
-i386fbsd-tdep-fixed.po: tm.h
-i386fbsd-tdep-fixed.po: xm.h
-i387-tdep.o: nm.h
-i387-tdep.o: tm.h
-i387-tdep.o: xm.h
-i387-tdep.po: nm.h
-i387-tdep.po: tm.h
-i387-tdep.po: xm.h
-inf-loop.o: nm.h
-inf-loop.o: tm.h
-inf-loop.o: xm.h
-inf-loop.po: nm.h
-inf-loop.po: tm.h
-inf-loop.po: xm.h
-infcall.o: nm.h
-infcall.o: tm.h
-infcall.o: xm.h
-infcall.po: nm.h
-infcall.po: tm.h
-infcall.po: xm.h
-infcmd.o: nm.h
-infcmd.o: tm.h
-infcmd.o: xm.h
-infcmd.po: nm.h
-infcmd.po: tm.h
-infcmd.po: xm.h
-inflow.o: nm.h
-inflow.o: tm.h
-inflow.o: xm.h
-inflow.po: nm.h
-inflow.po: tm.h
-inflow.po: xm.h
-infptrace.o: nm.h
-infptrace.o: tm.h
-infptrace.o: xm.h
-infptrace.po: nm.h
-infptrace.po: tm.h
-infptrace.po: xm.h
-infrun.o: nm.h
-infrun.o: tm.h
-infrun.o: xm.h
-infrun.po: nm.h
-infrun.po: tm.h
-infrun.po: xm.h
-inftarg.o: nm.h
-inftarg.o: tm.h
-inftarg.o: xm.h
-inftarg.po: nm.h
-inftarg.po: tm.h
-inftarg.po: xm.h
-init.o: nm.h
-init.o: tm.h
-init.o: xm.h
-init.po: nm.h
-init.po: tm.h
-init.po: xm.h
-interps.o: nm.h
-interps.o: tm.h
-interps.o: xm.h
-interps.po: nm.h
-interps.po: tm.h
-interps.po: xm.h
-jv-exp.o: jv-exp.c
-jv-exp.o: nm.h
-jv-exp.o: tm.h
-jv-exp.o: xm.h
-jv-exp.po: jv-exp.c
-jv-exp.po: nm.h
-jv-exp.po: tm.h
-jv-exp.po: xm.h
-jv-lang.o: nm.h
-jv-lang.o: tm.h
-jv-lang.o: xm.h
-jv-lang.po: nm.h
-jv-lang.po: tm.h
-jv-lang.po: xm.h
-jv-typeprint.o: nm.h
-jv-typeprint.o: tm.h
-jv-typeprint.o: xm.h
-jv-typeprint.po: nm.h
-jv-typeprint.po: tm.h
-jv-typeprint.po: xm.h
-jv-valprint.o: nm.h
-jv-valprint.o: tm.h
-jv-valprint.o: xm.h
-jv-valprint.po: nm.h
-jv-valprint.po: tm.h
-jv-valprint.po: xm.h
-kod-cisco.o: nm.h
-kod-cisco.o: tm.h
-kod-cisco.o: xm.h
-kod-cisco.po: nm.h
-kod-cisco.po: tm.h
-kod-cisco.po: xm.h
-kod.o: nm.h
-kod.o: tm.h
-kod.o: xm.h
-kod.po: nm.h
-kod.po: tm.h
-kod.po: xm.h
-language.o: nm.h
-language.o: tm.h
-language.o: xm.h
-language.po: nm.h
-language.po: tm.h
-language.po: xm.h
-linespec.o: nm.h
-linespec.o: tm.h
-linespec.o: xm.h
-linespec.po: nm.h
-linespec.po: tm.h
-linespec.po: xm.h
-m2-exp.o: m2-exp.c
-m2-exp.o: nm.h
-m2-exp.o: tm.h
-m2-exp.o: xm.h
-m2-exp.po: m2-exp.c
-m2-exp.po: nm.h
-m2-exp.po: tm.h
-m2-exp.po: xm.h
-m2-lang.o: nm.h
-m2-lang.o: tm.h
-m2-lang.o: xm.h
-m2-lang.po: nm.h
-m2-lang.po: tm.h
-m2-lang.po: xm.h
-m2-typeprint.o: nm.h
-m2-typeprint.o: tm.h
-m2-typeprint.o: xm.h
-m2-typeprint.po: nm.h
-m2-typeprint.po: tm.h
-m2-typeprint.po: xm.h
-m2-valprint.o: nm.h
-m2-valprint.o: tm.h
-m2-valprint.o: xm.h
-m2-valprint.po: nm.h
-m2-valprint.po: tm.h
-m2-valprint.po: xm.h
-macrocmd.o: nm.h
-macrocmd.o: tm.h
-macrocmd.o: xm.h
-macrocmd.po: nm.h
-macrocmd.po: tm.h
-macrocmd.po: xm.h
-macroexp.o: nm.h
-macroexp.o: tm.h
-macroexp.o: xm.h
-macroexp.po: nm.h
-macroexp.po: tm.h
-macroexp.po: xm.h
-macroscope.o: nm.h
-macroscope.o: tm.h
-macroscope.o: xm.h
-macroscope.po: nm.h
-macroscope.po: tm.h
-macroscope.po: xm.h
-macrotab.o: nm.h
-macrotab.o: tm.h
-macrotab.o: xm.h
-macrotab.po: nm.h
-macrotab.po: tm.h
-macrotab.po: xm.h
-main.o: nm.h
-main.o: tm.h
-main.o: xm.h
-main.po: nm.h
-main.po: tm.h
-main.po: xm.h
-maint.o: nm.h
-maint.o: tm.h
-maint.o: xm.h
-maint.po: nm.h
-maint.po: tm.h
-maint.po: xm.h
-mdebugread.o: nm.h
-mdebugread.o: tm.h
-mdebugread.o: xm.h
-mdebugread.po: nm.h
-mdebugread.po: tm.h
-mdebugread.po: xm.h
-mem-break.o: nm.h
-mem-break.o: tm.h
-mem-break.o: xm.h
-mem-break.po: nm.h
-mem-break.po: tm.h
-mem-break.po: xm.h
-memattr.o: nm.h
-memattr.o: tm.h
-memattr.o: xm.h
-memattr.po: nm.h
-memattr.po: tm.h
-memattr.po: xm.h
-mi-cmd-break.o: nm.h
-mi-cmd-break.o: tm.h
-mi-cmd-break.o: xm.h
-mi-cmd-break.po: nm.h
-mi-cmd-break.po: tm.h
-mi-cmd-break.po: xm.h
-mi-cmd-disas.o: nm.h
-mi-cmd-disas.o: tm.h
-mi-cmd-disas.o: xm.h
-mi-cmd-disas.po: nm.h
-mi-cmd-disas.po: tm.h
-mi-cmd-disas.po: xm.h
-mi-cmd-env.o: nm.h
-mi-cmd-env.o: tm.h
-mi-cmd-env.o: xm.h
-mi-cmd-env.po: nm.h
-mi-cmd-env.po: tm.h
-mi-cmd-env.po: xm.h
-mi-cmd-file.o: nm.h
-mi-cmd-file.o: tm.h
-mi-cmd-file.o: xm.h
-mi-cmd-file.po: nm.h
-mi-cmd-file.po: tm.h
-mi-cmd-file.po: xm.h
-mi-cmd-stack.o: nm.h
-mi-cmd-stack.o: tm.h
-mi-cmd-stack.o: xm.h
-mi-cmd-stack.po: nm.h
-mi-cmd-stack.po: tm.h
-mi-cmd-stack.po: xm.h
-mi-cmd-var.o: nm.h
-mi-cmd-var.o: tm.h
-mi-cmd-var.o: xm.h
-mi-cmd-var.po: nm.h
-mi-cmd-var.po: tm.h
-mi-cmd-var.po: xm.h
-mi-cmds.o: nm.h
-mi-cmds.o: tm.h
-mi-cmds.o: xm.h
-mi-cmds.po: nm.h
-mi-cmds.po: tm.h
-mi-cmds.po: xm.h
-mi-console.o: nm.h
-mi-console.o: tm.h
-mi-console.o: xm.h
-mi-console.po: nm.h
-mi-console.po: tm.h
-mi-console.po: xm.h
-mi-getopt.o: nm.h
-mi-getopt.o: tm.h
-mi-getopt.o: xm.h
-mi-getopt.po: nm.h
-mi-getopt.po: tm.h
-mi-getopt.po: xm.h
-mi-interp.o: nm.h
-mi-interp.o: tm.h
-mi-interp.o: xm.h
-mi-interp.po: nm.h
-mi-interp.po: tm.h
-mi-interp.po: xm.h
-mi-main.o: nm.h
-mi-main.o: tm.h
-mi-main.o: xm.h
-mi-main.po: nm.h
-mi-main.po: tm.h
-mi-main.po: xm.h
-mi-out.o: nm.h
-mi-out.o: tm.h
-mi-out.o: xm.h
-mi-out.po: nm.h
-mi-out.po: tm.h
-mi-out.po: xm.h
-mi-parse.o: nm.h
-mi-parse.o: tm.h
-mi-parse.o: xm.h
-mi-parse.po: nm.h
-mi-parse.po: tm.h
-mi-parse.po: xm.h
-mi-symbol-cmds.o: nm.h
-mi-symbol-cmds.o: tm.h
-mi-symbol-cmds.o: xm.h
-mi-symbol-cmds.po: nm.h
-mi-symbol-cmds.po: tm.h
-mi-symbol-cmds.po: xm.h
-minsyms.o: nm.h
-minsyms.o: tm.h
-minsyms.o: xm.h
-minsyms.po: nm.h
-minsyms.po: tm.h
-minsyms.po: xm.h
-mipsread.o: nm.h
-mipsread.o: tm.h
-mipsread.o: xm.h
-mipsread.po: nm.h
-mipsread.po: tm.h
-mipsread.po: xm.h
-nlmread.o: nm.h
-nlmread.o: tm.h
-nlmread.o: xm.h
-nlmread.po: nm.h
-nlmread.po: tm.h
-nlmread.po: xm.h
-objc-exp.o: nm.h
-objc-exp.o: objc-exp.c
-objc-exp.o: tm.h
-objc-exp.o: xm.h
-objc-exp.po: nm.h
-objc-exp.po: objc-exp.c
-objc-exp.po: tm.h
-objc-exp.po: xm.h
-objc-lang.o: nm.h
-objc-lang.o: tm.h
-objc-lang.o: xm.h
-objc-lang.po: nm.h
-objc-lang.po: tm.h
-objc-lang.po: xm.h
-objfiles.o: nm.h
-objfiles.o: tm.h
-objfiles.o: xm.h
-objfiles.po: nm.h
-objfiles.po: tm.h
-objfiles.po: xm.h
-observer.o: nm.h
-observer.o: tm.h
-observer.o: xm.h
-observer.po: nm.h
-observer.po: tm.h
-observer.po: xm.h
-osabi.o: nm.h
-osabi.o: tm.h
-osabi.o: xm.h
-osabi.po: nm.h
-osabi.po: tm.h
-osabi.po: xm.h
-p-exp.o: nm.h
-p-exp.o: p-exp.c
-p-exp.o: tm.h
-p-exp.o: xm.h
-p-exp.po: nm.h
-p-exp.po: p-exp.c
-p-exp.po: tm.h
-p-exp.po: xm.h
-p-lang.o: nm.h
-p-lang.o: tm.h
-p-lang.o: xm.h
-p-lang.po: nm.h
-p-lang.po: tm.h
-p-lang.po: xm.h
-p-typeprint.o: nm.h
-p-typeprint.o: tm.h
-p-typeprint.o: xm.h
-p-typeprint.po: nm.h
-p-typeprint.po: tm.h
-p-typeprint.po: xm.h
-p-valprint.o: nm.h
-p-valprint.o: tm.h
-p-valprint.o: xm.h
-p-valprint.po: nm.h
-p-valprint.po: tm.h
-p-valprint.po: xm.h
-parse.o: nm.h
-parse.o: tm.h
-parse.o: xm.h
-parse.po: nm.h
-parse.po: tm.h
-parse.po: xm.h
-printcmd.o: nm.h
-printcmd.o: tm.h
-printcmd.o: xm.h
-printcmd.po: nm.h
-printcmd.po: tm.h
-printcmd.po: xm.h
-regcache.o: nm.h
-regcache.o: tm.h
-regcache.o: xm.h
-regcache.po: nm.h
-regcache.po: tm.h
-regcache.po: xm.h
-reggroups.o: nm.h
-reggroups.o: tm.h
-reggroups.o: xm.h
-reggroups.po: nm.h
-reggroups.po: tm.h
-reggroups.po: xm.h
-remote-fileio.o: nm.h
-remote-fileio.o: tm.h
-remote-fileio.o: xm.h
-remote-fileio.po: nm.h
-remote-fileio.po: tm.h
-remote-fileio.po: xm.h
-remote-utils.o: nm.h
-remote-utils.o: tm.h
-remote-utils.o: xm.h
-remote-utils.po: nm.h
-remote-utils.po: tm.h
-remote-utils.po: xm.h
-remote.o: nm.h
-remote.o: tm.h
-remote.o: xm.h
-remote.po: nm.h
-remote.po: tm.h
-remote.po: xm.h
-scm-exp.o: nm.h
-scm-exp.o: tm.h
-scm-exp.o: xm.h
-scm-exp.po: nm.h
-scm-exp.po: tm.h
-scm-exp.po: xm.h
-scm-lang.o: nm.h
-scm-lang.o: tm.h
-scm-lang.o: xm.h
-scm-lang.po: nm.h
-scm-lang.po: tm.h
-scm-lang.po: xm.h
-scm-valprint.o: nm.h
-scm-valprint.o: tm.h
-scm-valprint.o: xm.h
-scm-valprint.po: nm.h
-scm-valprint.po: tm.h
-scm-valprint.po: xm.h
-sentinel-frame.o: nm.h
-sentinel-frame.o: tm.h
-sentinel-frame.o: xm.h
-sentinel-frame.po: nm.h
-sentinel-frame.po: tm.h
-sentinel-frame.po: xm.h
-ser-pipe.o: nm.h
-ser-pipe.o: tm.h
-ser-pipe.o: xm.h
-ser-pipe.po: nm.h
-ser-pipe.po: tm.h
-ser-pipe.po: xm.h
-ser-tcp.o: nm.h
-ser-tcp.o: tm.h
-ser-tcp.o: xm.h
-ser-tcp.po: nm.h
-ser-tcp.po: tm.h
-ser-tcp.po: xm.h
-ser-unix.o: nm.h
-ser-unix.o: tm.h
-ser-unix.o: xm.h
-ser-unix.po: nm.h
-ser-unix.po: tm.h
-ser-unix.po: xm.h
-serial.o: nm.h
-serial.o: tm.h
-serial.o: xm.h
-serial.po: nm.h
-serial.po: tm.h
-serial.po: xm.h
-signals.o: nm.h
-signals.o: tm.h
-signals.o: xm.h
-signals.po: nm.h
-signals.po: tm.h
-signals.po: xm.h
-solib-svr4.o: nm.h
-solib-svr4.o: tm.h
-solib-svr4.o: xm.h
-solib-svr4.po: nm.h
-solib-svr4.po: tm.h
-solib-svr4.po: xm.h
-solib.o: nm.h
-solib.o: tm.h
-solib.o: xm.h
-solib.po: nm.h
-solib.po: tm.h
-solib.po: xm.h
-source.o: nm.h
-source.o: tm.h
-source.o: xm.h
-source.po: nm.h
-source.po: tm.h
-source.po: xm.h
-stabsread.o: nm.h
-stabsread.o: tm.h
-stabsread.o: xm.h
-stabsread.po: nm.h
-stabsread.po: tm.h
-stabsread.po: xm.h
-stack.o: nm.h
-stack.o: tm.h
-stack.o: xm.h
-stack.po: nm.h
-stack.po: tm.h
-stack.po: xm.h
-std-regs.o: nm.h
-std-regs.o: tm.h
-std-regs.o: xm.h
-std-regs.po: nm.h
-std-regs.po: tm.h
-std-regs.po: xm.h
-symfile.o: nm.h
-symfile.o: tm.h
-symfile.o: xm.h
-symfile.po: nm.h
-symfile.po: tm.h
-symfile.po: xm.h
-symmisc.o: nm.h
-symmisc.o: tm.h
-symmisc.o: xm.h
-symmisc.po: nm.h
-symmisc.po: tm.h
-symmisc.po: xm.h
-symtab.o: nm.h
-symtab.o: tm.h
-symtab.o: xm.h
-symtab.po: nm.h
-symtab.po: tm.h
-symtab.po: xm.h
-target.o: nm.h
-target.o: tm.h
-target.o: xm.h
-target.po: nm.h
-target.po: tm.h
-target.po: xm.h
-thread.o: nm.h
-thread.o: tm.h
-thread.o: xm.h
-thread.po: nm.h
-thread.po: tm.h
-thread.po: xm.h
-top.o: nm.h
-top.o: tm.h
-top.o: xm.h
-top.po: nm.h
-top.po: tm.h
-top.po: xm.h
-tracepoint.o: nm.h
-tracepoint.o: tm.h
-tracepoint.o: xm.h
-tracepoint.po: nm.h
-tracepoint.po: tm.h
-tracepoint.po: xm.h
-trad-frame.o: nm.h
-trad-frame.o: tm.h
-trad-frame.o: xm.h
-trad-frame.po: nm.h
-trad-frame.po: tm.h
-trad-frame.po: xm.h
-tui-command.o: nm.h
-tui-command.o: tm.h
-tui-command.o: xm.h
-tui-command.po: nm.h
-tui-command.po: tm.h
-tui-command.po: xm.h
-tui-data.o: nm.h
-tui-data.o: tm.h
-tui-data.o: xm.h
-tui-data.po: nm.h
-tui-data.po: tm.h
-tui-data.po: xm.h
-tui-disasm.o: nm.h
-tui-disasm.o: tm.h
-tui-disasm.o: xm.h
-tui-disasm.po: nm.h
-tui-disasm.po: tm.h
-tui-disasm.po: xm.h
-tui-file.o: nm.h
-tui-file.o: tm.h
-tui-file.o: xm.h
-tui-file.po: nm.h
-tui-file.po: tm.h
-tui-file.po: xm.h
-tui-hooks.o: nm.h
-tui-hooks.o: tm.h
-tui-hooks.o: xm.h
-tui-hooks.po: nm.h
-tui-hooks.po: tm.h
-tui-hooks.po: xm.h
-tui-interp.o: nm.h
-tui-interp.o: tm.h
-tui-interp.o: xm.h
-tui-interp.po: nm.h
-tui-interp.po: tm.h
-tui-interp.po: xm.h
-tui-io.o: nm.h
-tui-io.o: tm.h
-tui-io.o: xm.h
-tui-io.po: nm.h
-tui-io.po: tm.h
-tui-io.po: xm.h
-tui-layout.o: nm.h
-tui-layout.o: tm.h
-tui-layout.o: xm.h
-tui-layout.po: nm.h
-tui-layout.po: tm.h
-tui-layout.po: xm.h
-tui-out.o: nm.h
-tui-out.o: tm.h
-tui-out.o: xm.h
-tui-out.po: nm.h
-tui-out.po: tm.h
-tui-out.po: xm.h
-tui-regs.o: nm.h
-tui-regs.o: tm.h
-tui-regs.o: xm.h
-tui-regs.po: nm.h
-tui-regs.po: tm.h
-tui-regs.po: xm.h
-tui-source.o: nm.h
-tui-source.o: tm.h
-tui-source.o: xm.h
-tui-source.po: nm.h
-tui-source.po: tm.h
-tui-source.po: xm.h
-tui-stack.o: nm.h
-tui-stack.o: tm.h
-tui-stack.o: xm.h
-tui-stack.po: nm.h
-tui-stack.po: tm.h
-tui-stack.po: xm.h
-tui-win.o: nm.h
-tui-win.o: tm.h
-tui-win.o: xm.h
-tui-win.po: nm.h
-tui-win.po: tm.h
-tui-win.po: xm.h
-tui-windata.o: nm.h
-tui-windata.o: tm.h
-tui-windata.o: xm.h
-tui-windata.po: nm.h
-tui-windata.po: tm.h
-tui-windata.po: xm.h
-tui-wingeneral.o: nm.h
-tui-wingeneral.o: tm.h
-tui-wingeneral.o: xm.h
-tui-wingeneral.po: nm.h
-tui-wingeneral.po: tm.h
-tui-wingeneral.po: xm.h
-tui-winsource.o: nm.h
-tui-winsource.o: tm.h
-tui-winsource.o: xm.h
-tui-winsource.po: nm.h
-tui-winsource.po: tm.h
-tui-winsource.po: xm.h
-tui.o: nm.h
-tui.o: tm.h
-tui.o: xm.h
-tui.po: nm.h
-tui.po: tm.h
-tui.po: xm.h
-typeprint.o: nm.h
-typeprint.o: tm.h
-typeprint.o: xm.h
-typeprint.po: nm.h
-typeprint.po: tm.h
-typeprint.po: xm.h
-ui-file.o: nm.h
-ui-file.o: tm.h
-ui-file.o: xm.h
-ui-file.po: nm.h
-ui-file.po: tm.h
-ui-file.po: xm.h
-ui-out.o: nm.h
-ui-out.o: tm.h
-ui-out.o: xm.h
-ui-out.po: nm.h
-ui-out.po: tm.h
-ui-out.po: xm.h
-user-regs.o: nm.h
-user-regs.o: tm.h
-user-regs.o: xm.h
-user-regs.po: nm.h
-user-regs.po: tm.h
-user-regs.po: xm.h
-utils.o: nm.h
-utils.o: tm.h
-utils.o: xm.h
-utils.po: nm.h
-utils.po: tm.h
-utils.po: xm.h
-valarith.o: nm.h
-valarith.o: tm.h
-valarith.o: xm.h
-valarith.po: nm.h
-valarith.po: tm.h
-valarith.po: xm.h
-valops.o: nm.h
-valops.o: tm.h
-valops.o: xm.h
-valops.po: nm.h
-valops.po: tm.h
-valops.po: xm.h
-valprint.o: nm.h
-valprint.o: tm.h
-valprint.o: xm.h
-valprint.po: nm.h
-valprint.po: tm.h
-valprint.po: xm.h
-values.o: nm.h
-values.o: tm.h
-values.o: xm.h
-values.po: nm.h
-values.po: tm.h
-values.po: xm.h
-varobj.o: nm.h
-varobj.o: tm.h
-varobj.o: xm.h
-varobj.po: nm.h
-varobj.po: tm.h
-varobj.po: xm.h
-version.o: version.c
-version.po: version.c
-wrapper.o: nm.h
-wrapper.o: tm.h
-wrapper.o: xm.h
-wrapper.po: nm.h
-wrapper.po: tm.h
-wrapper.po: xm.h
-.endif
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend b/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend
index b01cf38..c210061 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend
@@ -11,6 +11,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.cpp
-version.po: version.cpp
.endif
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
index f3ae4bf..ec3db8a 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
@@ -20,8 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-eqn.o: eqn.cpp
-eqn.po: eqn.cpp
-lex.o: eqn_tab.h
-lex.po: eqn_tab.h
.endif
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
index e78d5c4..ec3db8a 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
@@ -20,8 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: pic_tab.h
-lex.po: pic_tab.h
-pic.o: pic.cpp
-pic.po: pic.cpp
.endif
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
index f68ef58..ca7d4b4 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
@@ -21,6 +21,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-label.o: label.cpp
-label.po: label.cpp
.endif
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
index 974b022..7ca2c25 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
@@ -19,6 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-majorminor.o: majorminor.cpp
-majorminor.po: majorminor.cpp
.endif
diff --git a/gnu/usr.bin/sdiff/Makefile.depend b/gnu/usr.bin/sdiff/Makefile.depend
index 4ba3ae9..3646e2e 100644
--- a/gnu/usr.bin/sdiff/Makefile.depend
+++ b/gnu/usr.bin/sdiff/Makefile.depend
@@ -15,6 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-sdiff.o: sdiff.c
-sdiff.po: sdiff.c
.endif
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 177de85..349a8f7 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -116,11 +116,6 @@ ${GEN_KX509}: kx509.asn1
.hx.h:
${CP} ${.IMPSRC} ${.TARGET}
-# This makefile generates a lot of its headers
-# so tell bsd.sys.mk not to try and stage them before they are built.
-# Note: this is rare
-NO_BEFOREBUILD_INCLUDES=
-
.include <bsd.lib.mk>
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend
index b944759..72f4875 100644
--- a/kerberos5/lib/libasn1/Makefile.depend
+++ b/kerberos5/lib/libasn1/Makefile.depend
@@ -8,185 +8,16 @@ DIRDEPS = \
include/arpa \
include/xlocale \
kerberos5/lib/libroken \
+ kerberos5/tools/asn1_compile.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-asn1_cms_asn1.So: asn1_cms_asn1.c
-asn1_cms_asn1.So: asn1_err.h
-asn1_cms_asn1.So: cms_asn1-priv.h
-asn1_cms_asn1.So: cms_asn1.h
-asn1_cms_asn1.So: rfc2459_asn1.h
-asn1_cms_asn1.o: asn1_cms_asn1.c
-asn1_cms_asn1.o: asn1_err.h
-asn1_cms_asn1.o: cms_asn1-priv.h
-asn1_cms_asn1.o: cms_asn1.h
-asn1_cms_asn1.o: rfc2459_asn1.h
-asn1_cms_asn1.po: asn1_cms_asn1.c
-asn1_cms_asn1.po: asn1_err.h
-asn1_cms_asn1.po: cms_asn1-priv.h
-asn1_cms_asn1.po: cms_asn1.h
-asn1_cms_asn1.po: rfc2459_asn1.h
-asn1_digest_asn1.So: asn1_digest_asn1.c
-asn1_digest_asn1.So: asn1_err.h
-asn1_digest_asn1.So: digest_asn1-priv.h
-asn1_digest_asn1.So: digest_asn1.h
-asn1_digest_asn1.So: krb5_asn1.h
-asn1_digest_asn1.o: asn1_digest_asn1.c
-asn1_digest_asn1.o: asn1_err.h
-asn1_digest_asn1.o: digest_asn1-priv.h
-asn1_digest_asn1.o: digest_asn1.h
-asn1_digest_asn1.o: krb5_asn1.h
-asn1_digest_asn1.po: asn1_digest_asn1.c
-asn1_digest_asn1.po: asn1_err.h
-asn1_digest_asn1.po: digest_asn1-priv.h
-asn1_digest_asn1.po: digest_asn1.h
-asn1_digest_asn1.po: krb5_asn1.h
-asn1_err.So: asn1_err.c
-asn1_err.So: asn1_err.h
-asn1_err.o: asn1_err.c
-asn1_err.o: asn1_err.h
-asn1_err.po: asn1_err.c
-asn1_err.po: asn1_err.h
-asn1_krb5_asn1.So: asn1_err.h
-asn1_krb5_asn1.So: asn1_krb5_asn1.c
-asn1_krb5_asn1.So: krb5_asn1-priv.h
-asn1_krb5_asn1.So: krb5_asn1.h
-asn1_krb5_asn1.o: asn1_err.h
-asn1_krb5_asn1.o: asn1_krb5_asn1.c
-asn1_krb5_asn1.o: krb5_asn1-priv.h
-asn1_krb5_asn1.o: krb5_asn1.h
-asn1_krb5_asn1.po: asn1_err.h
-asn1_krb5_asn1.po: asn1_krb5_asn1.c
-asn1_krb5_asn1.po: krb5_asn1-priv.h
-asn1_krb5_asn1.po: krb5_asn1.h
-asn1_kx509_asn1.So: asn1_err.h
-asn1_kx509_asn1.So: asn1_kx509_asn1.c
-asn1_kx509_asn1.So: kx509_asn1-priv.h
-asn1_kx509_asn1.So: kx509_asn1.h
-asn1_kx509_asn1.o: asn1_err.h
-asn1_kx509_asn1.o: asn1_kx509_asn1.c
-asn1_kx509_asn1.o: kx509_asn1-priv.h
-asn1_kx509_asn1.o: kx509_asn1.h
-asn1_kx509_asn1.po: asn1_err.h
-asn1_kx509_asn1.po: asn1_kx509_asn1.c
-asn1_kx509_asn1.po: kx509_asn1-priv.h
-asn1_kx509_asn1.po: kx509_asn1.h
-asn1_pkcs12_asn1.So: asn1_err.h
-asn1_pkcs12_asn1.So: asn1_pkcs12_asn1.c
-asn1_pkcs12_asn1.So: cms_asn1.h
-asn1_pkcs12_asn1.So: pkcs12_asn1-priv.h
-asn1_pkcs12_asn1.So: pkcs12_asn1.h
-asn1_pkcs12_asn1.So: rfc2459_asn1.h
-asn1_pkcs12_asn1.o: asn1_err.h
-asn1_pkcs12_asn1.o: asn1_pkcs12_asn1.c
-asn1_pkcs12_asn1.o: cms_asn1.h
-asn1_pkcs12_asn1.o: pkcs12_asn1-priv.h
-asn1_pkcs12_asn1.o: pkcs12_asn1.h
-asn1_pkcs12_asn1.o: rfc2459_asn1.h
-asn1_pkcs12_asn1.po: asn1_err.h
-asn1_pkcs12_asn1.po: asn1_pkcs12_asn1.c
-asn1_pkcs12_asn1.po: cms_asn1.h
-asn1_pkcs12_asn1.po: pkcs12_asn1-priv.h
-asn1_pkcs12_asn1.po: pkcs12_asn1.h
-asn1_pkcs12_asn1.po: rfc2459_asn1.h
-asn1_pkcs8_asn1.So: asn1_err.h
-asn1_pkcs8_asn1.So: asn1_pkcs8_asn1.c
-asn1_pkcs8_asn1.So: pkcs8_asn1-priv.h
-asn1_pkcs8_asn1.So: pkcs8_asn1.h
-asn1_pkcs8_asn1.So: rfc2459_asn1.h
-asn1_pkcs8_asn1.o: asn1_err.h
-asn1_pkcs8_asn1.o: asn1_pkcs8_asn1.c
-asn1_pkcs8_asn1.o: pkcs8_asn1-priv.h
-asn1_pkcs8_asn1.o: pkcs8_asn1.h
-asn1_pkcs8_asn1.o: rfc2459_asn1.h
-asn1_pkcs8_asn1.po: asn1_err.h
-asn1_pkcs8_asn1.po: asn1_pkcs8_asn1.c
-asn1_pkcs8_asn1.po: pkcs8_asn1-priv.h
-asn1_pkcs8_asn1.po: pkcs8_asn1.h
-asn1_pkcs8_asn1.po: rfc2459_asn1.h
-asn1_pkcs9_asn1.So: asn1_err.h
-asn1_pkcs9_asn1.So: asn1_pkcs9_asn1.c
-asn1_pkcs9_asn1.So: pkcs9_asn1-priv.h
-asn1_pkcs9_asn1.So: pkcs9_asn1.h
-asn1_pkcs9_asn1.o: asn1_err.h
-asn1_pkcs9_asn1.o: asn1_pkcs9_asn1.c
-asn1_pkcs9_asn1.o: pkcs9_asn1-priv.h
-asn1_pkcs9_asn1.o: pkcs9_asn1.h
-asn1_pkcs9_asn1.po: asn1_err.h
-asn1_pkcs9_asn1.po: asn1_pkcs9_asn1.c
-asn1_pkcs9_asn1.po: pkcs9_asn1-priv.h
-asn1_pkcs9_asn1.po: pkcs9_asn1.h
-asn1_pkinit_asn1.So: asn1_err.h
-asn1_pkinit_asn1.So: asn1_pkinit_asn1.c
-asn1_pkinit_asn1.So: cms_asn1.h
-asn1_pkinit_asn1.So: krb5_asn1.h
-asn1_pkinit_asn1.So: pkinit_asn1-priv.h
-asn1_pkinit_asn1.So: pkinit_asn1.h
-asn1_pkinit_asn1.So: rfc2459_asn1.h
-asn1_pkinit_asn1.o: asn1_err.h
-asn1_pkinit_asn1.o: asn1_pkinit_asn1.c
-asn1_pkinit_asn1.o: cms_asn1.h
-asn1_pkinit_asn1.o: krb5_asn1.h
-asn1_pkinit_asn1.o: pkinit_asn1-priv.h
-asn1_pkinit_asn1.o: pkinit_asn1.h
-asn1_pkinit_asn1.o: rfc2459_asn1.h
-asn1_pkinit_asn1.po: asn1_err.h
-asn1_pkinit_asn1.po: asn1_pkinit_asn1.c
-asn1_pkinit_asn1.po: cms_asn1.h
-asn1_pkinit_asn1.po: krb5_asn1.h
-asn1_pkinit_asn1.po: pkinit_asn1-priv.h
-asn1_pkinit_asn1.po: pkinit_asn1.h
-asn1_pkinit_asn1.po: rfc2459_asn1.h
-asn1_rfc2459_asn1.So: asn1_err.h
-asn1_rfc2459_asn1.So: asn1_rfc2459_asn1.c
-asn1_rfc2459_asn1.So: rfc2459_asn1-priv.h
-asn1_rfc2459_asn1.So: rfc2459_asn1.h
-asn1_rfc2459_asn1.o: asn1_err.h
-asn1_rfc2459_asn1.o: asn1_rfc2459_asn1.c
-asn1_rfc2459_asn1.o: rfc2459_asn1-priv.h
-asn1_rfc2459_asn1.o: rfc2459_asn1.h
-asn1_rfc2459_asn1.po: asn1_err.h
-asn1_rfc2459_asn1.po: asn1_rfc2459_asn1.c
-asn1_rfc2459_asn1.po: rfc2459_asn1-priv.h
-asn1_rfc2459_asn1.po: rfc2459_asn1.h
-der.So: asn1_err.h
-der.o: asn1_err.h
-der.po: asn1_err.h
-der_cmp.So: asn1_err.h
-der_cmp.o: asn1_err.h
-der_cmp.po: asn1_err.h
-der_copy.So: asn1_err.h
-der_copy.o: asn1_err.h
-der_copy.po: asn1_err.h
-der_format.So: asn1_err.h
-der_format.o: asn1_err.h
-der_format.po: asn1_err.h
-der_free.So: asn1_err.h
-der_free.o: asn1_err.h
-der_free.po: asn1_err.h
-der_get.So: asn1_err.h
-der_get.o: asn1_err.h
-der_get.po: asn1_err.h
-der_length.So: asn1_err.h
-der_length.o: asn1_err.h
-der_length.po: asn1_err.h
-der_put.So: asn1_err.h
-der_put.o: asn1_err.h
-der_put.po: asn1_err.h
-extra.So: asn1_err.h
-extra.o: asn1_err.h
-extra.po: asn1_err.h
-template.So: asn1_err.h
-template.o: asn1_err.h
-template.po: asn1_err.h
-timegm.So: asn1_err.h
-timegm.o: asn1_err.h
-timegm.po: asn1_err.h
.endif
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend
index 4d9610a..2f0effb 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile.depend
+++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend
@@ -19,172 +19,11 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgssapi \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-8003.So: gkrb5_err.h
-8003.o: gkrb5_err.h
-8003.po: gkrb5_err.h
-accept_sec_context.So: gkrb5_err.h
-accept_sec_context.o: gkrb5_err.h
-accept_sec_context.po: gkrb5_err.h
-acquire_cred.So: gkrb5_err.h
-acquire_cred.o: gkrb5_err.h
-acquire_cred.po: gkrb5_err.h
-add_cred.So: gkrb5_err.h
-add_cred.o: gkrb5_err.h
-add_cred.po: gkrb5_err.h
-address_to_krb5addr.So: gkrb5_err.h
-address_to_krb5addr.o: gkrb5_err.h
-address_to_krb5addr.po: gkrb5_err.h
-aeap.So: gkrb5_err.h
-aeap.o: gkrb5_err.h
-aeap.po: gkrb5_err.h
-arcfour.So: gkrb5_err.h
-arcfour.o: gkrb5_err.h
-arcfour.po: gkrb5_err.h
-authorize_localname.So: gkrb5_err.h
-authorize_localname.o: gkrb5_err.h
-authorize_localname.po: gkrb5_err.h
-canonicalize_name.So: gkrb5_err.h
-canonicalize_name.o: gkrb5_err.h
-canonicalize_name.po: gkrb5_err.h
-ccache_name.So: gkrb5_err.h
-ccache_name.o: gkrb5_err.h
-ccache_name.po: gkrb5_err.h
-cfx.So: gkrb5_err.h
-cfx.o: gkrb5_err.h
-cfx.po: gkrb5_err.h
-compare_name.So: gkrb5_err.h
-compare_name.o: gkrb5_err.h
-compare_name.po: gkrb5_err.h
-compat.So: gkrb5_err.h
-compat.o: gkrb5_err.h
-compat.po: gkrb5_err.h
-context_time.So: gkrb5_err.h
-context_time.o: gkrb5_err.h
-context_time.po: gkrb5_err.h
-copy_ccache.So: gkrb5_err.h
-copy_ccache.o: gkrb5_err.h
-copy_ccache.po: gkrb5_err.h
-creds.So: gkrb5_err.h
-creds.o: gkrb5_err.h
-creds.po: gkrb5_err.h
-decapsulate.So: gkrb5_err.h
-decapsulate.o: gkrb5_err.h
-decapsulate.po: gkrb5_err.h
-delete_sec_context.So: gkrb5_err.h
-delete_sec_context.o: gkrb5_err.h
-delete_sec_context.po: gkrb5_err.h
-display_name.So: gkrb5_err.h
-display_name.o: gkrb5_err.h
-display_name.po: gkrb5_err.h
-display_status.So: gkrb5_err.h
-display_status.o: gkrb5_err.h
-display_status.po: gkrb5_err.h
-duplicate_name.So: gkrb5_err.h
-duplicate_name.o: gkrb5_err.h
-duplicate_name.po: gkrb5_err.h
-encapsulate.So: gkrb5_err.h
-encapsulate.o: gkrb5_err.h
-encapsulate.po: gkrb5_err.h
-export_name.So: gkrb5_err.h
-export_name.o: gkrb5_err.h
-export_name.po: gkrb5_err.h
-export_sec_context.So: gkrb5_err.h
-export_sec_context.o: gkrb5_err.h
-export_sec_context.po: gkrb5_err.h
-external.So: gkrb5_err.h
-external.o: gkrb5_err.h
-external.po: gkrb5_err.h
-get_mic.So: gkrb5_err.h
-get_mic.o: gkrb5_err.h
-get_mic.po: gkrb5_err.h
-gkrb5_err.So: gkrb5_err.c
-gkrb5_err.So: gkrb5_err.h
-gkrb5_err.o: gkrb5_err.c
-gkrb5_err.o: gkrb5_err.h
-gkrb5_err.po: gkrb5_err.c
-gkrb5_err.po: gkrb5_err.h
-import_name.So: gkrb5_err.h
-import_name.o: gkrb5_err.h
-import_name.po: gkrb5_err.h
-import_sec_context.So: gkrb5_err.h
-import_sec_context.o: gkrb5_err.h
-import_sec_context.po: gkrb5_err.h
-indicate_mechs.So: gkrb5_err.h
-indicate_mechs.o: gkrb5_err.h
-indicate_mechs.po: gkrb5_err.h
-init.So: gkrb5_err.h
-init.o: gkrb5_err.h
-init.po: gkrb5_err.h
-init_sec_context.So: gkrb5_err.h
-init_sec_context.o: gkrb5_err.h
-init_sec_context.po: gkrb5_err.h
-inquire_context.So: gkrb5_err.h
-inquire_context.o: gkrb5_err.h
-inquire_context.po: gkrb5_err.h
-inquire_cred.So: gkrb5_err.h
-inquire_cred.o: gkrb5_err.h
-inquire_cred.po: gkrb5_err.h
-inquire_cred_by_mech.So: gkrb5_err.h
-inquire_cred_by_mech.o: gkrb5_err.h
-inquire_cred_by_mech.po: gkrb5_err.h
-inquire_cred_by_oid.So: gkrb5_err.h
-inquire_cred_by_oid.o: gkrb5_err.h
-inquire_cred_by_oid.po: gkrb5_err.h
-inquire_mechs_for_name.So: gkrb5_err.h
-inquire_mechs_for_name.o: gkrb5_err.h
-inquire_mechs_for_name.po: gkrb5_err.h
-inquire_names_for_mech.So: gkrb5_err.h
-inquire_names_for_mech.o: gkrb5_err.h
-inquire_names_for_mech.po: gkrb5_err.h
-inquire_sec_context_by_oid.So: gkrb5_err.h
-inquire_sec_context_by_oid.o: gkrb5_err.h
-inquire_sec_context_by_oid.po: gkrb5_err.h
-pname_to_uid.So: gkrb5_err.h
-pname_to_uid.o: gkrb5_err.h
-pname_to_uid.po: gkrb5_err.h
-prf.So: gkrb5_err.h
-prf.o: gkrb5_err.h
-prf.po: gkrb5_err.h
-process_context_token.So: gkrb5_err.h
-process_context_token.o: gkrb5_err.h
-process_context_token.po: gkrb5_err.h
-release_buffer.So: gkrb5_err.h
-release_buffer.o: gkrb5_err.h
-release_buffer.po: gkrb5_err.h
-release_cred.So: gkrb5_err.h
-release_cred.o: gkrb5_err.h
-release_cred.po: gkrb5_err.h
-release_name.So: gkrb5_err.h
-release_name.o: gkrb5_err.h
-release_name.po: gkrb5_err.h
-sequence.So: gkrb5_err.h
-sequence.o: gkrb5_err.h
-sequence.po: gkrb5_err.h
-set_cred_option.So: gkrb5_err.h
-set_cred_option.o: gkrb5_err.h
-set_cred_option.po: gkrb5_err.h
-set_sec_context_option.So: gkrb5_err.h
-set_sec_context_option.o: gkrb5_err.h
-set_sec_context_option.po: gkrb5_err.h
-store_cred.So: gkrb5_err.h
-store_cred.o: gkrb5_err.h
-store_cred.po: gkrb5_err.h
-ticket_flags.So: gkrb5_err.h
-ticket_flags.o: gkrb5_err.h
-ticket_flags.po: gkrb5_err.h
-unwrap.So: gkrb5_err.h
-unwrap.o: gkrb5_err.h
-unwrap.po: gkrb5_err.h
-verify_mic.So: gkrb5_err.h
-verify_mic.o: gkrb5_err.h
-verify_mic.po: gkrb5_err.h
-wrap.So: gkrb5_err.h
-wrap.o: gkrb5_err.h
-wrap.po: gkrb5_err.h
.endif
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend
index 43eaf3d..a1aecc5 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile.depend
+++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend
@@ -11,6 +11,7 @@ DIRDEPS = \
kerberos5/lib/libheimbase \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
+ kerberos5/tools/asn1_compile.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
@@ -21,103 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-accept_sec_context.So: spnego_asn1.h
-accept_sec_context.o: spnego_asn1.h
-accept_sec_context.po: spnego_asn1.h
-asn1_ContextFlags.So: asn1_ContextFlags.c
-asn1_ContextFlags.So: spnego_asn1-priv.h
-asn1_ContextFlags.So: spnego_asn1.h
-asn1_ContextFlags.o: asn1_ContextFlags.c
-asn1_ContextFlags.o: spnego_asn1-priv.h
-asn1_ContextFlags.o: spnego_asn1.h
-asn1_ContextFlags.po: asn1_ContextFlags.c
-asn1_ContextFlags.po: spnego_asn1-priv.h
-asn1_ContextFlags.po: spnego_asn1.h
-asn1_MechType.So: asn1_MechType.c
-asn1_MechType.So: spnego_asn1-priv.h
-asn1_MechType.So: spnego_asn1.h
-asn1_MechType.o: asn1_MechType.c
-asn1_MechType.o: spnego_asn1-priv.h
-asn1_MechType.o: spnego_asn1.h
-asn1_MechType.po: asn1_MechType.c
-asn1_MechType.po: spnego_asn1-priv.h
-asn1_MechType.po: spnego_asn1.h
-asn1_MechTypeList.So: asn1_MechTypeList.c
-asn1_MechTypeList.So: spnego_asn1-priv.h
-asn1_MechTypeList.So: spnego_asn1.h
-asn1_MechTypeList.o: asn1_MechTypeList.c
-asn1_MechTypeList.o: spnego_asn1-priv.h
-asn1_MechTypeList.o: spnego_asn1.h
-asn1_MechTypeList.po: asn1_MechTypeList.c
-asn1_MechTypeList.po: spnego_asn1-priv.h
-asn1_MechTypeList.po: spnego_asn1.h
-asn1_NegHints.So: asn1_NegHints.c
-asn1_NegHints.So: spnego_asn1-priv.h
-asn1_NegHints.So: spnego_asn1.h
-asn1_NegHints.o: asn1_NegHints.c
-asn1_NegHints.o: spnego_asn1-priv.h
-asn1_NegHints.o: spnego_asn1.h
-asn1_NegHints.po: asn1_NegHints.c
-asn1_NegHints.po: spnego_asn1-priv.h
-asn1_NegHints.po: spnego_asn1.h
-asn1_NegTokenInit.So: asn1_NegTokenInit.c
-asn1_NegTokenInit.So: spnego_asn1-priv.h
-asn1_NegTokenInit.So: spnego_asn1.h
-asn1_NegTokenInit.o: asn1_NegTokenInit.c
-asn1_NegTokenInit.o: spnego_asn1-priv.h
-asn1_NegTokenInit.o: spnego_asn1.h
-asn1_NegTokenInit.po: asn1_NegTokenInit.c
-asn1_NegTokenInit.po: spnego_asn1-priv.h
-asn1_NegTokenInit.po: spnego_asn1.h
-asn1_NegTokenInitWin.So: asn1_NegTokenInitWin.c
-asn1_NegTokenInitWin.So: spnego_asn1-priv.h
-asn1_NegTokenInitWin.So: spnego_asn1.h
-asn1_NegTokenInitWin.o: asn1_NegTokenInitWin.c
-asn1_NegTokenInitWin.o: spnego_asn1-priv.h
-asn1_NegTokenInitWin.o: spnego_asn1.h
-asn1_NegTokenInitWin.po: asn1_NegTokenInitWin.c
-asn1_NegTokenInitWin.po: spnego_asn1-priv.h
-asn1_NegTokenInitWin.po: spnego_asn1.h
-asn1_NegTokenResp.So: asn1_NegTokenResp.c
-asn1_NegTokenResp.So: spnego_asn1-priv.h
-asn1_NegTokenResp.So: spnego_asn1.h
-asn1_NegTokenResp.o: asn1_NegTokenResp.c
-asn1_NegTokenResp.o: spnego_asn1-priv.h
-asn1_NegTokenResp.o: spnego_asn1.h
-asn1_NegTokenResp.po: asn1_NegTokenResp.c
-asn1_NegTokenResp.po: spnego_asn1-priv.h
-asn1_NegTokenResp.po: spnego_asn1.h
-asn1_NegotiationToken.So: asn1_NegotiationToken.c
-asn1_NegotiationToken.So: spnego_asn1-priv.h
-asn1_NegotiationToken.So: spnego_asn1.h
-asn1_NegotiationToken.o: asn1_NegotiationToken.c
-asn1_NegotiationToken.o: spnego_asn1-priv.h
-asn1_NegotiationToken.o: spnego_asn1.h
-asn1_NegotiationToken.po: asn1_NegotiationToken.c
-asn1_NegotiationToken.po: spnego_asn1-priv.h
-asn1_NegotiationToken.po: spnego_asn1.h
-asn1_NegotiationTokenWin.So: asn1_NegotiationTokenWin.c
-asn1_NegotiationTokenWin.So: spnego_asn1-priv.h
-asn1_NegotiationTokenWin.So: spnego_asn1.h
-asn1_NegotiationTokenWin.o: asn1_NegotiationTokenWin.c
-asn1_NegotiationTokenWin.o: spnego_asn1-priv.h
-asn1_NegotiationTokenWin.o: spnego_asn1.h
-asn1_NegotiationTokenWin.po: asn1_NegotiationTokenWin.c
-asn1_NegotiationTokenWin.po: spnego_asn1-priv.h
-asn1_NegotiationTokenWin.po: spnego_asn1.h
-compat.So: spnego_asn1.h
-compat.o: spnego_asn1.h
-compat.po: spnego_asn1.h
-context_stubs.So: spnego_asn1.h
-context_stubs.o: spnego_asn1.h
-context_stubs.po: spnego_asn1.h
-cred_stubs.So: spnego_asn1.h
-cred_stubs.o: spnego_asn1.h
-cred_stubs.po: spnego_asn1.h
-external.So: spnego_asn1.h
-external.o: spnego_asn1.h
-external.po: spnego_asn1.h
-init_sec_context.So: spnego_asn1.h
-init_sec_context.o: spnego_asn1.h
-init_sec_context.po: spnego_asn1.h
.endif
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 2c5ffe4..5f60c60 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -97,11 +97,6 @@ ${GEN}: hdb.asn1
.hx.h:
${CP} ${.IMPSRC} ${.TARGET}
-# This makefile generates a lot of its headers
-# so tell bsd.sys.mk not to try and stage them before they are built.
-# Note: this is rare
-NO_BEFOREBUILD_INCLUDES=
-
.include <bsd.lib.mk>
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend
index 227302e..1a071a8 100644
--- a/kerberos5/lib/libhdb/Makefile.depend
+++ b/kerberos5/lib/libhdb/Makefile.depend
@@ -13,265 +13,18 @@ DIRDEPS = \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libwind \
+ kerberos5/tools/asn1_compile.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
lib/libsqlite3 \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-asn1_Event.So: asn1_Event.c
-asn1_Event.So: hdb_asn1-priv.h
-asn1_Event.So: hdb_asn1.h
-asn1_Event.o: asn1_Event.c
-asn1_Event.o: hdb_asn1-priv.h
-asn1_Event.o: hdb_asn1.h
-asn1_Event.po: asn1_Event.c
-asn1_Event.po: hdb_asn1-priv.h
-asn1_Event.po: hdb_asn1.h
-asn1_GENERATION.So: asn1_GENERATION.c
-asn1_GENERATION.So: hdb_asn1-priv.h
-asn1_GENERATION.So: hdb_asn1.h
-asn1_GENERATION.o: asn1_GENERATION.c
-asn1_GENERATION.o: hdb_asn1-priv.h
-asn1_GENERATION.o: hdb_asn1.h
-asn1_GENERATION.po: asn1_GENERATION.c
-asn1_GENERATION.po: hdb_asn1-priv.h
-asn1_GENERATION.po: hdb_asn1.h
-asn1_HDBFlags.So: asn1_HDBFlags.c
-asn1_HDBFlags.So: hdb_asn1-priv.h
-asn1_HDBFlags.So: hdb_asn1.h
-asn1_HDBFlags.o: asn1_HDBFlags.c
-asn1_HDBFlags.o: hdb_asn1-priv.h
-asn1_HDBFlags.o: hdb_asn1.h
-asn1_HDBFlags.po: asn1_HDBFlags.c
-asn1_HDBFlags.po: hdb_asn1-priv.h
-asn1_HDBFlags.po: hdb_asn1.h
-asn1_HDB_Ext_Aliases.So: asn1_HDB_Ext_Aliases.c
-asn1_HDB_Ext_Aliases.So: hdb_asn1-priv.h
-asn1_HDB_Ext_Aliases.So: hdb_asn1.h
-asn1_HDB_Ext_Aliases.o: asn1_HDB_Ext_Aliases.c
-asn1_HDB_Ext_Aliases.o: hdb_asn1-priv.h
-asn1_HDB_Ext_Aliases.o: hdb_asn1.h
-asn1_HDB_Ext_Aliases.po: asn1_HDB_Ext_Aliases.c
-asn1_HDB_Ext_Aliases.po: hdb_asn1-priv.h
-asn1_HDB_Ext_Aliases.po: hdb_asn1.h
-asn1_HDB_Ext_Constrained_delegation_acl.So: asn1_HDB_Ext_Constrained_delegation_acl.c
-asn1_HDB_Ext_Constrained_delegation_acl.So: hdb_asn1-priv.h
-asn1_HDB_Ext_Constrained_delegation_acl.So: hdb_asn1.h
-asn1_HDB_Ext_Constrained_delegation_acl.o: asn1_HDB_Ext_Constrained_delegation_acl.c
-asn1_HDB_Ext_Constrained_delegation_acl.o: hdb_asn1-priv.h
-asn1_HDB_Ext_Constrained_delegation_acl.o: hdb_asn1.h
-asn1_HDB_Ext_Constrained_delegation_acl.po: asn1_HDB_Ext_Constrained_delegation_acl.c
-asn1_HDB_Ext_Constrained_delegation_acl.po: hdb_asn1-priv.h
-asn1_HDB_Ext_Constrained_delegation_acl.po: hdb_asn1.h
-asn1_HDB_Ext_Lan_Manager_OWF.So: asn1_HDB_Ext_Lan_Manager_OWF.c
-asn1_HDB_Ext_Lan_Manager_OWF.So: hdb_asn1-priv.h
-asn1_HDB_Ext_Lan_Manager_OWF.So: hdb_asn1.h
-asn1_HDB_Ext_Lan_Manager_OWF.o: asn1_HDB_Ext_Lan_Manager_OWF.c
-asn1_HDB_Ext_Lan_Manager_OWF.o: hdb_asn1-priv.h
-asn1_HDB_Ext_Lan_Manager_OWF.o: hdb_asn1.h
-asn1_HDB_Ext_Lan_Manager_OWF.po: asn1_HDB_Ext_Lan_Manager_OWF.c
-asn1_HDB_Ext_Lan_Manager_OWF.po: hdb_asn1-priv.h
-asn1_HDB_Ext_Lan_Manager_OWF.po: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_acl.So: asn1_HDB_Ext_PKINIT_acl.c
-asn1_HDB_Ext_PKINIT_acl.So: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_acl.So: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_acl.o: asn1_HDB_Ext_PKINIT_acl.c
-asn1_HDB_Ext_PKINIT_acl.o: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_acl.o: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_acl.po: asn1_HDB_Ext_PKINIT_acl.c
-asn1_HDB_Ext_PKINIT_acl.po: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_acl.po: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_cert.So: asn1_HDB_Ext_PKINIT_cert.c
-asn1_HDB_Ext_PKINIT_cert.So: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_cert.So: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_cert.o: asn1_HDB_Ext_PKINIT_cert.c
-asn1_HDB_Ext_PKINIT_cert.o: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_cert.o: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_cert.po: asn1_HDB_Ext_PKINIT_cert.c
-asn1_HDB_Ext_PKINIT_cert.po: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_cert.po: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_hash.So: asn1_HDB_Ext_PKINIT_hash.c
-asn1_HDB_Ext_PKINIT_hash.So: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_hash.So: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_hash.o: asn1_HDB_Ext_PKINIT_hash.c
-asn1_HDB_Ext_PKINIT_hash.o: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_hash.o: hdb_asn1.h
-asn1_HDB_Ext_PKINIT_hash.po: asn1_HDB_Ext_PKINIT_hash.c
-asn1_HDB_Ext_PKINIT_hash.po: hdb_asn1-priv.h
-asn1_HDB_Ext_PKINIT_hash.po: hdb_asn1.h
-asn1_HDB_Ext_Password.So: asn1_HDB_Ext_Password.c
-asn1_HDB_Ext_Password.So: hdb_asn1-priv.h
-asn1_HDB_Ext_Password.So: hdb_asn1.h
-asn1_HDB_Ext_Password.o: asn1_HDB_Ext_Password.c
-asn1_HDB_Ext_Password.o: hdb_asn1-priv.h
-asn1_HDB_Ext_Password.o: hdb_asn1.h
-asn1_HDB_Ext_Password.po: asn1_HDB_Ext_Password.c
-asn1_HDB_Ext_Password.po: hdb_asn1-priv.h
-asn1_HDB_Ext_Password.po: hdb_asn1.h
-asn1_HDB_extension.So: asn1_HDB_extension.c
-asn1_HDB_extension.So: hdb_asn1-priv.h
-asn1_HDB_extension.So: hdb_asn1.h
-asn1_HDB_extension.o: asn1_HDB_extension.c
-asn1_HDB_extension.o: hdb_asn1-priv.h
-asn1_HDB_extension.o: hdb_asn1.h
-asn1_HDB_extension.po: asn1_HDB_extension.c
-asn1_HDB_extension.po: hdb_asn1-priv.h
-asn1_HDB_extension.po: hdb_asn1.h
-asn1_HDB_extensions.So: asn1_HDB_extensions.c
-asn1_HDB_extensions.So: hdb_asn1-priv.h
-asn1_HDB_extensions.So: hdb_asn1.h
-asn1_HDB_extensions.o: asn1_HDB_extensions.c
-asn1_HDB_extensions.o: hdb_asn1-priv.h
-asn1_HDB_extensions.o: hdb_asn1.h
-asn1_HDB_extensions.po: asn1_HDB_extensions.c
-asn1_HDB_extensions.po: hdb_asn1-priv.h
-asn1_HDB_extensions.po: hdb_asn1.h
-asn1_Key.So: asn1_Key.c
-asn1_Key.So: hdb_asn1-priv.h
-asn1_Key.So: hdb_asn1.h
-asn1_Key.o: asn1_Key.c
-asn1_Key.o: hdb_asn1-priv.h
-asn1_Key.o: hdb_asn1.h
-asn1_Key.po: asn1_Key.c
-asn1_Key.po: hdb_asn1-priv.h
-asn1_Key.po: hdb_asn1.h
-asn1_Salt.So: asn1_Salt.c
-asn1_Salt.So: hdb_asn1-priv.h
-asn1_Salt.So: hdb_asn1.h
-asn1_Salt.o: asn1_Salt.c
-asn1_Salt.o: hdb_asn1-priv.h
-asn1_Salt.o: hdb_asn1.h
-asn1_Salt.po: asn1_Salt.c
-asn1_Salt.po: hdb_asn1-priv.h
-asn1_Salt.po: hdb_asn1.h
-asn1_hdb_entry.So: asn1_hdb_entry.c
-asn1_hdb_entry.So: hdb_asn1-priv.h
-asn1_hdb_entry.So: hdb_asn1.h
-asn1_hdb_entry.o: asn1_hdb_entry.c
-asn1_hdb_entry.o: hdb_asn1-priv.h
-asn1_hdb_entry.o: hdb_asn1.h
-asn1_hdb_entry.po: asn1_hdb_entry.c
-asn1_hdb_entry.po: hdb_asn1-priv.h
-asn1_hdb_entry.po: hdb_asn1.h
-asn1_hdb_entry_alias.So: asn1_hdb_entry_alias.c
-asn1_hdb_entry_alias.So: hdb_asn1-priv.h
-asn1_hdb_entry_alias.So: hdb_asn1.h
-asn1_hdb_entry_alias.o: asn1_hdb_entry_alias.c
-asn1_hdb_entry_alias.o: hdb_asn1-priv.h
-asn1_hdb_entry_alias.o: hdb_asn1.h
-asn1_hdb_entry_alias.po: asn1_hdb_entry_alias.c
-asn1_hdb_entry_alias.po: hdb_asn1-priv.h
-asn1_hdb_entry_alias.po: hdb_asn1.h
-asn1_hdb_keyset.So: asn1_hdb_keyset.c
-asn1_hdb_keyset.So: hdb_asn1-priv.h
-asn1_hdb_keyset.So: hdb_asn1.h
-asn1_hdb_keyset.o: asn1_hdb_keyset.c
-asn1_hdb_keyset.o: hdb_asn1-priv.h
-asn1_hdb_keyset.o: hdb_asn1.h
-asn1_hdb_keyset.po: asn1_hdb_keyset.c
-asn1_hdb_keyset.po: hdb_asn1-priv.h
-asn1_hdb_keyset.po: hdb_asn1.h
-common.So: hdb_asn1.h
-common.So: hdb_err.h
-common.o: hdb_asn1.h
-common.o: hdb_err.h
-common.po: hdb_asn1.h
-common.po: hdb_err.h
-db.So: hdb_asn1.h
-db.So: hdb_err.h
-db.o: hdb_asn1.h
-db.o: hdb_err.h
-db.po: hdb_asn1.h
-db.po: hdb_err.h
-db3.So: hdb_asn1.h
-db3.So: hdb_err.h
-db3.o: hdb_asn1.h
-db3.o: hdb_err.h
-db3.po: hdb_asn1.h
-db3.po: hdb_err.h
-dbinfo.So: hdb_asn1.h
-dbinfo.So: hdb_err.h
-dbinfo.o: hdb_asn1.h
-dbinfo.o: hdb_err.h
-dbinfo.po: hdb_asn1.h
-dbinfo.po: hdb_err.h
-ext.So: hdb_asn1.h
-ext.So: hdb_err.h
-ext.o: hdb_asn1.h
-ext.o: hdb_err.h
-ext.po: hdb_asn1.h
-ext.po: hdb_err.h
-hdb-keytab.So: hdb_asn1.h
-hdb-keytab.So: hdb_err.h
-hdb-keytab.o: hdb_asn1.h
-hdb-keytab.o: hdb_err.h
-hdb-keytab.po: hdb_asn1.h
-hdb-keytab.po: hdb_err.h
-hdb-ldap.So: hdb_asn1.h
-hdb-ldap.So: hdb_err.h
-hdb-ldap.o: hdb_asn1.h
-hdb-ldap.o: hdb_err.h
-hdb-ldap.po: hdb_asn1.h
-hdb-ldap.po: hdb_err.h
-hdb-mitdb.So: hdb_asn1.h
-hdb-mitdb.So: hdb_err.h
-hdb-mitdb.o: hdb_asn1.h
-hdb-mitdb.o: hdb_err.h
-hdb-mitdb.po: hdb_asn1.h
-hdb-mitdb.po: hdb_err.h
-hdb-sqlite.So: hdb_asn1.h
-hdb-sqlite.So: hdb_err.h
-hdb-sqlite.o: hdb_asn1.h
-hdb-sqlite.o: hdb_err.h
-hdb-sqlite.po: hdb_asn1.h
-hdb-sqlite.po: hdb_err.h
-hdb.So: hdb_asn1.h
-hdb.So: hdb_err.h
-hdb.o: hdb_asn1.h
-hdb.o: hdb_err.h
-hdb.po: hdb_asn1.h
-hdb.po: hdb_err.h
-hdb_err.So: hdb_err.c
-hdb_err.So: hdb_err.h
-hdb_err.o: hdb_err.c
-hdb_err.o: hdb_err.h
-hdb_err.po: hdb_err.c
-hdb_err.po: hdb_err.h
-keys.So: hdb_asn1.h
-keys.So: hdb_err.h
-keys.o: hdb_asn1.h
-keys.o: hdb_err.h
-keys.po: hdb_asn1.h
-keys.po: hdb_err.h
-keytab.So: hdb_asn1.h
-keytab.So: hdb_err.h
-keytab.o: hdb_asn1.h
-keytab.o: hdb_err.h
-keytab.po: hdb_asn1.h
-keytab.po: hdb_err.h
-mkey.So: hdb_asn1.h
-mkey.So: hdb_err.h
-mkey.o: hdb_asn1.h
-mkey.o: hdb_err.h
-mkey.po: hdb_asn1.h
-mkey.po: hdb_err.h
-ndbm.So: hdb_asn1.h
-ndbm.So: hdb_err.h
-ndbm.o: hdb_asn1.h
-ndbm.o: hdb_err.h
-ndbm.po: hdb_asn1.h
-ndbm.po: hdb_err.h
-print.So: hdb_asn1.h
-print.So: hdb_err.h
-print.o: hdb_asn1.h
-print.o: hdb_err.h
-print.po: hdb_asn1.h
-print.po: hdb_err.h
.endif
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index d35fc38..bcb45f3 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -3,7 +3,7 @@
LIB= heimntlm
LDFLAGS= -Wl,--no-undefined
LIBADD= crypto com_err krb5 roken
-SRCS= ntlm.c ntlm_err.c
+SRCS= ntlm.c ntlm_err.c ntlm_err.h
INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map
diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend
index 9e9f631..d337cb8 100644
--- a/kerberos5/lib/libheimntlm/Makefile.depend
+++ b/kerberos5/lib/libheimntlm/Makefile.depend
@@ -15,16 +15,11 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ntlm_err.So: ntlm_err.c
-ntlm_err.So: ntlm_err.h
-ntlm_err.o: ntlm_err.c
-ntlm_err.o: ntlm_err.h
-ntlm_err.po: ntlm_err.c
-ntlm_err.po: ntlm_err.h
.endif
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index d7bedfc..2e8564b 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -290,11 +290,6 @@ ${GEN_CRMF}: crmf.asn1
.hx.h:
${CP} ${.IMPSRC} ${.TARGET}
-# This makefile generates a lot of its headers
-# so tell bsd.sys.mk not to try and stage them before they are built.
-# Note: this is rare
-NO_BEFOREBUILD_INCLUDES=
-
.include <bsd.lib.mk>
.SUFFIXES: .h .c .x .hx
diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend
index c422d17..ad38cc4 100644
--- a/kerberos5/lib/libhx509/Makefile.depend
+++ b/kerberos5/lib/libhx509/Makefile.depend
@@ -10,11 +10,13 @@ DIRDEPS = \
kerberos5/lib/libasn1 \
kerberos5/lib/libroken \
kerberos5/lib/libwind \
+ kerberos5/tools/asn1_compile.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
usr.bin/yacc.host \
@@ -22,424 +24,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-asn1_CertificationRequest.So: asn1_CertificationRequest.c
-asn1_CertificationRequest.So: pkcs10_asn1-priv.h
-asn1_CertificationRequest.So: pkcs10_asn1.h
-asn1_CertificationRequest.o: asn1_CertificationRequest.c
-asn1_CertificationRequest.o: pkcs10_asn1-priv.h
-asn1_CertificationRequest.o: pkcs10_asn1.h
-asn1_CertificationRequest.po: asn1_CertificationRequest.c
-asn1_CertificationRequest.po: pkcs10_asn1-priv.h
-asn1_CertificationRequest.po: pkcs10_asn1.h
-asn1_CertificationRequestInfo.So: asn1_CertificationRequestInfo.c
-asn1_CertificationRequestInfo.So: pkcs10_asn1-priv.h
-asn1_CertificationRequestInfo.So: pkcs10_asn1.h
-asn1_CertificationRequestInfo.o: asn1_CertificationRequestInfo.c
-asn1_CertificationRequestInfo.o: pkcs10_asn1-priv.h
-asn1_CertificationRequestInfo.o: pkcs10_asn1.h
-asn1_CertificationRequestInfo.po: asn1_CertificationRequestInfo.c
-asn1_CertificationRequestInfo.po: pkcs10_asn1-priv.h
-asn1_CertificationRequestInfo.po: pkcs10_asn1.h
-asn1_OCSPBasicOCSPResponse.So: asn1_OCSPBasicOCSPResponse.c
-asn1_OCSPBasicOCSPResponse.So: ocsp_asn1-priv.h
-asn1_OCSPBasicOCSPResponse.So: ocsp_asn1.h
-asn1_OCSPBasicOCSPResponse.o: asn1_OCSPBasicOCSPResponse.c
-asn1_OCSPBasicOCSPResponse.o: ocsp_asn1-priv.h
-asn1_OCSPBasicOCSPResponse.o: ocsp_asn1.h
-asn1_OCSPBasicOCSPResponse.po: asn1_OCSPBasicOCSPResponse.c
-asn1_OCSPBasicOCSPResponse.po: ocsp_asn1-priv.h
-asn1_OCSPBasicOCSPResponse.po: ocsp_asn1.h
-asn1_OCSPCertID.So: asn1_OCSPCertID.c
-asn1_OCSPCertID.So: ocsp_asn1-priv.h
-asn1_OCSPCertID.So: ocsp_asn1.h
-asn1_OCSPCertID.o: asn1_OCSPCertID.c
-asn1_OCSPCertID.o: ocsp_asn1-priv.h
-asn1_OCSPCertID.o: ocsp_asn1.h
-asn1_OCSPCertID.po: asn1_OCSPCertID.c
-asn1_OCSPCertID.po: ocsp_asn1-priv.h
-asn1_OCSPCertID.po: ocsp_asn1.h
-asn1_OCSPCertStatus.So: asn1_OCSPCertStatus.c
-asn1_OCSPCertStatus.So: ocsp_asn1-priv.h
-asn1_OCSPCertStatus.So: ocsp_asn1.h
-asn1_OCSPCertStatus.o: asn1_OCSPCertStatus.c
-asn1_OCSPCertStatus.o: ocsp_asn1-priv.h
-asn1_OCSPCertStatus.o: ocsp_asn1.h
-asn1_OCSPCertStatus.po: asn1_OCSPCertStatus.c
-asn1_OCSPCertStatus.po: ocsp_asn1-priv.h
-asn1_OCSPCertStatus.po: ocsp_asn1.h
-asn1_OCSPInnerRequest.So: asn1_OCSPInnerRequest.c
-asn1_OCSPInnerRequest.So: ocsp_asn1-priv.h
-asn1_OCSPInnerRequest.So: ocsp_asn1.h
-asn1_OCSPInnerRequest.o: asn1_OCSPInnerRequest.c
-asn1_OCSPInnerRequest.o: ocsp_asn1-priv.h
-asn1_OCSPInnerRequest.o: ocsp_asn1.h
-asn1_OCSPInnerRequest.po: asn1_OCSPInnerRequest.c
-asn1_OCSPInnerRequest.po: ocsp_asn1-priv.h
-asn1_OCSPInnerRequest.po: ocsp_asn1.h
-asn1_OCSPKeyHash.So: asn1_OCSPKeyHash.c
-asn1_OCSPKeyHash.So: ocsp_asn1-priv.h
-asn1_OCSPKeyHash.So: ocsp_asn1.h
-asn1_OCSPKeyHash.o: asn1_OCSPKeyHash.c
-asn1_OCSPKeyHash.o: ocsp_asn1-priv.h
-asn1_OCSPKeyHash.o: ocsp_asn1.h
-asn1_OCSPKeyHash.po: asn1_OCSPKeyHash.c
-asn1_OCSPKeyHash.po: ocsp_asn1-priv.h
-asn1_OCSPKeyHash.po: ocsp_asn1.h
-asn1_OCSPRequest.So: asn1_OCSPRequest.c
-asn1_OCSPRequest.So: ocsp_asn1-priv.h
-asn1_OCSPRequest.So: ocsp_asn1.h
-asn1_OCSPRequest.o: asn1_OCSPRequest.c
-asn1_OCSPRequest.o: ocsp_asn1-priv.h
-asn1_OCSPRequest.o: ocsp_asn1.h
-asn1_OCSPRequest.po: asn1_OCSPRequest.c
-asn1_OCSPRequest.po: ocsp_asn1-priv.h
-asn1_OCSPRequest.po: ocsp_asn1.h
-asn1_OCSPResponderID.So: asn1_OCSPResponderID.c
-asn1_OCSPResponderID.So: ocsp_asn1-priv.h
-asn1_OCSPResponderID.So: ocsp_asn1.h
-asn1_OCSPResponderID.o: asn1_OCSPResponderID.c
-asn1_OCSPResponderID.o: ocsp_asn1-priv.h
-asn1_OCSPResponderID.o: ocsp_asn1.h
-asn1_OCSPResponderID.po: asn1_OCSPResponderID.c
-asn1_OCSPResponderID.po: ocsp_asn1-priv.h
-asn1_OCSPResponderID.po: ocsp_asn1.h
-asn1_OCSPResponse.So: asn1_OCSPResponse.c
-asn1_OCSPResponse.So: ocsp_asn1-priv.h
-asn1_OCSPResponse.So: ocsp_asn1.h
-asn1_OCSPResponse.o: asn1_OCSPResponse.c
-asn1_OCSPResponse.o: ocsp_asn1-priv.h
-asn1_OCSPResponse.o: ocsp_asn1.h
-asn1_OCSPResponse.po: asn1_OCSPResponse.c
-asn1_OCSPResponse.po: ocsp_asn1-priv.h
-asn1_OCSPResponse.po: ocsp_asn1.h
-asn1_OCSPResponseBytes.So: asn1_OCSPResponseBytes.c
-asn1_OCSPResponseBytes.So: ocsp_asn1-priv.h
-asn1_OCSPResponseBytes.So: ocsp_asn1.h
-asn1_OCSPResponseBytes.o: asn1_OCSPResponseBytes.c
-asn1_OCSPResponseBytes.o: ocsp_asn1-priv.h
-asn1_OCSPResponseBytes.o: ocsp_asn1.h
-asn1_OCSPResponseBytes.po: asn1_OCSPResponseBytes.c
-asn1_OCSPResponseBytes.po: ocsp_asn1-priv.h
-asn1_OCSPResponseBytes.po: ocsp_asn1.h
-asn1_OCSPResponseData.So: asn1_OCSPResponseData.c
-asn1_OCSPResponseData.So: ocsp_asn1-priv.h
-asn1_OCSPResponseData.So: ocsp_asn1.h
-asn1_OCSPResponseData.o: asn1_OCSPResponseData.c
-asn1_OCSPResponseData.o: ocsp_asn1-priv.h
-asn1_OCSPResponseData.o: ocsp_asn1.h
-asn1_OCSPResponseData.po: asn1_OCSPResponseData.c
-asn1_OCSPResponseData.po: ocsp_asn1-priv.h
-asn1_OCSPResponseData.po: ocsp_asn1.h
-asn1_OCSPResponseStatus.So: asn1_OCSPResponseStatus.c
-asn1_OCSPResponseStatus.So: ocsp_asn1-priv.h
-asn1_OCSPResponseStatus.So: ocsp_asn1.h
-asn1_OCSPResponseStatus.o: asn1_OCSPResponseStatus.c
-asn1_OCSPResponseStatus.o: ocsp_asn1-priv.h
-asn1_OCSPResponseStatus.o: ocsp_asn1.h
-asn1_OCSPResponseStatus.po: asn1_OCSPResponseStatus.c
-asn1_OCSPResponseStatus.po: ocsp_asn1-priv.h
-asn1_OCSPResponseStatus.po: ocsp_asn1.h
-asn1_OCSPSignature.So: asn1_OCSPSignature.c
-asn1_OCSPSignature.So: ocsp_asn1-priv.h
-asn1_OCSPSignature.So: ocsp_asn1.h
-asn1_OCSPSignature.o: asn1_OCSPSignature.c
-asn1_OCSPSignature.o: ocsp_asn1-priv.h
-asn1_OCSPSignature.o: ocsp_asn1.h
-asn1_OCSPSignature.po: asn1_OCSPSignature.c
-asn1_OCSPSignature.po: ocsp_asn1-priv.h
-asn1_OCSPSignature.po: ocsp_asn1.h
-asn1_OCSPSingleResponse.So: asn1_OCSPSingleResponse.c
-asn1_OCSPSingleResponse.So: ocsp_asn1-priv.h
-asn1_OCSPSingleResponse.So: ocsp_asn1.h
-asn1_OCSPSingleResponse.o: asn1_OCSPSingleResponse.c
-asn1_OCSPSingleResponse.o: ocsp_asn1-priv.h
-asn1_OCSPSingleResponse.o: ocsp_asn1.h
-asn1_OCSPSingleResponse.po: asn1_OCSPSingleResponse.c
-asn1_OCSPSingleResponse.po: ocsp_asn1-priv.h
-asn1_OCSPSingleResponse.po: ocsp_asn1.h
-asn1_OCSPTBSRequest.So: asn1_OCSPTBSRequest.c
-asn1_OCSPTBSRequest.So: ocsp_asn1-priv.h
-asn1_OCSPTBSRequest.So: ocsp_asn1.h
-asn1_OCSPTBSRequest.o: asn1_OCSPTBSRequest.c
-asn1_OCSPTBSRequest.o: ocsp_asn1-priv.h
-asn1_OCSPTBSRequest.o: ocsp_asn1.h
-asn1_OCSPTBSRequest.po: asn1_OCSPTBSRequest.c
-asn1_OCSPTBSRequest.po: ocsp_asn1-priv.h
-asn1_OCSPTBSRequest.po: ocsp_asn1.h
-asn1_OCSPVersion.So: asn1_OCSPVersion.c
-asn1_OCSPVersion.So: ocsp_asn1-priv.h
-asn1_OCSPVersion.So: ocsp_asn1.h
-asn1_OCSPVersion.o: asn1_OCSPVersion.c
-asn1_OCSPVersion.o: ocsp_asn1-priv.h
-asn1_OCSPVersion.o: ocsp_asn1.h
-asn1_OCSPVersion.po: asn1_OCSPVersion.c
-asn1_OCSPVersion.po: ocsp_asn1-priv.h
-asn1_OCSPVersion.po: ocsp_asn1.h
-asn1_id_pkix_ocsp.So: asn1_id_pkix_ocsp.c
-asn1_id_pkix_ocsp.So: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp.So: ocsp_asn1.h
-asn1_id_pkix_ocsp.o: asn1_id_pkix_ocsp.c
-asn1_id_pkix_ocsp.o: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp.o: ocsp_asn1.h
-asn1_id_pkix_ocsp.po: asn1_id_pkix_ocsp.c
-asn1_id_pkix_ocsp.po: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp.po: ocsp_asn1.h
-asn1_id_pkix_ocsp_basic.So: asn1_id_pkix_ocsp_basic.c
-asn1_id_pkix_ocsp_basic.So: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_basic.So: ocsp_asn1.h
-asn1_id_pkix_ocsp_basic.o: asn1_id_pkix_ocsp_basic.c
-asn1_id_pkix_ocsp_basic.o: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_basic.o: ocsp_asn1.h
-asn1_id_pkix_ocsp_basic.po: asn1_id_pkix_ocsp_basic.c
-asn1_id_pkix_ocsp_basic.po: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_basic.po: ocsp_asn1.h
-asn1_id_pkix_ocsp_nonce.So: asn1_id_pkix_ocsp_nonce.c
-asn1_id_pkix_ocsp_nonce.So: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_nonce.So: ocsp_asn1.h
-asn1_id_pkix_ocsp_nonce.o: asn1_id_pkix_ocsp_nonce.c
-asn1_id_pkix_ocsp_nonce.o: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_nonce.o: ocsp_asn1.h
-asn1_id_pkix_ocsp_nonce.po: asn1_id_pkix_ocsp_nonce.c
-asn1_id_pkix_ocsp_nonce.po: ocsp_asn1-priv.h
-asn1_id_pkix_ocsp_nonce.po: ocsp_asn1.h
-ca.So: hx509_err.h
-ca.So: ocsp_asn1.h
-ca.So: pkcs10_asn1.h
-ca.o: hx509_err.h
-ca.o: ocsp_asn1.h
-ca.o: pkcs10_asn1.h
-ca.po: hx509_err.h
-ca.po: ocsp_asn1.h
-ca.po: pkcs10_asn1.h
-cert.So: hx509_err.h
-cert.So: ocsp_asn1.h
-cert.So: pkcs10_asn1.h
-cert.o: hx509_err.h
-cert.o: ocsp_asn1.h
-cert.o: pkcs10_asn1.h
-cert.po: hx509_err.h
-cert.po: ocsp_asn1.h
-cert.po: pkcs10_asn1.h
-cms.So: hx509_err.h
-cms.So: ocsp_asn1.h
-cms.So: pkcs10_asn1.h
-cms.o: hx509_err.h
-cms.o: ocsp_asn1.h
-cms.o: pkcs10_asn1.h
-cms.po: hx509_err.h
-cms.po: ocsp_asn1.h
-cms.po: pkcs10_asn1.h
-collector.So: hx509_err.h
-collector.So: ocsp_asn1.h
-collector.So: pkcs10_asn1.h
-collector.o: hx509_err.h
-collector.o: ocsp_asn1.h
-collector.o: pkcs10_asn1.h
-collector.po: hx509_err.h
-collector.po: ocsp_asn1.h
-collector.po: pkcs10_asn1.h
-crypto.So: hx509_err.h
-crypto.So: ocsp_asn1.h
-crypto.So: pkcs10_asn1.h
-crypto.o: hx509_err.h
-crypto.o: ocsp_asn1.h
-crypto.o: pkcs10_asn1.h
-crypto.po: hx509_err.h
-crypto.po: ocsp_asn1.h
-crypto.po: pkcs10_asn1.h
-env.So: hx509_err.h
-env.So: ocsp_asn1.h
-env.So: pkcs10_asn1.h
-env.o: hx509_err.h
-env.o: ocsp_asn1.h
-env.o: pkcs10_asn1.h
-env.po: hx509_err.h
-env.po: ocsp_asn1.h
-env.po: pkcs10_asn1.h
-error.So: hx509_err.h
-error.So: ocsp_asn1.h
-error.So: pkcs10_asn1.h
-error.o: hx509_err.h
-error.o: ocsp_asn1.h
-error.o: pkcs10_asn1.h
-error.po: hx509_err.h
-error.po: ocsp_asn1.h
-error.po: pkcs10_asn1.h
-file.So: hx509_err.h
-file.So: ocsp_asn1.h
-file.So: pkcs10_asn1.h
-file.o: hx509_err.h
-file.o: ocsp_asn1.h
-file.o: pkcs10_asn1.h
-file.po: hx509_err.h
-file.po: ocsp_asn1.h
-file.po: pkcs10_asn1.h
-hx509_err.So: hx509_err.c
-hx509_err.So: hx509_err.h
-hx509_err.o: hx509_err.c
-hx509_err.o: hx509_err.h
-hx509_err.po: hx509_err.c
-hx509_err.po: hx509_err.h
-keyset.So: hx509_err.h
-keyset.So: ocsp_asn1.h
-keyset.So: pkcs10_asn1.h
-keyset.o: hx509_err.h
-keyset.o: ocsp_asn1.h
-keyset.o: pkcs10_asn1.h
-keyset.po: hx509_err.h
-keyset.po: ocsp_asn1.h
-keyset.po: pkcs10_asn1.h
-ks_dir.So: hx509_err.h
-ks_dir.So: ocsp_asn1.h
-ks_dir.So: pkcs10_asn1.h
-ks_dir.o: hx509_err.h
-ks_dir.o: ocsp_asn1.h
-ks_dir.o: pkcs10_asn1.h
-ks_dir.po: hx509_err.h
-ks_dir.po: ocsp_asn1.h
-ks_dir.po: pkcs10_asn1.h
-ks_file.So: hx509_err.h
-ks_file.So: ocsp_asn1.h
-ks_file.So: pkcs10_asn1.h
-ks_file.o: hx509_err.h
-ks_file.o: ocsp_asn1.h
-ks_file.o: pkcs10_asn1.h
-ks_file.po: hx509_err.h
-ks_file.po: ocsp_asn1.h
-ks_file.po: pkcs10_asn1.h
-ks_keychain.So: hx509_err.h
-ks_keychain.So: ocsp_asn1.h
-ks_keychain.So: pkcs10_asn1.h
-ks_keychain.o: hx509_err.h
-ks_keychain.o: ocsp_asn1.h
-ks_keychain.o: pkcs10_asn1.h
-ks_keychain.po: hx509_err.h
-ks_keychain.po: ocsp_asn1.h
-ks_keychain.po: pkcs10_asn1.h
-ks_mem.So: hx509_err.h
-ks_mem.So: ocsp_asn1.h
-ks_mem.So: pkcs10_asn1.h
-ks_mem.o: hx509_err.h
-ks_mem.o: ocsp_asn1.h
-ks_mem.o: pkcs10_asn1.h
-ks_mem.po: hx509_err.h
-ks_mem.po: ocsp_asn1.h
-ks_mem.po: pkcs10_asn1.h
-ks_null.So: hx509_err.h
-ks_null.So: ocsp_asn1.h
-ks_null.So: pkcs10_asn1.h
-ks_null.o: hx509_err.h
-ks_null.o: ocsp_asn1.h
-ks_null.o: pkcs10_asn1.h
-ks_null.po: hx509_err.h
-ks_null.po: ocsp_asn1.h
-ks_null.po: pkcs10_asn1.h
-ks_p11.So: hx509_err.h
-ks_p11.So: ocsp_asn1.h
-ks_p11.So: pkcs10_asn1.h
-ks_p11.o: hx509_err.h
-ks_p11.o: ocsp_asn1.h
-ks_p11.o: pkcs10_asn1.h
-ks_p11.po: hx509_err.h
-ks_p11.po: ocsp_asn1.h
-ks_p11.po: pkcs10_asn1.h
-ks_p12.So: hx509_err.h
-ks_p12.So: ocsp_asn1.h
-ks_p12.So: pkcs10_asn1.h
-ks_p12.o: hx509_err.h
-ks_p12.o: ocsp_asn1.h
-ks_p12.o: pkcs10_asn1.h
-ks_p12.po: hx509_err.h
-ks_p12.po: ocsp_asn1.h
-ks_p12.po: pkcs10_asn1.h
-lock.So: hx509_err.h
-lock.So: ocsp_asn1.h
-lock.So: pkcs10_asn1.h
-lock.o: hx509_err.h
-lock.o: ocsp_asn1.h
-lock.o: pkcs10_asn1.h
-lock.po: hx509_err.h
-lock.po: ocsp_asn1.h
-lock.po: pkcs10_asn1.h
-name.So: hx509_err.h
-name.So: ocsp_asn1.h
-name.So: pkcs10_asn1.h
-name.o: hx509_err.h
-name.o: ocsp_asn1.h
-name.o: pkcs10_asn1.h
-name.po: hx509_err.h
-name.po: ocsp_asn1.h
-name.po: pkcs10_asn1.h
-peer.So: hx509_err.h
-peer.So: ocsp_asn1.h
-peer.So: pkcs10_asn1.h
-peer.o: hx509_err.h
-peer.o: ocsp_asn1.h
-peer.o: pkcs10_asn1.h
-peer.po: hx509_err.h
-peer.po: ocsp_asn1.h
-peer.po: pkcs10_asn1.h
-print.So: hx509_err.h
-print.So: ocsp_asn1.h
-print.So: pkcs10_asn1.h
-print.o: hx509_err.h
-print.o: ocsp_asn1.h
-print.o: pkcs10_asn1.h
-print.po: hx509_err.h
-print.po: ocsp_asn1.h
-print.po: pkcs10_asn1.h
-req.So: hx509_err.h
-req.So: ocsp_asn1.h
-req.So: pkcs10_asn1.h
-req.o: hx509_err.h
-req.o: ocsp_asn1.h
-req.o: pkcs10_asn1.h
-req.po: hx509_err.h
-req.po: ocsp_asn1.h
-req.po: pkcs10_asn1.h
-revoke.So: hx509_err.h
-revoke.So: ocsp_asn1.h
-revoke.So: pkcs10_asn1.h
-revoke.o: hx509_err.h
-revoke.o: ocsp_asn1.h
-revoke.o: pkcs10_asn1.h
-revoke.po: hx509_err.h
-revoke.po: ocsp_asn1.h
-revoke.po: pkcs10_asn1.h
-sel-gram.So: hx509_err.h
-sel-gram.So: ocsp_asn1.h
-sel-gram.So: pkcs10_asn1.h
-sel-gram.So: sel-gram.c
-sel-gram.o: hx509_err.h
-sel-gram.o: ocsp_asn1.h
-sel-gram.o: pkcs10_asn1.h
-sel-gram.o: sel-gram.c
-sel-gram.po: hx509_err.h
-sel-gram.po: ocsp_asn1.h
-sel-gram.po: pkcs10_asn1.h
-sel-gram.po: sel-gram.c
-sel-lex.So: sel-gram.h
-sel-lex.So: sel-lex.c
-sel-lex.o: sel-gram.h
-sel-lex.o: sel-lex.c
-sel-lex.po: sel-gram.h
-sel-lex.po: sel-lex.c
-sel.So: hx509_err.h
-sel.So: ocsp_asn1.h
-sel.So: pkcs10_asn1.h
-sel.o: hx509_err.h
-sel.o: ocsp_asn1.h
-sel.o: pkcs10_asn1.h
-sel.po: hx509_err.h
-sel.po: ocsp_asn1.h
-sel.po: pkcs10_asn1.h
-softp11.So: hx509_err.h
-softp11.So: ocsp_asn1.h
-softp11.So: pkcs10_asn1.h
-softp11.o: hx509_err.h
-softp11.o: ocsp_asn1.h
-softp11.o: pkcs10_asn1.h
-softp11.po: hx509_err.h
-softp11.po: ocsp_asn1.h
-softp11.po: pkcs10_asn1.h
.endif
diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend
index f1c4cb5..b345b5d 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile.depend
+++ b/kerberos5/lib/libkadm5clnt/Makefile.depend
@@ -15,70 +15,11 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ad.So: kadm5_err.h
-ad.o: kadm5_err.h
-ad.po: kadm5_err.h
-chpass_c.So: kadm5_err.h
-chpass_c.o: kadm5_err.h
-chpass_c.po: kadm5_err.h
-client_glue.So: kadm5_err.h
-client_glue.o: kadm5_err.h
-client_glue.po: kadm5_err.h
-common_glue.So: kadm5_err.h
-common_glue.o: kadm5_err.h
-common_glue.po: kadm5_err.h
-create_c.So: kadm5_err.h
-create_c.o: kadm5_err.h
-create_c.po: kadm5_err.h
-delete_c.So: kadm5_err.h
-delete_c.o: kadm5_err.h
-delete_c.po: kadm5_err.h
-destroy_c.So: kadm5_err.h
-destroy_c.o: kadm5_err.h
-destroy_c.po: kadm5_err.h
-flush_c.So: kadm5_err.h
-flush_c.o: kadm5_err.h
-flush_c.po: kadm5_err.h
-free.So: kadm5_err.h
-free.o: kadm5_err.h
-free.po: kadm5_err.h
-get_c.So: kadm5_err.h
-get_c.o: kadm5_err.h
-get_c.po: kadm5_err.h
-get_princs_c.So: kadm5_err.h
-get_princs_c.o: kadm5_err.h
-get_princs_c.po: kadm5_err.h
-init_c.So: kadm5_err.h
-init_c.o: kadm5_err.h
-init_c.po: kadm5_err.h
-kadm5_err.So: kadm5_err.c
-kadm5_err.So: kadm5_err.h
-kadm5_err.o: kadm5_err.c
-kadm5_err.o: kadm5_err.h
-kadm5_err.po: kadm5_err.c
-kadm5_err.po: kadm5_err.h
-marshall.So: kadm5_err.h
-marshall.o: kadm5_err.h
-marshall.po: kadm5_err.h
-modify_c.So: kadm5_err.h
-modify_c.o: kadm5_err.h
-modify_c.po: kadm5_err.h
-privs_c.So: kadm5_err.h
-privs_c.o: kadm5_err.h
-privs_c.po: kadm5_err.h
-randkey_c.So: kadm5_err.h
-randkey_c.o: kadm5_err.h
-randkey_c.po: kadm5_err.h
-rename_c.So: kadm5_err.h
-rename_c.o: kadm5_err.h
-rename_c.po: kadm5_err.h
-send_recv.So: kadm5_err.h
-send_recv.o: kadm5_err.h
-send_recv.po: kadm5_err.h
.endif
diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend
index 1b24784..b345b5d 100644
--- a/kerberos5/lib/libkadm5srv/Makefile.depend
+++ b/kerberos5/lib/libkadm5srv/Makefile.depend
@@ -15,94 +15,11 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-acl.So: kadm5_err.h
-acl.o: kadm5_err.h
-acl.po: kadm5_err.h
-bump_pw_expire.So: kadm5_err.h
-bump_pw_expire.o: kadm5_err.h
-bump_pw_expire.po: kadm5_err.h
-chpass_s.So: kadm5_err.h
-chpass_s.o: kadm5_err.h
-chpass_s.po: kadm5_err.h
-common_glue.So: kadm5_err.h
-common_glue.o: kadm5_err.h
-common_glue.po: kadm5_err.h
-context_s.So: kadm5_err.h
-context_s.o: kadm5_err.h
-context_s.po: kadm5_err.h
-create_s.So: kadm5_err.h
-create_s.o: kadm5_err.h
-create_s.po: kadm5_err.h
-delete_s.So: kadm5_err.h
-delete_s.o: kadm5_err.h
-delete_s.po: kadm5_err.h
-destroy_s.So: kadm5_err.h
-destroy_s.o: kadm5_err.h
-destroy_s.po: kadm5_err.h
-ent_setup.So: kadm5_err.h
-ent_setup.o: kadm5_err.h
-ent_setup.po: kadm5_err.h
-error.So: kadm5_err.h
-error.o: kadm5_err.h
-error.po: kadm5_err.h
-flush_s.So: kadm5_err.h
-flush_s.o: kadm5_err.h
-flush_s.po: kadm5_err.h
-free.So: kadm5_err.h
-free.o: kadm5_err.h
-free.po: kadm5_err.h
-get_princs_s.So: kadm5_err.h
-get_princs_s.o: kadm5_err.h
-get_princs_s.po: kadm5_err.h
-get_s.So: kadm5_err.h
-get_s.o: kadm5_err.h
-get_s.po: kadm5_err.h
-init_s.So: kadm5_err.h
-init_s.o: kadm5_err.h
-init_s.po: kadm5_err.h
-kadm5_err.So: kadm5_err.c
-kadm5_err.So: kadm5_err.h
-kadm5_err.o: kadm5_err.c
-kadm5_err.o: kadm5_err.h
-kadm5_err.po: kadm5_err.c
-kadm5_err.po: kadm5_err.h
-keys.So: kadm5_err.h
-keys.o: kadm5_err.h
-keys.po: kadm5_err.h
-log.So: kadm5_err.h
-log.o: kadm5_err.h
-log.po: kadm5_err.h
-marshall.So: kadm5_err.h
-marshall.o: kadm5_err.h
-marshall.po: kadm5_err.h
-modify_s.So: kadm5_err.h
-modify_s.o: kadm5_err.h
-modify_s.po: kadm5_err.h
-password_quality.So: kadm5_err.h
-password_quality.o: kadm5_err.h
-password_quality.po: kadm5_err.h
-privs_s.So: kadm5_err.h
-privs_s.o: kadm5_err.h
-privs_s.po: kadm5_err.h
-randkey_s.So: kadm5_err.h
-randkey_s.o: kadm5_err.h
-randkey_s.po: kadm5_err.h
-rename_s.So: kadm5_err.h
-rename_s.o: kadm5_err.h
-rename_s.po: kadm5_err.h
-server_glue.So: kadm5_err.h
-server_glue.o: kadm5_err.h
-server_glue.po: kadm5_err.h
-set_keys.So: kadm5_err.h
-set_keys.o: kadm5_err.h
-set_keys.po: kadm5_err.h
-set_modifier.So: kadm5_err.h
-set_modifier.o: kadm5_err.h
-set_modifier.po: kadm5_err.h
.endif
diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend
index 5649824..4f22e41 100644
--- a/kerberos5/lib/libkafs5/Makefile.depend
+++ b/kerberos5/lib/libkafs5/Makefile.depend
@@ -14,6 +14,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkrb5/Makefile.depend b/kerberos5/lib/libkrb5/Makefile.depend
index 0adc7b6..5ccf595 100644
--- a/kerberos5/lib/libkrb5/Makefile.depend
+++ b/kerberos5/lib/libkrb5/Makefile.depend
@@ -19,1081 +19,11 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcrypt \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-acache.So: heim_err.h
-acache.So: k524_err.h
-acache.So: krb5_err.h
-acache.o: heim_err.h
-acache.o: k524_err.h
-acache.o: krb5_err.h
-acache.po: heim_err.h
-acache.po: k524_err.h
-acache.po: krb5_err.h
-acl.So: heim_err.h
-acl.So: k524_err.h
-acl.So: krb5_err.h
-acl.o: heim_err.h
-acl.o: k524_err.h
-acl.o: krb5_err.h
-acl.po: heim_err.h
-acl.po: k524_err.h
-acl.po: krb5_err.h
-add_et_list.So: heim_err.h
-add_et_list.So: k524_err.h
-add_et_list.So: krb5_err.h
-add_et_list.o: heim_err.h
-add_et_list.o: k524_err.h
-add_et_list.o: krb5_err.h
-add_et_list.po: heim_err.h
-add_et_list.po: k524_err.h
-add_et_list.po: krb5_err.h
-addr_families.So: heim_err.h
-addr_families.So: k524_err.h
-addr_families.So: krb5_err.h
-addr_families.o: heim_err.h
-addr_families.o: k524_err.h
-addr_families.o: krb5_err.h
-addr_families.po: heim_err.h
-addr_families.po: k524_err.h
-addr_families.po: krb5_err.h
-aname_to_localname.So: heim_err.h
-aname_to_localname.So: k524_err.h
-aname_to_localname.So: krb5_err.h
-aname_to_localname.o: heim_err.h
-aname_to_localname.o: k524_err.h
-aname_to_localname.o: krb5_err.h
-aname_to_localname.po: heim_err.h
-aname_to_localname.po: k524_err.h
-aname_to_localname.po: krb5_err.h
-appdefault.So: heim_err.h
-appdefault.So: k524_err.h
-appdefault.So: krb5_err.h
-appdefault.o: heim_err.h
-appdefault.o: k524_err.h
-appdefault.o: krb5_err.h
-appdefault.po: heim_err.h
-appdefault.po: k524_err.h
-appdefault.po: krb5_err.h
-asn1_glue.So: heim_err.h
-asn1_glue.So: k524_err.h
-asn1_glue.So: krb5_err.h
-asn1_glue.o: heim_err.h
-asn1_glue.o: k524_err.h
-asn1_glue.o: krb5_err.h
-asn1_glue.po: heim_err.h
-asn1_glue.po: k524_err.h
-asn1_glue.po: krb5_err.h
-auth_context.So: heim_err.h
-auth_context.So: k524_err.h
-auth_context.So: krb5_err.h
-auth_context.o: heim_err.h
-auth_context.o: k524_err.h
-auth_context.o: krb5_err.h
-auth_context.po: heim_err.h
-auth_context.po: k524_err.h
-auth_context.po: krb5_err.h
-build_ap_req.So: heim_err.h
-build_ap_req.So: k524_err.h
-build_ap_req.So: krb5_err.h
-build_ap_req.o: heim_err.h
-build_ap_req.o: k524_err.h
-build_ap_req.o: krb5_err.h
-build_ap_req.po: heim_err.h
-build_ap_req.po: k524_err.h
-build_ap_req.po: krb5_err.h
-build_auth.So: heim_err.h
-build_auth.So: k524_err.h
-build_auth.So: krb5_err.h
-build_auth.o: heim_err.h
-build_auth.o: k524_err.h
-build_auth.o: krb5_err.h
-build_auth.po: heim_err.h
-build_auth.po: k524_err.h
-build_auth.po: krb5_err.h
-cache.So: heim_err.h
-cache.So: k524_err.h
-cache.So: krb5_err.h
-cache.o: heim_err.h
-cache.o: k524_err.h
-cache.o: krb5_err.h
-cache.po: heim_err.h
-cache.po: k524_err.h
-cache.po: krb5_err.h
-changepw.So: heim_err.h
-changepw.So: k524_err.h
-changepw.So: krb5_err.h
-changepw.o: heim_err.h
-changepw.o: k524_err.h
-changepw.o: krb5_err.h
-changepw.po: heim_err.h
-changepw.po: k524_err.h
-changepw.po: krb5_err.h
-codec.So: heim_err.h
-codec.So: k524_err.h
-codec.So: krb5_err.h
-codec.o: heim_err.h
-codec.o: k524_err.h
-codec.o: krb5_err.h
-codec.po: heim_err.h
-codec.po: k524_err.h
-codec.po: krb5_err.h
-config_file.So: heim_err.h
-config_file.So: k524_err.h
-config_file.So: krb5_err.h
-config_file.o: heim_err.h
-config_file.o: k524_err.h
-config_file.o: krb5_err.h
-config_file.po: heim_err.h
-config_file.po: k524_err.h
-config_file.po: krb5_err.h
-constants.So: heim_err.h
-constants.So: k524_err.h
-constants.So: krb5_err.h
-constants.o: heim_err.h
-constants.o: k524_err.h
-constants.o: krb5_err.h
-constants.po: heim_err.h
-constants.po: k524_err.h
-constants.po: krb5_err.h
-context.So: heim_err.h
-context.So: k524_err.h
-context.So: krb5_err.h
-context.o: heim_err.h
-context.o: k524_err.h
-context.o: krb5_err.h
-context.po: heim_err.h
-context.po: k524_err.h
-context.po: krb5_err.h
-convert_creds.So: heim_err.h
-convert_creds.So: k524_err.h
-convert_creds.So: krb5_err.h
-convert_creds.So: krb_err.h
-convert_creds.o: heim_err.h
-convert_creds.o: k524_err.h
-convert_creds.o: krb5_err.h
-convert_creds.o: krb_err.h
-convert_creds.po: heim_err.h
-convert_creds.po: k524_err.h
-convert_creds.po: krb5_err.h
-convert_creds.po: krb_err.h
-copy_host_realm.So: heim_err.h
-copy_host_realm.So: k524_err.h
-copy_host_realm.So: krb5_err.h
-copy_host_realm.o: heim_err.h
-copy_host_realm.o: k524_err.h
-copy_host_realm.o: krb5_err.h
-copy_host_realm.po: heim_err.h
-copy_host_realm.po: k524_err.h
-copy_host_realm.po: krb5_err.h
-crc.So: heim_err.h
-crc.So: k524_err.h
-crc.So: krb5_err.h
-crc.o: heim_err.h
-crc.o: k524_err.h
-crc.o: krb5_err.h
-crc.po: heim_err.h
-crc.po: k524_err.h
-crc.po: krb5_err.h
-creds.So: heim_err.h
-creds.So: k524_err.h
-creds.So: krb5_err.h
-creds.o: heim_err.h
-creds.o: k524_err.h
-creds.o: krb5_err.h
-creds.po: heim_err.h
-creds.po: k524_err.h
-creds.po: krb5_err.h
-crypto-aes.So: heim_err.h
-crypto-aes.So: k524_err.h
-crypto-aes.So: krb5_err.h
-crypto-aes.o: heim_err.h
-crypto-aes.o: k524_err.h
-crypto-aes.o: krb5_err.h
-crypto-aes.po: heim_err.h
-crypto-aes.po: k524_err.h
-crypto-aes.po: krb5_err.h
-crypto-algs.So: heim_err.h
-crypto-algs.So: k524_err.h
-crypto-algs.So: krb5_err.h
-crypto-algs.o: heim_err.h
-crypto-algs.o: k524_err.h
-crypto-algs.o: krb5_err.h
-crypto-algs.po: heim_err.h
-crypto-algs.po: k524_err.h
-crypto-algs.po: krb5_err.h
-crypto-arcfour.So: heim_err.h
-crypto-arcfour.So: k524_err.h
-crypto-arcfour.So: krb5_err.h
-crypto-arcfour.o: heim_err.h
-crypto-arcfour.o: k524_err.h
-crypto-arcfour.o: krb5_err.h
-crypto-arcfour.po: heim_err.h
-crypto-arcfour.po: k524_err.h
-crypto-arcfour.po: krb5_err.h
-crypto-des-common.So: heim_err.h
-crypto-des-common.So: k524_err.h
-crypto-des-common.So: krb5_err.h
-crypto-des-common.o: heim_err.h
-crypto-des-common.o: k524_err.h
-crypto-des-common.o: krb5_err.h
-crypto-des-common.po: heim_err.h
-crypto-des-common.po: k524_err.h
-crypto-des-common.po: krb5_err.h
-crypto-des.So: heim_err.h
-crypto-des.So: k524_err.h
-crypto-des.So: krb5_err.h
-crypto-des.o: heim_err.h
-crypto-des.o: k524_err.h
-crypto-des.o: krb5_err.h
-crypto-des.po: heim_err.h
-crypto-des.po: k524_err.h
-crypto-des.po: krb5_err.h
-crypto-des3.So: heim_err.h
-crypto-des3.So: k524_err.h
-crypto-des3.So: krb5_err.h
-crypto-des3.o: heim_err.h
-crypto-des3.o: k524_err.h
-crypto-des3.o: krb5_err.h
-crypto-des3.po: heim_err.h
-crypto-des3.po: k524_err.h
-crypto-des3.po: krb5_err.h
-crypto-evp.So: heim_err.h
-crypto-evp.So: k524_err.h
-crypto-evp.So: krb5_err.h
-crypto-evp.o: heim_err.h
-crypto-evp.o: k524_err.h
-crypto-evp.o: krb5_err.h
-crypto-evp.po: heim_err.h
-crypto-evp.po: k524_err.h
-crypto-evp.po: krb5_err.h
-crypto-null.So: heim_err.h
-crypto-null.So: k524_err.h
-crypto-null.So: krb5_err.h
-crypto-null.o: heim_err.h
-crypto-null.o: k524_err.h
-crypto-null.o: krb5_err.h
-crypto-null.po: heim_err.h
-crypto-null.po: k524_err.h
-crypto-null.po: krb5_err.h
-crypto-pk.So: heim_err.h
-crypto-pk.So: k524_err.h
-crypto-pk.So: krb5_err.h
-crypto-pk.o: heim_err.h
-crypto-pk.o: k524_err.h
-crypto-pk.o: krb5_err.h
-crypto-pk.po: heim_err.h
-crypto-pk.po: k524_err.h
-crypto-pk.po: krb5_err.h
-crypto-rand.So: heim_err.h
-crypto-rand.So: k524_err.h
-crypto-rand.So: krb5_err.h
-crypto-rand.o: heim_err.h
-crypto-rand.o: k524_err.h
-crypto-rand.o: krb5_err.h
-crypto-rand.po: heim_err.h
-crypto-rand.po: k524_err.h
-crypto-rand.po: krb5_err.h
-crypto.So: heim_err.h
-crypto.So: k524_err.h
-crypto.So: krb5_err.h
-crypto.o: heim_err.h
-crypto.o: k524_err.h
-crypto.o: krb5_err.h
-crypto.po: heim_err.h
-crypto.po: k524_err.h
-crypto.po: krb5_err.h
-data.So: heim_err.h
-data.So: k524_err.h
-data.So: krb5_err.h
-data.o: heim_err.h
-data.o: k524_err.h
-data.o: krb5_err.h
-data.po: heim_err.h
-data.po: k524_err.h
-data.po: krb5_err.h
-deprecated.So: heim_err.h
-deprecated.So: k524_err.h
-deprecated.So: krb5_err.h
-deprecated.o: heim_err.h
-deprecated.o: k524_err.h
-deprecated.o: krb5_err.h
-deprecated.po: heim_err.h
-deprecated.po: k524_err.h
-deprecated.po: krb5_err.h
-digest.So: heim_err.h
-digest.So: k524_err.h
-digest.So: krb5_err.h
-digest.o: heim_err.h
-digest.o: k524_err.h
-digest.o: krb5_err.h
-digest.po: heim_err.h
-digest.po: k524_err.h
-digest.po: krb5_err.h
-doxygen.So: heim_err.h
-doxygen.So: k524_err.h
-doxygen.So: krb5_err.h
-doxygen.o: heim_err.h
-doxygen.o: k524_err.h
-doxygen.o: krb5_err.h
-doxygen.po: heim_err.h
-doxygen.po: k524_err.h
-doxygen.po: krb5_err.h
-eai_to_heim_errno.So: heim_err.h
-eai_to_heim_errno.So: k524_err.h
-eai_to_heim_errno.So: krb5_err.h
-eai_to_heim_errno.o: heim_err.h
-eai_to_heim_errno.o: k524_err.h
-eai_to_heim_errno.o: krb5_err.h
-eai_to_heim_errno.po: heim_err.h
-eai_to_heim_errno.po: k524_err.h
-eai_to_heim_errno.po: krb5_err.h
-error_string.So: heim_err.h
-error_string.So: k524_err.h
-error_string.So: krb5_err.h
-error_string.o: heim_err.h
-error_string.o: k524_err.h
-error_string.o: krb5_err.h
-error_string.po: heim_err.h
-error_string.po: k524_err.h
-error_string.po: krb5_err.h
-expand_hostname.So: heim_err.h
-expand_hostname.So: k524_err.h
-expand_hostname.So: krb5_err.h
-expand_hostname.o: heim_err.h
-expand_hostname.o: k524_err.h
-expand_hostname.o: krb5_err.h
-expand_hostname.po: heim_err.h
-expand_hostname.po: k524_err.h
-expand_hostname.po: krb5_err.h
-expand_path.So: heim_err.h
-expand_path.So: k524_err.h
-expand_path.So: krb5_err.h
-expand_path.o: heim_err.h
-expand_path.o: k524_err.h
-expand_path.o: krb5_err.h
-expand_path.po: heim_err.h
-expand_path.po: k524_err.h
-expand_path.po: krb5_err.h
-fcache.So: heim_err.h
-fcache.So: k524_err.h
-fcache.So: krb5_err.h
-fcache.o: heim_err.h
-fcache.o: k524_err.h
-fcache.o: krb5_err.h
-fcache.po: heim_err.h
-fcache.po: k524_err.h
-fcache.po: krb5_err.h
-free.So: heim_err.h
-free.So: k524_err.h
-free.So: krb5_err.h
-free.o: heim_err.h
-free.o: k524_err.h
-free.o: krb5_err.h
-free.po: heim_err.h
-free.po: k524_err.h
-free.po: krb5_err.h
-free_host_realm.So: heim_err.h
-free_host_realm.So: k524_err.h
-free_host_realm.So: krb5_err.h
-free_host_realm.o: heim_err.h
-free_host_realm.o: k524_err.h
-free_host_realm.o: krb5_err.h
-free_host_realm.po: heim_err.h
-free_host_realm.po: k524_err.h
-free_host_realm.po: krb5_err.h
-generate_seq_number.So: heim_err.h
-generate_seq_number.So: k524_err.h
-generate_seq_number.So: krb5_err.h
-generate_seq_number.o: heim_err.h
-generate_seq_number.o: k524_err.h
-generate_seq_number.o: krb5_err.h
-generate_seq_number.po: heim_err.h
-generate_seq_number.po: k524_err.h
-generate_seq_number.po: krb5_err.h
-generate_subkey.So: heim_err.h
-generate_subkey.So: k524_err.h
-generate_subkey.So: krb5_err.h
-generate_subkey.o: heim_err.h
-generate_subkey.o: k524_err.h
-generate_subkey.o: krb5_err.h
-generate_subkey.po: heim_err.h
-generate_subkey.po: k524_err.h
-generate_subkey.po: krb5_err.h
-get_addrs.So: heim_err.h
-get_addrs.So: k524_err.h
-get_addrs.So: krb5_err.h
-get_addrs.o: heim_err.h
-get_addrs.o: k524_err.h
-get_addrs.o: krb5_err.h
-get_addrs.po: heim_err.h
-get_addrs.po: k524_err.h
-get_addrs.po: krb5_err.h
-get_cred.So: heim_err.h
-get_cred.So: k524_err.h
-get_cred.So: krb5_err.h
-get_cred.o: heim_err.h
-get_cred.o: k524_err.h
-get_cred.o: krb5_err.h
-get_cred.po: heim_err.h
-get_cred.po: k524_err.h
-get_cred.po: krb5_err.h
-get_default_principal.So: heim_err.h
-get_default_principal.So: k524_err.h
-get_default_principal.So: krb5_err.h
-get_default_principal.o: heim_err.h
-get_default_principal.o: k524_err.h
-get_default_principal.o: krb5_err.h
-get_default_principal.po: heim_err.h
-get_default_principal.po: k524_err.h
-get_default_principal.po: krb5_err.h
-get_default_realm.So: heim_err.h
-get_default_realm.So: k524_err.h
-get_default_realm.So: krb5_err.h
-get_default_realm.o: heim_err.h
-get_default_realm.o: k524_err.h
-get_default_realm.o: krb5_err.h
-get_default_realm.po: heim_err.h
-get_default_realm.po: k524_err.h
-get_default_realm.po: krb5_err.h
-get_for_creds.So: heim_err.h
-get_for_creds.So: k524_err.h
-get_for_creds.So: krb5_err.h
-get_for_creds.o: heim_err.h
-get_for_creds.o: k524_err.h
-get_for_creds.o: krb5_err.h
-get_for_creds.po: heim_err.h
-get_for_creds.po: k524_err.h
-get_for_creds.po: krb5_err.h
-get_host_realm.So: heim_err.h
-get_host_realm.So: k524_err.h
-get_host_realm.So: krb5_err.h
-get_host_realm.o: heim_err.h
-get_host_realm.o: k524_err.h
-get_host_realm.o: krb5_err.h
-get_host_realm.po: heim_err.h
-get_host_realm.po: k524_err.h
-get_host_realm.po: krb5_err.h
-get_in_tkt.So: heim_err.h
-get_in_tkt.So: k524_err.h
-get_in_tkt.So: krb5_err.h
-get_in_tkt.o: heim_err.h
-get_in_tkt.o: k524_err.h
-get_in_tkt.o: krb5_err.h
-get_in_tkt.po: heim_err.h
-get_in_tkt.po: k524_err.h
-get_in_tkt.po: krb5_err.h
-get_port.So: heim_err.h
-get_port.So: k524_err.h
-get_port.So: krb5_err.h
-get_port.o: heim_err.h
-get_port.o: k524_err.h
-get_port.o: krb5_err.h
-get_port.po: heim_err.h
-get_port.po: k524_err.h
-get_port.po: krb5_err.h
-heim_err.So: heim_err.c
-heim_err.So: heim_err.h
-heim_err.o: heim_err.c
-heim_err.o: heim_err.h
-heim_err.po: heim_err.c
-heim_err.po: heim_err.h
-init_creds.So: heim_err.h
-init_creds.So: k524_err.h
-init_creds.So: krb5_err.h
-init_creds.o: heim_err.h
-init_creds.o: k524_err.h
-init_creds.o: krb5_err.h
-init_creds.po: heim_err.h
-init_creds.po: k524_err.h
-init_creds.po: krb5_err.h
-init_creds_pw.So: heim_err.h
-init_creds_pw.So: k524_err.h
-init_creds_pw.So: krb5_err.h
-init_creds_pw.o: heim_err.h
-init_creds_pw.o: k524_err.h
-init_creds_pw.o: krb5_err.h
-init_creds_pw.po: heim_err.h
-init_creds_pw.po: k524_err.h
-init_creds_pw.po: krb5_err.h
-k524_err.So: k524_err.c
-k524_err.So: k524_err.h
-k524_err.o: k524_err.c
-k524_err.o: k524_err.h
-k524_err.po: k524_err.c
-k524_err.po: k524_err.h
-kcm.So: heim_err.h
-kcm.So: k524_err.h
-kcm.So: krb5_err.h
-kcm.o: heim_err.h
-kcm.o: k524_err.h
-kcm.o: krb5_err.h
-kcm.po: heim_err.h
-kcm.po: k524_err.h
-kcm.po: krb5_err.h
-keyblock.So: heim_err.h
-keyblock.So: k524_err.h
-keyblock.So: krb5_err.h
-keyblock.o: heim_err.h
-keyblock.o: k524_err.h
-keyblock.o: krb5_err.h
-keyblock.po: heim_err.h
-keyblock.po: k524_err.h
-keyblock.po: krb5_err.h
-keytab.So: heim_err.h
-keytab.So: k524_err.h
-keytab.So: krb5_err.h
-keytab.o: heim_err.h
-keytab.o: k524_err.h
-keytab.o: krb5_err.h
-keytab.po: heim_err.h
-keytab.po: k524_err.h
-keytab.po: krb5_err.h
-keytab_any.So: heim_err.h
-keytab_any.So: k524_err.h
-keytab_any.So: krb5_err.h
-keytab_any.o: heim_err.h
-keytab_any.o: k524_err.h
-keytab_any.o: krb5_err.h
-keytab_any.po: heim_err.h
-keytab_any.po: k524_err.h
-keytab_any.po: krb5_err.h
-keytab_file.So: heim_err.h
-keytab_file.So: k524_err.h
-keytab_file.So: krb5_err.h
-keytab_file.o: heim_err.h
-keytab_file.o: k524_err.h
-keytab_file.o: krb5_err.h
-keytab_file.po: heim_err.h
-keytab_file.po: k524_err.h
-keytab_file.po: krb5_err.h
-keytab_keyfile.So: heim_err.h
-keytab_keyfile.So: k524_err.h
-keytab_keyfile.So: krb5_err.h
-keytab_keyfile.o: heim_err.h
-keytab_keyfile.o: k524_err.h
-keytab_keyfile.o: krb5_err.h
-keytab_keyfile.po: heim_err.h
-keytab_keyfile.po: k524_err.h
-keytab_keyfile.po: krb5_err.h
-keytab_memory.So: heim_err.h
-keytab_memory.So: k524_err.h
-keytab_memory.So: krb5_err.h
-keytab_memory.o: heim_err.h
-keytab_memory.o: k524_err.h
-keytab_memory.o: krb5_err.h
-keytab_memory.po: heim_err.h
-keytab_memory.po: k524_err.h
-keytab_memory.po: krb5_err.h
-krb5_err.So: krb5_err.c
-krb5_err.So: krb5_err.h
-krb5_err.o: krb5_err.c
-krb5_err.o: krb5_err.h
-krb5_err.po: krb5_err.c
-krb5_err.po: krb5_err.h
-krb_err.So: krb_err.c
-krb_err.So: krb_err.h
-krb_err.o: krb_err.c
-krb_err.o: krb_err.h
-krb_err.po: krb_err.c
-krb_err.po: krb_err.h
-krbhst.So: heim_err.h
-krbhst.So: k524_err.h
-krbhst.So: krb5_err.h
-krbhst.o: heim_err.h
-krbhst.o: k524_err.h
-krbhst.o: krb5_err.h
-krbhst.po: heim_err.h
-krbhst.po: k524_err.h
-krbhst.po: krb5_err.h
-kuserok.So: heim_err.h
-kuserok.So: k524_err.h
-kuserok.So: krb5_err.h
-kuserok.o: heim_err.h
-kuserok.o: k524_err.h
-kuserok.o: krb5_err.h
-kuserok.po: heim_err.h
-kuserok.po: k524_err.h
-kuserok.po: krb5_err.h
-log.So: heim_err.h
-log.So: k524_err.h
-log.So: krb5_err.h
-log.o: heim_err.h
-log.o: k524_err.h
-log.o: krb5_err.h
-log.po: heim_err.h
-log.po: k524_err.h
-log.po: krb5_err.h
-mcache.So: heim_err.h
-mcache.So: k524_err.h
-mcache.So: krb5_err.h
-mcache.o: heim_err.h
-mcache.o: k524_err.h
-mcache.o: krb5_err.h
-mcache.po: heim_err.h
-mcache.po: k524_err.h
-mcache.po: krb5_err.h
-misc.So: heim_err.h
-misc.So: k524_err.h
-misc.So: krb5_err.h
-misc.o: heim_err.h
-misc.o: k524_err.h
-misc.o: krb5_err.h
-misc.po: heim_err.h
-misc.po: k524_err.h
-misc.po: krb5_err.h
-mit_glue.So: heim_err.h
-mit_glue.So: k524_err.h
-mit_glue.So: krb5_err.h
-mit_glue.o: heim_err.h
-mit_glue.o: k524_err.h
-mit_glue.o: krb5_err.h
-mit_glue.po: heim_err.h
-mit_glue.po: k524_err.h
-mit_glue.po: krb5_err.h
-mk_error.So: heim_err.h
-mk_error.So: k524_err.h
-mk_error.So: krb5_err.h
-mk_error.o: heim_err.h
-mk_error.o: k524_err.h
-mk_error.o: krb5_err.h
-mk_error.po: heim_err.h
-mk_error.po: k524_err.h
-mk_error.po: krb5_err.h
-mk_priv.So: heim_err.h
-mk_priv.So: k524_err.h
-mk_priv.So: krb5_err.h
-mk_priv.o: heim_err.h
-mk_priv.o: k524_err.h
-mk_priv.o: krb5_err.h
-mk_priv.po: heim_err.h
-mk_priv.po: k524_err.h
-mk_priv.po: krb5_err.h
-mk_rep.So: heim_err.h
-mk_rep.So: k524_err.h
-mk_rep.So: krb5_err.h
-mk_rep.o: heim_err.h
-mk_rep.o: k524_err.h
-mk_rep.o: krb5_err.h
-mk_rep.po: heim_err.h
-mk_rep.po: k524_err.h
-mk_rep.po: krb5_err.h
-mk_req.So: heim_err.h
-mk_req.So: k524_err.h
-mk_req.So: krb5_err.h
-mk_req.o: heim_err.h
-mk_req.o: k524_err.h
-mk_req.o: krb5_err.h
-mk_req.po: heim_err.h
-mk_req.po: k524_err.h
-mk_req.po: krb5_err.h
-mk_req_ext.So: heim_err.h
-mk_req_ext.So: k524_err.h
-mk_req_ext.So: krb5_err.h
-mk_req_ext.o: heim_err.h
-mk_req_ext.o: k524_err.h
-mk_req_ext.o: krb5_err.h
-mk_req_ext.po: heim_err.h
-mk_req_ext.po: k524_err.h
-mk_req_ext.po: krb5_err.h
-mk_safe.So: heim_err.h
-mk_safe.So: k524_err.h
-mk_safe.So: krb5_err.h
-mk_safe.o: heim_err.h
-mk_safe.o: k524_err.h
-mk_safe.o: krb5_err.h
-mk_safe.po: heim_err.h
-mk_safe.po: k524_err.h
-mk_safe.po: krb5_err.h
-n-fold.So: heim_err.h
-n-fold.So: k524_err.h
-n-fold.So: krb5_err.h
-n-fold.o: heim_err.h
-n-fold.o: k524_err.h
-n-fold.o: krb5_err.h
-n-fold.po: heim_err.h
-n-fold.po: k524_err.h
-n-fold.po: krb5_err.h
-net_read.So: heim_err.h
-net_read.So: k524_err.h
-net_read.So: krb5_err.h
-net_read.o: heim_err.h
-net_read.o: k524_err.h
-net_read.o: krb5_err.h
-net_read.po: heim_err.h
-net_read.po: k524_err.h
-net_read.po: krb5_err.h
-net_write.So: heim_err.h
-net_write.So: k524_err.h
-net_write.So: krb5_err.h
-net_write.o: heim_err.h
-net_write.o: k524_err.h
-net_write.o: krb5_err.h
-net_write.po: heim_err.h
-net_write.po: k524_err.h
-net_write.po: krb5_err.h
-pac.So: heim_err.h
-pac.So: k524_err.h
-pac.So: krb5_err.h
-pac.o: heim_err.h
-pac.o: k524_err.h
-pac.o: krb5_err.h
-pac.po: heim_err.h
-pac.po: k524_err.h
-pac.po: krb5_err.h
-padata.So: heim_err.h
-padata.So: k524_err.h
-padata.So: krb5_err.h
-padata.o: heim_err.h
-padata.o: k524_err.h
-padata.o: krb5_err.h
-padata.po: heim_err.h
-padata.po: k524_err.h
-padata.po: krb5_err.h
-pcache.So: heim_err.h
-pcache.So: k524_err.h
-pcache.So: krb5_err.h
-pcache.o: heim_err.h
-pcache.o: k524_err.h
-pcache.o: krb5_err.h
-pcache.po: heim_err.h
-pcache.po: k524_err.h
-pcache.po: krb5_err.h
-pkinit.So: heim_err.h
-pkinit.So: k524_err.h
-pkinit.So: krb5_err.h
-pkinit.o: heim_err.h
-pkinit.o: k524_err.h
-pkinit.o: krb5_err.h
-pkinit.po: heim_err.h
-pkinit.po: k524_err.h
-pkinit.po: krb5_err.h
-plugin.So: heim_err.h
-plugin.So: k524_err.h
-plugin.So: krb5_err.h
-plugin.o: heim_err.h
-plugin.o: k524_err.h
-plugin.o: krb5_err.h
-plugin.po: heim_err.h
-plugin.po: k524_err.h
-plugin.po: krb5_err.h
-principal.So: heim_err.h
-principal.So: k524_err.h
-principal.So: krb5_err.h
-principal.o: heim_err.h
-principal.o: k524_err.h
-principal.o: krb5_err.h
-principal.po: heim_err.h
-principal.po: k524_err.h
-principal.po: krb5_err.h
-prog_setup.So: heim_err.h
-prog_setup.So: k524_err.h
-prog_setup.So: krb5_err.h
-prog_setup.o: heim_err.h
-prog_setup.o: k524_err.h
-prog_setup.o: krb5_err.h
-prog_setup.po: heim_err.h
-prog_setup.po: k524_err.h
-prog_setup.po: krb5_err.h
-prompter_posix.So: heim_err.h
-prompter_posix.So: k524_err.h
-prompter_posix.So: krb5_err.h
-prompter_posix.o: heim_err.h
-prompter_posix.o: k524_err.h
-prompter_posix.o: krb5_err.h
-prompter_posix.po: heim_err.h
-prompter_posix.po: k524_err.h
-prompter_posix.po: krb5_err.h
-rd_cred.So: heim_err.h
-rd_cred.So: k524_err.h
-rd_cred.So: krb5_err.h
-rd_cred.o: heim_err.h
-rd_cred.o: k524_err.h
-rd_cred.o: krb5_err.h
-rd_cred.po: heim_err.h
-rd_cred.po: k524_err.h
-rd_cred.po: krb5_err.h
-rd_error.So: heim_err.h
-rd_error.So: k524_err.h
-rd_error.So: krb5_err.h
-rd_error.o: heim_err.h
-rd_error.o: k524_err.h
-rd_error.o: krb5_err.h
-rd_error.po: heim_err.h
-rd_error.po: k524_err.h
-rd_error.po: krb5_err.h
-rd_priv.So: heim_err.h
-rd_priv.So: k524_err.h
-rd_priv.So: krb5_err.h
-rd_priv.o: heim_err.h
-rd_priv.o: k524_err.h
-rd_priv.o: krb5_err.h
-rd_priv.po: heim_err.h
-rd_priv.po: k524_err.h
-rd_priv.po: krb5_err.h
-rd_rep.So: heim_err.h
-rd_rep.So: k524_err.h
-rd_rep.So: krb5_err.h
-rd_rep.o: heim_err.h
-rd_rep.o: k524_err.h
-rd_rep.o: krb5_err.h
-rd_rep.po: heim_err.h
-rd_rep.po: k524_err.h
-rd_rep.po: krb5_err.h
-rd_req.So: heim_err.h
-rd_req.So: k524_err.h
-rd_req.So: krb5_err.h
-rd_req.o: heim_err.h
-rd_req.o: k524_err.h
-rd_req.o: krb5_err.h
-rd_req.po: heim_err.h
-rd_req.po: k524_err.h
-rd_req.po: krb5_err.h
-rd_safe.So: heim_err.h
-rd_safe.So: k524_err.h
-rd_safe.So: krb5_err.h
-rd_safe.o: heim_err.h
-rd_safe.o: k524_err.h
-rd_safe.o: krb5_err.h
-rd_safe.po: heim_err.h
-rd_safe.po: k524_err.h
-rd_safe.po: krb5_err.h
-read_message.So: heim_err.h
-read_message.So: k524_err.h
-read_message.So: krb5_err.h
-read_message.o: heim_err.h
-read_message.o: k524_err.h
-read_message.o: krb5_err.h
-read_message.po: heim_err.h
-read_message.po: k524_err.h
-read_message.po: krb5_err.h
-recvauth.So: heim_err.h
-recvauth.So: k524_err.h
-recvauth.So: krb5_err.h
-recvauth.o: heim_err.h
-recvauth.o: k524_err.h
-recvauth.o: krb5_err.h
-recvauth.po: heim_err.h
-recvauth.po: k524_err.h
-recvauth.po: krb5_err.h
-replay.So: heim_err.h
-replay.So: k524_err.h
-replay.So: krb5_err.h
-replay.o: heim_err.h
-replay.o: k524_err.h
-replay.o: krb5_err.h
-replay.po: heim_err.h
-replay.po: k524_err.h
-replay.po: krb5_err.h
-salt-aes.So: heim_err.h
-salt-aes.So: k524_err.h
-salt-aes.So: krb5_err.h
-salt-aes.o: heim_err.h
-salt-aes.o: k524_err.h
-salt-aes.o: krb5_err.h
-salt-aes.po: heim_err.h
-salt-aes.po: k524_err.h
-salt-aes.po: krb5_err.h
-salt-arcfour.So: heim_err.h
-salt-arcfour.So: k524_err.h
-salt-arcfour.So: krb5_err.h
-salt-arcfour.o: heim_err.h
-salt-arcfour.o: k524_err.h
-salt-arcfour.o: krb5_err.h
-salt-arcfour.po: heim_err.h
-salt-arcfour.po: k524_err.h
-salt-arcfour.po: krb5_err.h
-salt-des.So: heim_err.h
-salt-des.So: k524_err.h
-salt-des.So: krb5_err.h
-salt-des.o: heim_err.h
-salt-des.o: k524_err.h
-salt-des.o: krb5_err.h
-salt-des.po: heim_err.h
-salt-des.po: k524_err.h
-salt-des.po: krb5_err.h
-salt-des3.So: heim_err.h
-salt-des3.So: k524_err.h
-salt-des3.So: krb5_err.h
-salt-des3.o: heim_err.h
-salt-des3.o: k524_err.h
-salt-des3.o: krb5_err.h
-salt-des3.po: heim_err.h
-salt-des3.po: k524_err.h
-salt-des3.po: krb5_err.h
-salt.So: heim_err.h
-salt.So: k524_err.h
-salt.So: krb5_err.h
-salt.o: heim_err.h
-salt.o: k524_err.h
-salt.o: krb5_err.h
-salt.po: heim_err.h
-salt.po: k524_err.h
-salt.po: krb5_err.h
-scache.So: heim_err.h
-scache.So: k524_err.h
-scache.So: krb5_err.h
-scache.o: heim_err.h
-scache.o: k524_err.h
-scache.o: krb5_err.h
-scache.po: heim_err.h
-scache.po: k524_err.h
-scache.po: krb5_err.h
-send_to_kdc.So: heim_err.h
-send_to_kdc.So: k524_err.h
-send_to_kdc.So: krb5_err.h
-send_to_kdc.o: heim_err.h
-send_to_kdc.o: k524_err.h
-send_to_kdc.o: krb5_err.h
-send_to_kdc.po: heim_err.h
-send_to_kdc.po: k524_err.h
-send_to_kdc.po: krb5_err.h
-sendauth.So: heim_err.h
-sendauth.So: k524_err.h
-sendauth.So: krb5_err.h
-sendauth.o: heim_err.h
-sendauth.o: k524_err.h
-sendauth.o: krb5_err.h
-sendauth.po: heim_err.h
-sendauth.po: k524_err.h
-sendauth.po: krb5_err.h
-set_default_realm.So: heim_err.h
-set_default_realm.So: k524_err.h
-set_default_realm.So: krb5_err.h
-set_default_realm.o: heim_err.h
-set_default_realm.o: k524_err.h
-set_default_realm.o: krb5_err.h
-set_default_realm.po: heim_err.h
-set_default_realm.po: k524_err.h
-set_default_realm.po: krb5_err.h
-sock_principal.So: heim_err.h
-sock_principal.So: k524_err.h
-sock_principal.So: krb5_err.h
-sock_principal.o: heim_err.h
-sock_principal.o: k524_err.h
-sock_principal.o: krb5_err.h
-sock_principal.po: heim_err.h
-sock_principal.po: k524_err.h
-sock_principal.po: krb5_err.h
-store-int.So: heim_err.h
-store-int.So: k524_err.h
-store-int.So: krb5_err.h
-store-int.o: heim_err.h
-store-int.o: k524_err.h
-store-int.o: krb5_err.h
-store-int.po: heim_err.h
-store-int.po: k524_err.h
-store-int.po: krb5_err.h
-store.So: heim_err.h
-store.So: k524_err.h
-store.So: krb5_err.h
-store.o: heim_err.h
-store.o: k524_err.h
-store.o: krb5_err.h
-store.po: heim_err.h
-store.po: k524_err.h
-store.po: krb5_err.h
-store_emem.So: heim_err.h
-store_emem.So: k524_err.h
-store_emem.So: krb5_err.h
-store_emem.o: heim_err.h
-store_emem.o: k524_err.h
-store_emem.o: krb5_err.h
-store_emem.po: heim_err.h
-store_emem.po: k524_err.h
-store_emem.po: krb5_err.h
-store_fd.So: heim_err.h
-store_fd.So: k524_err.h
-store_fd.So: krb5_err.h
-store_fd.o: heim_err.h
-store_fd.o: k524_err.h
-store_fd.o: krb5_err.h
-store_fd.po: heim_err.h
-store_fd.po: k524_err.h
-store_fd.po: krb5_err.h
-store_mem.So: heim_err.h
-store_mem.So: k524_err.h
-store_mem.So: krb5_err.h
-store_mem.o: heim_err.h
-store_mem.o: k524_err.h
-store_mem.o: krb5_err.h
-store_mem.po: heim_err.h
-store_mem.po: k524_err.h
-store_mem.po: krb5_err.h
-ticket.So: heim_err.h
-ticket.So: k524_err.h
-ticket.So: krb5_err.h
-ticket.o: heim_err.h
-ticket.o: k524_err.h
-ticket.o: krb5_err.h
-ticket.po: heim_err.h
-ticket.po: k524_err.h
-ticket.po: krb5_err.h
-time.So: heim_err.h
-time.So: k524_err.h
-time.So: krb5_err.h
-time.o: heim_err.h
-time.o: k524_err.h
-time.o: krb5_err.h
-time.po: heim_err.h
-time.po: k524_err.h
-time.po: krb5_err.h
-transited.So: heim_err.h
-transited.So: k524_err.h
-transited.So: krb5_err.h
-transited.o: heim_err.h
-transited.o: k524_err.h
-transited.o: krb5_err.h
-transited.po: heim_err.h
-transited.po: k524_err.h
-transited.po: krb5_err.h
-verify_init.So: heim_err.h
-verify_init.So: k524_err.h
-verify_init.So: krb5_err.h
-verify_init.o: heim_err.h
-verify_init.o: k524_err.h
-verify_init.o: krb5_err.h
-verify_init.po: heim_err.h
-verify_init.po: k524_err.h
-verify_init.po: krb5_err.h
-verify_user.So: heim_err.h
-verify_user.So: k524_err.h
-verify_user.So: krb5_err.h
-verify_user.o: heim_err.h
-verify_user.o: k524_err.h
-verify_user.o: krb5_err.h
-verify_user.po: heim_err.h
-verify_user.po: k524_err.h
-verify_user.po: krb5_err.h
-version.So: heim_err.h
-version.So: k524_err.h
-version.So: krb5_err.h
-version.o: heim_err.h
-version.o: k524_err.h
-version.o: krb5_err.h
-version.po: heim_err.h
-version.po: k524_err.h
-version.po: krb5_err.h
-warn.So: heim_err.h
-warn.So: k524_err.h
-warn.So: krb5_err.h
-warn.o: heim_err.h
-warn.o: k524_err.h
-warn.o: krb5_err.h
-warn.po: heim_err.h
-warn.po: k524_err.h
-warn.po: krb5_err.h
-write_message.So: heim_err.h
-write_message.So: k524_err.h
-write_message.So: krb5_err.h
-write_message.o: heim_err.h
-write_message.o: k524_err.h
-write_message.o: krb5_err.h
-write_message.po: heim_err.h
-write_message.po: k524_err.h
-write_message.po: krb5_err.h
.endif
diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend
index e280c94..35cdb76 100644
--- a/kerberos5/lib/libroken/Makefile.depend
+++ b/kerberos5/lib/libroken/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
include \
include/arpa \
include/xlocale \
+ kerberos5/tools/make-roken.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
@@ -17,160 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bswap.So: roken.h
-bswap.o: roken.h
-bswap.po: roken.h
-cloexec.So: roken.h
-cloexec.o: roken.h
-cloexec.po: roken.h
-concat.So: roken.h
-concat.o: roken.h
-concat.po: roken.h
-copyhostent.So: roken.h
-copyhostent.o: roken.h
-copyhostent.po: roken.h
-ct.So: roken.h
-ct.o: roken.h
-ct.po: roken.h
-dumpdata.So: roken.h
-dumpdata.o: roken.h
-dumpdata.po: roken.h
-ecalloc.So: roken.h
-ecalloc.o: roken.h
-ecalloc.po: roken.h
-emalloc.So: roken.h
-emalloc.o: roken.h
-emalloc.po: roken.h
-environment.So: roken.h
-environment.o: roken.h
-environment.po: roken.h
-eread.So: roken.h
-eread.o: roken.h
-eread.po: roken.h
-erealloc.So: roken.h
-erealloc.o: roken.h
-erealloc.po: roken.h
-esetenv.So: roken.h
-esetenv.o: roken.h
-esetenv.po: roken.h
-estrdup.So: roken.h
-estrdup.o: roken.h
-estrdup.po: roken.h
-ewrite.So: roken.h
-ewrite.o: roken.h
-ewrite.po: roken.h
-get_default_username.So: roken.h
-get_default_username.o: roken.h
-get_default_username.po: roken.h
-get_window_size.So: roken.h
-get_window_size.o: roken.h
-get_window_size.po: roken.h
-getaddrinfo_hostspec.So: roken.h
-getaddrinfo_hostspec.o: roken.h
-getaddrinfo_hostspec.po: roken.h
-getarg.So: roken.h
-getarg.o: roken.h
-getarg.po: roken.h
-getnameinfo_verified.So: roken.h
-getnameinfo_verified.o: roken.h
-getnameinfo_verified.po: roken.h
-getprogname.So: roken.h
-getprogname.o: roken.h
-getprogname.po: roken.h
-hex.So: roken.h
-hex.o: roken.h
-hex.po: roken.h
-hostent_find_fqdn.So: roken.h
-hostent_find_fqdn.o: roken.h
-hostent_find_fqdn.po: roken.h
-issuid.So: roken.h
-issuid.o: roken.h
-issuid.po: roken.h
-k_getpwnam.So: roken.h
-k_getpwnam.o: roken.h
-k_getpwnam.po: roken.h
-k_getpwuid.So: roken.h
-k_getpwuid.o: roken.h
-k_getpwuid.po: roken.h
-mini_inetd.So: roken.h
-mini_inetd.o: roken.h
-mini_inetd.po: roken.h
-net_read.So: roken.h
-net_read.o: roken.h
-net_read.po: roken.h
-net_write.So: roken.h
-net_write.o: roken.h
-net_write.po: roken.h
-parse_units.So: roken.h
-parse_units.o: roken.h
-parse_units.po: roken.h
-rand.So: roken.h
-rand.o: roken.h
-rand.po: roken.h
-realloc.So: roken.h
-realloc.o: roken.h
-realloc.po: roken.h
-resolve.So: roken.h
-resolve.o: roken.h
-resolve.po: roken.h
-roken_gethostby.So: roken.h
-roken_gethostby.o: roken.h
-roken_gethostby.po: roken.h
-rtbl.So: roken.h
-rtbl.o: roken.h
-rtbl.po: roken.h
-setprogname.So: roken.h
-setprogname.o: roken.h
-setprogname.po: roken.h
-signal.So: roken.h
-signal.o: roken.h
-signal.po: roken.h
-simple_exec.So: roken.h
-simple_exec.o: roken.h
-simple_exec.po: roken.h
-snprintf.So: roken.h
-snprintf.o: roken.h
-snprintf.po: roken.h
-socket.So: roken.h
-socket.o: roken.h
-socket.po: roken.h
-strcollect.So: roken.h
-strcollect.o: roken.h
-strcollect.po: roken.h
-strlwr.So: roken.h
-strlwr.o: roken.h
-strlwr.po: roken.h
-strpool.So: roken.h
-strpool.o: roken.h
-strpool.po: roken.h
-strsep_copy.So: roken.h
-strsep_copy.o: roken.h
-strsep_copy.po: roken.h
-strupr.So: roken.h
-strupr.o: roken.h
-strupr.po: roken.h
-timeval.So: roken.h
-timeval.o: roken.h
-timeval.po: roken.h
-tm2time.So: roken.h
-tm2time.o: roken.h
-tm2time.po: roken.h
-unvis.So: roken.h
-unvis.o: roken.h
-unvis.po: roken.h
-verify.So: roken.h
-verify.o: roken.h
-verify.po: roken.h
-vis.So: roken.h
-vis.o: roken.h
-vis.po: roken.h
-warnerr.So: roken.h
-warnerr.o: roken.h
-warnerr.po: roken.h
-write_pid.So: roken.h
-write_pid.o: roken.h
-write_pid.po: roken.h
-xfree.So: roken.h
-xfree.o: roken.h
-xfree.po: roken.h
.endif
diff --git a/kerberos5/lib/libvers/Makefile.depend b/kerberos5/lib/libvers/Makefile.depend
index ae841b8..b6d7d1c 100644
--- a/kerberos5/lib/libvers/Makefile.depend
+++ b/kerberos5/lib/libvers/Makefile.depend
@@ -5,12 +5,11 @@ DIRDEPS = \
include \
include/arpa \
include/xlocale \
+ kerberos5/tools/make-roken.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-print_version.o: roken.h
-print_version.po: roken.h
.endif
diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend
index 87bc4c1..94dff02 100644
--- a/kerberos5/lib/libwind/Makefile.depend
+++ b/kerberos5/lib/libwind/Makefile.depend
@@ -12,49 +12,11 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bidi.So: wind_err.h
-bidi.o: wind_err.h
-bidi.po: wind_err.h
-combining.So: wind_err.h
-combining.o: wind_err.h
-combining.po: wind_err.h
-errorlist.So: wind_err.h
-errorlist.o: wind_err.h
-errorlist.po: wind_err.h
-errorlist_table.So: wind_err.h
-errorlist_table.o: wind_err.h
-errorlist_table.po: wind_err.h
-ldap.So: wind_err.h
-ldap.o: wind_err.h
-ldap.po: wind_err.h
-map.So: wind_err.h
-map.o: wind_err.h
-map.po: wind_err.h
-map_table.So: wind_err.h
-map_table.o: wind_err.h
-map_table.po: wind_err.h
-normalize.So: wind_err.h
-normalize.o: wind_err.h
-normalize.po: wind_err.h
-punycode.So: wind_err.h
-punycode.o: wind_err.h
-punycode.po: wind_err.h
-stringprep.So: wind_err.h
-stringprep.o: wind_err.h
-stringprep.po: wind_err.h
-utf8.So: wind_err.h
-utf8.o: wind_err.h
-utf8.po: wind_err.h
-wind_err.So: wind_err.c
-wind_err.So: wind_err.h
-wind_err.o: wind_err.c
-wind_err.o: wind_err.h
-wind_err.po: wind_err.c
-wind_err.po: wind_err.h
.endif
diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend
index 35482e2..309e114 100644
--- a/kerberos5/libexec/ipropd-master/Makefile.depend
+++ b/kerberos5/libexec/ipropd-master/Makefile.depend
@@ -25,14 +25,11 @@ DIRDEPS = \
lib/libsqlite3 \
lib/libthr \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipropd_common.o: kadm5_err.h
-ipropd_common.po: kadm5_err.h
-ipropd_master.o: kadm5_err.h
-ipropd_master.po: kadm5_err.h
.endif
diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend
index bbde923..309e114 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile.depend
+++ b/kerberos5/libexec/ipropd-slave/Makefile.depend
@@ -25,14 +25,11 @@ DIRDEPS = \
lib/libsqlite3 \
lib/libthr \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipropd_common.o: kadm5_err.h
-ipropd_common.po: kadm5_err.h
-ipropd_slave.o: kadm5_err.h
-ipropd_slave.po: kadm5_err.h
.endif
diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend
index a87c8e0..325d4ed 100644
--- a/kerberos5/libexec/kdigest/Makefile.depend
+++ b/kerberos5/libexec/kdigest/Makefile.depend
@@ -18,6 +18,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -33,10 +34,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-kdigest-commands.o: kdigest-commands.c
-kdigest-commands.o: kdigest-commands.h
-kdigest-commands.po: kdigest-commands.c
-kdigest-commands.po: kdigest-commands.h
-kdigest.o: kdigest-commands.h
-kdigest.po: kdigest-commands.h
.endif
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index cdec769..947a8ed 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
include/xlocale \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
+ kerberos5/tools/make-roken.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
@@ -19,38 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-asn1parse.o: asn1parse.c
-asn1parse.o: roken.h
-asn1parse.po: asn1parse.c
-asn1parse.po: roken.h
-gen.o: roken.h
-gen.po: roken.h
-gen_copy.o: roken.h
-gen_copy.po: roken.h
-gen_decode.o: roken.h
-gen_decode.po: roken.h
-gen_encode.o: roken.h
-gen_encode.po: roken.h
-gen_free.o: roken.h
-gen_free.po: roken.h
-gen_glue.o: roken.h
-gen_glue.po: roken.h
-gen_length.o: roken.h
-gen_length.po: roken.h
-gen_seq.o: roken.h
-gen_seq.po: roken.h
-gen_template.o: roken.h
-gen_template.po: roken.h
-hash.o: roken.h
-hash.po: roken.h
-lex.o: asn1parse.h
-lex.o: lex.c
-lex.o: roken.h
-lex.po: asn1parse.h
-lex.po: lex.c
-lex.po: roken.h
-main.o: roken.h
-main.po: roken.h
-symbol.o: roken.h
-symbol.po: roken.h
.endif
diff --git a/kerberos5/tools/make-roken/Makefile.depend b/kerberos5/tools/make-roken/Makefile.depend
index ef25e5c..9cb890b 100644
--- a/kerberos5/tools/make-roken/Makefile.depend
+++ b/kerberos5/tools/make-roken/Makefile.depend
@@ -14,6 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-make-roken.o: make-roken.c
-make-roken.po: make-roken.c
.endif
diff --git a/kerberos5/tools/slc/Makefile.depend b/kerberos5/tools/slc/Makefile.depend
index f585953..947a8ed 100644
--- a/kerberos5/tools/slc/Makefile.depend
+++ b/kerberos5/tools/slc/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
include/xlocale \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
+ kerberos5/tools/make-roken.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
@@ -19,12 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-slc-gram.o: roken.h
-slc-gram.o: slc-gram.c
-slc-gram.po: roken.h
-slc-gram.po: slc-gram.c
-slc-lex.o: slc-gram.h
-slc-lex.o: slc-lex.c
-slc-lex.po: slc-gram.h
-slc-lex.po: slc-lex.c
.endif
diff --git a/kerberos5/usr.bin/hxtool/Makefile.depend b/kerberos5/usr.bin/hxtool/Makefile.depend
index b39235f..e673899 100644
--- a/kerberos5/usr.bin/hxtool/Makefile.depend
+++ b/kerberos5/usr.bin/hxtool/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -27,10 +28,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-hxtool-commands.o: hxtool-commands.c
-hxtool-commands.o: hxtool-commands.h
-hxtool-commands.po: hxtool-commands.c
-hxtool-commands.po: hxtool-commands.h
-hxtool.o: hxtool-commands.h
-hxtool.po: hxtool-commands.h
.endif
diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend
index ba39879..bd50254 100644
--- a/kerberos5/usr.bin/kadmin/Makefile.depend
+++ b/kerberos5/usr.bin/kadmin/Makefile.depend
@@ -19,6 +19,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -36,40 +37,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-add_enctype.o: kadmin-commands.h
-add_enctype.po: kadmin-commands.h
-ank.o: kadmin-commands.h
-ank.po: kadmin-commands.h
-check.o: kadmin-commands.h
-check.po: kadmin-commands.h
-cpw.o: kadmin-commands.h
-cpw.po: kadmin-commands.h
-del.o: kadmin-commands.h
-del.po: kadmin-commands.h
-del_enctype.o: kadmin-commands.h
-del_enctype.po: kadmin-commands.h
-dump.o: kadmin-commands.h
-dump.po: kadmin-commands.h
-ext.o: kadmin-commands.h
-ext.po: kadmin-commands.h
-get.o: kadmin-commands.h
-get.po: kadmin-commands.h
-init.o: kadmin-commands.h
-init.po: kadmin-commands.h
-kadmin-commands.o: kadmin-commands.c
-kadmin-commands.o: kadmin-commands.h
-kadmin-commands.po: kadmin-commands.c
-kadmin-commands.po: kadmin-commands.h
-kadmin.o: kadmin-commands.h
-kadmin.po: kadmin-commands.h
-load.o: kadmin-commands.h
-load.po: kadmin-commands.h
-mod.o: kadmin-commands.h
-mod.po: kadmin-commands.h
-pw_quality.o: kadmin-commands.h
-pw_quality.po: kadmin-commands.h
-rename.o: kadmin-commands.h
-rename.po: kadmin-commands.h
-stash.o: kadmin-commands.h
-stash.po: kadmin-commands.h
.endif
diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend
index 385f604..c7d0db6 100644
--- a/kerberos5/usr.bin/kcc/Makefile.depend
+++ b/kerberos5/usr.bin/kcc/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -32,16 +33,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-copy_cred_cache.o: kcc-commands.h
-copy_cred_cache.po: kcc-commands.h
-kcc-commands.o: kcc-commands.c
-kcc-commands.o: kcc-commands.h
-kcc-commands.po: kcc-commands.c
-kcc-commands.po: kcc-commands.h
-kcc.o: kcc-commands.h
-kcc.po: kcc-commands.h
-klist.o: kcc-commands.h
-klist.po: kcc-commands.h
-kswitch.o: kcc-commands.h
-kswitch.po: kcc-commands.h
.endif
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend
index 5d0a242..d8cb0d5 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile.depend
+++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend
@@ -18,6 +18,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -28,18 +29,11 @@ DIRDEPS = \
lib/libthr \
lib/ncurses/ncursesw \
secure/lib/libcrypto \
+ usr.bin/compile_et.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-iprop-commands.o: iprop-commands.c
-iprop-commands.o: iprop-commands.h
-iprop-commands.po: iprop-commands.c
-iprop-commands.po: iprop-commands.h
-iprop-log.o: iprop-commands.h
-iprop-log.o: kadm5_err.h
-iprop-log.po: iprop-commands.h
-iprop-log.po: kadm5_err.h
.endif
diff --git a/kerberos5/usr.sbin/ktutil/Makefile.depend b/kerberos5/usr.sbin/ktutil/Makefile.depend
index 4d47a99..ce4c832 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile.depend
+++ b/kerberos5/usr.sbin/ktutil/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
kerberos5/lib/libwind \
+ kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
lib/libcom_err \
@@ -32,28 +33,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-add.o: ktutil-commands.h
-add.po: ktutil-commands.h
-change.o: ktutil-commands.h
-change.po: ktutil-commands.h
-copy.o: ktutil-commands.h
-copy.po: ktutil-commands.h
-destroy.o: ktutil-commands.h
-destroy.po: ktutil-commands.h
-get.o: ktutil-commands.h
-get.po: ktutil-commands.h
-ktutil-commands.o: ktutil-commands.c
-ktutil-commands.o: ktutil-commands.h
-ktutil-commands.po: ktutil-commands.c
-ktutil-commands.po: ktutil-commands.h
-ktutil.o: ktutil-commands.h
-ktutil.po: ktutil-commands.h
-list.o: ktutil-commands.h
-list.po: ktutil-commands.h
-purge.o: ktutil-commands.h
-purge.po: ktutil-commands.h
-remove.o: ktutil-commands.h
-remove.po: ktutil-commands.h
-rename.o: ktutil-commands.h
-rename.po: ktutil-commands.h
.endif
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index eb6ef16..8ab2399 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -248,7 +248,3 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
SRCS+= ${TGHDRS:C/$/.inc.h/}
CLEANFILES+= ${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}
-
-# if we are not doing explicit 'make depend', there is
-# nothing to cause these to be generated.
-beforebuild: ${SRCS:M*.inc.h}
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
index a3f2b86..264ede1 100644
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ b/lib/clang/libclanganalysis/Makefile.depend
@@ -13,178 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalysisDeclContext.o: AttrList.inc.h
-AnalysisDeclContext.o: Attrs.inc.h
-AnalysisDeclContext.o: CommentCommandList.inc.h
-AnalysisDeclContext.o: DeclNodes.inc.h
-AnalysisDeclContext.o: DiagnosticCommonKinds.inc.h
-AnalysisDeclContext.o: StmtNodes.inc.h
-AnalysisDeclContext.po: AttrList.inc.h
-AnalysisDeclContext.po: Attrs.inc.h
-AnalysisDeclContext.po: CommentCommandList.inc.h
-AnalysisDeclContext.po: DeclNodes.inc.h
-AnalysisDeclContext.po: DiagnosticCommonKinds.inc.h
-AnalysisDeclContext.po: StmtNodes.inc.h
-BodyFarm.o: CommentCommandList.inc.h
-BodyFarm.o: DeclNodes.inc.h
-BodyFarm.o: DiagnosticCommonKinds.inc.h
-BodyFarm.o: StmtNodes.inc.h
-BodyFarm.po: CommentCommandList.inc.h
-BodyFarm.po: DeclNodes.inc.h
-BodyFarm.po: DiagnosticCommonKinds.inc.h
-BodyFarm.po: StmtNodes.inc.h
-CFG.o: AttrList.inc.h
-CFG.o: Attrs.inc.h
-CFG.o: CommentCommandList.inc.h
-CFG.o: DeclNodes.inc.h
-CFG.o: DiagnosticCommonKinds.inc.h
-CFG.o: StmtNodes.inc.h
-CFG.po: AttrList.inc.h
-CFG.po: Attrs.inc.h
-CFG.po: CommentCommandList.inc.h
-CFG.po: DeclNodes.inc.h
-CFG.po: DiagnosticCommonKinds.inc.h
-CFG.po: StmtNodes.inc.h
-CFGReachabilityAnalysis.o: StmtNodes.inc.h
-CFGReachabilityAnalysis.po: StmtNodes.inc.h
-CFGStmtMap.o: StmtNodes.inc.h
-CFGStmtMap.po: StmtNodes.inc.h
-CallGraph.o: AttrList.inc.h
-CallGraph.o: AttrVisitor.inc.h
-CallGraph.o: Attrs.inc.h
-CallGraph.o: CommentCommandList.inc.h
-CallGraph.o: DeclNodes.inc.h
-CallGraph.o: DiagnosticCommonKinds.inc.h
-CallGraph.o: StmtNodes.inc.h
-CallGraph.po: AttrList.inc.h
-CallGraph.po: AttrVisitor.inc.h
-CallGraph.po: Attrs.inc.h
-CallGraph.po: CommentCommandList.inc.h
-CallGraph.po: DeclNodes.inc.h
-CallGraph.po: DiagnosticCommonKinds.inc.h
-CallGraph.po: StmtNodes.inc.h
-CocoaConventions.o: DeclNodes.inc.h
-CocoaConventions.o: DiagnosticCommonKinds.inc.h
-CocoaConventions.po: DeclNodes.inc.h
-CocoaConventions.po: DiagnosticCommonKinds.inc.h
-Consumed.o: AttrList.inc.h
-Consumed.o: AttrVisitor.inc.h
-Consumed.o: Attrs.inc.h
-Consumed.o: CommentCommandList.inc.h
-Consumed.o: DeclNodes.inc.h
-Consumed.o: DiagnosticCommonKinds.inc.h
-Consumed.o: StmtNodes.inc.h
-Consumed.po: AttrList.inc.h
-Consumed.po: AttrVisitor.inc.h
-Consumed.po: Attrs.inc.h
-Consumed.po: CommentCommandList.inc.h
-Consumed.po: DeclNodes.inc.h
-Consumed.po: DiagnosticCommonKinds.inc.h
-Consumed.po: StmtNodes.inc.h
-Dominators.o: DeclNodes.inc.h
-Dominators.o: DiagnosticCommonKinds.inc.h
-Dominators.o: StmtNodes.inc.h
-Dominators.po: DeclNodes.inc.h
-Dominators.po: DiagnosticCommonKinds.inc.h
-Dominators.po: StmtNodes.inc.h
-FormatString.o: CommentCommandList.inc.h
-FormatString.o: DeclNodes.inc.h
-FormatString.o: DiagnosticCommonKinds.inc.h
-FormatString.o: StmtNodes.inc.h
-FormatString.po: CommentCommandList.inc.h
-FormatString.po: DeclNodes.inc.h
-FormatString.po: DiagnosticCommonKinds.inc.h
-FormatString.po: StmtNodes.inc.h
-LiveVariables.o: DeclNodes.inc.h
-LiveVariables.o: DiagnosticCommonKinds.inc.h
-LiveVariables.o: StmtNodes.inc.h
-LiveVariables.po: DeclNodes.inc.h
-LiveVariables.po: DiagnosticCommonKinds.inc.h
-LiveVariables.po: StmtNodes.inc.h
-ObjCNoReturn.o: CommentCommandList.inc.h
-ObjCNoReturn.o: DeclNodes.inc.h
-ObjCNoReturn.o: DiagnosticCommonKinds.inc.h
-ObjCNoReturn.o: StmtNodes.inc.h
-ObjCNoReturn.po: CommentCommandList.inc.h
-ObjCNoReturn.po: DeclNodes.inc.h
-ObjCNoReturn.po: DiagnosticCommonKinds.inc.h
-ObjCNoReturn.po: StmtNodes.inc.h
-PostOrderCFGView.o: DeclNodes.inc.h
-PostOrderCFGView.o: DiagnosticCommonKinds.inc.h
-PostOrderCFGView.o: StmtNodes.inc.h
-PostOrderCFGView.po: DeclNodes.inc.h
-PostOrderCFGView.po: DiagnosticCommonKinds.inc.h
-PostOrderCFGView.po: StmtNodes.inc.h
-PrintfFormatString.o: CommentCommandList.inc.h
-PrintfFormatString.o: DeclNodes.inc.h
-PrintfFormatString.o: DiagnosticCommonKinds.inc.h
-PrintfFormatString.o: StmtNodes.inc.h
-PrintfFormatString.po: CommentCommandList.inc.h
-PrintfFormatString.po: DeclNodes.inc.h
-PrintfFormatString.po: DiagnosticCommonKinds.inc.h
-PrintfFormatString.po: StmtNodes.inc.h
-ProgramPoint.o: DeclNodes.inc.h
-ProgramPoint.o: DiagnosticCommonKinds.inc.h
-ProgramPoint.o: StmtNodes.inc.h
-ProgramPoint.po: DeclNodes.inc.h
-ProgramPoint.po: DiagnosticCommonKinds.inc.h
-ProgramPoint.po: StmtNodes.inc.h
-PseudoConstantAnalysis.o: DeclNodes.inc.h
-PseudoConstantAnalysis.o: DiagnosticCommonKinds.inc.h
-PseudoConstantAnalysis.o: StmtNodes.inc.h
-PseudoConstantAnalysis.po: DeclNodes.inc.h
-PseudoConstantAnalysis.po: DiagnosticCommonKinds.inc.h
-PseudoConstantAnalysis.po: StmtNodes.inc.h
-ReachableCode.o: DeclNodes.inc.h
-ReachableCode.o: DiagnosticCommonKinds.inc.h
-ReachableCode.o: StmtNodes.inc.h
-ReachableCode.po: DeclNodes.inc.h
-ReachableCode.po: DiagnosticCommonKinds.inc.h
-ReachableCode.po: StmtNodes.inc.h
-ScanfFormatString.o: CommentCommandList.inc.h
-ScanfFormatString.o: DeclNodes.inc.h
-ScanfFormatString.o: DiagnosticCommonKinds.inc.h
-ScanfFormatString.o: StmtNodes.inc.h
-ScanfFormatString.po: CommentCommandList.inc.h
-ScanfFormatString.po: DeclNodes.inc.h
-ScanfFormatString.po: DiagnosticCommonKinds.inc.h
-ScanfFormatString.po: StmtNodes.inc.h
-ThreadSafety.o: AttrList.inc.h
-ThreadSafety.o: Attrs.inc.h
-ThreadSafety.o: DeclNodes.inc.h
-ThreadSafety.o: DiagnosticCommonKinds.inc.h
-ThreadSafety.o: StmtNodes.inc.h
-ThreadSafety.po: AttrList.inc.h
-ThreadSafety.po: Attrs.inc.h
-ThreadSafety.po: DeclNodes.inc.h
-ThreadSafety.po: DiagnosticCommonKinds.inc.h
-ThreadSafety.po: StmtNodes.inc.h
-ThreadSafetyCommon.o: AttrList.inc.h
-ThreadSafetyCommon.o: Attrs.inc.h
-ThreadSafetyCommon.o: DeclNodes.inc.h
-ThreadSafetyCommon.o: DiagnosticCommonKinds.inc.h
-ThreadSafetyCommon.o: StmtNodes.inc.h
-ThreadSafetyCommon.po: AttrList.inc.h
-ThreadSafetyCommon.po: Attrs.inc.h
-ThreadSafetyCommon.po: DeclNodes.inc.h
-ThreadSafetyCommon.po: DiagnosticCommonKinds.inc.h
-ThreadSafetyCommon.po: StmtNodes.inc.h
-ThreadSafetyTIL.o: DeclNodes.inc.h
-ThreadSafetyTIL.o: DiagnosticCommonKinds.inc.h
-ThreadSafetyTIL.o: StmtNodes.inc.h
-ThreadSafetyTIL.po: DeclNodes.inc.h
-ThreadSafetyTIL.po: DiagnosticCommonKinds.inc.h
-ThreadSafetyTIL.po: StmtNodes.inc.h
-UninitializedValues.o: AttrList.inc.h
-UninitializedValues.o: Attrs.inc.h
-UninitializedValues.o: CommentCommandList.inc.h
-UninitializedValues.o: DeclNodes.inc.h
-UninitializedValues.o: DiagnosticCommonKinds.inc.h
-UninitializedValues.o: StmtNodes.inc.h
-UninitializedValues.po: AttrList.inc.h
-UninitializedValues.po: Attrs.inc.h
-UninitializedValues.po: CommentCommandList.inc.h
-UninitializedValues.po: DeclNodes.inc.h
-UninitializedValues.po: DiagnosticCommonKinds.inc.h
-UninitializedValues.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
index 70e0854..264ede1 100644
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ b/lib/clang/libclangarcmigrate/Makefile.depend
@@ -13,274 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARCMT.o: AttrList.inc.h
-ARCMT.o: AttrParsedAttrList.inc.h
-ARCMT.o: Attrs.inc.h
-ARCMT.o: CommentCommandList.inc.h
-ARCMT.o: DeclNodes.inc.h
-ARCMT.o: DiagnosticCommonKinds.inc.h
-ARCMT.o: DiagnosticGroups.inc.h
-ARCMT.o: DiagnosticSemaKinds.inc.h
-ARCMT.o: StmtNodes.inc.h
-ARCMT.po: AttrList.inc.h
-ARCMT.po: AttrParsedAttrList.inc.h
-ARCMT.po: Attrs.inc.h
-ARCMT.po: CommentCommandList.inc.h
-ARCMT.po: DeclNodes.inc.h
-ARCMT.po: DiagnosticCommonKinds.inc.h
-ARCMT.po: DiagnosticGroups.inc.h
-ARCMT.po: DiagnosticSemaKinds.inc.h
-ARCMT.po: StmtNodes.inc.h
-ARCMTActions.o: CommentCommandList.inc.h
-ARCMTActions.o: DeclNodes.inc.h
-ARCMTActions.o: DiagnosticCommonKinds.inc.h
-ARCMTActions.o: StmtNodes.inc.h
-ARCMTActions.po: CommentCommandList.inc.h
-ARCMTActions.po: DeclNodes.inc.h
-ARCMTActions.po: DiagnosticCommonKinds.inc.h
-ARCMTActions.po: StmtNodes.inc.h
-FileRemapper.o: DiagnosticCommonKinds.inc.h
-FileRemapper.po: DiagnosticCommonKinds.inc.h
-ObjCMT.o: AttrList.inc.h
-ObjCMT.o: AttrVisitor.inc.h
-ObjCMT.o: Attrs.inc.h
-ObjCMT.o: CommentCommandList.inc.h
-ObjCMT.o: DeclNodes.inc.h
-ObjCMT.o: DiagnosticCommonKinds.inc.h
-ObjCMT.o: StmtNodes.inc.h
-ObjCMT.po: AttrList.inc.h
-ObjCMT.po: AttrVisitor.inc.h
-ObjCMT.po: Attrs.inc.h
-ObjCMT.po: CommentCommandList.inc.h
-ObjCMT.po: DeclNodes.inc.h
-ObjCMT.po: DiagnosticCommonKinds.inc.h
-ObjCMT.po: StmtNodes.inc.h
-PlistReporter.o: DiagnosticCommonKinds.inc.h
-PlistReporter.po: DiagnosticCommonKinds.inc.h
-TransAPIUses.o: AttrList.inc.h
-TransAPIUses.o: AttrVisitor.inc.h
-TransAPIUses.o: Attrs.inc.h
-TransAPIUses.o: CommentCommandList.inc.h
-TransAPIUses.o: DeclNodes.inc.h
-TransAPIUses.o: DiagnosticCommonKinds.inc.h
-TransAPIUses.o: DiagnosticSemaKinds.inc.h
-TransAPIUses.o: StmtNodes.inc.h
-TransAPIUses.po: AttrList.inc.h
-TransAPIUses.po: AttrVisitor.inc.h
-TransAPIUses.po: Attrs.inc.h
-TransAPIUses.po: CommentCommandList.inc.h
-TransAPIUses.po: DeclNodes.inc.h
-TransAPIUses.po: DiagnosticCommonKinds.inc.h
-TransAPIUses.po: DiagnosticSemaKinds.inc.h
-TransAPIUses.po: StmtNodes.inc.h
-TransARCAssign.o: AttrList.inc.h
-TransARCAssign.o: AttrVisitor.inc.h
-TransARCAssign.o: Attrs.inc.h
-TransARCAssign.o: CommentCommandList.inc.h
-TransARCAssign.o: DeclNodes.inc.h
-TransARCAssign.o: DiagnosticCommonKinds.inc.h
-TransARCAssign.o: DiagnosticSemaKinds.inc.h
-TransARCAssign.o: StmtNodes.inc.h
-TransARCAssign.po: AttrList.inc.h
-TransARCAssign.po: AttrVisitor.inc.h
-TransARCAssign.po: Attrs.inc.h
-TransARCAssign.po: CommentCommandList.inc.h
-TransARCAssign.po: DeclNodes.inc.h
-TransARCAssign.po: DiagnosticCommonKinds.inc.h
-TransARCAssign.po: DiagnosticSemaKinds.inc.h
-TransARCAssign.po: StmtNodes.inc.h
-TransAutoreleasePool.o: AttrList.inc.h
-TransAutoreleasePool.o: AttrVisitor.inc.h
-TransAutoreleasePool.o: Attrs.inc.h
-TransAutoreleasePool.o: CommentCommandList.inc.h
-TransAutoreleasePool.o: DeclNodes.inc.h
-TransAutoreleasePool.o: DiagnosticCommonKinds.inc.h
-TransAutoreleasePool.o: DiagnosticSemaKinds.inc.h
-TransAutoreleasePool.o: StmtNodes.inc.h
-TransAutoreleasePool.po: AttrList.inc.h
-TransAutoreleasePool.po: AttrVisitor.inc.h
-TransAutoreleasePool.po: Attrs.inc.h
-TransAutoreleasePool.po: CommentCommandList.inc.h
-TransAutoreleasePool.po: DeclNodes.inc.h
-TransAutoreleasePool.po: DiagnosticCommonKinds.inc.h
-TransAutoreleasePool.po: DiagnosticSemaKinds.inc.h
-TransAutoreleasePool.po: StmtNodes.inc.h
-TransBlockObjCVariable.o: AttrList.inc.h
-TransBlockObjCVariable.o: AttrVisitor.inc.h
-TransBlockObjCVariable.o: Attrs.inc.h
-TransBlockObjCVariable.o: CommentCommandList.inc.h
-TransBlockObjCVariable.o: DeclNodes.inc.h
-TransBlockObjCVariable.o: DiagnosticCommonKinds.inc.h
-TransBlockObjCVariable.o: StmtNodes.inc.h
-TransBlockObjCVariable.po: AttrList.inc.h
-TransBlockObjCVariable.po: AttrVisitor.inc.h
-TransBlockObjCVariable.po: Attrs.inc.h
-TransBlockObjCVariable.po: CommentCommandList.inc.h
-TransBlockObjCVariable.po: DeclNodes.inc.h
-TransBlockObjCVariable.po: DiagnosticCommonKinds.inc.h
-TransBlockObjCVariable.po: StmtNodes.inc.h
-TransEmptyStatementsAndDealloc.o: AttrList.inc.h
-TransEmptyStatementsAndDealloc.o: AttrVisitor.inc.h
-TransEmptyStatementsAndDealloc.o: Attrs.inc.h
-TransEmptyStatementsAndDealloc.o: CommentCommandList.inc.h
-TransEmptyStatementsAndDealloc.o: DeclNodes.inc.h
-TransEmptyStatementsAndDealloc.o: DiagnosticCommonKinds.inc.h
-TransEmptyStatementsAndDealloc.o: StmtNodes.inc.h
-TransEmptyStatementsAndDealloc.po: AttrList.inc.h
-TransEmptyStatementsAndDealloc.po: AttrVisitor.inc.h
-TransEmptyStatementsAndDealloc.po: Attrs.inc.h
-TransEmptyStatementsAndDealloc.po: CommentCommandList.inc.h
-TransEmptyStatementsAndDealloc.po: DeclNodes.inc.h
-TransEmptyStatementsAndDealloc.po: DiagnosticCommonKinds.inc.h
-TransEmptyStatementsAndDealloc.po: StmtNodes.inc.h
-TransGCAttrs.o: AttrList.inc.h
-TransGCAttrs.o: AttrVisitor.inc.h
-TransGCAttrs.o: Attrs.inc.h
-TransGCAttrs.o: CommentCommandList.inc.h
-TransGCAttrs.o: DeclNodes.inc.h
-TransGCAttrs.o: DiagnosticCommonKinds.inc.h
-TransGCAttrs.o: DiagnosticSemaKinds.inc.h
-TransGCAttrs.o: StmtNodes.inc.h
-TransGCAttrs.po: AttrList.inc.h
-TransGCAttrs.po: AttrVisitor.inc.h
-TransGCAttrs.po: Attrs.inc.h
-TransGCAttrs.po: CommentCommandList.inc.h
-TransGCAttrs.po: DeclNodes.inc.h
-TransGCAttrs.po: DiagnosticCommonKinds.inc.h
-TransGCAttrs.po: DiagnosticSemaKinds.inc.h
-TransGCAttrs.po: StmtNodes.inc.h
-TransGCCalls.o: AttrList.inc.h
-TransGCCalls.o: AttrVisitor.inc.h
-TransGCCalls.o: Attrs.inc.h
-TransGCCalls.o: CommentCommandList.inc.h
-TransGCCalls.o: DeclNodes.inc.h
-TransGCCalls.o: DiagnosticCommonKinds.inc.h
-TransGCCalls.o: DiagnosticSemaKinds.inc.h
-TransGCCalls.o: StmtNodes.inc.h
-TransGCCalls.po: AttrList.inc.h
-TransGCCalls.po: AttrVisitor.inc.h
-TransGCCalls.po: Attrs.inc.h
-TransGCCalls.po: CommentCommandList.inc.h
-TransGCCalls.po: DeclNodes.inc.h
-TransGCCalls.po: DiagnosticCommonKinds.inc.h
-TransGCCalls.po: DiagnosticSemaKinds.inc.h
-TransGCCalls.po: StmtNodes.inc.h
-TransProperties.o: AttrList.inc.h
-TransProperties.o: AttrVisitor.inc.h
-TransProperties.o: Attrs.inc.h
-TransProperties.o: DeclNodes.inc.h
-TransProperties.o: DiagnosticCommonKinds.inc.h
-TransProperties.o: DiagnosticSemaKinds.inc.h
-TransProperties.o: StmtNodes.inc.h
-TransProperties.po: AttrList.inc.h
-TransProperties.po: AttrVisitor.inc.h
-TransProperties.po: Attrs.inc.h
-TransProperties.po: DeclNodes.inc.h
-TransProperties.po: DiagnosticCommonKinds.inc.h
-TransProperties.po: DiagnosticSemaKinds.inc.h
-TransProperties.po: StmtNodes.inc.h
-TransProtectedScope.o: AttrList.inc.h
-TransProtectedScope.o: AttrVisitor.inc.h
-TransProtectedScope.o: Attrs.inc.h
-TransProtectedScope.o: CommentCommandList.inc.h
-TransProtectedScope.o: DeclNodes.inc.h
-TransProtectedScope.o: DiagnosticCommonKinds.inc.h
-TransProtectedScope.o: DiagnosticSemaKinds.inc.h
-TransProtectedScope.o: StmtNodes.inc.h
-TransProtectedScope.po: AttrList.inc.h
-TransProtectedScope.po: AttrVisitor.inc.h
-TransProtectedScope.po: Attrs.inc.h
-TransProtectedScope.po: CommentCommandList.inc.h
-TransProtectedScope.po: DeclNodes.inc.h
-TransProtectedScope.po: DiagnosticCommonKinds.inc.h
-TransProtectedScope.po: DiagnosticSemaKinds.inc.h
-TransProtectedScope.po: StmtNodes.inc.h
-TransRetainReleaseDealloc.o: AttrList.inc.h
-TransRetainReleaseDealloc.o: AttrVisitor.inc.h
-TransRetainReleaseDealloc.o: Attrs.inc.h
-TransRetainReleaseDealloc.o: CommentCommandList.inc.h
-TransRetainReleaseDealloc.o: DeclNodes.inc.h
-TransRetainReleaseDealloc.o: DiagnosticCommonKinds.inc.h
-TransRetainReleaseDealloc.o: DiagnosticSemaKinds.inc.h
-TransRetainReleaseDealloc.o: StmtNodes.inc.h
-TransRetainReleaseDealloc.po: AttrList.inc.h
-TransRetainReleaseDealloc.po: AttrVisitor.inc.h
-TransRetainReleaseDealloc.po: Attrs.inc.h
-TransRetainReleaseDealloc.po: CommentCommandList.inc.h
-TransRetainReleaseDealloc.po: DeclNodes.inc.h
-TransRetainReleaseDealloc.po: DiagnosticCommonKinds.inc.h
-TransRetainReleaseDealloc.po: DiagnosticSemaKinds.inc.h
-TransRetainReleaseDealloc.po: StmtNodes.inc.h
-TransUnbridgedCasts.o: AttrList.inc.h
-TransUnbridgedCasts.o: AttrVisitor.inc.h
-TransUnbridgedCasts.o: Attrs.inc.h
-TransUnbridgedCasts.o: CommentCommandList.inc.h
-TransUnbridgedCasts.o: DeclNodes.inc.h
-TransUnbridgedCasts.o: DiagnosticCommonKinds.inc.h
-TransUnbridgedCasts.o: DiagnosticSemaKinds.inc.h
-TransUnbridgedCasts.o: StmtNodes.inc.h
-TransUnbridgedCasts.po: AttrList.inc.h
-TransUnbridgedCasts.po: AttrVisitor.inc.h
-TransUnbridgedCasts.po: Attrs.inc.h
-TransUnbridgedCasts.po: CommentCommandList.inc.h
-TransUnbridgedCasts.po: DeclNodes.inc.h
-TransUnbridgedCasts.po: DiagnosticCommonKinds.inc.h
-TransUnbridgedCasts.po: DiagnosticSemaKinds.inc.h
-TransUnbridgedCasts.po: StmtNodes.inc.h
-TransUnusedInitDelegate.o: AttrList.inc.h
-TransUnusedInitDelegate.o: AttrVisitor.inc.h
-TransUnusedInitDelegate.o: Attrs.inc.h
-TransUnusedInitDelegate.o: CommentCommandList.inc.h
-TransUnusedInitDelegate.o: DeclNodes.inc.h
-TransUnusedInitDelegate.o: DiagnosticCommonKinds.inc.h
-TransUnusedInitDelegate.o: DiagnosticSemaKinds.inc.h
-TransUnusedInitDelegate.o: StmtNodes.inc.h
-TransUnusedInitDelegate.po: AttrList.inc.h
-TransUnusedInitDelegate.po: AttrVisitor.inc.h
-TransUnusedInitDelegate.po: Attrs.inc.h
-TransUnusedInitDelegate.po: CommentCommandList.inc.h
-TransUnusedInitDelegate.po: DeclNodes.inc.h
-TransUnusedInitDelegate.po: DiagnosticCommonKinds.inc.h
-TransUnusedInitDelegate.po: DiagnosticSemaKinds.inc.h
-TransUnusedInitDelegate.po: StmtNodes.inc.h
-TransZeroOutPropsInDealloc.o: AttrList.inc.h
-TransZeroOutPropsInDealloc.o: AttrVisitor.inc.h
-TransZeroOutPropsInDealloc.o: Attrs.inc.h
-TransZeroOutPropsInDealloc.o: CommentCommandList.inc.h
-TransZeroOutPropsInDealloc.o: DeclNodes.inc.h
-TransZeroOutPropsInDealloc.o: DiagnosticCommonKinds.inc.h
-TransZeroOutPropsInDealloc.o: StmtNodes.inc.h
-TransZeroOutPropsInDealloc.po: AttrList.inc.h
-TransZeroOutPropsInDealloc.po: AttrVisitor.inc.h
-TransZeroOutPropsInDealloc.po: Attrs.inc.h
-TransZeroOutPropsInDealloc.po: CommentCommandList.inc.h
-TransZeroOutPropsInDealloc.po: DeclNodes.inc.h
-TransZeroOutPropsInDealloc.po: DiagnosticCommonKinds.inc.h
-TransZeroOutPropsInDealloc.po: StmtNodes.inc.h
-TransformActions.o: CommentCommandList.inc.h
-TransformActions.o: DeclNodes.inc.h
-TransformActions.o: DiagnosticCommonKinds.inc.h
-TransformActions.o: StmtNodes.inc.h
-TransformActions.po: CommentCommandList.inc.h
-TransformActions.po: DeclNodes.inc.h
-TransformActions.po: DiagnosticCommonKinds.inc.h
-TransformActions.po: StmtNodes.inc.h
-Transforms.o: AttrList.inc.h
-Transforms.o: AttrParsedAttrList.inc.h
-Transforms.o: AttrVisitor.inc.h
-Transforms.o: Attrs.inc.h
-Transforms.o: CommentCommandList.inc.h
-Transforms.o: DeclNodes.inc.h
-Transforms.o: DiagnosticCommonKinds.inc.h
-Transforms.o: DiagnosticSemaKinds.inc.h
-Transforms.o: StmtNodes.inc.h
-Transforms.po: AttrList.inc.h
-Transforms.po: AttrParsedAttrList.inc.h
-Transforms.po: AttrVisitor.inc.h
-Transforms.po: Attrs.inc.h
-Transforms.po: CommentCommandList.inc.h
-Transforms.po: DeclNodes.inc.h
-Transforms.po: DiagnosticCommonKinds.inc.h
-Transforms.po: DiagnosticSemaKinds.inc.h
-Transforms.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
index 01a929b..264ede1 100644
--- a/lib/clang/libclangast/Makefile.depend
+++ b/lib/clang/libclangast/Makefile.depend
@@ -13,612 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-APValue.o: AttrList.inc.h
-APValue.o: Attrs.inc.h
-APValue.o: CommentCommandList.inc.h
-APValue.o: DeclNodes.inc.h
-APValue.o: DiagnosticCommonKinds.inc.h
-APValue.o: StmtNodes.inc.h
-APValue.po: AttrList.inc.h
-APValue.po: Attrs.inc.h
-APValue.po: CommentCommandList.inc.h
-APValue.po: DeclNodes.inc.h
-APValue.po: DiagnosticCommonKinds.inc.h
-APValue.po: StmtNodes.inc.h
-ASTConsumer.o: DeclNodes.inc.h
-ASTConsumer.o: DiagnosticCommonKinds.inc.h
-ASTConsumer.po: DeclNodes.inc.h
-ASTConsumer.po: DiagnosticCommonKinds.inc.h
-ASTContext.o: AttrList.inc.h
-ASTContext.o: AttrVisitor.inc.h
-ASTContext.o: Attrs.inc.h
-ASTContext.o: CommentCommandList.inc.h
-ASTContext.o: CommentNodes.inc.h
-ASTContext.o: DeclNodes.inc.h
-ASTContext.o: DiagnosticCommonKinds.inc.h
-ASTContext.o: StmtNodes.inc.h
-ASTContext.po: AttrList.inc.h
-ASTContext.po: AttrVisitor.inc.h
-ASTContext.po: Attrs.inc.h
-ASTContext.po: CommentCommandList.inc.h
-ASTContext.po: CommentNodes.inc.h
-ASTContext.po: DeclNodes.inc.h
-ASTContext.po: DiagnosticCommonKinds.inc.h
-ASTContext.po: StmtNodes.inc.h
-ASTDiagnostic.o: AttrList.inc.h
-ASTDiagnostic.o: Attrs.inc.h
-ASTDiagnostic.o: CommentCommandList.inc.h
-ASTDiagnostic.o: DeclNodes.inc.h
-ASTDiagnostic.o: DiagnosticASTKinds.inc.h
-ASTDiagnostic.o: DiagnosticCommonKinds.inc.h
-ASTDiagnostic.o: StmtNodes.inc.h
-ASTDiagnostic.po: AttrList.inc.h
-ASTDiagnostic.po: Attrs.inc.h
-ASTDiagnostic.po: CommentCommandList.inc.h
-ASTDiagnostic.po: DeclNodes.inc.h
-ASTDiagnostic.po: DiagnosticASTKinds.inc.h
-ASTDiagnostic.po: DiagnosticCommonKinds.inc.h
-ASTDiagnostic.po: StmtNodes.inc.h
-ASTDumper.o: AttrDump.inc.h
-ASTDumper.o: AttrList.inc.h
-ASTDumper.o: Attrs.inc.h
-ASTDumper.o: CommentCommandList.inc.h
-ASTDumper.o: CommentNodes.inc.h
-ASTDumper.o: DeclNodes.inc.h
-ASTDumper.o: DiagnosticCommonKinds.inc.h
-ASTDumper.o: StmtNodes.inc.h
-ASTDumper.po: AttrDump.inc.h
-ASTDumper.po: AttrList.inc.h
-ASTDumper.po: Attrs.inc.h
-ASTDumper.po: CommentCommandList.inc.h
-ASTDumper.po: CommentNodes.inc.h
-ASTDumper.po: DeclNodes.inc.h
-ASTDumper.po: DiagnosticCommonKinds.inc.h
-ASTDumper.po: StmtNodes.inc.h
-ASTImporter.o: AttrList.inc.h
-ASTImporter.o: Attrs.inc.h
-ASTImporter.o: CommentCommandList.inc.h
-ASTImporter.o: DeclNodes.inc.h
-ASTImporter.o: DiagnosticASTKinds.inc.h
-ASTImporter.o: DiagnosticCommonKinds.inc.h
-ASTImporter.o: StmtNodes.inc.h
-ASTImporter.po: AttrList.inc.h
-ASTImporter.po: Attrs.inc.h
-ASTImporter.po: CommentCommandList.inc.h
-ASTImporter.po: DeclNodes.inc.h
-ASTImporter.po: DiagnosticASTKinds.inc.h
-ASTImporter.po: DiagnosticCommonKinds.inc.h
-ASTImporter.po: StmtNodes.inc.h
-ASTTypeTraits.o: AttrList.inc.h
-ASTTypeTraits.o: Attrs.inc.h
-ASTTypeTraits.o: CommentCommandList.inc.h
-ASTTypeTraits.o: DeclNodes.inc.h
-ASTTypeTraits.o: DiagnosticCommonKinds.inc.h
-ASTTypeTraits.o: StmtNodes.inc.h
-ASTTypeTraits.po: AttrList.inc.h
-ASTTypeTraits.po: Attrs.inc.h
-ASTTypeTraits.po: CommentCommandList.inc.h
-ASTTypeTraits.po: DeclNodes.inc.h
-ASTTypeTraits.po: DiagnosticCommonKinds.inc.h
-ASTTypeTraits.po: StmtNodes.inc.h
-AttrImpl.o: AttrImpl.inc.h
-AttrImpl.o: AttrList.inc.h
-AttrImpl.o: Attrs.inc.h
-AttrImpl.o: CommentCommandList.inc.h
-AttrImpl.o: DeclNodes.inc.h
-AttrImpl.o: DiagnosticCommonKinds.inc.h
-AttrImpl.o: StmtNodes.inc.h
-AttrImpl.po: AttrImpl.inc.h
-AttrImpl.po: AttrList.inc.h
-AttrImpl.po: Attrs.inc.h
-AttrImpl.po: CommentCommandList.inc.h
-AttrImpl.po: DeclNodes.inc.h
-AttrImpl.po: DiagnosticCommonKinds.inc.h
-AttrImpl.po: StmtNodes.inc.h
-CXXInheritance.o: AttrList.inc.h
-CXXInheritance.o: Attrs.inc.h
-CXXInheritance.o: CommentCommandList.inc.h
-CXXInheritance.o: DeclNodes.inc.h
-CXXInheritance.o: DiagnosticCommonKinds.inc.h
-CXXInheritance.o: StmtNodes.inc.h
-CXXInheritance.po: AttrList.inc.h
-CXXInheritance.po: Attrs.inc.h
-CXXInheritance.po: CommentCommandList.inc.h
-CXXInheritance.po: DeclNodes.inc.h
-CXXInheritance.po: DiagnosticCommonKinds.inc.h
-CXXInheritance.po: StmtNodes.inc.h
-Comment.o: AttrList.inc.h
-Comment.o: Attrs.inc.h
-Comment.o: CommentCommandList.inc.h
-Comment.o: CommentNodes.inc.h
-Comment.o: DeclNodes.inc.h
-Comment.o: DiagnosticCommonKinds.inc.h
-Comment.o: StmtNodes.inc.h
-Comment.po: AttrList.inc.h
-Comment.po: Attrs.inc.h
-Comment.po: CommentCommandList.inc.h
-Comment.po: CommentNodes.inc.h
-Comment.po: DeclNodes.inc.h
-Comment.po: DiagnosticCommonKinds.inc.h
-Comment.po: StmtNodes.inc.h
-CommentBriefParser.o: CommentCommandList.inc.h
-CommentBriefParser.o: DiagnosticCommonKinds.inc.h
-CommentBriefParser.po: CommentCommandList.inc.h
-CommentBriefParser.po: DiagnosticCommonKinds.inc.h
-CommentCommandTraits.o: CommentCommandInfo.inc.h
-CommentCommandTraits.o: CommentCommandList.inc.h
-CommentCommandTraits.po: CommentCommandInfo.inc.h
-CommentCommandTraits.po: CommentCommandList.inc.h
-CommentLexer.o: CommentCommandList.inc.h
-CommentLexer.o: CommentHTMLNamedCharacterReferences.inc.h
-CommentLexer.o: CommentHTMLTags.inc.h
-CommentLexer.o: DiagnosticCommentKinds.inc.h
-CommentLexer.o: DiagnosticCommonKinds.inc.h
-CommentLexer.po: CommentCommandList.inc.h
-CommentLexer.po: CommentHTMLNamedCharacterReferences.inc.h
-CommentLexer.po: CommentHTMLTags.inc.h
-CommentLexer.po: DiagnosticCommentKinds.inc.h
-CommentLexer.po: DiagnosticCommonKinds.inc.h
-CommentParser.o: CommentCommandList.inc.h
-CommentParser.o: CommentNodes.inc.h
-CommentParser.o: DeclNodes.inc.h
-CommentParser.o: DiagnosticCommentKinds.inc.h
-CommentParser.o: DiagnosticCommonKinds.inc.h
-CommentParser.po: CommentCommandList.inc.h
-CommentParser.po: CommentNodes.inc.h
-CommentParser.po: DeclNodes.inc.h
-CommentParser.po: DiagnosticCommentKinds.inc.h
-CommentParser.po: DiagnosticCommonKinds.inc.h
-CommentSema.o: AttrList.inc.h
-CommentSema.o: Attrs.inc.h
-CommentSema.o: CommentCommandList.inc.h
-CommentSema.o: CommentHTMLTagsProperties.inc.h
-CommentSema.o: CommentNodes.inc.h
-CommentSema.o: DeclNodes.inc.h
-CommentSema.o: DiagnosticCommentKinds.inc.h
-CommentSema.o: DiagnosticCommonKinds.inc.h
-CommentSema.o: StmtNodes.inc.h
-CommentSema.po: AttrList.inc.h
-CommentSema.po: Attrs.inc.h
-CommentSema.po: CommentCommandList.inc.h
-CommentSema.po: CommentHTMLTagsProperties.inc.h
-CommentSema.po: CommentNodes.inc.h
-CommentSema.po: DeclNodes.inc.h
-CommentSema.po: DiagnosticCommentKinds.inc.h
-CommentSema.po: DiagnosticCommonKinds.inc.h
-CommentSema.po: StmtNodes.inc.h
-Decl.o: AttrList.inc.h
-Decl.o: Attrs.inc.h
-Decl.o: CommentCommandList.inc.h
-Decl.o: DeclNodes.inc.h
-Decl.o: DiagnosticCommonKinds.inc.h
-Decl.o: DiagnosticFrontendKinds.inc.h
-Decl.o: StmtNodes.inc.h
-Decl.po: AttrList.inc.h
-Decl.po: Attrs.inc.h
-Decl.po: CommentCommandList.inc.h
-Decl.po: DeclNodes.inc.h
-Decl.po: DiagnosticCommonKinds.inc.h
-Decl.po: DiagnosticFrontendKinds.inc.h
-Decl.po: StmtNodes.inc.h
-DeclBase.o: AttrList.inc.h
-DeclBase.o: Attrs.inc.h
-DeclBase.o: CommentCommandList.inc.h
-DeclBase.o: DeclNodes.inc.h
-DeclBase.o: DiagnosticCommonKinds.inc.h
-DeclBase.o: StmtNodes.inc.h
-DeclBase.po: AttrList.inc.h
-DeclBase.po: Attrs.inc.h
-DeclBase.po: CommentCommandList.inc.h
-DeclBase.po: DeclNodes.inc.h
-DeclBase.po: DiagnosticCommonKinds.inc.h
-DeclBase.po: StmtNodes.inc.h
-DeclCXX.o: AttrList.inc.h
-DeclCXX.o: Attrs.inc.h
-DeclCXX.o: CommentCommandList.inc.h
-DeclCXX.o: DeclNodes.inc.h
-DeclCXX.o: DiagnosticCommonKinds.inc.h
-DeclCXX.o: StmtNodes.inc.h
-DeclCXX.po: AttrList.inc.h
-DeclCXX.po: Attrs.inc.h
-DeclCXX.po: CommentCommandList.inc.h
-DeclCXX.po: DeclNodes.inc.h
-DeclCXX.po: DiagnosticCommonKinds.inc.h
-DeclCXX.po: StmtNodes.inc.h
-DeclFriend.o: AttrList.inc.h
-DeclFriend.o: Attrs.inc.h
-DeclFriend.o: CommentCommandList.inc.h
-DeclFriend.o: DeclNodes.inc.h
-DeclFriend.o: DiagnosticCommonKinds.inc.h
-DeclFriend.o: StmtNodes.inc.h
-DeclFriend.po: AttrList.inc.h
-DeclFriend.po: Attrs.inc.h
-DeclFriend.po: CommentCommandList.inc.h
-DeclFriend.po: DeclNodes.inc.h
-DeclFriend.po: DiagnosticCommonKinds.inc.h
-DeclFriend.po: StmtNodes.inc.h
-DeclGroup.o: CommentCommandList.inc.h
-DeclGroup.o: DeclNodes.inc.h
-DeclGroup.o: DiagnosticCommonKinds.inc.h
-DeclGroup.o: StmtNodes.inc.h
-DeclGroup.po: CommentCommandList.inc.h
-DeclGroup.po: DeclNodes.inc.h
-DeclGroup.po: DiagnosticCommonKinds.inc.h
-DeclGroup.po: StmtNodes.inc.h
-DeclObjC.o: AttrList.inc.h
-DeclObjC.o: Attrs.inc.h
-DeclObjC.o: CommentCommandList.inc.h
-DeclObjC.o: DeclNodes.inc.h
-DeclObjC.o: DiagnosticCommonKinds.inc.h
-DeclObjC.o: StmtNodes.inc.h
-DeclObjC.po: AttrList.inc.h
-DeclObjC.po: Attrs.inc.h
-DeclObjC.po: CommentCommandList.inc.h
-DeclObjC.po: DeclNodes.inc.h
-DeclObjC.po: DiagnosticCommonKinds.inc.h
-DeclObjC.po: StmtNodes.inc.h
-DeclOpenMP.o: CommentCommandList.inc.h
-DeclOpenMP.o: DeclNodes.inc.h
-DeclOpenMP.o: DiagnosticCommonKinds.inc.h
-DeclOpenMP.o: StmtNodes.inc.h
-DeclOpenMP.po: CommentCommandList.inc.h
-DeclOpenMP.po: DeclNodes.inc.h
-DeclOpenMP.po: DiagnosticCommonKinds.inc.h
-DeclOpenMP.po: StmtNodes.inc.h
-DeclPrinter.o: AttrList.inc.h
-DeclPrinter.o: Attrs.inc.h
-DeclPrinter.o: CommentCommandList.inc.h
-DeclPrinter.o: DeclNodes.inc.h
-DeclPrinter.o: DiagnosticCommonKinds.inc.h
-DeclPrinter.o: StmtNodes.inc.h
-DeclPrinter.po: AttrList.inc.h
-DeclPrinter.po: Attrs.inc.h
-DeclPrinter.po: CommentCommandList.inc.h
-DeclPrinter.po: DeclNodes.inc.h
-DeclPrinter.po: DiagnosticCommonKinds.inc.h
-DeclPrinter.po: StmtNodes.inc.h
-DeclTemplate.o: AttrList.inc.h
-DeclTemplate.o: Attrs.inc.h
-DeclTemplate.o: CommentCommandList.inc.h
-DeclTemplate.o: DeclNodes.inc.h
-DeclTemplate.o: DiagnosticCommonKinds.inc.h
-DeclTemplate.o: StmtNodes.inc.h
-DeclTemplate.po: AttrList.inc.h
-DeclTemplate.po: Attrs.inc.h
-DeclTemplate.po: CommentCommandList.inc.h
-DeclTemplate.po: DeclNodes.inc.h
-DeclTemplate.po: DiagnosticCommonKinds.inc.h
-DeclTemplate.po: StmtNodes.inc.h
-DeclarationName.o: CommentCommandList.inc.h
-DeclarationName.o: DeclNodes.inc.h
-DeclarationName.o: DiagnosticCommonKinds.inc.h
-DeclarationName.o: StmtNodes.inc.h
-DeclarationName.po: CommentCommandList.inc.h
-DeclarationName.po: DeclNodes.inc.h
-DeclarationName.po: DiagnosticCommonKinds.inc.h
-DeclarationName.po: StmtNodes.inc.h
-Expr.o: AttrList.inc.h
-Expr.o: Attrs.inc.h
-Expr.o: CommentCommandList.inc.h
-Expr.o: DeclNodes.inc.h
-Expr.o: DiagnosticCommonKinds.inc.h
-Expr.o: DiagnosticSemaKinds.inc.h
-Expr.o: StmtNodes.inc.h
-Expr.po: AttrList.inc.h
-Expr.po: Attrs.inc.h
-Expr.po: CommentCommandList.inc.h
-Expr.po: DeclNodes.inc.h
-Expr.po: DiagnosticCommonKinds.inc.h
-Expr.po: DiagnosticSemaKinds.inc.h
-Expr.po: StmtNodes.inc.h
-ExprCXX.o: AttrList.inc.h
-ExprCXX.o: Attrs.inc.h
-ExprCXX.o: CommentCommandList.inc.h
-ExprCXX.o: DeclNodes.inc.h
-ExprCXX.o: DiagnosticCommonKinds.inc.h
-ExprCXX.o: StmtNodes.inc.h
-ExprCXX.po: AttrList.inc.h
-ExprCXX.po: Attrs.inc.h
-ExprCXX.po: CommentCommandList.inc.h
-ExprCXX.po: DeclNodes.inc.h
-ExprCXX.po: DiagnosticCommonKinds.inc.h
-ExprCXX.po: StmtNodes.inc.h
-ExprClassification.o: AttrList.inc.h
-ExprClassification.o: Attrs.inc.h
-ExprClassification.o: CommentCommandList.inc.h
-ExprClassification.o: DeclNodes.inc.h
-ExprClassification.o: DiagnosticCommonKinds.inc.h
-ExprClassification.o: StmtNodes.inc.h
-ExprClassification.po: AttrList.inc.h
-ExprClassification.po: Attrs.inc.h
-ExprClassification.po: CommentCommandList.inc.h
-ExprClassification.po: DeclNodes.inc.h
-ExprClassification.po: DiagnosticCommonKinds.inc.h
-ExprClassification.po: StmtNodes.inc.h
-ExprConstant.o: AttrList.inc.h
-ExprConstant.o: Attrs.inc.h
-ExprConstant.o: CommentCommandList.inc.h
-ExprConstant.o: DeclNodes.inc.h
-ExprConstant.o: DiagnosticASTKinds.inc.h
-ExprConstant.o: DiagnosticCommonKinds.inc.h
-ExprConstant.o: StmtNodes.inc.h
-ExprConstant.po: AttrList.inc.h
-ExprConstant.po: Attrs.inc.h
-ExprConstant.po: CommentCommandList.inc.h
-ExprConstant.po: DeclNodes.inc.h
-ExprConstant.po: DiagnosticASTKinds.inc.h
-ExprConstant.po: DiagnosticCommonKinds.inc.h
-ExprConstant.po: StmtNodes.inc.h
-ExternalASTSource.o: CommentCommandList.inc.h
-ExternalASTSource.o: DeclNodes.inc.h
-ExternalASTSource.o: DiagnosticCommonKinds.inc.h
-ExternalASTSource.o: StmtNodes.inc.h
-ExternalASTSource.po: CommentCommandList.inc.h
-ExternalASTSource.po: DeclNodes.inc.h
-ExternalASTSource.po: DiagnosticCommonKinds.inc.h
-ExternalASTSource.po: StmtNodes.inc.h
-InheritViz.o: AttrList.inc.h
-InheritViz.o: Attrs.inc.h
-InheritViz.o: CommentCommandList.inc.h
-InheritViz.o: DeclNodes.inc.h
-InheritViz.o: DiagnosticCommonKinds.inc.h
-InheritViz.o: StmtNodes.inc.h
-InheritViz.po: AttrList.inc.h
-InheritViz.po: Attrs.inc.h
-InheritViz.po: CommentCommandList.inc.h
-InheritViz.po: DeclNodes.inc.h
-InheritViz.po: DiagnosticCommonKinds.inc.h
-InheritViz.po: StmtNodes.inc.h
-ItaniumCXXABI.o: AttrList.inc.h
-ItaniumCXXABI.o: Attrs.inc.h
-ItaniumCXXABI.o: CommentCommandList.inc.h
-ItaniumCXXABI.o: DeclNodes.inc.h
-ItaniumCXXABI.o: DiagnosticCommonKinds.inc.h
-ItaniumCXXABI.o: StmtNodes.inc.h
-ItaniumCXXABI.po: AttrList.inc.h
-ItaniumCXXABI.po: Attrs.inc.h
-ItaniumCXXABI.po: CommentCommandList.inc.h
-ItaniumCXXABI.po: DeclNodes.inc.h
-ItaniumCXXABI.po: DiagnosticCommonKinds.inc.h
-ItaniumCXXABI.po: StmtNodes.inc.h
-ItaniumMangle.o: AttrList.inc.h
-ItaniumMangle.o: Attrs.inc.h
-ItaniumMangle.o: CommentCommandList.inc.h
-ItaniumMangle.o: DeclNodes.inc.h
-ItaniumMangle.o: DiagnosticCommonKinds.inc.h
-ItaniumMangle.o: StmtNodes.inc.h
-ItaniumMangle.po: AttrList.inc.h
-ItaniumMangle.po: Attrs.inc.h
-ItaniumMangle.po: CommentCommandList.inc.h
-ItaniumMangle.po: DeclNodes.inc.h
-ItaniumMangle.po: DiagnosticCommonKinds.inc.h
-ItaniumMangle.po: StmtNodes.inc.h
-Mangle.o: AttrList.inc.h
-Mangle.o: Attrs.inc.h
-Mangle.o: CommentCommandList.inc.h
-Mangle.o: DeclNodes.inc.h
-Mangle.o: DiagnosticCommonKinds.inc.h
-Mangle.o: StmtNodes.inc.h
-Mangle.po: AttrList.inc.h
-Mangle.po: Attrs.inc.h
-Mangle.po: CommentCommandList.inc.h
-Mangle.po: DeclNodes.inc.h
-Mangle.po: DiagnosticCommonKinds.inc.h
-Mangle.po: StmtNodes.inc.h
-MicrosoftCXXABI.o: AttrList.inc.h
-MicrosoftCXXABI.o: Attrs.inc.h
-MicrosoftCXXABI.o: CommentCommandList.inc.h
-MicrosoftCXXABI.o: DeclNodes.inc.h
-MicrosoftCXXABI.o: DiagnosticCommonKinds.inc.h
-MicrosoftCXXABI.o: StmtNodes.inc.h
-MicrosoftCXXABI.po: AttrList.inc.h
-MicrosoftCXXABI.po: Attrs.inc.h
-MicrosoftCXXABI.po: CommentCommandList.inc.h
-MicrosoftCXXABI.po: DeclNodes.inc.h
-MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
-MicrosoftCXXABI.po: StmtNodes.inc.h
-MicrosoftMangle.o: AttrList.inc.h
-MicrosoftMangle.o: Attrs.inc.h
-MicrosoftMangle.o: CommentCommandList.inc.h
-MicrosoftMangle.o: DeclNodes.inc.h
-MicrosoftMangle.o: DiagnosticCommonKinds.inc.h
-MicrosoftMangle.o: StmtNodes.inc.h
-MicrosoftMangle.po: AttrList.inc.h
-MicrosoftMangle.po: Attrs.inc.h
-MicrosoftMangle.po: CommentCommandList.inc.h
-MicrosoftMangle.po: DeclNodes.inc.h
-MicrosoftMangle.po: DiagnosticCommonKinds.inc.h
-MicrosoftMangle.po: StmtNodes.inc.h
-NSAPI.o: CommentCommandList.inc.h
-NSAPI.o: DeclNodes.inc.h
-NSAPI.o: DiagnosticCommonKinds.inc.h
-NSAPI.o: StmtNodes.inc.h
-NSAPI.po: CommentCommandList.inc.h
-NSAPI.po: DeclNodes.inc.h
-NSAPI.po: DiagnosticCommonKinds.inc.h
-NSAPI.po: StmtNodes.inc.h
-NestedNameSpecifier.o: AttrList.inc.h
-NestedNameSpecifier.o: Attrs.inc.h
-NestedNameSpecifier.o: CommentCommandList.inc.h
-NestedNameSpecifier.o: DeclNodes.inc.h
-NestedNameSpecifier.o: DiagnosticCommonKinds.inc.h
-NestedNameSpecifier.o: StmtNodes.inc.h
-NestedNameSpecifier.po: AttrList.inc.h
-NestedNameSpecifier.po: Attrs.inc.h
-NestedNameSpecifier.po: CommentCommandList.inc.h
-NestedNameSpecifier.po: DeclNodes.inc.h
-NestedNameSpecifier.po: DiagnosticCommonKinds.inc.h
-NestedNameSpecifier.po: StmtNodes.inc.h
-ParentMap.o: DeclNodes.inc.h
-ParentMap.o: DiagnosticCommonKinds.inc.h
-ParentMap.o: StmtNodes.inc.h
-ParentMap.po: DeclNodes.inc.h
-ParentMap.po: DiagnosticCommonKinds.inc.h
-ParentMap.po: StmtNodes.inc.h
-RawCommentList.o: CommentCommandList.inc.h
-RawCommentList.o: CommentNodes.inc.h
-RawCommentList.o: DeclNodes.inc.h
-RawCommentList.o: DiagnosticCommonKinds.inc.h
-RawCommentList.o: StmtNodes.inc.h
-RawCommentList.po: CommentCommandList.inc.h
-RawCommentList.po: CommentNodes.inc.h
-RawCommentList.po: DeclNodes.inc.h
-RawCommentList.po: DiagnosticCommonKinds.inc.h
-RawCommentList.po: StmtNodes.inc.h
-RecordLayout.o: AttrList.inc.h
-RecordLayout.o: Attrs.inc.h
-RecordLayout.o: CommentCommandList.inc.h
-RecordLayout.o: DeclNodes.inc.h
-RecordLayout.o: DiagnosticCommonKinds.inc.h
-RecordLayout.o: StmtNodes.inc.h
-RecordLayout.po: AttrList.inc.h
-RecordLayout.po: Attrs.inc.h
-RecordLayout.po: CommentCommandList.inc.h
-RecordLayout.po: DeclNodes.inc.h
-RecordLayout.po: DiagnosticCommonKinds.inc.h
-RecordLayout.po: StmtNodes.inc.h
-RecordLayoutBuilder.o: AttrList.inc.h
-RecordLayoutBuilder.o: Attrs.inc.h
-RecordLayoutBuilder.o: CommentCommandList.inc.h
-RecordLayoutBuilder.o: DeclNodes.inc.h
-RecordLayoutBuilder.o: DiagnosticCommonKinds.inc.h
-RecordLayoutBuilder.o: DiagnosticSemaKinds.inc.h
-RecordLayoutBuilder.o: StmtNodes.inc.h
-RecordLayoutBuilder.po: AttrList.inc.h
-RecordLayoutBuilder.po: Attrs.inc.h
-RecordLayoutBuilder.po: CommentCommandList.inc.h
-RecordLayoutBuilder.po: DeclNodes.inc.h
-RecordLayoutBuilder.po: DiagnosticCommonKinds.inc.h
-RecordLayoutBuilder.po: DiagnosticSemaKinds.inc.h
-RecordLayoutBuilder.po: StmtNodes.inc.h
-SelectorLocationsKind.o: DeclNodes.inc.h
-SelectorLocationsKind.o: DiagnosticCommonKinds.inc.h
-SelectorLocationsKind.o: StmtNodes.inc.h
-SelectorLocationsKind.po: DeclNodes.inc.h
-SelectorLocationsKind.po: DiagnosticCommonKinds.inc.h
-SelectorLocationsKind.po: StmtNodes.inc.h
-Stmt.o: CommentCommandList.inc.h
-Stmt.o: DeclNodes.inc.h
-Stmt.o: DiagnosticASTKinds.inc.h
-Stmt.o: DiagnosticCommonKinds.inc.h
-Stmt.o: StmtNodes.inc.h
-Stmt.po: CommentCommandList.inc.h
-Stmt.po: DeclNodes.inc.h
-Stmt.po: DiagnosticASTKinds.inc.h
-Stmt.po: DiagnosticCommonKinds.inc.h
-Stmt.po: StmtNodes.inc.h
-StmtIterator.o: DeclNodes.inc.h
-StmtIterator.o: DiagnosticCommonKinds.inc.h
-StmtIterator.po: DeclNodes.inc.h
-StmtIterator.po: DiagnosticCommonKinds.inc.h
-StmtPrinter.o: AttrList.inc.h
-StmtPrinter.o: Attrs.inc.h
-StmtPrinter.o: CommentCommandList.inc.h
-StmtPrinter.o: DeclNodes.inc.h
-StmtPrinter.o: DiagnosticCommonKinds.inc.h
-StmtPrinter.o: StmtNodes.inc.h
-StmtPrinter.po: AttrList.inc.h
-StmtPrinter.po: Attrs.inc.h
-StmtPrinter.po: CommentCommandList.inc.h
-StmtPrinter.po: DeclNodes.inc.h
-StmtPrinter.po: DiagnosticCommonKinds.inc.h
-StmtPrinter.po: StmtNodes.inc.h
-StmtProfile.o: AttrList.inc.h
-StmtProfile.o: Attrs.inc.h
-StmtProfile.o: CommentCommandList.inc.h
-StmtProfile.o: DeclNodes.inc.h
-StmtProfile.o: DiagnosticCommonKinds.inc.h
-StmtProfile.o: StmtNodes.inc.h
-StmtProfile.po: AttrList.inc.h
-StmtProfile.po: Attrs.inc.h
-StmtProfile.po: CommentCommandList.inc.h
-StmtProfile.po: DeclNodes.inc.h
-StmtProfile.po: DiagnosticCommonKinds.inc.h
-StmtProfile.po: StmtNodes.inc.h
-StmtViz.o: DeclNodes.inc.h
-StmtViz.o: DiagnosticCommonKinds.inc.h
-StmtViz.o: StmtNodes.inc.h
-StmtViz.po: DeclNodes.inc.h
-StmtViz.po: DiagnosticCommonKinds.inc.h
-StmtViz.po: StmtNodes.inc.h
-TemplateBase.o: AttrList.inc.h
-TemplateBase.o: Attrs.inc.h
-TemplateBase.o: CommentCommandList.inc.h
-TemplateBase.o: DeclNodes.inc.h
-TemplateBase.o: DiagnosticCommonKinds.inc.h
-TemplateBase.o: StmtNodes.inc.h
-TemplateBase.po: AttrList.inc.h
-TemplateBase.po: Attrs.inc.h
-TemplateBase.po: CommentCommandList.inc.h
-TemplateBase.po: DeclNodes.inc.h
-TemplateBase.po: DiagnosticCommonKinds.inc.h
-TemplateBase.po: StmtNodes.inc.h
-TemplateName.o: AttrList.inc.h
-TemplateName.o: Attrs.inc.h
-TemplateName.o: DeclNodes.inc.h
-TemplateName.o: DiagnosticCommonKinds.inc.h
-TemplateName.o: StmtNodes.inc.h
-TemplateName.po: AttrList.inc.h
-TemplateName.po: Attrs.inc.h
-TemplateName.po: DeclNodes.inc.h
-TemplateName.po: DiagnosticCommonKinds.inc.h
-TemplateName.po: StmtNodes.inc.h
-Type.o: AttrList.inc.h
-Type.o: Attrs.inc.h
-Type.o: CommentCommandList.inc.h
-Type.o: DeclNodes.inc.h
-Type.o: DiagnosticCommonKinds.inc.h
-Type.o: StmtNodes.inc.h
-Type.po: AttrList.inc.h
-Type.po: Attrs.inc.h
-Type.po: CommentCommandList.inc.h
-Type.po: DeclNodes.inc.h
-Type.po: DiagnosticCommonKinds.inc.h
-Type.po: StmtNodes.inc.h
-TypeLoc.o: CommentCommandList.inc.h
-TypeLoc.o: DeclNodes.inc.h
-TypeLoc.o: DiagnosticCommonKinds.inc.h
-TypeLoc.o: StmtNodes.inc.h
-TypeLoc.po: CommentCommandList.inc.h
-TypeLoc.po: DeclNodes.inc.h
-TypeLoc.po: DiagnosticCommonKinds.inc.h
-TypeLoc.po: StmtNodes.inc.h
-TypePrinter.o: AttrList.inc.h
-TypePrinter.o: Attrs.inc.h
-TypePrinter.o: CommentCommandList.inc.h
-TypePrinter.o: DeclNodes.inc.h
-TypePrinter.o: DiagnosticCommonKinds.inc.h
-TypePrinter.o: StmtNodes.inc.h
-TypePrinter.po: AttrList.inc.h
-TypePrinter.po: Attrs.inc.h
-TypePrinter.po: CommentCommandList.inc.h
-TypePrinter.po: DeclNodes.inc.h
-TypePrinter.po: DiagnosticCommonKinds.inc.h
-TypePrinter.po: StmtNodes.inc.h
-VTTBuilder.o: AttrList.inc.h
-VTTBuilder.o: Attrs.inc.h
-VTTBuilder.o: CommentCommandList.inc.h
-VTTBuilder.o: DeclNodes.inc.h
-VTTBuilder.o: DiagnosticCommonKinds.inc.h
-VTTBuilder.o: StmtNodes.inc.h
-VTTBuilder.po: AttrList.inc.h
-VTTBuilder.po: Attrs.inc.h
-VTTBuilder.po: CommentCommandList.inc.h
-VTTBuilder.po: DeclNodes.inc.h
-VTTBuilder.po: DiagnosticCommonKinds.inc.h
-VTTBuilder.po: StmtNodes.inc.h
-VTableBuilder.o: AttrList.inc.h
-VTableBuilder.o: Attrs.inc.h
-VTableBuilder.o: CommentCommandList.inc.h
-VTableBuilder.o: DeclNodes.inc.h
-VTableBuilder.o: DiagnosticASTKinds.inc.h
-VTableBuilder.o: DiagnosticCommonKinds.inc.h
-VTableBuilder.o: StmtNodes.inc.h
-VTableBuilder.po: AttrList.inc.h
-VTableBuilder.po: Attrs.inc.h
-VTableBuilder.po: CommentCommandList.inc.h
-VTableBuilder.po: DeclNodes.inc.h
-VTableBuilder.po: DiagnosticASTKinds.inc.h
-VTableBuilder.po: DiagnosticCommonKinds.inc.h
-VTableBuilder.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
index 1b845df..264ede1 100644
--- a/lib/clang/libclangbasic/Makefile.depend
+++ b/lib/clang/libclangbasic/Makefile.depend
@@ -13,56 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Attributes.o: AttrHasAttributeImpl.inc.h
-Attributes.po: AttrHasAttributeImpl.inc.h
-Diagnostic.o: DiagnosticCommonKinds.inc.h
-Diagnostic.po: DiagnosticCommonKinds.inc.h
-DiagnosticIDs.o: DiagnosticASTKinds.inc.h
-DiagnosticIDs.o: DiagnosticAnalysisKinds.inc.h
-DiagnosticIDs.o: DiagnosticCommentKinds.inc.h
-DiagnosticIDs.o: DiagnosticCommonKinds.inc.h
-DiagnosticIDs.o: DiagnosticDriverKinds.inc.h
-DiagnosticIDs.o: DiagnosticFrontendKinds.inc.h
-DiagnosticIDs.o: DiagnosticGroups.inc.h
-DiagnosticIDs.o: DiagnosticLexKinds.inc.h
-DiagnosticIDs.o: DiagnosticParseKinds.inc.h
-DiagnosticIDs.o: DiagnosticSemaKinds.inc.h
-DiagnosticIDs.o: DiagnosticSerializationKinds.inc.h
-DiagnosticIDs.po: DiagnosticASTKinds.inc.h
-DiagnosticIDs.po: DiagnosticAnalysisKinds.inc.h
-DiagnosticIDs.po: DiagnosticCommentKinds.inc.h
-DiagnosticIDs.po: DiagnosticCommonKinds.inc.h
-DiagnosticIDs.po: DiagnosticDriverKinds.inc.h
-DiagnosticIDs.po: DiagnosticFrontendKinds.inc.h
-DiagnosticIDs.po: DiagnosticGroups.inc.h
-DiagnosticIDs.po: DiagnosticLexKinds.inc.h
-DiagnosticIDs.po: DiagnosticParseKinds.inc.h
-DiagnosticIDs.po: DiagnosticSemaKinds.inc.h
-DiagnosticIDs.po: DiagnosticSerializationKinds.inc.h
-SourceManager.o: DiagnosticCommonKinds.inc.h
-SourceManager.po: DiagnosticCommonKinds.inc.h
-Targets.o: DiagnosticCommonKinds.inc.h
-Targets.o: arm_neon.inc.h
-Targets.po: DiagnosticCommonKinds.inc.h
-Targets.po: arm_neon.inc.h
-Warnings.o: DiagnosticASTKinds.inc.h
-Warnings.o: DiagnosticAnalysisKinds.inc.h
-Warnings.o: DiagnosticCommentKinds.inc.h
-Warnings.o: DiagnosticCommonKinds.inc.h
-Warnings.o: DiagnosticDriverKinds.inc.h
-Warnings.o: DiagnosticFrontendKinds.inc.h
-Warnings.o: DiagnosticLexKinds.inc.h
-Warnings.o: DiagnosticParseKinds.inc.h
-Warnings.o: DiagnosticSemaKinds.inc.h
-Warnings.o: DiagnosticSerializationKinds.inc.h
-Warnings.po: DiagnosticASTKinds.inc.h
-Warnings.po: DiagnosticAnalysisKinds.inc.h
-Warnings.po: DiagnosticCommentKinds.inc.h
-Warnings.po: DiagnosticCommonKinds.inc.h
-Warnings.po: DiagnosticDriverKinds.inc.h
-Warnings.po: DiagnosticFrontendKinds.inc.h
-Warnings.po: DiagnosticLexKinds.inc.h
-Warnings.po: DiagnosticParseKinds.inc.h
-Warnings.po: DiagnosticSemaKinds.inc.h
-Warnings.po: DiagnosticSerializationKinds.inc.h
.endif
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
index 1a535fb..9a1b84e 100644
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ b/lib/clang/libclangcodegen/Makefile.depend
@@ -14,622 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-BackendUtil.o: DiagnosticCommonKinds.inc.h
-BackendUtil.o: DiagnosticFrontendKinds.inc.h
-BackendUtil.o: Intrinsics.inc.h
-BackendUtil.po: DiagnosticCommonKinds.inc.h
-BackendUtil.po: DiagnosticFrontendKinds.inc.h
-BackendUtil.po: Intrinsics.inc.h
-CGAtomic.o: AttrList.inc.h
-CGAtomic.o: Attrs.inc.h
-CGAtomic.o: CommentCommandList.inc.h
-CGAtomic.o: DeclNodes.inc.h
-CGAtomic.o: DiagnosticCommonKinds.inc.h
-CGAtomic.o: Intrinsics.inc.h
-CGAtomic.o: StmtNodes.inc.h
-CGAtomic.po: AttrList.inc.h
-CGAtomic.po: Attrs.inc.h
-CGAtomic.po: CommentCommandList.inc.h
-CGAtomic.po: DeclNodes.inc.h
-CGAtomic.po: DiagnosticCommonKinds.inc.h
-CGAtomic.po: Intrinsics.inc.h
-CGAtomic.po: StmtNodes.inc.h
-CGBlocks.o: AttrList.inc.h
-CGBlocks.o: Attrs.inc.h
-CGBlocks.o: CommentCommandList.inc.h
-CGBlocks.o: DeclNodes.inc.h
-CGBlocks.o: DiagnosticCommonKinds.inc.h
-CGBlocks.o: StmtNodes.inc.h
-CGBlocks.po: AttrList.inc.h
-CGBlocks.po: Attrs.inc.h
-CGBlocks.po: CommentCommandList.inc.h
-CGBlocks.po: DeclNodes.inc.h
-CGBlocks.po: DiagnosticCommonKinds.inc.h
-CGBlocks.po: StmtNodes.inc.h
-CGBuiltin.o: AttrList.inc.h
-CGBuiltin.o: Attrs.inc.h
-CGBuiltin.o: CommentCommandList.inc.h
-CGBuiltin.o: DeclNodes.inc.h
-CGBuiltin.o: DiagnosticCommonKinds.inc.h
-CGBuiltin.o: Intrinsics.inc.h
-CGBuiltin.o: StmtNodes.inc.h
-CGBuiltin.o: arm_neon.inc.h
-CGBuiltin.po: AttrList.inc.h
-CGBuiltin.po: Attrs.inc.h
-CGBuiltin.po: CommentCommandList.inc.h
-CGBuiltin.po: DeclNodes.inc.h
-CGBuiltin.po: DiagnosticCommonKinds.inc.h
-CGBuiltin.po: Intrinsics.inc.h
-CGBuiltin.po: StmtNodes.inc.h
-CGBuiltin.po: arm_neon.inc.h
-CGCUDANV.o: AttrList.inc.h
-CGCUDANV.o: Attrs.inc.h
-CGCUDANV.o: CommentCommandList.inc.h
-CGCUDANV.o: DeclNodes.inc.h
-CGCUDANV.o: DiagnosticCommonKinds.inc.h
-CGCUDANV.o: StmtNodes.inc.h
-CGCUDANV.po: AttrList.inc.h
-CGCUDANV.po: Attrs.inc.h
-CGCUDANV.po: CommentCommandList.inc.h
-CGCUDANV.po: DeclNodes.inc.h
-CGCUDANV.po: DiagnosticCommonKinds.inc.h
-CGCUDANV.po: StmtNodes.inc.h
-CGCUDARuntime.o: AttrList.inc.h
-CGCUDARuntime.o: Attrs.inc.h
-CGCUDARuntime.o: CommentCommandList.inc.h
-CGCUDARuntime.o: DeclNodes.inc.h
-CGCUDARuntime.o: DiagnosticCommonKinds.inc.h
-CGCUDARuntime.o: StmtNodes.inc.h
-CGCUDARuntime.po: AttrList.inc.h
-CGCUDARuntime.po: Attrs.inc.h
-CGCUDARuntime.po: CommentCommandList.inc.h
-CGCUDARuntime.po: DeclNodes.inc.h
-CGCUDARuntime.po: DiagnosticCommonKinds.inc.h
-CGCUDARuntime.po: StmtNodes.inc.h
-CGCXX.o: AttrList.inc.h
-CGCXX.o: Attrs.inc.h
-CGCXX.o: CommentCommandList.inc.h
-CGCXX.o: DeclNodes.inc.h
-CGCXX.o: DiagnosticCommonKinds.inc.h
-CGCXX.o: StmtNodes.inc.h
-CGCXX.po: AttrList.inc.h
-CGCXX.po: Attrs.inc.h
-CGCXX.po: CommentCommandList.inc.h
-CGCXX.po: DeclNodes.inc.h
-CGCXX.po: DiagnosticCommonKinds.inc.h
-CGCXX.po: StmtNodes.inc.h
-CGCXXABI.o: AttrList.inc.h
-CGCXXABI.o: Attrs.inc.h
-CGCXXABI.o: CommentCommandList.inc.h
-CGCXXABI.o: DeclNodes.inc.h
-CGCXXABI.o: DiagnosticCommonKinds.inc.h
-CGCXXABI.o: StmtNodes.inc.h
-CGCXXABI.po: AttrList.inc.h
-CGCXXABI.po: Attrs.inc.h
-CGCXXABI.po: CommentCommandList.inc.h
-CGCXXABI.po: DeclNodes.inc.h
-CGCXXABI.po: DiagnosticCommonKinds.inc.h
-CGCXXABI.po: StmtNodes.inc.h
-CGCall.o: AttrList.inc.h
-CGCall.o: Attrs.inc.h
-CGCall.o: CommentCommandList.inc.h
-CGCall.o: DeclNodes.inc.h
-CGCall.o: DiagnosticCommonKinds.inc.h
-CGCall.o: Intrinsics.inc.h
-CGCall.o: StmtNodes.inc.h
-CGCall.po: AttrList.inc.h
-CGCall.po: Attrs.inc.h
-CGCall.po: CommentCommandList.inc.h
-CGCall.po: DeclNodes.inc.h
-CGCall.po: DiagnosticCommonKinds.inc.h
-CGCall.po: Intrinsics.inc.h
-CGCall.po: StmtNodes.inc.h
-CGClass.o: AttrList.inc.h
-CGClass.o: Attrs.inc.h
-CGClass.o: CommentCommandList.inc.h
-CGClass.o: DeclNodes.inc.h
-CGClass.o: DiagnosticCommonKinds.inc.h
-CGClass.o: Intrinsics.inc.h
-CGClass.o: StmtNodes.inc.h
-CGClass.o: arm_neon.inc.h
-CGClass.po: AttrList.inc.h
-CGClass.po: Attrs.inc.h
-CGClass.po: CommentCommandList.inc.h
-CGClass.po: DeclNodes.inc.h
-CGClass.po: DiagnosticCommonKinds.inc.h
-CGClass.po: Intrinsics.inc.h
-CGClass.po: StmtNodes.inc.h
-CGClass.po: arm_neon.inc.h
-CGCleanup.o: AttrList.inc.h
-CGCleanup.o: Attrs.inc.h
-CGCleanup.o: CommentCommandList.inc.h
-CGCleanup.o: DeclNodes.inc.h
-CGCleanup.o: DiagnosticCommonKinds.inc.h
-CGCleanup.o: StmtNodes.inc.h
-CGCleanup.po: AttrList.inc.h
-CGCleanup.po: Attrs.inc.h
-CGCleanup.po: CommentCommandList.inc.h
-CGCleanup.po: DeclNodes.inc.h
-CGCleanup.po: DiagnosticCommonKinds.inc.h
-CGCleanup.po: StmtNodes.inc.h
-CGDebugInfo.o: AttrList.inc.h
-CGDebugInfo.o: Attrs.inc.h
-CGDebugInfo.o: CommentCommandList.inc.h
-CGDebugInfo.o: DeclNodes.inc.h
-CGDebugInfo.o: DiagnosticCommonKinds.inc.h
-CGDebugInfo.o: Intrinsics.inc.h
-CGDebugInfo.o: StmtNodes.inc.h
-CGDebugInfo.po: AttrList.inc.h
-CGDebugInfo.po: Attrs.inc.h
-CGDebugInfo.po: CommentCommandList.inc.h
-CGDebugInfo.po: DeclNodes.inc.h
-CGDebugInfo.po: DiagnosticCommonKinds.inc.h
-CGDebugInfo.po: Intrinsics.inc.h
-CGDebugInfo.po: StmtNodes.inc.h
-CGDecl.o: AttrList.inc.h
-CGDecl.o: Attrs.inc.h
-CGDecl.o: CommentCommandList.inc.h
-CGDecl.o: DeclNodes.inc.h
-CGDecl.o: DiagnosticCommonKinds.inc.h
-CGDecl.o: Intrinsics.inc.h
-CGDecl.o: StmtNodes.inc.h
-CGDecl.po: AttrList.inc.h
-CGDecl.po: Attrs.inc.h
-CGDecl.po: CommentCommandList.inc.h
-CGDecl.po: DeclNodes.inc.h
-CGDecl.po: DiagnosticCommonKinds.inc.h
-CGDecl.po: Intrinsics.inc.h
-CGDecl.po: StmtNodes.inc.h
-CGDeclCXX.o: AttrList.inc.h
-CGDeclCXX.o: Attrs.inc.h
-CGDeclCXX.o: CommentCommandList.inc.h
-CGDeclCXX.o: DeclNodes.inc.h
-CGDeclCXX.o: DiagnosticCommonKinds.inc.h
-CGDeclCXX.o: Intrinsics.inc.h
-CGDeclCXX.o: StmtNodes.inc.h
-CGDeclCXX.po: AttrList.inc.h
-CGDeclCXX.po: Attrs.inc.h
-CGDeclCXX.po: CommentCommandList.inc.h
-CGDeclCXX.po: DeclNodes.inc.h
-CGDeclCXX.po: DiagnosticCommonKinds.inc.h
-CGDeclCXX.po: Intrinsics.inc.h
-CGDeclCXX.po: StmtNodes.inc.h
-CGException.o: AttrList.inc.h
-CGException.o: Attrs.inc.h
-CGException.o: CommentCommandList.inc.h
-CGException.o: DeclNodes.inc.h
-CGException.o: DiagnosticCommonKinds.inc.h
-CGException.o: Intrinsics.inc.h
-CGException.o: StmtNodes.inc.h
-CGException.o: arm_neon.inc.h
-CGException.po: AttrList.inc.h
-CGException.po: Attrs.inc.h
-CGException.po: CommentCommandList.inc.h
-CGException.po: DeclNodes.inc.h
-CGException.po: DiagnosticCommonKinds.inc.h
-CGException.po: Intrinsics.inc.h
-CGException.po: StmtNodes.inc.h
-CGException.po: arm_neon.inc.h
-CGExpr.o: AttrList.inc.h
-CGExpr.o: Attrs.inc.h
-CGExpr.o: CommentCommandList.inc.h
-CGExpr.o: DeclNodes.inc.h
-CGExpr.o: DiagnosticCommonKinds.inc.h
-CGExpr.o: Intrinsics.inc.h
-CGExpr.o: StmtNodes.inc.h
-CGExpr.po: AttrList.inc.h
-CGExpr.po: Attrs.inc.h
-CGExpr.po: CommentCommandList.inc.h
-CGExpr.po: DeclNodes.inc.h
-CGExpr.po: DiagnosticCommonKinds.inc.h
-CGExpr.po: Intrinsics.inc.h
-CGExpr.po: StmtNodes.inc.h
-CGExprAgg.o: AttrList.inc.h
-CGExprAgg.o: Attrs.inc.h
-CGExprAgg.o: CommentCommandList.inc.h
-CGExprAgg.o: DeclNodes.inc.h
-CGExprAgg.o: DiagnosticCommonKinds.inc.h
-CGExprAgg.o: Intrinsics.inc.h
-CGExprAgg.o: StmtNodes.inc.h
-CGExprAgg.po: AttrList.inc.h
-CGExprAgg.po: Attrs.inc.h
-CGExprAgg.po: CommentCommandList.inc.h
-CGExprAgg.po: DeclNodes.inc.h
-CGExprAgg.po: DiagnosticCommonKinds.inc.h
-CGExprAgg.po: Intrinsics.inc.h
-CGExprAgg.po: StmtNodes.inc.h
-CGExprCXX.o: AttrList.inc.h
-CGExprCXX.o: Attrs.inc.h
-CGExprCXX.o: CommentCommandList.inc.h
-CGExprCXX.o: DeclNodes.inc.h
-CGExprCXX.o: DiagnosticCommonKinds.inc.h
-CGExprCXX.o: Intrinsics.inc.h
-CGExprCXX.o: StmtNodes.inc.h
-CGExprCXX.po: AttrList.inc.h
-CGExprCXX.po: Attrs.inc.h
-CGExprCXX.po: CommentCommandList.inc.h
-CGExprCXX.po: DeclNodes.inc.h
-CGExprCXX.po: DiagnosticCommonKinds.inc.h
-CGExprCXX.po: Intrinsics.inc.h
-CGExprCXX.po: StmtNodes.inc.h
-CGExprComplex.o: AttrList.inc.h
-CGExprComplex.o: Attrs.inc.h
-CGExprComplex.o: CommentCommandList.inc.h
-CGExprComplex.o: DeclNodes.inc.h
-CGExprComplex.o: DiagnosticCommonKinds.inc.h
-CGExprComplex.o: StmtNodes.inc.h
-CGExprComplex.po: AttrList.inc.h
-CGExprComplex.po: Attrs.inc.h
-CGExprComplex.po: CommentCommandList.inc.h
-CGExprComplex.po: DeclNodes.inc.h
-CGExprComplex.po: DiagnosticCommonKinds.inc.h
-CGExprComplex.po: StmtNodes.inc.h
-CGExprConstant.o: AttrList.inc.h
-CGExprConstant.o: Attrs.inc.h
-CGExprConstant.o: CommentCommandList.inc.h
-CGExprConstant.o: DeclNodes.inc.h
-CGExprConstant.o: DiagnosticCommonKinds.inc.h
-CGExprConstant.o: StmtNodes.inc.h
-CGExprConstant.po: AttrList.inc.h
-CGExprConstant.po: Attrs.inc.h
-CGExprConstant.po: CommentCommandList.inc.h
-CGExprConstant.po: DeclNodes.inc.h
-CGExprConstant.po: DiagnosticCommonKinds.inc.h
-CGExprConstant.po: StmtNodes.inc.h
-CGExprScalar.o: AttrList.inc.h
-CGExprScalar.o: Attrs.inc.h
-CGExprScalar.o: CommentCommandList.inc.h
-CGExprScalar.o: DeclNodes.inc.h
-CGExprScalar.o: DiagnosticCommonKinds.inc.h
-CGExprScalar.o: Intrinsics.inc.h
-CGExprScalar.o: StmtNodes.inc.h
-CGExprScalar.po: AttrList.inc.h
-CGExprScalar.po: Attrs.inc.h
-CGExprScalar.po: CommentCommandList.inc.h
-CGExprScalar.po: DeclNodes.inc.h
-CGExprScalar.po: DiagnosticCommonKinds.inc.h
-CGExprScalar.po: Intrinsics.inc.h
-CGExprScalar.po: StmtNodes.inc.h
-CGLoopInfo.o: AttrList.inc.h
-CGLoopInfo.o: AttrParsedAttrList.inc.h
-CGLoopInfo.o: Attrs.inc.h
-CGLoopInfo.o: DeclNodes.inc.h
-CGLoopInfo.o: DiagnosticCommonKinds.inc.h
-CGLoopInfo.o: StmtNodes.inc.h
-CGLoopInfo.po: AttrList.inc.h
-CGLoopInfo.po: AttrParsedAttrList.inc.h
-CGLoopInfo.po: Attrs.inc.h
-CGLoopInfo.po: DeclNodes.inc.h
-CGLoopInfo.po: DiagnosticCommonKinds.inc.h
-CGLoopInfo.po: StmtNodes.inc.h
-CGObjC.o: AttrList.inc.h
-CGObjC.o: Attrs.inc.h
-CGObjC.o: CommentCommandList.inc.h
-CGObjC.o: DeclNodes.inc.h
-CGObjC.o: DiagnosticCommonKinds.inc.h
-CGObjC.o: StmtNodes.inc.h
-CGObjC.po: AttrList.inc.h
-CGObjC.po: Attrs.inc.h
-CGObjC.po: CommentCommandList.inc.h
-CGObjC.po: DeclNodes.inc.h
-CGObjC.po: DiagnosticCommonKinds.inc.h
-CGObjC.po: StmtNodes.inc.h
-CGObjCGNU.o: AttrList.inc.h
-CGObjCGNU.o: Attrs.inc.h
-CGObjCGNU.o: CommentCommandList.inc.h
-CGObjCGNU.o: DeclNodes.inc.h
-CGObjCGNU.o: DiagnosticCommonKinds.inc.h
-CGObjCGNU.o: Intrinsics.inc.h
-CGObjCGNU.o: StmtNodes.inc.h
-CGObjCGNU.po: AttrList.inc.h
-CGObjCGNU.po: Attrs.inc.h
-CGObjCGNU.po: CommentCommandList.inc.h
-CGObjCGNU.po: DeclNodes.inc.h
-CGObjCGNU.po: DiagnosticCommonKinds.inc.h
-CGObjCGNU.po: Intrinsics.inc.h
-CGObjCGNU.po: StmtNodes.inc.h
-CGObjCMac.o: AttrList.inc.h
-CGObjCMac.o: Attrs.inc.h
-CGObjCMac.o: CommentCommandList.inc.h
-CGObjCMac.o: DeclNodes.inc.h
-CGObjCMac.o: DiagnosticCommonKinds.inc.h
-CGObjCMac.o: Intrinsics.inc.h
-CGObjCMac.o: StmtNodes.inc.h
-CGObjCMac.po: AttrList.inc.h
-CGObjCMac.po: Attrs.inc.h
-CGObjCMac.po: CommentCommandList.inc.h
-CGObjCMac.po: DeclNodes.inc.h
-CGObjCMac.po: DiagnosticCommonKinds.inc.h
-CGObjCMac.po: Intrinsics.inc.h
-CGObjCMac.po: StmtNodes.inc.h
-CGObjCRuntime.o: AttrList.inc.h
-CGObjCRuntime.o: Attrs.inc.h
-CGObjCRuntime.o: CommentCommandList.inc.h
-CGObjCRuntime.o: DeclNodes.inc.h
-CGObjCRuntime.o: DiagnosticCommonKinds.inc.h
-CGObjCRuntime.o: StmtNodes.inc.h
-CGObjCRuntime.po: AttrList.inc.h
-CGObjCRuntime.po: Attrs.inc.h
-CGObjCRuntime.po: CommentCommandList.inc.h
-CGObjCRuntime.po: DeclNodes.inc.h
-CGObjCRuntime.po: DiagnosticCommonKinds.inc.h
-CGObjCRuntime.po: StmtNodes.inc.h
-CGOpenCLRuntime.o: AttrList.inc.h
-CGOpenCLRuntime.o: Attrs.inc.h
-CGOpenCLRuntime.o: CommentCommandList.inc.h
-CGOpenCLRuntime.o: DeclNodes.inc.h
-CGOpenCLRuntime.o: DiagnosticCommonKinds.inc.h
-CGOpenCLRuntime.o: StmtNodes.inc.h
-CGOpenCLRuntime.po: AttrList.inc.h
-CGOpenCLRuntime.po: Attrs.inc.h
-CGOpenCLRuntime.po: CommentCommandList.inc.h
-CGOpenCLRuntime.po: DeclNodes.inc.h
-CGOpenCLRuntime.po: DiagnosticCommonKinds.inc.h
-CGOpenCLRuntime.po: StmtNodes.inc.h
-CGOpenMPRuntime.o: AttrList.inc.h
-CGOpenMPRuntime.o: Attrs.inc.h
-CGOpenMPRuntime.o: CommentCommandList.inc.h
-CGOpenMPRuntime.o: DeclNodes.inc.h
-CGOpenMPRuntime.o: DiagnosticCommonKinds.inc.h
-CGOpenMPRuntime.o: StmtNodes.inc.h
-CGOpenMPRuntime.po: AttrList.inc.h
-CGOpenMPRuntime.po: Attrs.inc.h
-CGOpenMPRuntime.po: CommentCommandList.inc.h
-CGOpenMPRuntime.po: DeclNodes.inc.h
-CGOpenMPRuntime.po: DiagnosticCommonKinds.inc.h
-CGOpenMPRuntime.po: StmtNodes.inc.h
-CGRecordLayoutBuilder.o: AttrList.inc.h
-CGRecordLayoutBuilder.o: Attrs.inc.h
-CGRecordLayoutBuilder.o: CommentCommandList.inc.h
-CGRecordLayoutBuilder.o: DeclNodes.inc.h
-CGRecordLayoutBuilder.o: DiagnosticCommonKinds.inc.h
-CGRecordLayoutBuilder.o: StmtNodes.inc.h
-CGRecordLayoutBuilder.po: AttrList.inc.h
-CGRecordLayoutBuilder.po: Attrs.inc.h
-CGRecordLayoutBuilder.po: CommentCommandList.inc.h
-CGRecordLayoutBuilder.po: DeclNodes.inc.h
-CGRecordLayoutBuilder.po: DiagnosticCommonKinds.inc.h
-CGRecordLayoutBuilder.po: StmtNodes.inc.h
-CGStmt.o: AttrList.inc.h
-CGStmt.o: AttrParsedAttrList.inc.h
-CGStmt.o: Attrs.inc.h
-CGStmt.o: CommentCommandList.inc.h
-CGStmt.o: DeclNodes.inc.h
-CGStmt.o: DiagnosticCommonKinds.inc.h
-CGStmt.o: DiagnosticSemaKinds.inc.h
-CGStmt.o: Intrinsics.inc.h
-CGStmt.o: StmtNodes.inc.h
-CGStmt.po: AttrList.inc.h
-CGStmt.po: AttrParsedAttrList.inc.h
-CGStmt.po: Attrs.inc.h
-CGStmt.po: CommentCommandList.inc.h
-CGStmt.po: DeclNodes.inc.h
-CGStmt.po: DiagnosticCommonKinds.inc.h
-CGStmt.po: DiagnosticSemaKinds.inc.h
-CGStmt.po: Intrinsics.inc.h
-CGStmt.po: StmtNodes.inc.h
-CGStmtOpenMP.o: AttrList.inc.h
-CGStmtOpenMP.o: Attrs.inc.h
-CGStmtOpenMP.o: CommentCommandList.inc.h
-CGStmtOpenMP.o: DeclNodes.inc.h
-CGStmtOpenMP.o: DiagnosticCommonKinds.inc.h
-CGStmtOpenMP.o: StmtNodes.inc.h
-CGStmtOpenMP.po: AttrList.inc.h
-CGStmtOpenMP.po: Attrs.inc.h
-CGStmtOpenMP.po: CommentCommandList.inc.h
-CGStmtOpenMP.po: DeclNodes.inc.h
-CGStmtOpenMP.po: DiagnosticCommonKinds.inc.h
-CGStmtOpenMP.po: StmtNodes.inc.h
-CGVTT.o: AttrList.inc.h
-CGVTT.o: Attrs.inc.h
-CGVTT.o: CommentCommandList.inc.h
-CGVTT.o: DeclNodes.inc.h
-CGVTT.o: DiagnosticCommonKinds.inc.h
-CGVTT.o: StmtNodes.inc.h
-CGVTT.po: AttrList.inc.h
-CGVTT.po: Attrs.inc.h
-CGVTT.po: CommentCommandList.inc.h
-CGVTT.po: DeclNodes.inc.h
-CGVTT.po: DiagnosticCommonKinds.inc.h
-CGVTT.po: StmtNodes.inc.h
-CGVTables.o: AttrList.inc.h
-CGVTables.o: Attrs.inc.h
-CGVTables.o: CommentCommandList.inc.h
-CGVTables.o: DeclNodes.inc.h
-CGVTables.o: DiagnosticCommonKinds.inc.h
-CGVTables.o: StmtNodes.inc.h
-CGVTables.po: AttrList.inc.h
-CGVTables.po: Attrs.inc.h
-CGVTables.po: CommentCommandList.inc.h
-CGVTables.po: DeclNodes.inc.h
-CGVTables.po: DiagnosticCommonKinds.inc.h
-CGVTables.po: StmtNodes.inc.h
-CodeGenABITypes.o: AttrList.inc.h
-CodeGenABITypes.o: Attrs.inc.h
-CodeGenABITypes.o: CommentCommandList.inc.h
-CodeGenABITypes.o: DeclNodes.inc.h
-CodeGenABITypes.o: DiagnosticCommonKinds.inc.h
-CodeGenABITypes.o: StmtNodes.inc.h
-CodeGenABITypes.po: AttrList.inc.h
-CodeGenABITypes.po: Attrs.inc.h
-CodeGenABITypes.po: CommentCommandList.inc.h
-CodeGenABITypes.po: DeclNodes.inc.h
-CodeGenABITypes.po: DiagnosticCommonKinds.inc.h
-CodeGenABITypes.po: StmtNodes.inc.h
-CodeGenAction.o: AttrList.inc.h
-CodeGenAction.o: Attrs.inc.h
-CodeGenAction.o: CommentCommandList.inc.h
-CodeGenAction.o: DeclNodes.inc.h
-CodeGenAction.o: DiagnosticCommonKinds.inc.h
-CodeGenAction.o: DiagnosticFrontendKinds.inc.h
-CodeGenAction.o: StmtNodes.inc.h
-CodeGenAction.po: AttrList.inc.h
-CodeGenAction.po: Attrs.inc.h
-CodeGenAction.po: CommentCommandList.inc.h
-CodeGenAction.po: DeclNodes.inc.h
-CodeGenAction.po: DiagnosticCommonKinds.inc.h
-CodeGenAction.po: DiagnosticFrontendKinds.inc.h
-CodeGenAction.po: StmtNodes.inc.h
-CodeGenFunction.o: AttrList.inc.h
-CodeGenFunction.o: Attrs.inc.h
-CodeGenFunction.o: CommentCommandList.inc.h
-CodeGenFunction.o: DeclNodes.inc.h
-CodeGenFunction.o: DiagnosticCommonKinds.inc.h
-CodeGenFunction.o: Intrinsics.inc.h
-CodeGenFunction.o: StmtNodes.inc.h
-CodeGenFunction.po: AttrList.inc.h
-CodeGenFunction.po: Attrs.inc.h
-CodeGenFunction.po: CommentCommandList.inc.h
-CodeGenFunction.po: DeclNodes.inc.h
-CodeGenFunction.po: DiagnosticCommonKinds.inc.h
-CodeGenFunction.po: Intrinsics.inc.h
-CodeGenFunction.po: StmtNodes.inc.h
-CodeGenModule.o: AttrList.inc.h
-CodeGenModule.o: AttrVisitor.inc.h
-CodeGenModule.o: Attrs.inc.h
-CodeGenModule.o: CommentCommandList.inc.h
-CodeGenModule.o: DeclNodes.inc.h
-CodeGenModule.o: DiagnosticCommonKinds.inc.h
-CodeGenModule.o: DiagnosticSemaKinds.inc.h
-CodeGenModule.o: Intrinsics.inc.h
-CodeGenModule.o: StmtNodes.inc.h
-CodeGenModule.po: AttrList.inc.h
-CodeGenModule.po: AttrVisitor.inc.h
-CodeGenModule.po: Attrs.inc.h
-CodeGenModule.po: CommentCommandList.inc.h
-CodeGenModule.po: DeclNodes.inc.h
-CodeGenModule.po: DiagnosticCommonKinds.inc.h
-CodeGenModule.po: DiagnosticSemaKinds.inc.h
-CodeGenModule.po: Intrinsics.inc.h
-CodeGenModule.po: StmtNodes.inc.h
-CodeGenPGO.o: AttrList.inc.h
-CodeGenPGO.o: AttrVisitor.inc.h
-CodeGenPGO.o: Attrs.inc.h
-CodeGenPGO.o: CommentCommandList.inc.h
-CodeGenPGO.o: DeclNodes.inc.h
-CodeGenPGO.o: DiagnosticCommonKinds.inc.h
-CodeGenPGO.o: Intrinsics.inc.h
-CodeGenPGO.o: StmtNodes.inc.h
-CodeGenPGO.po: AttrList.inc.h
-CodeGenPGO.po: AttrVisitor.inc.h
-CodeGenPGO.po: Attrs.inc.h
-CodeGenPGO.po: CommentCommandList.inc.h
-CodeGenPGO.po: DeclNodes.inc.h
-CodeGenPGO.po: DiagnosticCommonKinds.inc.h
-CodeGenPGO.po: Intrinsics.inc.h
-CodeGenPGO.po: StmtNodes.inc.h
-CodeGenTBAA.o: AttrList.inc.h
-CodeGenTBAA.o: Attrs.inc.h
-CodeGenTBAA.o: CommentCommandList.inc.h
-CodeGenTBAA.o: DeclNodes.inc.h
-CodeGenTBAA.o: DiagnosticCommonKinds.inc.h
-CodeGenTBAA.o: StmtNodes.inc.h
-CodeGenTBAA.po: AttrList.inc.h
-CodeGenTBAA.po: Attrs.inc.h
-CodeGenTBAA.po: CommentCommandList.inc.h
-CodeGenTBAA.po: DeclNodes.inc.h
-CodeGenTBAA.po: DiagnosticCommonKinds.inc.h
-CodeGenTBAA.po: StmtNodes.inc.h
-CodeGenTypes.o: AttrList.inc.h
-CodeGenTypes.o: Attrs.inc.h
-CodeGenTypes.o: CommentCommandList.inc.h
-CodeGenTypes.o: DeclNodes.inc.h
-CodeGenTypes.o: DiagnosticCommonKinds.inc.h
-CodeGenTypes.o: StmtNodes.inc.h
-CodeGenTypes.po: AttrList.inc.h
-CodeGenTypes.po: Attrs.inc.h
-CodeGenTypes.po: CommentCommandList.inc.h
-CodeGenTypes.po: DeclNodes.inc.h
-CodeGenTypes.po: DiagnosticCommonKinds.inc.h
-CodeGenTypes.po: StmtNodes.inc.h
-CoverageMappingGen.o: AttrList.inc.h
-CoverageMappingGen.o: Attrs.inc.h
-CoverageMappingGen.o: CommentCommandList.inc.h
-CoverageMappingGen.o: DeclNodes.inc.h
-CoverageMappingGen.o: DiagnosticCommonKinds.inc.h
-CoverageMappingGen.o: StmtNodes.inc.h
-CoverageMappingGen.po: AttrList.inc.h
-CoverageMappingGen.po: Attrs.inc.h
-CoverageMappingGen.po: CommentCommandList.inc.h
-CoverageMappingGen.po: DeclNodes.inc.h
-CoverageMappingGen.po: DiagnosticCommonKinds.inc.h
-CoverageMappingGen.po: StmtNodes.inc.h
-ItaniumCXXABI.o: AttrList.inc.h
-ItaniumCXXABI.o: Attrs.inc.h
-ItaniumCXXABI.o: CommentCommandList.inc.h
-ItaniumCXXABI.o: DeclNodes.inc.h
-ItaniumCXXABI.o: DiagnosticCommonKinds.inc.h
-ItaniumCXXABI.o: Intrinsics.inc.h
-ItaniumCXXABI.o: StmtNodes.inc.h
-ItaniumCXXABI.po: AttrList.inc.h
-ItaniumCXXABI.po: Attrs.inc.h
-ItaniumCXXABI.po: CommentCommandList.inc.h
-ItaniumCXXABI.po: DeclNodes.inc.h
-ItaniumCXXABI.po: DiagnosticCommonKinds.inc.h
-ItaniumCXXABI.po: Intrinsics.inc.h
-ItaniumCXXABI.po: StmtNodes.inc.h
-MicrosoftCXXABI.o: AttrList.inc.h
-MicrosoftCXXABI.o: Attrs.inc.h
-MicrosoftCXXABI.o: CommentCommandList.inc.h
-MicrosoftCXXABI.o: DeclNodes.inc.h
-MicrosoftCXXABI.o: DiagnosticCommonKinds.inc.h
-MicrosoftCXXABI.o: Intrinsics.inc.h
-MicrosoftCXXABI.o: StmtNodes.inc.h
-MicrosoftCXXABI.po: AttrList.inc.h
-MicrosoftCXXABI.po: Attrs.inc.h
-MicrosoftCXXABI.po: CommentCommandList.inc.h
-MicrosoftCXXABI.po: DeclNodes.inc.h
-MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
-MicrosoftCXXABI.po: Intrinsics.inc.h
-MicrosoftCXXABI.po: StmtNodes.inc.h
-ModuleBuilder.o: AttrList.inc.h
-ModuleBuilder.o: Attrs.inc.h
-ModuleBuilder.o: CommentCommandList.inc.h
-ModuleBuilder.o: DeclNodes.inc.h
-ModuleBuilder.o: DiagnosticCommonKinds.inc.h
-ModuleBuilder.o: StmtNodes.inc.h
-ModuleBuilder.po: AttrList.inc.h
-ModuleBuilder.po: Attrs.inc.h
-ModuleBuilder.po: CommentCommandList.inc.h
-ModuleBuilder.po: DeclNodes.inc.h
-ModuleBuilder.po: DiagnosticCommonKinds.inc.h
-ModuleBuilder.po: StmtNodes.inc.h
-ObjectFilePCHContainerOperations.o: AttrList.inc.h
-ObjectFilePCHContainerOperations.o: AttrVisitor.inc.h
-ObjectFilePCHContainerOperations.o: Attrs.inc.h
-ObjectFilePCHContainerOperations.o: CommentCommandList.inc.h
-ObjectFilePCHContainerOperations.o: DeclNodes.inc.h
-ObjectFilePCHContainerOperations.o: DiagnosticCommonKinds.inc.h
-ObjectFilePCHContainerOperations.o: StmtNodes.inc.h
-ObjectFilePCHContainerOperations.po: AttrList.inc.h
-ObjectFilePCHContainerOperations.po: AttrVisitor.inc.h
-ObjectFilePCHContainerOperations.po: Attrs.inc.h
-ObjectFilePCHContainerOperations.po: CommentCommandList.inc.h
-ObjectFilePCHContainerOperations.po: DeclNodes.inc.h
-ObjectFilePCHContainerOperations.po: DiagnosticCommonKinds.inc.h
-ObjectFilePCHContainerOperations.po: StmtNodes.inc.h
-SanitizerMetadata.o: AttrList.inc.h
-SanitizerMetadata.o: Attrs.inc.h
-SanitizerMetadata.o: CommentCommandList.inc.h
-SanitizerMetadata.o: DeclNodes.inc.h
-SanitizerMetadata.o: DiagnosticCommonKinds.inc.h
-SanitizerMetadata.o: StmtNodes.inc.h
-SanitizerMetadata.po: AttrList.inc.h
-SanitizerMetadata.po: Attrs.inc.h
-SanitizerMetadata.po: CommentCommandList.inc.h
-SanitizerMetadata.po: DeclNodes.inc.h
-SanitizerMetadata.po: DiagnosticCommonKinds.inc.h
-SanitizerMetadata.po: StmtNodes.inc.h
-TargetInfo.o: AttrList.inc.h
-TargetInfo.o: Attrs.inc.h
-TargetInfo.o: CommentCommandList.inc.h
-TargetInfo.o: DeclNodes.inc.h
-TargetInfo.o: DiagnosticCommonKinds.inc.h
-TargetInfo.o: StmtNodes.inc.h
-TargetInfo.po: AttrList.inc.h
-TargetInfo.po: Attrs.inc.h
-TargetInfo.po: CommentCommandList.inc.h
-TargetInfo.po: DeclNodes.inc.h
-TargetInfo.po: DiagnosticCommonKinds.inc.h
-TargetInfo.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
index 5aa7286..9a1b84e 100644
--- a/lib/clang/libclangdriver/Makefile.depend
+++ b/lib/clang/libclangdriver/Makefile.depend
@@ -14,62 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Compilation.o: DiagnosticCommonKinds.inc.h
-Compilation.o: DiagnosticDriverKinds.inc.h
-Compilation.o: Options.inc.h
-Compilation.po: DiagnosticCommonKinds.inc.h
-Compilation.po: DiagnosticDriverKinds.inc.h
-Compilation.po: Options.inc.h
-CrossWindowsToolChain.o: DiagnosticCommonKinds.inc.h
-CrossWindowsToolChain.o: Options.inc.h
-CrossWindowsToolChain.po: DiagnosticCommonKinds.inc.h
-CrossWindowsToolChain.po: Options.inc.h
-Driver.o: DiagnosticCommonKinds.inc.h
-Driver.o: DiagnosticDriverKinds.inc.h
-Driver.o: Options.inc.h
-Driver.po: DiagnosticCommonKinds.inc.h
-Driver.po: DiagnosticDriverKinds.inc.h
-Driver.po: Options.inc.h
-DriverOptions.o: Options.inc.h
-DriverOptions.po: Options.inc.h
-Job.o: DiagnosticCommonKinds.inc.h
-Job.o: DiagnosticDriverKinds.inc.h
-Job.po: DiagnosticCommonKinds.inc.h
-Job.po: DiagnosticDriverKinds.inc.h
-MSVCToolChain.o: DiagnosticCommonKinds.inc.h
-MSVCToolChain.o: DiagnosticDriverKinds.inc.h
-MSVCToolChain.o: Options.inc.h
-MSVCToolChain.po: DiagnosticCommonKinds.inc.h
-MSVCToolChain.po: DiagnosticDriverKinds.inc.h
-MSVCToolChain.po: Options.inc.h
-MinGWToolChain.o: DiagnosticCommonKinds.inc.h
-MinGWToolChain.o: Options.inc.h
-MinGWToolChain.po: DiagnosticCommonKinds.inc.h
-MinGWToolChain.po: Options.inc.h
-Multilib.o: Options.inc.h
-Multilib.po: Options.inc.h
-SanitizerArgs.o: DiagnosticCommonKinds.inc.h
-SanitizerArgs.o: DiagnosticDriverKinds.inc.h
-SanitizerArgs.o: Options.inc.h
-SanitizerArgs.po: DiagnosticCommonKinds.inc.h
-SanitizerArgs.po: DiagnosticDriverKinds.inc.h
-SanitizerArgs.po: Options.inc.h
-ToolChain.o: DiagnosticCommonKinds.inc.h
-ToolChain.o: DiagnosticDriverKinds.inc.h
-ToolChain.o: Options.inc.h
-ToolChain.po: DiagnosticCommonKinds.inc.h
-ToolChain.po: DiagnosticDriverKinds.inc.h
-ToolChain.po: Options.inc.h
-ToolChains.o: DiagnosticCommonKinds.inc.h
-ToolChains.o: DiagnosticDriverKinds.inc.h
-ToolChains.o: Options.inc.h
-ToolChains.po: DiagnosticCommonKinds.inc.h
-ToolChains.po: DiagnosticDriverKinds.inc.h
-ToolChains.po: Options.inc.h
-Tools.o: DiagnosticCommonKinds.inc.h
-Tools.o: DiagnosticDriverKinds.inc.h
-Tools.o: Options.inc.h
-Tools.po: DiagnosticCommonKinds.inc.h
-Tools.po: DiagnosticDriverKinds.inc.h
-Tools.po: Options.inc.h
.endif
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
index 778a945..264ede1 100644
--- a/lib/clang/libclangedit/Makefile.depend
+++ b/lib/clang/libclangedit/Makefile.depend
@@ -13,14 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Commit.o: DiagnosticCommonKinds.inc.h
-Commit.po: DiagnosticCommonKinds.inc.h
-RewriteObjCFoundationAPI.o: CommentCommandList.inc.h
-RewriteObjCFoundationAPI.o: DeclNodes.inc.h
-RewriteObjCFoundationAPI.o: DiagnosticCommonKinds.inc.h
-RewriteObjCFoundationAPI.o: StmtNodes.inc.h
-RewriteObjCFoundationAPI.po: CommentCommandList.inc.h
-RewriteObjCFoundationAPI.po: DeclNodes.inc.h
-RewriteObjCFoundationAPI.po: DiagnosticCommonKinds.inc.h
-RewriteObjCFoundationAPI.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
index 8605e39..9a1b84e 100644
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ b/lib/clang/libclangfrontend/Makefile.depend
@@ -14,212 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ASTConsumers.o: AttrList.inc.h
-ASTConsumers.o: AttrVisitor.inc.h
-ASTConsumers.o: Attrs.inc.h
-ASTConsumers.o: CommentCommandList.inc.h
-ASTConsumers.o: DeclNodes.inc.h
-ASTConsumers.o: DiagnosticCommonKinds.inc.h
-ASTConsumers.o: StmtNodes.inc.h
-ASTConsumers.po: AttrList.inc.h
-ASTConsumers.po: AttrVisitor.inc.h
-ASTConsumers.po: Attrs.inc.h
-ASTConsumers.po: CommentCommandList.inc.h
-ASTConsumers.po: DeclNodes.inc.h
-ASTConsumers.po: DiagnosticCommonKinds.inc.h
-ASTConsumers.po: StmtNodes.inc.h
-ASTMerge.o: CommentCommandList.inc.h
-ASTMerge.o: DeclNodes.inc.h
-ASTMerge.o: DiagnosticASTKinds.inc.h
-ASTMerge.o: DiagnosticCommonKinds.inc.h
-ASTMerge.o: StmtNodes.inc.h
-ASTMerge.po: CommentCommandList.inc.h
-ASTMerge.po: DeclNodes.inc.h
-ASTMerge.po: DiagnosticASTKinds.inc.h
-ASTMerge.po: DiagnosticCommonKinds.inc.h
-ASTMerge.po: StmtNodes.inc.h
-ASTUnit.o: AttrList.inc.h
-ASTUnit.o: AttrParsedAttrList.inc.h
-ASTUnit.o: Attrs.inc.h
-ASTUnit.o: CommentCommandList.inc.h
-ASTUnit.o: DeclNodes.inc.h
-ASTUnit.o: DiagnosticCommonKinds.inc.h
-ASTUnit.o: DiagnosticFrontendKinds.inc.h
-ASTUnit.o: StmtNodes.inc.h
-ASTUnit.po: AttrList.inc.h
-ASTUnit.po: AttrParsedAttrList.inc.h
-ASTUnit.po: Attrs.inc.h
-ASTUnit.po: CommentCommandList.inc.h
-ASTUnit.po: DeclNodes.inc.h
-ASTUnit.po: DiagnosticCommonKinds.inc.h
-ASTUnit.po: DiagnosticFrontendKinds.inc.h
-ASTUnit.po: StmtNodes.inc.h
-CacheTokens.o: DiagnosticCommonKinds.inc.h
-CacheTokens.po: DiagnosticCommonKinds.inc.h
-ChainedDiagnosticConsumer.o: DiagnosticCommonKinds.inc.h
-ChainedDiagnosticConsumer.po: DiagnosticCommonKinds.inc.h
-ChainedIncludesSource.o: AttrList.inc.h
-ChainedIncludesSource.o: AttrParsedAttrList.inc.h
-ChainedIncludesSource.o: Attrs.inc.h
-ChainedIncludesSource.o: CommentCommandList.inc.h
-ChainedIncludesSource.o: DeclNodes.inc.h
-ChainedIncludesSource.o: DiagnosticCommonKinds.inc.h
-ChainedIncludesSource.o: StmtNodes.inc.h
-ChainedIncludesSource.po: AttrList.inc.h
-ChainedIncludesSource.po: AttrParsedAttrList.inc.h
-ChainedIncludesSource.po: Attrs.inc.h
-ChainedIncludesSource.po: CommentCommandList.inc.h
-ChainedIncludesSource.po: DeclNodes.inc.h
-ChainedIncludesSource.po: DiagnosticCommonKinds.inc.h
-ChainedIncludesSource.po: StmtNodes.inc.h
-CompilerInstance.o: AttrList.inc.h
-CompilerInstance.o: AttrParsedAttrList.inc.h
-CompilerInstance.o: Attrs.inc.h
-CompilerInstance.o: CommentCommandList.inc.h
-CompilerInstance.o: DeclNodes.inc.h
-CompilerInstance.o: DiagnosticCommonKinds.inc.h
-CompilerInstance.o: DiagnosticFrontendKinds.inc.h
-CompilerInstance.o: StmtNodes.inc.h
-CompilerInstance.po: AttrList.inc.h
-CompilerInstance.po: AttrParsedAttrList.inc.h
-CompilerInstance.po: Attrs.inc.h
-CompilerInstance.po: CommentCommandList.inc.h
-CompilerInstance.po: DeclNodes.inc.h
-CompilerInstance.po: DiagnosticCommonKinds.inc.h
-CompilerInstance.po: DiagnosticFrontendKinds.inc.h
-CompilerInstance.po: StmtNodes.inc.h
-CompilerInvocation.o: AttrList.inc.h
-CompilerInvocation.o: AttrParsedAttrList.inc.h
-CompilerInvocation.o: Attrs.inc.h
-CompilerInvocation.o: DeclNodes.inc.h
-CompilerInvocation.o: DiagnosticCommonKinds.inc.h
-CompilerInvocation.o: DiagnosticDriverKinds.inc.h
-CompilerInvocation.o: DiagnosticFrontendKinds.inc.h
-CompilerInvocation.o: Options.inc.h
-CompilerInvocation.o: StmtNodes.inc.h
-CompilerInvocation.po: AttrList.inc.h
-CompilerInvocation.po: AttrParsedAttrList.inc.h
-CompilerInvocation.po: Attrs.inc.h
-CompilerInvocation.po: DeclNodes.inc.h
-CompilerInvocation.po: DiagnosticCommonKinds.inc.h
-CompilerInvocation.po: DiagnosticDriverKinds.inc.h
-CompilerInvocation.po: DiagnosticFrontendKinds.inc.h
-CompilerInvocation.po: Options.inc.h
-CompilerInvocation.po: StmtNodes.inc.h
-CreateInvocationFromCommandLine.o: DiagnosticCommonKinds.inc.h
-CreateInvocationFromCommandLine.o: DiagnosticFrontendKinds.inc.h
-CreateInvocationFromCommandLine.o: Options.inc.h
-CreateInvocationFromCommandLine.po: DiagnosticCommonKinds.inc.h
-CreateInvocationFromCommandLine.po: DiagnosticFrontendKinds.inc.h
-CreateInvocationFromCommandLine.po: Options.inc.h
-DependencyFile.o: AttrList.inc.h
-DependencyFile.o: AttrParsedAttrList.inc.h
-DependencyFile.o: Attrs.inc.h
-DependencyFile.o: DeclNodes.inc.h
-DependencyFile.o: DiagnosticCommonKinds.inc.h
-DependencyFile.o: DiagnosticFrontendKinds.inc.h
-DependencyFile.o: DiagnosticLexKinds.inc.h
-DependencyFile.o: StmtNodes.inc.h
-DependencyFile.po: AttrList.inc.h
-DependencyFile.po: AttrParsedAttrList.inc.h
-DependencyFile.po: Attrs.inc.h
-DependencyFile.po: DeclNodes.inc.h
-DependencyFile.po: DiagnosticCommonKinds.inc.h
-DependencyFile.po: DiagnosticFrontendKinds.inc.h
-DependencyFile.po: DiagnosticLexKinds.inc.h
-DependencyFile.po: StmtNodes.inc.h
-DependencyGraph.o: DiagnosticCommonKinds.inc.h
-DependencyGraph.o: DiagnosticFrontendKinds.inc.h
-DependencyGraph.po: DiagnosticCommonKinds.inc.h
-DependencyGraph.po: DiagnosticFrontendKinds.inc.h
-DiagnosticRenderer.o: DiagnosticCommonKinds.inc.h
-DiagnosticRenderer.po: DiagnosticCommonKinds.inc.h
-FrontendAction.o: AttrList.inc.h
-FrontendAction.o: AttrParsedAttrList.inc.h
-FrontendAction.o: Attrs.inc.h
-FrontendAction.o: CommentCommandList.inc.h
-FrontendAction.o: DeclNodes.inc.h
-FrontendAction.o: DiagnosticCommonKinds.inc.h
-FrontendAction.o: DiagnosticFrontendKinds.inc.h
-FrontendAction.o: StmtNodes.inc.h
-FrontendAction.po: AttrList.inc.h
-FrontendAction.po: AttrParsedAttrList.inc.h
-FrontendAction.po: Attrs.inc.h
-FrontendAction.po: CommentCommandList.inc.h
-FrontendAction.po: DeclNodes.inc.h
-FrontendAction.po: DiagnosticCommonKinds.inc.h
-FrontendAction.po: DiagnosticFrontendKinds.inc.h
-FrontendAction.po: StmtNodes.inc.h
-FrontendActions.o: AttrList.inc.h
-FrontendActions.o: AttrParsedAttrList.inc.h
-FrontendActions.o: Attrs.inc.h
-FrontendActions.o: CommentCommandList.inc.h
-FrontendActions.o: DeclNodes.inc.h
-FrontendActions.o: DiagnosticCommonKinds.inc.h
-FrontendActions.o: DiagnosticFrontendKinds.inc.h
-FrontendActions.o: StmtNodes.inc.h
-FrontendActions.po: AttrList.inc.h
-FrontendActions.po: AttrParsedAttrList.inc.h
-FrontendActions.po: Attrs.inc.h
-FrontendActions.po: CommentCommandList.inc.h
-FrontendActions.po: DeclNodes.inc.h
-FrontendActions.po: DiagnosticCommonKinds.inc.h
-FrontendActions.po: DiagnosticFrontendKinds.inc.h
-FrontendActions.po: StmtNodes.inc.h
-HeaderIncludeGen.o: DiagnosticCommonKinds.inc.h
-HeaderIncludeGen.o: DiagnosticFrontendKinds.inc.h
-HeaderIncludeGen.po: DiagnosticCommonKinds.inc.h
-HeaderIncludeGen.po: DiagnosticFrontendKinds.inc.h
-InitHeaderSearch.o: DiagnosticCommonKinds.inc.h
-InitHeaderSearch.po: DiagnosticCommonKinds.inc.h
-InitPreprocessor.o: AttrList.inc.h
-InitPreprocessor.o: AttrParsedAttrList.inc.h
-InitPreprocessor.o: Attrs.inc.h
-InitPreprocessor.o: DeclNodes.inc.h
-InitPreprocessor.o: DiagnosticCommonKinds.inc.h
-InitPreprocessor.o: DiagnosticFrontendKinds.inc.h
-InitPreprocessor.o: StmtNodes.inc.h
-InitPreprocessor.po: AttrList.inc.h
-InitPreprocessor.po: AttrParsedAttrList.inc.h
-InitPreprocessor.po: Attrs.inc.h
-InitPreprocessor.po: DeclNodes.inc.h
-InitPreprocessor.po: DiagnosticCommonKinds.inc.h
-InitPreprocessor.po: DiagnosticFrontendKinds.inc.h
-InitPreprocessor.po: StmtNodes.inc.h
-LayoutOverrideSource.o: DeclNodes.inc.h
-LayoutOverrideSource.o: DiagnosticCommonKinds.inc.h
-LayoutOverrideSource.po: DeclNodes.inc.h
-LayoutOverrideSource.po: DiagnosticCommonKinds.inc.h
-LogDiagnosticPrinter.o: DiagnosticCommonKinds.inc.h
-LogDiagnosticPrinter.po: DiagnosticCommonKinds.inc.h
-ModuleDependencyCollector.o: AttrList.inc.h
-ModuleDependencyCollector.o: AttrParsedAttrList.inc.h
-ModuleDependencyCollector.o: Attrs.inc.h
-ModuleDependencyCollector.o: DeclNodes.inc.h
-ModuleDependencyCollector.o: DiagnosticCommonKinds.inc.h
-ModuleDependencyCollector.o: StmtNodes.inc.h
-ModuleDependencyCollector.po: AttrList.inc.h
-ModuleDependencyCollector.po: AttrParsedAttrList.inc.h
-ModuleDependencyCollector.po: Attrs.inc.h
-ModuleDependencyCollector.po: DeclNodes.inc.h
-ModuleDependencyCollector.po: DiagnosticCommonKinds.inc.h
-ModuleDependencyCollector.po: StmtNodes.inc.h
-MultiplexConsumer.o: DiagnosticCommonKinds.inc.h
-MultiplexConsumer.po: DiagnosticCommonKinds.inc.h
-PrintPreprocessedOutput.o: DiagnosticCommonKinds.inc.h
-PrintPreprocessedOutput.po: DiagnosticCommonKinds.inc.h
-SerializedDiagnosticPrinter.o: DiagnosticCommonKinds.inc.h
-SerializedDiagnosticPrinter.o: DiagnosticFrontendKinds.inc.h
-SerializedDiagnosticPrinter.po: DiagnosticCommonKinds.inc.h
-SerializedDiagnosticPrinter.po: DiagnosticFrontendKinds.inc.h
-TextDiagnostic.o: DiagnosticCommonKinds.inc.h
-TextDiagnostic.po: DiagnosticCommonKinds.inc.h
-TextDiagnosticBuffer.o: DiagnosticCommonKinds.inc.h
-TextDiagnosticBuffer.po: DiagnosticCommonKinds.inc.h
-TextDiagnosticPrinter.o: DiagnosticCommonKinds.inc.h
-TextDiagnosticPrinter.po: DiagnosticCommonKinds.inc.h
-VerifyDiagnosticConsumer.o: DiagnosticCommonKinds.inc.h
-VerifyDiagnosticConsumer.o: DiagnosticFrontendKinds.inc.h
-VerifyDiagnosticConsumer.po: DiagnosticCommonKinds.inc.h
-VerifyDiagnosticConsumer.po: DiagnosticFrontendKinds.inc.h
.endif
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
index 78a5190..9a1b84e 100644
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ b/lib/clang/libclangfrontendtool/Makefile.depend
@@ -14,16 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ExecuteCompilerInvocation.o: CommentCommandList.inc.h
-ExecuteCompilerInvocation.o: DeclNodes.inc.h
-ExecuteCompilerInvocation.o: DiagnosticCommonKinds.inc.h
-ExecuteCompilerInvocation.o: DiagnosticFrontendKinds.inc.h
-ExecuteCompilerInvocation.o: Options.inc.h
-ExecuteCompilerInvocation.o: StmtNodes.inc.h
-ExecuteCompilerInvocation.po: CommentCommandList.inc.h
-ExecuteCompilerInvocation.po: DeclNodes.inc.h
-ExecuteCompilerInvocation.po: DiagnosticCommonKinds.inc.h
-ExecuteCompilerInvocation.po: DiagnosticFrontendKinds.inc.h
-ExecuteCompilerInvocation.po: Options.inc.h
-ExecuteCompilerInvocation.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
index be86cb7..264ede1 100644
--- a/lib/clang/libclanglex/Makefile.depend
+++ b/lib/clang/libclanglex/Makefile.depend
@@ -13,72 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-HeaderSearch.o: DiagnosticCommonKinds.inc.h
-HeaderSearch.o: DiagnosticLexKinds.inc.h
-HeaderSearch.po: DiagnosticCommonKinds.inc.h
-HeaderSearch.po: DiagnosticLexKinds.inc.h
-Lexer.o: DiagnosticCommonKinds.inc.h
-Lexer.o: DiagnosticLexKinds.inc.h
-Lexer.po: DiagnosticCommonKinds.inc.h
-Lexer.po: DiagnosticLexKinds.inc.h
-LiteralSupport.o: DiagnosticCommonKinds.inc.h
-LiteralSupport.o: DiagnosticLexKinds.inc.h
-LiteralSupport.po: DiagnosticCommonKinds.inc.h
-LiteralSupport.po: DiagnosticLexKinds.inc.h
-MacroArgs.o: DiagnosticCommonKinds.inc.h
-MacroArgs.o: DiagnosticLexKinds.inc.h
-MacroArgs.po: DiagnosticCommonKinds.inc.h
-MacroArgs.po: DiagnosticLexKinds.inc.h
-MacroInfo.o: DiagnosticCommonKinds.inc.h
-MacroInfo.po: DiagnosticCommonKinds.inc.h
-ModuleMap.o: DiagnosticCommonKinds.inc.h
-ModuleMap.o: DiagnosticLexKinds.inc.h
-ModuleMap.po: DiagnosticCommonKinds.inc.h
-ModuleMap.po: DiagnosticLexKinds.inc.h
-PPCaching.o: DiagnosticCommonKinds.inc.h
-PPCaching.po: DiagnosticCommonKinds.inc.h
-PPCallbacks.o: DiagnosticCommonKinds.inc.h
-PPCallbacks.po: DiagnosticCommonKinds.inc.h
-PPConditionalDirectiveRecord.o: DiagnosticCommonKinds.inc.h
-PPConditionalDirectiveRecord.po: DiagnosticCommonKinds.inc.h
-PPDirectives.o: DiagnosticCommonKinds.inc.h
-PPDirectives.o: DiagnosticLexKinds.inc.h
-PPDirectives.po: DiagnosticCommonKinds.inc.h
-PPDirectives.po: DiagnosticLexKinds.inc.h
-PPExpressions.o: DiagnosticCommonKinds.inc.h
-PPExpressions.o: DiagnosticLexKinds.inc.h
-PPExpressions.po: DiagnosticCommonKinds.inc.h
-PPExpressions.po: DiagnosticLexKinds.inc.h
-PPLexerChange.o: DiagnosticCommonKinds.inc.h
-PPLexerChange.o: DiagnosticLexKinds.inc.h
-PPLexerChange.po: DiagnosticCommonKinds.inc.h
-PPLexerChange.po: DiagnosticLexKinds.inc.h
-PPMacroExpansion.o: DiagnosticCommonKinds.inc.h
-PPMacroExpansion.o: DiagnosticLexKinds.inc.h
-PPMacroExpansion.po: DiagnosticCommonKinds.inc.h
-PPMacroExpansion.po: DiagnosticLexKinds.inc.h
-PTHLexer.o: DiagnosticCommonKinds.inc.h
-PTHLexer.o: DiagnosticLexKinds.inc.h
-PTHLexer.po: DiagnosticCommonKinds.inc.h
-PTHLexer.po: DiagnosticLexKinds.inc.h
-Pragma.o: DiagnosticCommonKinds.inc.h
-Pragma.o: DiagnosticLexKinds.inc.h
-Pragma.po: DiagnosticCommonKinds.inc.h
-Pragma.po: DiagnosticLexKinds.inc.h
-PreprocessingRecord.o: DiagnosticCommonKinds.inc.h
-PreprocessingRecord.po: DiagnosticCommonKinds.inc.h
-Preprocessor.o: DiagnosticCommonKinds.inc.h
-Preprocessor.o: DiagnosticLexKinds.inc.h
-Preprocessor.po: DiagnosticCommonKinds.inc.h
-Preprocessor.po: DiagnosticLexKinds.inc.h
-PreprocessorLexer.o: DiagnosticCommonKinds.inc.h
-PreprocessorLexer.o: DiagnosticLexKinds.inc.h
-PreprocessorLexer.po: DiagnosticCommonKinds.inc.h
-PreprocessorLexer.po: DiagnosticLexKinds.inc.h
-TokenConcatenation.o: DiagnosticCommonKinds.inc.h
-TokenConcatenation.po: DiagnosticCommonKinds.inc.h
-TokenLexer.o: DiagnosticCommonKinds.inc.h
-TokenLexer.o: DiagnosticLexKinds.inc.h
-TokenLexer.po: DiagnosticCommonKinds.inc.h
-TokenLexer.po: DiagnosticLexKinds.inc.h
.endif
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
index 9c2e889..264ede1 100644
--- a/lib/clang/libclangparse/Makefile.depend
+++ b/lib/clang/libclangparse/Makefile.depend
@@ -13,242 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ParseAST.o: AttrList.inc.h
-ParseAST.o: AttrParsedAttrList.inc.h
-ParseAST.o: Attrs.inc.h
-ParseAST.o: CommentCommandList.inc.h
-ParseAST.o: DeclNodes.inc.h
-ParseAST.o: DiagnosticCommonKinds.inc.h
-ParseAST.o: DiagnosticParseKinds.inc.h
-ParseAST.o: StmtNodes.inc.h
-ParseAST.po: AttrList.inc.h
-ParseAST.po: AttrParsedAttrList.inc.h
-ParseAST.po: Attrs.inc.h
-ParseAST.po: CommentCommandList.inc.h
-ParseAST.po: DeclNodes.inc.h
-ParseAST.po: DiagnosticCommonKinds.inc.h
-ParseAST.po: DiagnosticParseKinds.inc.h
-ParseAST.po: StmtNodes.inc.h
-ParseCXXInlineMethods.o: AttrList.inc.h
-ParseCXXInlineMethods.o: AttrParsedAttrList.inc.h
-ParseCXXInlineMethods.o: Attrs.inc.h
-ParseCXXInlineMethods.o: DeclNodes.inc.h
-ParseCXXInlineMethods.o: DiagnosticCommonKinds.inc.h
-ParseCXXInlineMethods.o: DiagnosticParseKinds.inc.h
-ParseCXXInlineMethods.o: StmtNodes.inc.h
-ParseCXXInlineMethods.po: AttrList.inc.h
-ParseCXXInlineMethods.po: AttrParsedAttrList.inc.h
-ParseCXXInlineMethods.po: Attrs.inc.h
-ParseCXXInlineMethods.po: DeclNodes.inc.h
-ParseCXXInlineMethods.po: DiagnosticCommonKinds.inc.h
-ParseCXXInlineMethods.po: DiagnosticParseKinds.inc.h
-ParseCXXInlineMethods.po: StmtNodes.inc.h
-ParseDecl.o: AttrList.inc.h
-ParseDecl.o: AttrParsedAttrList.inc.h
-ParseDecl.o: AttrParserStringSwitches.inc.h
-ParseDecl.o: Attrs.inc.h
-ParseDecl.o: CommentCommandList.inc.h
-ParseDecl.o: DeclNodes.inc.h
-ParseDecl.o: DiagnosticCommonKinds.inc.h
-ParseDecl.o: DiagnosticParseKinds.inc.h
-ParseDecl.o: StmtNodes.inc.h
-ParseDecl.po: AttrList.inc.h
-ParseDecl.po: AttrParsedAttrList.inc.h
-ParseDecl.po: AttrParserStringSwitches.inc.h
-ParseDecl.po: Attrs.inc.h
-ParseDecl.po: CommentCommandList.inc.h
-ParseDecl.po: DeclNodes.inc.h
-ParseDecl.po: DiagnosticCommonKinds.inc.h
-ParseDecl.po: DiagnosticParseKinds.inc.h
-ParseDecl.po: StmtNodes.inc.h
-ParseDeclCXX.o: AttrList.inc.h
-ParseDeclCXX.o: AttrParsedAttrList.inc.h
-ParseDeclCXX.o: Attrs.inc.h
-ParseDeclCXX.o: CommentCommandList.inc.h
-ParseDeclCXX.o: DeclNodes.inc.h
-ParseDeclCXX.o: DiagnosticCommonKinds.inc.h
-ParseDeclCXX.o: DiagnosticParseKinds.inc.h
-ParseDeclCXX.o: DiagnosticSemaKinds.inc.h
-ParseDeclCXX.o: StmtNodes.inc.h
-ParseDeclCXX.po: AttrList.inc.h
-ParseDeclCXX.po: AttrParsedAttrList.inc.h
-ParseDeclCXX.po: Attrs.inc.h
-ParseDeclCXX.po: CommentCommandList.inc.h
-ParseDeclCXX.po: DeclNodes.inc.h
-ParseDeclCXX.po: DiagnosticCommonKinds.inc.h
-ParseDeclCXX.po: DiagnosticParseKinds.inc.h
-ParseDeclCXX.po: DiagnosticSemaKinds.inc.h
-ParseDeclCXX.po: StmtNodes.inc.h
-ParseExpr.o: AttrList.inc.h
-ParseExpr.o: AttrParsedAttrList.inc.h
-ParseExpr.o: Attrs.inc.h
-ParseExpr.o: CommentCommandList.inc.h
-ParseExpr.o: DeclNodes.inc.h
-ParseExpr.o: DiagnosticCommonKinds.inc.h
-ParseExpr.o: DiagnosticParseKinds.inc.h
-ParseExpr.o: StmtNodes.inc.h
-ParseExpr.po: AttrList.inc.h
-ParseExpr.po: AttrParsedAttrList.inc.h
-ParseExpr.po: Attrs.inc.h
-ParseExpr.po: CommentCommandList.inc.h
-ParseExpr.po: DeclNodes.inc.h
-ParseExpr.po: DiagnosticCommonKinds.inc.h
-ParseExpr.po: DiagnosticParseKinds.inc.h
-ParseExpr.po: StmtNodes.inc.h
-ParseExprCXX.o: AttrList.inc.h
-ParseExprCXX.o: AttrParsedAttrList.inc.h
-ParseExprCXX.o: Attrs.inc.h
-ParseExprCXX.o: CommentCommandList.inc.h
-ParseExprCXX.o: DeclNodes.inc.h
-ParseExprCXX.o: DiagnosticCommonKinds.inc.h
-ParseExprCXX.o: DiagnosticParseKinds.inc.h
-ParseExprCXX.o: StmtNodes.inc.h
-ParseExprCXX.po: AttrList.inc.h
-ParseExprCXX.po: AttrParsedAttrList.inc.h
-ParseExprCXX.po: Attrs.inc.h
-ParseExprCXX.po: CommentCommandList.inc.h
-ParseExprCXX.po: DeclNodes.inc.h
-ParseExprCXX.po: DiagnosticCommonKinds.inc.h
-ParseExprCXX.po: DiagnosticParseKinds.inc.h
-ParseExprCXX.po: StmtNodes.inc.h
-ParseInit.o: AttrList.inc.h
-ParseInit.o: AttrParsedAttrList.inc.h
-ParseInit.o: Attrs.inc.h
-ParseInit.o: DeclNodes.inc.h
-ParseInit.o: DiagnosticCommonKinds.inc.h
-ParseInit.o: DiagnosticParseKinds.inc.h
-ParseInit.o: StmtNodes.inc.h
-ParseInit.po: AttrList.inc.h
-ParseInit.po: AttrParsedAttrList.inc.h
-ParseInit.po: Attrs.inc.h
-ParseInit.po: DeclNodes.inc.h
-ParseInit.po: DiagnosticCommonKinds.inc.h
-ParseInit.po: DiagnosticParseKinds.inc.h
-ParseInit.po: StmtNodes.inc.h
-ParseObjc.o: AttrList.inc.h
-ParseObjc.o: AttrParsedAttrList.inc.h
-ParseObjc.o: Attrs.inc.h
-ParseObjc.o: CommentCommandList.inc.h
-ParseObjc.o: DeclNodes.inc.h
-ParseObjc.o: DiagnosticCommonKinds.inc.h
-ParseObjc.o: DiagnosticParseKinds.inc.h
-ParseObjc.o: StmtNodes.inc.h
-ParseObjc.po: AttrList.inc.h
-ParseObjc.po: AttrParsedAttrList.inc.h
-ParseObjc.po: Attrs.inc.h
-ParseObjc.po: CommentCommandList.inc.h
-ParseObjc.po: DeclNodes.inc.h
-ParseObjc.po: DiagnosticCommonKinds.inc.h
-ParseObjc.po: DiagnosticParseKinds.inc.h
-ParseObjc.po: StmtNodes.inc.h
-ParseOpenMP.o: AttrList.inc.h
-ParseOpenMP.o: AttrParsedAttrList.inc.h
-ParseOpenMP.o: Attrs.inc.h
-ParseOpenMP.o: CommentCommandList.inc.h
-ParseOpenMP.o: DeclNodes.inc.h
-ParseOpenMP.o: DiagnosticCommonKinds.inc.h
-ParseOpenMP.o: DiagnosticParseKinds.inc.h
-ParseOpenMP.o: StmtNodes.inc.h
-ParseOpenMP.po: AttrList.inc.h
-ParseOpenMP.po: AttrParsedAttrList.inc.h
-ParseOpenMP.po: Attrs.inc.h
-ParseOpenMP.po: CommentCommandList.inc.h
-ParseOpenMP.po: DeclNodes.inc.h
-ParseOpenMP.po: DiagnosticCommonKinds.inc.h
-ParseOpenMP.po: DiagnosticParseKinds.inc.h
-ParseOpenMP.po: StmtNodes.inc.h
-ParsePragma.o: AttrList.inc.h
-ParsePragma.o: AttrParsedAttrList.inc.h
-ParsePragma.o: Attrs.inc.h
-ParsePragma.o: CommentCommandList.inc.h
-ParsePragma.o: DeclNodes.inc.h
-ParsePragma.o: DiagnosticCommonKinds.inc.h
-ParsePragma.o: DiagnosticParseKinds.inc.h
-ParsePragma.o: StmtNodes.inc.h
-ParsePragma.po: AttrList.inc.h
-ParsePragma.po: AttrParsedAttrList.inc.h
-ParsePragma.po: Attrs.inc.h
-ParsePragma.po: CommentCommandList.inc.h
-ParsePragma.po: DeclNodes.inc.h
-ParsePragma.po: DiagnosticCommonKinds.inc.h
-ParsePragma.po: DiagnosticParseKinds.inc.h
-ParsePragma.po: StmtNodes.inc.h
-ParseStmt.o: AttrList.inc.h
-ParseStmt.o: AttrParsedAttrList.inc.h
-ParseStmt.o: Attrs.inc.h
-ParseStmt.o: CommentCommandList.inc.h
-ParseStmt.o: DeclNodes.inc.h
-ParseStmt.o: DiagnosticCommonKinds.inc.h
-ParseStmt.o: DiagnosticParseKinds.inc.h
-ParseStmt.o: StmtNodes.inc.h
-ParseStmt.po: AttrList.inc.h
-ParseStmt.po: AttrParsedAttrList.inc.h
-ParseStmt.po: Attrs.inc.h
-ParseStmt.po: CommentCommandList.inc.h
-ParseStmt.po: DeclNodes.inc.h
-ParseStmt.po: DiagnosticCommonKinds.inc.h
-ParseStmt.po: DiagnosticParseKinds.inc.h
-ParseStmt.po: StmtNodes.inc.h
-ParseStmtAsm.o: AttrList.inc.h
-ParseStmtAsm.o: AttrParsedAttrList.inc.h
-ParseStmtAsm.o: Attrs.inc.h
-ParseStmtAsm.o: CommentCommandList.inc.h
-ParseStmtAsm.o: DeclNodes.inc.h
-ParseStmtAsm.o: DiagnosticCommonKinds.inc.h
-ParseStmtAsm.o: DiagnosticParseKinds.inc.h
-ParseStmtAsm.o: StmtNodes.inc.h
-ParseStmtAsm.po: AttrList.inc.h
-ParseStmtAsm.po: AttrParsedAttrList.inc.h
-ParseStmtAsm.po: Attrs.inc.h
-ParseStmtAsm.po: CommentCommandList.inc.h
-ParseStmtAsm.po: DeclNodes.inc.h
-ParseStmtAsm.po: DiagnosticCommonKinds.inc.h
-ParseStmtAsm.po: DiagnosticParseKinds.inc.h
-ParseStmtAsm.po: StmtNodes.inc.h
-ParseTemplate.o: AttrList.inc.h
-ParseTemplate.o: AttrParsedAttrList.inc.h
-ParseTemplate.o: Attrs.inc.h
-ParseTemplate.o: CommentCommandList.inc.h
-ParseTemplate.o: DeclNodes.inc.h
-ParseTemplate.o: DiagnosticCommonKinds.inc.h
-ParseTemplate.o: DiagnosticParseKinds.inc.h
-ParseTemplate.o: StmtNodes.inc.h
-ParseTemplate.po: AttrList.inc.h
-ParseTemplate.po: AttrParsedAttrList.inc.h
-ParseTemplate.po: Attrs.inc.h
-ParseTemplate.po: CommentCommandList.inc.h
-ParseTemplate.po: DeclNodes.inc.h
-ParseTemplate.po: DiagnosticCommonKinds.inc.h
-ParseTemplate.po: DiagnosticParseKinds.inc.h
-ParseTemplate.po: StmtNodes.inc.h
-ParseTentative.o: AttrList.inc.h
-ParseTentative.o: AttrParsedAttrList.inc.h
-ParseTentative.o: Attrs.inc.h
-ParseTentative.o: DeclNodes.inc.h
-ParseTentative.o: DiagnosticCommonKinds.inc.h
-ParseTentative.o: DiagnosticParseKinds.inc.h
-ParseTentative.o: StmtNodes.inc.h
-ParseTentative.po: AttrList.inc.h
-ParseTentative.po: AttrParsedAttrList.inc.h
-ParseTentative.po: Attrs.inc.h
-ParseTentative.po: DeclNodes.inc.h
-ParseTentative.po: DiagnosticCommonKinds.inc.h
-ParseTentative.po: DiagnosticParseKinds.inc.h
-ParseTentative.po: StmtNodes.inc.h
-Parser.o: AttrList.inc.h
-Parser.o: AttrParsedAttrList.inc.h
-Parser.o: Attrs.inc.h
-Parser.o: CommentCommandList.inc.h
-Parser.o: DeclNodes.inc.h
-Parser.o: DiagnosticCommonKinds.inc.h
-Parser.o: DiagnosticParseKinds.inc.h
-Parser.o: StmtNodes.inc.h
-Parser.po: AttrList.inc.h
-Parser.po: AttrParsedAttrList.inc.h
-Parser.po: Attrs.inc.h
-Parser.po: CommentCommandList.inc.h
-Parser.po: DeclNodes.inc.h
-Parser.po: DiagnosticCommonKinds.inc.h
-Parser.po: DiagnosticParseKinds.inc.h
-Parser.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangrewrite/Makefile.depend b/lib/clang/libclangrewrite/Makefile.depend
index a6f8e9c..264ede1 100644
--- a/lib/clang/libclangrewrite/Makefile.depend
+++ b/lib/clang/libclangrewrite/Makefile.depend
@@ -13,8 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-HTMLRewrite.o: DiagnosticCommonKinds.inc.h
-HTMLRewrite.po: DiagnosticCommonKinds.inc.h
-Rewriter.o: DiagnosticCommonKinds.inc.h
-Rewriter.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/libclangrewritefrontend/Makefile.depend b/lib/clang/libclangrewritefrontend/Makefile.depend
index 6bb290f..264ede1 100644
--- a/lib/clang/libclangrewritefrontend/Makefile.depend
+++ b/lib/clang/libclangrewritefrontend/Makefile.depend
@@ -13,38 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-FixItRewriter.o: DiagnosticCommonKinds.inc.h
-FixItRewriter.o: DiagnosticFrontendKinds.inc.h
-FixItRewriter.po: DiagnosticCommonKinds.inc.h
-FixItRewriter.po: DiagnosticFrontendKinds.inc.h
-FrontendActions.o: AttrList.inc.h
-FrontendActions.o: AttrParsedAttrList.inc.h
-FrontendActions.o: Attrs.inc.h
-FrontendActions.o: CommentCommandList.inc.h
-FrontendActions.o: DeclNodes.inc.h
-FrontendActions.o: DiagnosticCommonKinds.inc.h
-FrontendActions.o: DiagnosticFrontendKinds.inc.h
-FrontendActions.o: StmtNodes.inc.h
-FrontendActions.po: AttrList.inc.h
-FrontendActions.po: AttrParsedAttrList.inc.h
-FrontendActions.po: Attrs.inc.h
-FrontendActions.po: CommentCommandList.inc.h
-FrontendActions.po: DeclNodes.inc.h
-FrontendActions.po: DiagnosticCommonKinds.inc.h
-FrontendActions.po: DiagnosticFrontendKinds.inc.h
-FrontendActions.po: StmtNodes.inc.h
-HTMLPrint.o: CommentCommandList.inc.h
-HTMLPrint.o: DeclNodes.inc.h
-HTMLPrint.o: DiagnosticCommonKinds.inc.h
-HTMLPrint.o: StmtNodes.inc.h
-HTMLPrint.po: CommentCommandList.inc.h
-HTMLPrint.po: DeclNodes.inc.h
-HTMLPrint.po: DiagnosticCommonKinds.inc.h
-HTMLPrint.po: StmtNodes.inc.h
-InclusionRewriter.o: DiagnosticCommonKinds.inc.h
-InclusionRewriter.po: DiagnosticCommonKinds.inc.h
-RewriteMacros.o: DiagnosticCommonKinds.inc.h
-RewriteMacros.po: DiagnosticCommonKinds.inc.h
-RewriteTest.o: DiagnosticCommonKinds.inc.h
-RewriteTest.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
index 158b16d..264ede1 100644
--- a/lib/clang/libclangsema/Makefile.depend
+++ b/lib/clang/libclangsema/Makefile.depend
@@ -13,710 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalysisBasedWarnings.o: AttrList.inc.h
-AnalysisBasedWarnings.o: AttrParsedAttrList.inc.h
-AnalysisBasedWarnings.o: AttrVisitor.inc.h
-AnalysisBasedWarnings.o: Attrs.inc.h
-AnalysisBasedWarnings.o: CommentCommandList.inc.h
-AnalysisBasedWarnings.o: DeclNodes.inc.h
-AnalysisBasedWarnings.o: DiagnosticCommonKinds.inc.h
-AnalysisBasedWarnings.o: DiagnosticSemaKinds.inc.h
-AnalysisBasedWarnings.o: StmtNodes.inc.h
-AnalysisBasedWarnings.po: AttrList.inc.h
-AnalysisBasedWarnings.po: AttrParsedAttrList.inc.h
-AnalysisBasedWarnings.po: AttrVisitor.inc.h
-AnalysisBasedWarnings.po: Attrs.inc.h
-AnalysisBasedWarnings.po: CommentCommandList.inc.h
-AnalysisBasedWarnings.po: DeclNodes.inc.h
-AnalysisBasedWarnings.po: DiagnosticCommonKinds.inc.h
-AnalysisBasedWarnings.po: DiagnosticSemaKinds.inc.h
-AnalysisBasedWarnings.po: StmtNodes.inc.h
-AttributeList.o: AttrList.inc.h
-AttributeList.o: AttrParsedAttrImpl.inc.h
-AttributeList.o: AttrParsedAttrKinds.inc.h
-AttributeList.o: AttrParsedAttrList.inc.h
-AttributeList.o: AttrSpellingListIndex.inc.h
-AttributeList.o: Attrs.inc.h
-AttributeList.o: CommentCommandList.inc.h
-AttributeList.o: DeclNodes.inc.h
-AttributeList.o: DiagnosticCommonKinds.inc.h
-AttributeList.o: DiagnosticSemaKinds.inc.h
-AttributeList.o: StmtNodes.inc.h
-AttributeList.po: AttrList.inc.h
-AttributeList.po: AttrParsedAttrImpl.inc.h
-AttributeList.po: AttrParsedAttrKinds.inc.h
-AttributeList.po: AttrParsedAttrList.inc.h
-AttributeList.po: AttrSpellingListIndex.inc.h
-AttributeList.po: Attrs.inc.h
-AttributeList.po: CommentCommandList.inc.h
-AttributeList.po: DeclNodes.inc.h
-AttributeList.po: DiagnosticCommonKinds.inc.h
-AttributeList.po: DiagnosticSemaKinds.inc.h
-AttributeList.po: StmtNodes.inc.h
-CodeCompleteConsumer.o: AttrList.inc.h
-CodeCompleteConsumer.o: AttrParsedAttrList.inc.h
-CodeCompleteConsumer.o: Attrs.inc.h
-CodeCompleteConsumer.o: DeclNodes.inc.h
-CodeCompleteConsumer.o: DiagnosticCommonKinds.inc.h
-CodeCompleteConsumer.o: StmtNodes.inc.h
-CodeCompleteConsumer.po: AttrList.inc.h
-CodeCompleteConsumer.po: AttrParsedAttrList.inc.h
-CodeCompleteConsumer.po: Attrs.inc.h
-CodeCompleteConsumer.po: DeclNodes.inc.h
-CodeCompleteConsumer.po: DiagnosticCommonKinds.inc.h
-CodeCompleteConsumer.po: StmtNodes.inc.h
-DeclSpec.o: AttrList.inc.h
-DeclSpec.o: AttrParsedAttrList.inc.h
-DeclSpec.o: Attrs.inc.h
-DeclSpec.o: CommentCommandList.inc.h
-DeclSpec.o: DeclNodes.inc.h
-DeclSpec.o: DiagnosticCommonKinds.inc.h
-DeclSpec.o: DiagnosticParseKinds.inc.h
-DeclSpec.o: DiagnosticSemaKinds.inc.h
-DeclSpec.o: StmtNodes.inc.h
-DeclSpec.po: AttrList.inc.h
-DeclSpec.po: AttrParsedAttrList.inc.h
-DeclSpec.po: Attrs.inc.h
-DeclSpec.po: CommentCommandList.inc.h
-DeclSpec.po: DeclNodes.inc.h
-DeclSpec.po: DiagnosticCommonKinds.inc.h
-DeclSpec.po: DiagnosticParseKinds.inc.h
-DeclSpec.po: DiagnosticSemaKinds.inc.h
-DeclSpec.po: StmtNodes.inc.h
-DelayedDiagnostic.o: AttrList.inc.h
-DelayedDiagnostic.o: AttrParsedAttrList.inc.h
-DelayedDiagnostic.o: Attrs.inc.h
-DelayedDiagnostic.o: DeclNodes.inc.h
-DelayedDiagnostic.o: DiagnosticCommonKinds.inc.h
-DelayedDiagnostic.o: StmtNodes.inc.h
-DelayedDiagnostic.po: AttrList.inc.h
-DelayedDiagnostic.po: AttrParsedAttrList.inc.h
-DelayedDiagnostic.po: Attrs.inc.h
-DelayedDiagnostic.po: DeclNodes.inc.h
-DelayedDiagnostic.po: DiagnosticCommonKinds.inc.h
-DelayedDiagnostic.po: StmtNodes.inc.h
-IdentifierResolver.o: DeclNodes.inc.h
-IdentifierResolver.o: DiagnosticCommonKinds.inc.h
-IdentifierResolver.po: DeclNodes.inc.h
-IdentifierResolver.po: DiagnosticCommonKinds.inc.h
-JumpDiagnostics.o: AttrList.inc.h
-JumpDiagnostics.o: AttrParsedAttrList.inc.h
-JumpDiagnostics.o: Attrs.inc.h
-JumpDiagnostics.o: CommentCommandList.inc.h
-JumpDiagnostics.o: DeclNodes.inc.h
-JumpDiagnostics.o: DiagnosticCommonKinds.inc.h
-JumpDiagnostics.o: DiagnosticSemaKinds.inc.h
-JumpDiagnostics.o: StmtNodes.inc.h
-JumpDiagnostics.po: AttrList.inc.h
-JumpDiagnostics.po: AttrParsedAttrList.inc.h
-JumpDiagnostics.po: Attrs.inc.h
-JumpDiagnostics.po: CommentCommandList.inc.h
-JumpDiagnostics.po: DeclNodes.inc.h
-JumpDiagnostics.po: DiagnosticCommonKinds.inc.h
-JumpDiagnostics.po: DiagnosticSemaKinds.inc.h
-JumpDiagnostics.po: StmtNodes.inc.h
-MultiplexExternalSemaSource.o: AttrList.inc.h
-MultiplexExternalSemaSource.o: AttrParsedAttrList.inc.h
-MultiplexExternalSemaSource.o: Attrs.inc.h
-MultiplexExternalSemaSource.o: DeclNodes.inc.h
-MultiplexExternalSemaSource.o: DiagnosticCommonKinds.inc.h
-MultiplexExternalSemaSource.o: StmtNodes.inc.h
-MultiplexExternalSemaSource.po: AttrList.inc.h
-MultiplexExternalSemaSource.po: AttrParsedAttrList.inc.h
-MultiplexExternalSemaSource.po: Attrs.inc.h
-MultiplexExternalSemaSource.po: DeclNodes.inc.h
-MultiplexExternalSemaSource.po: DiagnosticCommonKinds.inc.h
-MultiplexExternalSemaSource.po: StmtNodes.inc.h
-Scope.o: DeclNodes.inc.h
-Scope.o: DiagnosticCommonKinds.inc.h
-Scope.po: DeclNodes.inc.h
-Scope.po: DiagnosticCommonKinds.inc.h
-ScopeInfo.o: AttrList.inc.h
-ScopeInfo.o: Attrs.inc.h
-ScopeInfo.o: DeclNodes.inc.h
-ScopeInfo.o: DiagnosticCommonKinds.inc.h
-ScopeInfo.o: StmtNodes.inc.h
-ScopeInfo.po: AttrList.inc.h
-ScopeInfo.po: Attrs.inc.h
-ScopeInfo.po: DeclNodes.inc.h
-ScopeInfo.po: DiagnosticCommonKinds.inc.h
-ScopeInfo.po: StmtNodes.inc.h
-Sema.o: AttrList.inc.h
-Sema.o: AttrParsedAttrList.inc.h
-Sema.o: Attrs.inc.h
-Sema.o: CommentCommandList.inc.h
-Sema.o: DeclNodes.inc.h
-Sema.o: DiagnosticASTKinds.inc.h
-Sema.o: DiagnosticCommonKinds.inc.h
-Sema.o: DiagnosticSemaKinds.inc.h
-Sema.o: StmtNodes.inc.h
-Sema.po: AttrList.inc.h
-Sema.po: AttrParsedAttrList.inc.h
-Sema.po: Attrs.inc.h
-Sema.po: CommentCommandList.inc.h
-Sema.po: DeclNodes.inc.h
-Sema.po: DiagnosticASTKinds.inc.h
-Sema.po: DiagnosticCommonKinds.inc.h
-Sema.po: DiagnosticSemaKinds.inc.h
-Sema.po: StmtNodes.inc.h
-SemaAccess.o: AttrList.inc.h
-SemaAccess.o: AttrParsedAttrList.inc.h
-SemaAccess.o: Attrs.inc.h
-SemaAccess.o: CommentCommandList.inc.h
-SemaAccess.o: DeclNodes.inc.h
-SemaAccess.o: DiagnosticCommonKinds.inc.h
-SemaAccess.o: DiagnosticSemaKinds.inc.h
-SemaAccess.o: StmtNodes.inc.h
-SemaAccess.po: AttrList.inc.h
-SemaAccess.po: AttrParsedAttrList.inc.h
-SemaAccess.po: Attrs.inc.h
-SemaAccess.po: CommentCommandList.inc.h
-SemaAccess.po: DeclNodes.inc.h
-SemaAccess.po: DiagnosticCommonKinds.inc.h
-SemaAccess.po: DiagnosticSemaKinds.inc.h
-SemaAccess.po: StmtNodes.inc.h
-SemaAttr.o: AttrList.inc.h
-SemaAttr.o: AttrParsedAttrList.inc.h
-SemaAttr.o: Attrs.inc.h
-SemaAttr.o: CommentCommandList.inc.h
-SemaAttr.o: DeclNodes.inc.h
-SemaAttr.o: DiagnosticCommonKinds.inc.h
-SemaAttr.o: DiagnosticSemaKinds.inc.h
-SemaAttr.o: StmtNodes.inc.h
-SemaAttr.po: AttrList.inc.h
-SemaAttr.po: AttrParsedAttrList.inc.h
-SemaAttr.po: Attrs.inc.h
-SemaAttr.po: CommentCommandList.inc.h
-SemaAttr.po: DeclNodes.inc.h
-SemaAttr.po: DiagnosticCommonKinds.inc.h
-SemaAttr.po: DiagnosticSemaKinds.inc.h
-SemaAttr.po: StmtNodes.inc.h
-SemaCUDA.o: AttrList.inc.h
-SemaCUDA.o: AttrParsedAttrList.inc.h
-SemaCUDA.o: Attrs.inc.h
-SemaCUDA.o: CommentCommandList.inc.h
-SemaCUDA.o: DeclNodes.inc.h
-SemaCUDA.o: DiagnosticCommonKinds.inc.h
-SemaCUDA.o: DiagnosticSemaKinds.inc.h
-SemaCUDA.o: StmtNodes.inc.h
-SemaCUDA.po: AttrList.inc.h
-SemaCUDA.po: AttrParsedAttrList.inc.h
-SemaCUDA.po: Attrs.inc.h
-SemaCUDA.po: CommentCommandList.inc.h
-SemaCUDA.po: DeclNodes.inc.h
-SemaCUDA.po: DiagnosticCommonKinds.inc.h
-SemaCUDA.po: DiagnosticSemaKinds.inc.h
-SemaCUDA.po: StmtNodes.inc.h
-SemaCXXScopeSpec.o: AttrList.inc.h
-SemaCXXScopeSpec.o: AttrParsedAttrList.inc.h
-SemaCXXScopeSpec.o: Attrs.inc.h
-SemaCXXScopeSpec.o: CommentCommandList.inc.h
-SemaCXXScopeSpec.o: DeclNodes.inc.h
-SemaCXXScopeSpec.o: DiagnosticCommonKinds.inc.h
-SemaCXXScopeSpec.o: DiagnosticSemaKinds.inc.h
-SemaCXXScopeSpec.o: StmtNodes.inc.h
-SemaCXXScopeSpec.po: AttrList.inc.h
-SemaCXXScopeSpec.po: AttrParsedAttrList.inc.h
-SemaCXXScopeSpec.po: Attrs.inc.h
-SemaCXXScopeSpec.po: CommentCommandList.inc.h
-SemaCXXScopeSpec.po: DeclNodes.inc.h
-SemaCXXScopeSpec.po: DiagnosticCommonKinds.inc.h
-SemaCXXScopeSpec.po: DiagnosticSemaKinds.inc.h
-SemaCXXScopeSpec.po: StmtNodes.inc.h
-SemaCast.o: AttrList.inc.h
-SemaCast.o: AttrParsedAttrList.inc.h
-SemaCast.o: Attrs.inc.h
-SemaCast.o: CommentCommandList.inc.h
-SemaCast.o: DeclNodes.inc.h
-SemaCast.o: DiagnosticCommonKinds.inc.h
-SemaCast.o: DiagnosticSemaKinds.inc.h
-SemaCast.o: StmtNodes.inc.h
-SemaCast.po: AttrList.inc.h
-SemaCast.po: AttrParsedAttrList.inc.h
-SemaCast.po: Attrs.inc.h
-SemaCast.po: CommentCommandList.inc.h
-SemaCast.po: DeclNodes.inc.h
-SemaCast.po: DiagnosticCommonKinds.inc.h
-SemaCast.po: DiagnosticSemaKinds.inc.h
-SemaCast.po: StmtNodes.inc.h
-SemaChecking.o: AttrList.inc.h
-SemaChecking.o: AttrParsedAttrList.inc.h
-SemaChecking.o: Attrs.inc.h
-SemaChecking.o: CommentCommandList.inc.h
-SemaChecking.o: DeclNodes.inc.h
-SemaChecking.o: DiagnosticCommonKinds.inc.h
-SemaChecking.o: DiagnosticSemaKinds.inc.h
-SemaChecking.o: StmtNodes.inc.h
-SemaChecking.o: arm_neon.inc.h
-SemaChecking.po: AttrList.inc.h
-SemaChecking.po: AttrParsedAttrList.inc.h
-SemaChecking.po: Attrs.inc.h
-SemaChecking.po: CommentCommandList.inc.h
-SemaChecking.po: DeclNodes.inc.h
-SemaChecking.po: DiagnosticCommonKinds.inc.h
-SemaChecking.po: DiagnosticSemaKinds.inc.h
-SemaChecking.po: StmtNodes.inc.h
-SemaChecking.po: arm_neon.inc.h
-SemaCodeComplete.o: AttrList.inc.h
-SemaCodeComplete.o: AttrParsedAttrList.inc.h
-SemaCodeComplete.o: Attrs.inc.h
-SemaCodeComplete.o: CommentCommandList.inc.h
-SemaCodeComplete.o: DeclNodes.inc.h
-SemaCodeComplete.o: DiagnosticCommonKinds.inc.h
-SemaCodeComplete.o: DiagnosticSemaKinds.inc.h
-SemaCodeComplete.o: StmtNodes.inc.h
-SemaCodeComplete.po: AttrList.inc.h
-SemaCodeComplete.po: AttrParsedAttrList.inc.h
-SemaCodeComplete.po: Attrs.inc.h
-SemaCodeComplete.po: CommentCommandList.inc.h
-SemaCodeComplete.po: DeclNodes.inc.h
-SemaCodeComplete.po: DiagnosticCommonKinds.inc.h
-SemaCodeComplete.po: DiagnosticSemaKinds.inc.h
-SemaCodeComplete.po: StmtNodes.inc.h
-SemaDecl.o: AttrList.inc.h
-SemaDecl.o: AttrParsedAttrList.inc.h
-SemaDecl.o: Attrs.inc.h
-SemaDecl.o: CommentCommandList.inc.h
-SemaDecl.o: DeclNodes.inc.h
-SemaDecl.o: DiagnosticCommentKinds.inc.h
-SemaDecl.o: DiagnosticCommonKinds.inc.h
-SemaDecl.o: DiagnosticParseKinds.inc.h
-SemaDecl.o: DiagnosticSemaKinds.inc.h
-SemaDecl.o: StmtNodes.inc.h
-SemaDecl.po: AttrList.inc.h
-SemaDecl.po: AttrParsedAttrList.inc.h
-SemaDecl.po: Attrs.inc.h
-SemaDecl.po: CommentCommandList.inc.h
-SemaDecl.po: DeclNodes.inc.h
-SemaDecl.po: DiagnosticCommentKinds.inc.h
-SemaDecl.po: DiagnosticCommonKinds.inc.h
-SemaDecl.po: DiagnosticParseKinds.inc.h
-SemaDecl.po: DiagnosticSemaKinds.inc.h
-SemaDecl.po: StmtNodes.inc.h
-SemaDeclAttr.o: AttrList.inc.h
-SemaDeclAttr.o: AttrParsedAttrList.inc.h
-SemaDeclAttr.o: Attrs.inc.h
-SemaDeclAttr.o: CommentCommandList.inc.h
-SemaDeclAttr.o: DeclNodes.inc.h
-SemaDeclAttr.o: DiagnosticCommonKinds.inc.h
-SemaDeclAttr.o: DiagnosticSemaKinds.inc.h
-SemaDeclAttr.o: StmtNodes.inc.h
-SemaDeclAttr.po: AttrList.inc.h
-SemaDeclAttr.po: AttrParsedAttrList.inc.h
-SemaDeclAttr.po: Attrs.inc.h
-SemaDeclAttr.po: CommentCommandList.inc.h
-SemaDeclAttr.po: DeclNodes.inc.h
-SemaDeclAttr.po: DiagnosticCommonKinds.inc.h
-SemaDeclAttr.po: DiagnosticSemaKinds.inc.h
-SemaDeclAttr.po: StmtNodes.inc.h
-SemaDeclCXX.o: AttrList.inc.h
-SemaDeclCXX.o: AttrParsedAttrList.inc.h
-SemaDeclCXX.o: AttrVisitor.inc.h
-SemaDeclCXX.o: Attrs.inc.h
-SemaDeclCXX.o: CommentCommandList.inc.h
-SemaDeclCXX.o: DeclNodes.inc.h
-SemaDeclCXX.o: DiagnosticCommonKinds.inc.h
-SemaDeclCXX.o: DiagnosticSemaKinds.inc.h
-SemaDeclCXX.o: StmtNodes.inc.h
-SemaDeclCXX.po: AttrList.inc.h
-SemaDeclCXX.po: AttrParsedAttrList.inc.h
-SemaDeclCXX.po: AttrVisitor.inc.h
-SemaDeclCXX.po: Attrs.inc.h
-SemaDeclCXX.po: CommentCommandList.inc.h
-SemaDeclCXX.po: DeclNodes.inc.h
-SemaDeclCXX.po: DiagnosticCommonKinds.inc.h
-SemaDeclCXX.po: DiagnosticSemaKinds.inc.h
-SemaDeclCXX.po: StmtNodes.inc.h
-SemaDeclObjC.o: AttrList.inc.h
-SemaDeclObjC.o: AttrParsedAttrList.inc.h
-SemaDeclObjC.o: AttrVisitor.inc.h
-SemaDeclObjC.o: Attrs.inc.h
-SemaDeclObjC.o: CommentCommandList.inc.h
-SemaDeclObjC.o: DeclNodes.inc.h
-SemaDeclObjC.o: DiagnosticCommonKinds.inc.h
-SemaDeclObjC.o: DiagnosticSemaKinds.inc.h
-SemaDeclObjC.o: StmtNodes.inc.h
-SemaDeclObjC.po: AttrList.inc.h
-SemaDeclObjC.po: AttrParsedAttrList.inc.h
-SemaDeclObjC.po: AttrVisitor.inc.h
-SemaDeclObjC.po: Attrs.inc.h
-SemaDeclObjC.po: CommentCommandList.inc.h
-SemaDeclObjC.po: DeclNodes.inc.h
-SemaDeclObjC.po: DiagnosticCommonKinds.inc.h
-SemaDeclObjC.po: DiagnosticSemaKinds.inc.h
-SemaDeclObjC.po: StmtNodes.inc.h
-SemaExceptionSpec.o: AttrList.inc.h
-SemaExceptionSpec.o: AttrParsedAttrList.inc.h
-SemaExceptionSpec.o: Attrs.inc.h
-SemaExceptionSpec.o: CommentCommandList.inc.h
-SemaExceptionSpec.o: DeclNodes.inc.h
-SemaExceptionSpec.o: DiagnosticCommonKinds.inc.h
-SemaExceptionSpec.o: DiagnosticSemaKinds.inc.h
-SemaExceptionSpec.o: StmtNodes.inc.h
-SemaExceptionSpec.po: AttrList.inc.h
-SemaExceptionSpec.po: AttrParsedAttrList.inc.h
-SemaExceptionSpec.po: Attrs.inc.h
-SemaExceptionSpec.po: CommentCommandList.inc.h
-SemaExceptionSpec.po: DeclNodes.inc.h
-SemaExceptionSpec.po: DiagnosticCommonKinds.inc.h
-SemaExceptionSpec.po: DiagnosticSemaKinds.inc.h
-SemaExceptionSpec.po: StmtNodes.inc.h
-SemaExpr.o: AttrList.inc.h
-SemaExpr.o: AttrParsedAttrList.inc.h
-SemaExpr.o: AttrVisitor.inc.h
-SemaExpr.o: Attrs.inc.h
-SemaExpr.o: CommentCommandList.inc.h
-SemaExpr.o: DeclNodes.inc.h
-SemaExpr.o: DiagnosticCommonKinds.inc.h
-SemaExpr.o: DiagnosticSemaKinds.inc.h
-SemaExpr.o: StmtNodes.inc.h
-SemaExpr.po: AttrList.inc.h
-SemaExpr.po: AttrParsedAttrList.inc.h
-SemaExpr.po: AttrVisitor.inc.h
-SemaExpr.po: Attrs.inc.h
-SemaExpr.po: CommentCommandList.inc.h
-SemaExpr.po: DeclNodes.inc.h
-SemaExpr.po: DiagnosticCommonKinds.inc.h
-SemaExpr.po: DiagnosticSemaKinds.inc.h
-SemaExpr.po: StmtNodes.inc.h
-SemaExprCXX.o: AttrList.inc.h
-SemaExprCXX.o: AttrParsedAttrList.inc.h
-SemaExprCXX.o: AttrVisitor.inc.h
-SemaExprCXX.o: Attrs.inc.h
-SemaExprCXX.o: CommentCommandList.inc.h
-SemaExprCXX.o: DeclNodes.inc.h
-SemaExprCXX.o: DiagnosticCommonKinds.inc.h
-SemaExprCXX.o: DiagnosticSemaKinds.inc.h
-SemaExprCXX.o: StmtNodes.inc.h
-SemaExprCXX.po: AttrList.inc.h
-SemaExprCXX.po: AttrParsedAttrList.inc.h
-SemaExprCXX.po: AttrVisitor.inc.h
-SemaExprCXX.po: Attrs.inc.h
-SemaExprCXX.po: CommentCommandList.inc.h
-SemaExprCXX.po: DeclNodes.inc.h
-SemaExprCXX.po: DiagnosticCommonKinds.inc.h
-SemaExprCXX.po: DiagnosticSemaKinds.inc.h
-SemaExprCXX.po: StmtNodes.inc.h
-SemaExprMember.o: AttrList.inc.h
-SemaExprMember.o: AttrParsedAttrList.inc.h
-SemaExprMember.o: Attrs.inc.h
-SemaExprMember.o: CommentCommandList.inc.h
-SemaExprMember.o: DeclNodes.inc.h
-SemaExprMember.o: DiagnosticCommonKinds.inc.h
-SemaExprMember.o: DiagnosticSemaKinds.inc.h
-SemaExprMember.o: StmtNodes.inc.h
-SemaExprMember.po: AttrList.inc.h
-SemaExprMember.po: AttrParsedAttrList.inc.h
-SemaExprMember.po: Attrs.inc.h
-SemaExprMember.po: CommentCommandList.inc.h
-SemaExprMember.po: DeclNodes.inc.h
-SemaExprMember.po: DiagnosticCommonKinds.inc.h
-SemaExprMember.po: DiagnosticSemaKinds.inc.h
-SemaExprMember.po: StmtNodes.inc.h
-SemaExprObjC.o: AttrList.inc.h
-SemaExprObjC.o: AttrParsedAttrList.inc.h
-SemaExprObjC.o: Attrs.inc.h
-SemaExprObjC.o: CommentCommandList.inc.h
-SemaExprObjC.o: DeclNodes.inc.h
-SemaExprObjC.o: DiagnosticCommonKinds.inc.h
-SemaExprObjC.o: DiagnosticSemaKinds.inc.h
-SemaExprObjC.o: StmtNodes.inc.h
-SemaExprObjC.po: AttrList.inc.h
-SemaExprObjC.po: AttrParsedAttrList.inc.h
-SemaExprObjC.po: Attrs.inc.h
-SemaExprObjC.po: CommentCommandList.inc.h
-SemaExprObjC.po: DeclNodes.inc.h
-SemaExprObjC.po: DiagnosticCommonKinds.inc.h
-SemaExprObjC.po: DiagnosticSemaKinds.inc.h
-SemaExprObjC.po: StmtNodes.inc.h
-SemaFixItUtils.o: AttrList.inc.h
-SemaFixItUtils.o: AttrParsedAttrList.inc.h
-SemaFixItUtils.o: Attrs.inc.h
-SemaFixItUtils.o: CommentCommandList.inc.h
-SemaFixItUtils.o: DeclNodes.inc.h
-SemaFixItUtils.o: DiagnosticCommonKinds.inc.h
-SemaFixItUtils.o: StmtNodes.inc.h
-SemaFixItUtils.po: AttrList.inc.h
-SemaFixItUtils.po: AttrParsedAttrList.inc.h
-SemaFixItUtils.po: Attrs.inc.h
-SemaFixItUtils.po: CommentCommandList.inc.h
-SemaFixItUtils.po: DeclNodes.inc.h
-SemaFixItUtils.po: DiagnosticCommonKinds.inc.h
-SemaFixItUtils.po: StmtNodes.inc.h
-SemaInit.o: AttrList.inc.h
-SemaInit.o: AttrParsedAttrList.inc.h
-SemaInit.o: Attrs.inc.h
-SemaInit.o: CommentCommandList.inc.h
-SemaInit.o: DeclNodes.inc.h
-SemaInit.o: DiagnosticCommonKinds.inc.h
-SemaInit.o: DiagnosticSemaKinds.inc.h
-SemaInit.o: StmtNodes.inc.h
-SemaInit.po: AttrList.inc.h
-SemaInit.po: AttrParsedAttrList.inc.h
-SemaInit.po: Attrs.inc.h
-SemaInit.po: CommentCommandList.inc.h
-SemaInit.po: DeclNodes.inc.h
-SemaInit.po: DiagnosticCommonKinds.inc.h
-SemaInit.po: DiagnosticSemaKinds.inc.h
-SemaInit.po: StmtNodes.inc.h
-SemaLambda.o: AttrList.inc.h
-SemaLambda.o: AttrParsedAttrList.inc.h
-SemaLambda.o: Attrs.inc.h
-SemaLambda.o: CommentCommandList.inc.h
-SemaLambda.o: DeclNodes.inc.h
-SemaLambda.o: DiagnosticCommonKinds.inc.h
-SemaLambda.o: DiagnosticSemaKinds.inc.h
-SemaLambda.o: StmtNodes.inc.h
-SemaLambda.po: AttrList.inc.h
-SemaLambda.po: AttrParsedAttrList.inc.h
-SemaLambda.po: Attrs.inc.h
-SemaLambda.po: CommentCommandList.inc.h
-SemaLambda.po: DeclNodes.inc.h
-SemaLambda.po: DiagnosticCommonKinds.inc.h
-SemaLambda.po: DiagnosticSemaKinds.inc.h
-SemaLambda.po: StmtNodes.inc.h
-SemaLookup.o: AttrList.inc.h
-SemaLookup.o: AttrParsedAttrList.inc.h
-SemaLookup.o: Attrs.inc.h
-SemaLookup.o: CommentCommandList.inc.h
-SemaLookup.o: DeclNodes.inc.h
-SemaLookup.o: DiagnosticCommonKinds.inc.h
-SemaLookup.o: DiagnosticSemaKinds.inc.h
-SemaLookup.o: StmtNodes.inc.h
-SemaLookup.po: AttrList.inc.h
-SemaLookup.po: AttrParsedAttrList.inc.h
-SemaLookup.po: Attrs.inc.h
-SemaLookup.po: CommentCommandList.inc.h
-SemaLookup.po: DeclNodes.inc.h
-SemaLookup.po: DiagnosticCommonKinds.inc.h
-SemaLookup.po: DiagnosticSemaKinds.inc.h
-SemaLookup.po: StmtNodes.inc.h
-SemaObjCProperty.o: AttrList.inc.h
-SemaObjCProperty.o: AttrParsedAttrList.inc.h
-SemaObjCProperty.o: Attrs.inc.h
-SemaObjCProperty.o: CommentCommandList.inc.h
-SemaObjCProperty.o: DeclNodes.inc.h
-SemaObjCProperty.o: DiagnosticCommonKinds.inc.h
-SemaObjCProperty.o: DiagnosticSemaKinds.inc.h
-SemaObjCProperty.o: StmtNodes.inc.h
-SemaObjCProperty.po: AttrList.inc.h
-SemaObjCProperty.po: AttrParsedAttrList.inc.h
-SemaObjCProperty.po: Attrs.inc.h
-SemaObjCProperty.po: CommentCommandList.inc.h
-SemaObjCProperty.po: DeclNodes.inc.h
-SemaObjCProperty.po: DiagnosticCommonKinds.inc.h
-SemaObjCProperty.po: DiagnosticSemaKinds.inc.h
-SemaObjCProperty.po: StmtNodes.inc.h
-SemaOpenMP.o: AttrList.inc.h
-SemaOpenMP.o: AttrParsedAttrList.inc.h
-SemaOpenMP.o: Attrs.inc.h
-SemaOpenMP.o: CommentCommandList.inc.h
-SemaOpenMP.o: DeclNodes.inc.h
-SemaOpenMP.o: DiagnosticCommonKinds.inc.h
-SemaOpenMP.o: DiagnosticSemaKinds.inc.h
-SemaOpenMP.o: StmtNodes.inc.h
-SemaOpenMP.po: AttrList.inc.h
-SemaOpenMP.po: AttrParsedAttrList.inc.h
-SemaOpenMP.po: Attrs.inc.h
-SemaOpenMP.po: CommentCommandList.inc.h
-SemaOpenMP.po: DeclNodes.inc.h
-SemaOpenMP.po: DiagnosticCommonKinds.inc.h
-SemaOpenMP.po: DiagnosticSemaKinds.inc.h
-SemaOpenMP.po: StmtNodes.inc.h
-SemaOverload.o: AttrList.inc.h
-SemaOverload.o: AttrParsedAttrList.inc.h
-SemaOverload.o: Attrs.inc.h
-SemaOverload.o: CommentCommandList.inc.h
-SemaOverload.o: DeclNodes.inc.h
-SemaOverload.o: DiagnosticCommonKinds.inc.h
-SemaOverload.o: DiagnosticSemaKinds.inc.h
-SemaOverload.o: StmtNodes.inc.h
-SemaOverload.po: AttrList.inc.h
-SemaOverload.po: AttrParsedAttrList.inc.h
-SemaOverload.po: Attrs.inc.h
-SemaOverload.po: CommentCommandList.inc.h
-SemaOverload.po: DeclNodes.inc.h
-SemaOverload.po: DiagnosticCommonKinds.inc.h
-SemaOverload.po: DiagnosticSemaKinds.inc.h
-SemaOverload.po: StmtNodes.inc.h
-SemaPseudoObject.o: AttrList.inc.h
-SemaPseudoObject.o: AttrParsedAttrList.inc.h
-SemaPseudoObject.o: Attrs.inc.h
-SemaPseudoObject.o: CommentCommandList.inc.h
-SemaPseudoObject.o: DeclNodes.inc.h
-SemaPseudoObject.o: DiagnosticCommonKinds.inc.h
-SemaPseudoObject.o: DiagnosticSemaKinds.inc.h
-SemaPseudoObject.o: StmtNodes.inc.h
-SemaPseudoObject.po: AttrList.inc.h
-SemaPseudoObject.po: AttrParsedAttrList.inc.h
-SemaPseudoObject.po: Attrs.inc.h
-SemaPseudoObject.po: CommentCommandList.inc.h
-SemaPseudoObject.po: DeclNodes.inc.h
-SemaPseudoObject.po: DiagnosticCommonKinds.inc.h
-SemaPseudoObject.po: DiagnosticSemaKinds.inc.h
-SemaPseudoObject.po: StmtNodes.inc.h
-SemaStmt.o: AttrList.inc.h
-SemaStmt.o: AttrParsedAttrList.inc.h
-SemaStmt.o: AttrVisitor.inc.h
-SemaStmt.o: Attrs.inc.h
-SemaStmt.o: CommentCommandList.inc.h
-SemaStmt.o: DeclNodes.inc.h
-SemaStmt.o: DiagnosticASTKinds.inc.h
-SemaStmt.o: DiagnosticCommonKinds.inc.h
-SemaStmt.o: DiagnosticSemaKinds.inc.h
-SemaStmt.o: StmtNodes.inc.h
-SemaStmt.po: AttrList.inc.h
-SemaStmt.po: AttrParsedAttrList.inc.h
-SemaStmt.po: AttrVisitor.inc.h
-SemaStmt.po: Attrs.inc.h
-SemaStmt.po: CommentCommandList.inc.h
-SemaStmt.po: DeclNodes.inc.h
-SemaStmt.po: DiagnosticASTKinds.inc.h
-SemaStmt.po: DiagnosticCommonKinds.inc.h
-SemaStmt.po: DiagnosticSemaKinds.inc.h
-SemaStmt.po: StmtNodes.inc.h
-SemaStmtAsm.o: AttrList.inc.h
-SemaStmtAsm.o: AttrParsedAttrList.inc.h
-SemaStmtAsm.o: Attrs.inc.h
-SemaStmtAsm.o: CommentCommandList.inc.h
-SemaStmtAsm.o: DeclNodes.inc.h
-SemaStmtAsm.o: DiagnosticCommonKinds.inc.h
-SemaStmtAsm.o: DiagnosticSemaKinds.inc.h
-SemaStmtAsm.o: StmtNodes.inc.h
-SemaStmtAsm.po: AttrList.inc.h
-SemaStmtAsm.po: AttrParsedAttrList.inc.h
-SemaStmtAsm.po: Attrs.inc.h
-SemaStmtAsm.po: CommentCommandList.inc.h
-SemaStmtAsm.po: DeclNodes.inc.h
-SemaStmtAsm.po: DiagnosticCommonKinds.inc.h
-SemaStmtAsm.po: DiagnosticSemaKinds.inc.h
-SemaStmtAsm.po: StmtNodes.inc.h
-SemaStmtAttr.o: AttrList.inc.h
-SemaStmtAttr.o: AttrParsedAttrList.inc.h
-SemaStmtAttr.o: Attrs.inc.h
-SemaStmtAttr.o: CommentCommandList.inc.h
-SemaStmtAttr.o: DeclNodes.inc.h
-SemaStmtAttr.o: DiagnosticCommonKinds.inc.h
-SemaStmtAttr.o: DiagnosticSemaKinds.inc.h
-SemaStmtAttr.o: StmtNodes.inc.h
-SemaStmtAttr.po: AttrList.inc.h
-SemaStmtAttr.po: AttrParsedAttrList.inc.h
-SemaStmtAttr.po: Attrs.inc.h
-SemaStmtAttr.po: CommentCommandList.inc.h
-SemaStmtAttr.po: DeclNodes.inc.h
-SemaStmtAttr.po: DiagnosticCommonKinds.inc.h
-SemaStmtAttr.po: DiagnosticSemaKinds.inc.h
-SemaStmtAttr.po: StmtNodes.inc.h
-SemaTemplate.o: AttrList.inc.h
-SemaTemplate.o: AttrParsedAttrList.inc.h
-SemaTemplate.o: AttrVisitor.inc.h
-SemaTemplate.o: Attrs.inc.h
-SemaTemplate.o: CommentCommandList.inc.h
-SemaTemplate.o: DeclNodes.inc.h
-SemaTemplate.o: DiagnosticCommonKinds.inc.h
-SemaTemplate.o: DiagnosticSemaKinds.inc.h
-SemaTemplate.o: StmtNodes.inc.h
-SemaTemplate.po: AttrList.inc.h
-SemaTemplate.po: AttrParsedAttrList.inc.h
-SemaTemplate.po: AttrVisitor.inc.h
-SemaTemplate.po: Attrs.inc.h
-SemaTemplate.po: CommentCommandList.inc.h
-SemaTemplate.po: DeclNodes.inc.h
-SemaTemplate.po: DiagnosticCommonKinds.inc.h
-SemaTemplate.po: DiagnosticSemaKinds.inc.h
-SemaTemplate.po: StmtNodes.inc.h
-SemaTemplateDeduction.o: AttrList.inc.h
-SemaTemplateDeduction.o: AttrParsedAttrList.inc.h
-SemaTemplateDeduction.o: Attrs.inc.h
-SemaTemplateDeduction.o: CommentCommandList.inc.h
-SemaTemplateDeduction.o: DeclNodes.inc.h
-SemaTemplateDeduction.o: DiagnosticCommonKinds.inc.h
-SemaTemplateDeduction.o: DiagnosticSemaKinds.inc.h
-SemaTemplateDeduction.o: StmtNodes.inc.h
-SemaTemplateDeduction.po: AttrList.inc.h
-SemaTemplateDeduction.po: AttrParsedAttrList.inc.h
-SemaTemplateDeduction.po: Attrs.inc.h
-SemaTemplateDeduction.po: CommentCommandList.inc.h
-SemaTemplateDeduction.po: DeclNodes.inc.h
-SemaTemplateDeduction.po: DiagnosticCommonKinds.inc.h
-SemaTemplateDeduction.po: DiagnosticSemaKinds.inc.h
-SemaTemplateDeduction.po: StmtNodes.inc.h
-SemaTemplateInstantiate.o: AttrList.inc.h
-SemaTemplateInstantiate.o: AttrParsedAttrList.inc.h
-SemaTemplateInstantiate.o: Attrs.inc.h
-SemaTemplateInstantiate.o: CommentCommandList.inc.h
-SemaTemplateInstantiate.o: DeclNodes.inc.h
-SemaTemplateInstantiate.o: DiagnosticCommonKinds.inc.h
-SemaTemplateInstantiate.o: DiagnosticSemaKinds.inc.h
-SemaTemplateInstantiate.o: StmtNodes.inc.h
-SemaTemplateInstantiate.po: AttrList.inc.h
-SemaTemplateInstantiate.po: AttrParsedAttrList.inc.h
-SemaTemplateInstantiate.po: Attrs.inc.h
-SemaTemplateInstantiate.po: CommentCommandList.inc.h
-SemaTemplateInstantiate.po: DeclNodes.inc.h
-SemaTemplateInstantiate.po: DiagnosticCommonKinds.inc.h
-SemaTemplateInstantiate.po: DiagnosticSemaKinds.inc.h
-SemaTemplateInstantiate.po: StmtNodes.inc.h
-SemaTemplateInstantiateDecl.o: AttrList.inc.h
-SemaTemplateInstantiateDecl.o: AttrParsedAttrList.inc.h
-SemaTemplateInstantiateDecl.o: AttrTemplateInstantiate.inc.h
-SemaTemplateInstantiateDecl.o: Attrs.inc.h
-SemaTemplateInstantiateDecl.o: CommentCommandList.inc.h
-SemaTemplateInstantiateDecl.o: DeclNodes.inc.h
-SemaTemplateInstantiateDecl.o: DiagnosticCommonKinds.inc.h
-SemaTemplateInstantiateDecl.o: DiagnosticSemaKinds.inc.h
-SemaTemplateInstantiateDecl.o: StmtNodes.inc.h
-SemaTemplateInstantiateDecl.po: AttrList.inc.h
-SemaTemplateInstantiateDecl.po: AttrParsedAttrList.inc.h
-SemaTemplateInstantiateDecl.po: AttrTemplateInstantiate.inc.h
-SemaTemplateInstantiateDecl.po: Attrs.inc.h
-SemaTemplateInstantiateDecl.po: CommentCommandList.inc.h
-SemaTemplateInstantiateDecl.po: DeclNodes.inc.h
-SemaTemplateInstantiateDecl.po: DiagnosticCommonKinds.inc.h
-SemaTemplateInstantiateDecl.po: DiagnosticSemaKinds.inc.h
-SemaTemplateInstantiateDecl.po: StmtNodes.inc.h
-SemaTemplateVariadic.o: AttrList.inc.h
-SemaTemplateVariadic.o: AttrParsedAttrList.inc.h
-SemaTemplateVariadic.o: AttrVisitor.inc.h
-SemaTemplateVariadic.o: Attrs.inc.h
-SemaTemplateVariadic.o: CommentCommandList.inc.h
-SemaTemplateVariadic.o: DeclNodes.inc.h
-SemaTemplateVariadic.o: DiagnosticCommonKinds.inc.h
-SemaTemplateVariadic.o: DiagnosticSemaKinds.inc.h
-SemaTemplateVariadic.o: StmtNodes.inc.h
-SemaTemplateVariadic.po: AttrList.inc.h
-SemaTemplateVariadic.po: AttrParsedAttrList.inc.h
-SemaTemplateVariadic.po: AttrVisitor.inc.h
-SemaTemplateVariadic.po: Attrs.inc.h
-SemaTemplateVariadic.po: CommentCommandList.inc.h
-SemaTemplateVariadic.po: DeclNodes.inc.h
-SemaTemplateVariadic.po: DiagnosticCommonKinds.inc.h
-SemaTemplateVariadic.po: DiagnosticSemaKinds.inc.h
-SemaTemplateVariadic.po: StmtNodes.inc.h
-SemaType.o: AttrList.inc.h
-SemaType.o: AttrParsedAttrList.inc.h
-SemaType.o: Attrs.inc.h
-SemaType.o: CommentCommandList.inc.h
-SemaType.o: DeclNodes.inc.h
-SemaType.o: DiagnosticCommonKinds.inc.h
-SemaType.o: DiagnosticParseKinds.inc.h
-SemaType.o: DiagnosticSemaKinds.inc.h
-SemaType.o: StmtNodes.inc.h
-SemaType.po: AttrList.inc.h
-SemaType.po: AttrParsedAttrList.inc.h
-SemaType.po: Attrs.inc.h
-SemaType.po: CommentCommandList.inc.h
-SemaType.po: DeclNodes.inc.h
-SemaType.po: DiagnosticCommonKinds.inc.h
-SemaType.po: DiagnosticParseKinds.inc.h
-SemaType.po: DiagnosticSemaKinds.inc.h
-SemaType.po: StmtNodes.inc.h
-TypeLocBuilder.o: CommentCommandList.inc.h
-TypeLocBuilder.o: DeclNodes.inc.h
-TypeLocBuilder.o: DiagnosticCommonKinds.inc.h
-TypeLocBuilder.o: StmtNodes.inc.h
-TypeLocBuilder.po: CommentCommandList.inc.h
-TypeLocBuilder.po: DeclNodes.inc.h
-TypeLocBuilder.po: DiagnosticCommonKinds.inc.h
-TypeLocBuilder.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
index 6ee9d58..264ede1 100644
--- a/lib/clang/libclangserialization/Makefile.depend
+++ b/lib/clang/libclangserialization/Makefile.depend
@@ -13,120 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ASTCommon.o: AttrList.inc.h
-ASTCommon.o: Attrs.inc.h
-ASTCommon.o: CommentCommandList.inc.h
-ASTCommon.o: DeclNodes.inc.h
-ASTCommon.o: DiagnosticCommonKinds.inc.h
-ASTCommon.o: StmtNodes.inc.h
-ASTCommon.po: AttrList.inc.h
-ASTCommon.po: Attrs.inc.h
-ASTCommon.po: CommentCommandList.inc.h
-ASTCommon.po: DeclNodes.inc.h
-ASTCommon.po: DiagnosticCommonKinds.inc.h
-ASTCommon.po: StmtNodes.inc.h
-ASTReader.o: AttrList.inc.h
-ASTReader.o: AttrParsedAttrList.inc.h
-ASTReader.o: Attrs.inc.h
-ASTReader.o: CommentCommandList.inc.h
-ASTReader.o: DeclNodes.inc.h
-ASTReader.o: DiagnosticCommonKinds.inc.h
-ASTReader.o: DiagnosticSerializationKinds.inc.h
-ASTReader.o: StmtNodes.inc.h
-ASTReader.po: AttrList.inc.h
-ASTReader.po: AttrParsedAttrList.inc.h
-ASTReader.po: Attrs.inc.h
-ASTReader.po: CommentCommandList.inc.h
-ASTReader.po: DeclNodes.inc.h
-ASTReader.po: DiagnosticCommonKinds.inc.h
-ASTReader.po: DiagnosticSerializationKinds.inc.h
-ASTReader.po: StmtNodes.inc.h
-ASTReaderDecl.o: AttrList.inc.h
-ASTReaderDecl.o: AttrPCHRead.inc.h
-ASTReaderDecl.o: AttrParsedAttrList.inc.h
-ASTReaderDecl.o: Attrs.inc.h
-ASTReaderDecl.o: CommentCommandList.inc.h
-ASTReaderDecl.o: DeclNodes.inc.h
-ASTReaderDecl.o: DiagnosticCommonKinds.inc.h
-ASTReaderDecl.o: DiagnosticSemaKinds.inc.h
-ASTReaderDecl.o: StmtNodes.inc.h
-ASTReaderDecl.po: AttrList.inc.h
-ASTReaderDecl.po: AttrPCHRead.inc.h
-ASTReaderDecl.po: AttrParsedAttrList.inc.h
-ASTReaderDecl.po: Attrs.inc.h
-ASTReaderDecl.po: CommentCommandList.inc.h
-ASTReaderDecl.po: DeclNodes.inc.h
-ASTReaderDecl.po: DiagnosticCommonKinds.inc.h
-ASTReaderDecl.po: DiagnosticSemaKinds.inc.h
-ASTReaderDecl.po: StmtNodes.inc.h
-ASTReaderStmt.o: AttrList.inc.h
-ASTReaderStmt.o: AttrParsedAttrList.inc.h
-ASTReaderStmt.o: Attrs.inc.h
-ASTReaderStmt.o: CommentCommandList.inc.h
-ASTReaderStmt.o: DeclNodes.inc.h
-ASTReaderStmt.o: DiagnosticCommonKinds.inc.h
-ASTReaderStmt.o: StmtNodes.inc.h
-ASTReaderStmt.po: AttrList.inc.h
-ASTReaderStmt.po: AttrParsedAttrList.inc.h
-ASTReaderStmt.po: Attrs.inc.h
-ASTReaderStmt.po: CommentCommandList.inc.h
-ASTReaderStmt.po: DeclNodes.inc.h
-ASTReaderStmt.po: DiagnosticCommonKinds.inc.h
-ASTReaderStmt.po: StmtNodes.inc.h
-ASTWriter.o: AttrList.inc.h
-ASTWriter.o: AttrPCHWrite.inc.h
-ASTWriter.o: AttrParsedAttrList.inc.h
-ASTWriter.o: Attrs.inc.h
-ASTWriter.o: CommentCommandList.inc.h
-ASTWriter.o: DeclNodes.inc.h
-ASTWriter.o: DiagnosticCommonKinds.inc.h
-ASTWriter.o: StmtNodes.inc.h
-ASTWriter.po: AttrList.inc.h
-ASTWriter.po: AttrPCHWrite.inc.h
-ASTWriter.po: AttrParsedAttrList.inc.h
-ASTWriter.po: Attrs.inc.h
-ASTWriter.po: CommentCommandList.inc.h
-ASTWriter.po: DeclNodes.inc.h
-ASTWriter.po: DiagnosticCommonKinds.inc.h
-ASTWriter.po: StmtNodes.inc.h
-ASTWriterDecl.o: AttrList.inc.h
-ASTWriterDecl.o: AttrParsedAttrList.inc.h
-ASTWriterDecl.o: Attrs.inc.h
-ASTWriterDecl.o: CommentCommandList.inc.h
-ASTWriterDecl.o: DeclNodes.inc.h
-ASTWriterDecl.o: DiagnosticCommonKinds.inc.h
-ASTWriterDecl.o: StmtNodes.inc.h
-ASTWriterDecl.po: AttrList.inc.h
-ASTWriterDecl.po: AttrParsedAttrList.inc.h
-ASTWriterDecl.po: Attrs.inc.h
-ASTWriterDecl.po: CommentCommandList.inc.h
-ASTWriterDecl.po: DeclNodes.inc.h
-ASTWriterDecl.po: DiagnosticCommonKinds.inc.h
-ASTWriterDecl.po: StmtNodes.inc.h
-ASTWriterStmt.o: AttrList.inc.h
-ASTWriterStmt.o: Attrs.inc.h
-ASTWriterStmt.o: CommentCommandList.inc.h
-ASTWriterStmt.o: DeclNodes.inc.h
-ASTWriterStmt.o: DiagnosticCommonKinds.inc.h
-ASTWriterStmt.o: StmtNodes.inc.h
-ASTWriterStmt.po: AttrList.inc.h
-ASTWriterStmt.po: Attrs.inc.h
-ASTWriterStmt.po: CommentCommandList.inc.h
-ASTWriterStmt.po: DeclNodes.inc.h
-ASTWriterStmt.po: DiagnosticCommonKinds.inc.h
-ASTWriterStmt.po: StmtNodes.inc.h
-GeneratePCH.o: CommentCommandList.inc.h
-GeneratePCH.o: DeclNodes.inc.h
-GeneratePCH.o: DiagnosticCommonKinds.inc.h
-GeneratePCH.o: StmtNodes.inc.h
-GeneratePCH.po: CommentCommandList.inc.h
-GeneratePCH.po: DeclNodes.inc.h
-GeneratePCH.po: DiagnosticCommonKinds.inc.h
-GeneratePCH.po: StmtNodes.inc.h
-GlobalModuleIndex.o: DiagnosticCommonKinds.inc.h
-GlobalModuleIndex.po: DiagnosticCommonKinds.inc.h
-Module.o: DiagnosticCommonKinds.inc.h
-Module.po: DiagnosticCommonKinds.inc.h
-ModuleManager.o: DiagnosticCommonKinds.inc.h
-ModuleManager.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
index cdb2b7a..264ede1 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
@@ -13,770 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalyzerStatsChecker.o: Checkers.inc.h
-AnalyzerStatsChecker.o: CommentCommandList.inc.h
-AnalyzerStatsChecker.o: DeclNodes.inc.h
-AnalyzerStatsChecker.o: DiagnosticCommonKinds.inc.h
-AnalyzerStatsChecker.o: StmtNodes.inc.h
-AnalyzerStatsChecker.po: Checkers.inc.h
-AnalyzerStatsChecker.po: CommentCommandList.inc.h
-AnalyzerStatsChecker.po: DeclNodes.inc.h
-AnalyzerStatsChecker.po: DiagnosticCommonKinds.inc.h
-AnalyzerStatsChecker.po: StmtNodes.inc.h
-ArrayBoundChecker.o: Checkers.inc.h
-ArrayBoundChecker.o: CommentCommandList.inc.h
-ArrayBoundChecker.o: DeclNodes.inc.h
-ArrayBoundChecker.o: DiagnosticCommonKinds.inc.h
-ArrayBoundChecker.o: StmtNodes.inc.h
-ArrayBoundChecker.po: Checkers.inc.h
-ArrayBoundChecker.po: CommentCommandList.inc.h
-ArrayBoundChecker.po: DeclNodes.inc.h
-ArrayBoundChecker.po: DiagnosticCommonKinds.inc.h
-ArrayBoundChecker.po: StmtNodes.inc.h
-ArrayBoundCheckerV2.o: Checkers.inc.h
-ArrayBoundCheckerV2.o: CommentCommandList.inc.h
-ArrayBoundCheckerV2.o: DeclNodes.inc.h
-ArrayBoundCheckerV2.o: DiagnosticCommonKinds.inc.h
-ArrayBoundCheckerV2.o: StmtNodes.inc.h
-ArrayBoundCheckerV2.po: Checkers.inc.h
-ArrayBoundCheckerV2.po: CommentCommandList.inc.h
-ArrayBoundCheckerV2.po: DeclNodes.inc.h
-ArrayBoundCheckerV2.po: DiagnosticCommonKinds.inc.h
-ArrayBoundCheckerV2.po: StmtNodes.inc.h
-BasicObjCFoundationChecks.o: AttrList.inc.h
-BasicObjCFoundationChecks.o: Attrs.inc.h
-BasicObjCFoundationChecks.o: Checkers.inc.h
-BasicObjCFoundationChecks.o: CommentCommandList.inc.h
-BasicObjCFoundationChecks.o: DeclNodes.inc.h
-BasicObjCFoundationChecks.o: DiagnosticCommonKinds.inc.h
-BasicObjCFoundationChecks.o: StmtNodes.inc.h
-BasicObjCFoundationChecks.po: AttrList.inc.h
-BasicObjCFoundationChecks.po: Attrs.inc.h
-BasicObjCFoundationChecks.po: Checkers.inc.h
-BasicObjCFoundationChecks.po: CommentCommandList.inc.h
-BasicObjCFoundationChecks.po: DeclNodes.inc.h
-BasicObjCFoundationChecks.po: DiagnosticCommonKinds.inc.h
-BasicObjCFoundationChecks.po: StmtNodes.inc.h
-BoolAssignmentChecker.o: Checkers.inc.h
-BoolAssignmentChecker.o: CommentCommandList.inc.h
-BoolAssignmentChecker.o: DeclNodes.inc.h
-BoolAssignmentChecker.o: DiagnosticCommonKinds.inc.h
-BoolAssignmentChecker.o: StmtNodes.inc.h
-BoolAssignmentChecker.po: Checkers.inc.h
-BoolAssignmentChecker.po: CommentCommandList.inc.h
-BoolAssignmentChecker.po: DeclNodes.inc.h
-BoolAssignmentChecker.po: DiagnosticCommonKinds.inc.h
-BoolAssignmentChecker.po: StmtNodes.inc.h
-BuiltinFunctionChecker.o: Checkers.inc.h
-BuiltinFunctionChecker.o: CommentCommandList.inc.h
-BuiltinFunctionChecker.o: DeclNodes.inc.h
-BuiltinFunctionChecker.o: DiagnosticCommonKinds.inc.h
-BuiltinFunctionChecker.o: StmtNodes.inc.h
-BuiltinFunctionChecker.po: Checkers.inc.h
-BuiltinFunctionChecker.po: CommentCommandList.inc.h
-BuiltinFunctionChecker.po: DeclNodes.inc.h
-BuiltinFunctionChecker.po: DiagnosticCommonKinds.inc.h
-BuiltinFunctionChecker.po: StmtNodes.inc.h
-CStringChecker.o: Checkers.inc.h
-CStringChecker.o: CommentCommandList.inc.h
-CStringChecker.o: DeclNodes.inc.h
-CStringChecker.o: DiagnosticCommonKinds.inc.h
-CStringChecker.o: StmtNodes.inc.h
-CStringChecker.po: Checkers.inc.h
-CStringChecker.po: CommentCommandList.inc.h
-CStringChecker.po: DeclNodes.inc.h
-CStringChecker.po: DiagnosticCommonKinds.inc.h
-CStringChecker.po: StmtNodes.inc.h
-CStringSyntaxChecker.o: Checkers.inc.h
-CStringSyntaxChecker.o: CommentCommandList.inc.h
-CStringSyntaxChecker.o: DeclNodes.inc.h
-CStringSyntaxChecker.o: DiagnosticCommonKinds.inc.h
-CStringSyntaxChecker.o: StmtNodes.inc.h
-CStringSyntaxChecker.po: Checkers.inc.h
-CStringSyntaxChecker.po: CommentCommandList.inc.h
-CStringSyntaxChecker.po: DeclNodes.inc.h
-CStringSyntaxChecker.po: DiagnosticCommonKinds.inc.h
-CStringSyntaxChecker.po: StmtNodes.inc.h
-CallAndMessageChecker.o: AttrList.inc.h
-CallAndMessageChecker.o: Attrs.inc.h
-CallAndMessageChecker.o: Checkers.inc.h
-CallAndMessageChecker.o: CommentCommandList.inc.h
-CallAndMessageChecker.o: DeclNodes.inc.h
-CallAndMessageChecker.o: DiagnosticCommonKinds.inc.h
-CallAndMessageChecker.o: StmtNodes.inc.h
-CallAndMessageChecker.po: AttrList.inc.h
-CallAndMessageChecker.po: Attrs.inc.h
-CallAndMessageChecker.po: Checkers.inc.h
-CallAndMessageChecker.po: CommentCommandList.inc.h
-CallAndMessageChecker.po: DeclNodes.inc.h
-CallAndMessageChecker.po: DiagnosticCommonKinds.inc.h
-CallAndMessageChecker.po: StmtNodes.inc.h
-CastSizeChecker.o: Checkers.inc.h
-CastSizeChecker.o: CommentCommandList.inc.h
-CastSizeChecker.o: DeclNodes.inc.h
-CastSizeChecker.o: DiagnosticCommonKinds.inc.h
-CastSizeChecker.o: StmtNodes.inc.h
-CastSizeChecker.po: Checkers.inc.h
-CastSizeChecker.po: CommentCommandList.inc.h
-CastSizeChecker.po: DeclNodes.inc.h
-CastSizeChecker.po: DiagnosticCommonKinds.inc.h
-CastSizeChecker.po: StmtNodes.inc.h
-CastToStructChecker.o: Checkers.inc.h
-CastToStructChecker.o: CommentCommandList.inc.h
-CastToStructChecker.o: DeclNodes.inc.h
-CastToStructChecker.o: DiagnosticCommonKinds.inc.h
-CastToStructChecker.o: StmtNodes.inc.h
-CastToStructChecker.po: Checkers.inc.h
-CastToStructChecker.po: CommentCommandList.inc.h
-CastToStructChecker.po: DeclNodes.inc.h
-CastToStructChecker.po: DiagnosticCommonKinds.inc.h
-CastToStructChecker.po: StmtNodes.inc.h
-CheckObjCDealloc.o: AttrList.inc.h
-CheckObjCDealloc.o: Attrs.inc.h
-CheckObjCDealloc.o: Checkers.inc.h
-CheckObjCDealloc.o: CommentCommandList.inc.h
-CheckObjCDealloc.o: DeclNodes.inc.h
-CheckObjCDealloc.o: DiagnosticCommonKinds.inc.h
-CheckObjCDealloc.o: StmtNodes.inc.h
-CheckObjCDealloc.po: AttrList.inc.h
-CheckObjCDealloc.po: Attrs.inc.h
-CheckObjCDealloc.po: Checkers.inc.h
-CheckObjCDealloc.po: CommentCommandList.inc.h
-CheckObjCDealloc.po: DeclNodes.inc.h
-CheckObjCDealloc.po: DiagnosticCommonKinds.inc.h
-CheckObjCDealloc.po: StmtNodes.inc.h
-CheckObjCInstMethSignature.o: Checkers.inc.h
-CheckObjCInstMethSignature.o: CommentCommandList.inc.h
-CheckObjCInstMethSignature.o: DeclNodes.inc.h
-CheckObjCInstMethSignature.o: DiagnosticCommonKinds.inc.h
-CheckObjCInstMethSignature.o: StmtNodes.inc.h
-CheckObjCInstMethSignature.po: Checkers.inc.h
-CheckObjCInstMethSignature.po: CommentCommandList.inc.h
-CheckObjCInstMethSignature.po: DeclNodes.inc.h
-CheckObjCInstMethSignature.po: DiagnosticCommonKinds.inc.h
-CheckObjCInstMethSignature.po: StmtNodes.inc.h
-CheckSecuritySyntaxOnly.o: Checkers.inc.h
-CheckSecuritySyntaxOnly.o: CommentCommandList.inc.h
-CheckSecuritySyntaxOnly.o: DeclNodes.inc.h
-CheckSecuritySyntaxOnly.o: DiagnosticCommonKinds.inc.h
-CheckSecuritySyntaxOnly.o: StmtNodes.inc.h
-CheckSecuritySyntaxOnly.po: Checkers.inc.h
-CheckSecuritySyntaxOnly.po: CommentCommandList.inc.h
-CheckSecuritySyntaxOnly.po: DeclNodes.inc.h
-CheckSecuritySyntaxOnly.po: DiagnosticCommonKinds.inc.h
-CheckSecuritySyntaxOnly.po: StmtNodes.inc.h
-CheckSizeofPointer.o: Checkers.inc.h
-CheckSizeofPointer.o: CommentCommandList.inc.h
-CheckSizeofPointer.o: DeclNodes.inc.h
-CheckSizeofPointer.o: DiagnosticCommonKinds.inc.h
-CheckSizeofPointer.o: StmtNodes.inc.h
-CheckSizeofPointer.po: Checkers.inc.h
-CheckSizeofPointer.po: CommentCommandList.inc.h
-CheckSizeofPointer.po: DeclNodes.inc.h
-CheckSizeofPointer.po: DiagnosticCommonKinds.inc.h
-CheckSizeofPointer.po: StmtNodes.inc.h
-ChrootChecker.o: Checkers.inc.h
-ChrootChecker.o: CommentCommandList.inc.h
-ChrootChecker.o: DeclNodes.inc.h
-ChrootChecker.o: DiagnosticCommonKinds.inc.h
-ChrootChecker.o: StmtNodes.inc.h
-ChrootChecker.po: Checkers.inc.h
-ChrootChecker.po: CommentCommandList.inc.h
-ChrootChecker.po: DeclNodes.inc.h
-ChrootChecker.po: DiagnosticCommonKinds.inc.h
-ChrootChecker.po: StmtNodes.inc.h
-ClangCheckers.o: Checkers.inc.h
-ClangCheckers.o: CommentCommandList.inc.h
-ClangCheckers.o: DeclNodes.inc.h
-ClangCheckers.o: DiagnosticCommonKinds.inc.h
-ClangCheckers.o: StmtNodes.inc.h
-ClangCheckers.po: Checkers.inc.h
-ClangCheckers.po: CommentCommandList.inc.h
-ClangCheckers.po: DeclNodes.inc.h
-ClangCheckers.po: DiagnosticCommonKinds.inc.h
-ClangCheckers.po: StmtNodes.inc.h
-DeadStoresChecker.o: AttrList.inc.h
-DeadStoresChecker.o: AttrVisitor.inc.h
-DeadStoresChecker.o: Attrs.inc.h
-DeadStoresChecker.o: Checkers.inc.h
-DeadStoresChecker.o: CommentCommandList.inc.h
-DeadStoresChecker.o: DeclNodes.inc.h
-DeadStoresChecker.o: DiagnosticCommonKinds.inc.h
-DeadStoresChecker.o: StmtNodes.inc.h
-DeadStoresChecker.po: AttrList.inc.h
-DeadStoresChecker.po: AttrVisitor.inc.h
-DeadStoresChecker.po: Attrs.inc.h
-DeadStoresChecker.po: Checkers.inc.h
-DeadStoresChecker.po: CommentCommandList.inc.h
-DeadStoresChecker.po: DeclNodes.inc.h
-DeadStoresChecker.po: DiagnosticCommonKinds.inc.h
-DeadStoresChecker.po: StmtNodes.inc.h
-DebugCheckers.o: AttrList.inc.h
-DebugCheckers.o: AttrVisitor.inc.h
-DebugCheckers.o: Attrs.inc.h
-DebugCheckers.o: Checkers.inc.h
-DebugCheckers.o: CommentCommandList.inc.h
-DebugCheckers.o: DeclNodes.inc.h
-DebugCheckers.o: DiagnosticCommonKinds.inc.h
-DebugCheckers.o: StmtNodes.inc.h
-DebugCheckers.po: AttrList.inc.h
-DebugCheckers.po: AttrVisitor.inc.h
-DebugCheckers.po: Attrs.inc.h
-DebugCheckers.po: Checkers.inc.h
-DebugCheckers.po: CommentCommandList.inc.h
-DebugCheckers.po: DeclNodes.inc.h
-DebugCheckers.po: DiagnosticCommonKinds.inc.h
-DebugCheckers.po: StmtNodes.inc.h
-DereferenceChecker.o: Checkers.inc.h
-DereferenceChecker.o: CommentCommandList.inc.h
-DereferenceChecker.o: DeclNodes.inc.h
-DereferenceChecker.o: DiagnosticCommonKinds.inc.h
-DereferenceChecker.o: StmtNodes.inc.h
-DereferenceChecker.po: Checkers.inc.h
-DereferenceChecker.po: CommentCommandList.inc.h
-DereferenceChecker.po: DeclNodes.inc.h
-DereferenceChecker.po: DiagnosticCommonKinds.inc.h
-DereferenceChecker.po: StmtNodes.inc.h
-DirectIvarAssignment.o: AttrList.inc.h
-DirectIvarAssignment.o: Attrs.inc.h
-DirectIvarAssignment.o: Checkers.inc.h
-DirectIvarAssignment.o: CommentCommandList.inc.h
-DirectIvarAssignment.o: DeclNodes.inc.h
-DirectIvarAssignment.o: DiagnosticCommonKinds.inc.h
-DirectIvarAssignment.o: StmtNodes.inc.h
-DirectIvarAssignment.po: AttrList.inc.h
-DirectIvarAssignment.po: Attrs.inc.h
-DirectIvarAssignment.po: Checkers.inc.h
-DirectIvarAssignment.po: CommentCommandList.inc.h
-DirectIvarAssignment.po: DeclNodes.inc.h
-DirectIvarAssignment.po: DiagnosticCommonKinds.inc.h
-DirectIvarAssignment.po: StmtNodes.inc.h
-DivZeroChecker.o: Checkers.inc.h
-DivZeroChecker.o: CommentCommandList.inc.h
-DivZeroChecker.o: DeclNodes.inc.h
-DivZeroChecker.o: DiagnosticCommonKinds.inc.h
-DivZeroChecker.o: StmtNodes.inc.h
-DivZeroChecker.po: Checkers.inc.h
-DivZeroChecker.po: CommentCommandList.inc.h
-DivZeroChecker.po: DeclNodes.inc.h
-DivZeroChecker.po: DiagnosticCommonKinds.inc.h
-DivZeroChecker.po: StmtNodes.inc.h
-DynamicTypePropagation.o: AttrList.inc.h
-DynamicTypePropagation.o: Attrs.inc.h
-DynamicTypePropagation.o: Checkers.inc.h
-DynamicTypePropagation.o: CommentCommandList.inc.h
-DynamicTypePropagation.o: DeclNodes.inc.h
-DynamicTypePropagation.o: DiagnosticCommonKinds.inc.h
-DynamicTypePropagation.o: StmtNodes.inc.h
-DynamicTypePropagation.po: AttrList.inc.h
-DynamicTypePropagation.po: Attrs.inc.h
-DynamicTypePropagation.po: Checkers.inc.h
-DynamicTypePropagation.po: CommentCommandList.inc.h
-DynamicTypePropagation.po: DeclNodes.inc.h
-DynamicTypePropagation.po: DiagnosticCommonKinds.inc.h
-DynamicTypePropagation.po: StmtNodes.inc.h
-ExprInspectionChecker.o: Checkers.inc.h
-ExprInspectionChecker.o: CommentCommandList.inc.h
-ExprInspectionChecker.o: DeclNodes.inc.h
-ExprInspectionChecker.o: DiagnosticCommonKinds.inc.h
-ExprInspectionChecker.o: StmtNodes.inc.h
-ExprInspectionChecker.po: Checkers.inc.h
-ExprInspectionChecker.po: CommentCommandList.inc.h
-ExprInspectionChecker.po: DeclNodes.inc.h
-ExprInspectionChecker.po: DiagnosticCommonKinds.inc.h
-ExprInspectionChecker.po: StmtNodes.inc.h
-FixedAddressChecker.o: Checkers.inc.h
-FixedAddressChecker.o: CommentCommandList.inc.h
-FixedAddressChecker.o: DeclNodes.inc.h
-FixedAddressChecker.o: DiagnosticCommonKinds.inc.h
-FixedAddressChecker.o: StmtNodes.inc.h
-FixedAddressChecker.po: Checkers.inc.h
-FixedAddressChecker.po: CommentCommandList.inc.h
-FixedAddressChecker.po: DeclNodes.inc.h
-FixedAddressChecker.po: DiagnosticCommonKinds.inc.h
-FixedAddressChecker.po: StmtNodes.inc.h
-GenericTaintChecker.o: AttrList.inc.h
-GenericTaintChecker.o: Attrs.inc.h
-GenericTaintChecker.o: Checkers.inc.h
-GenericTaintChecker.o: CommentCommandList.inc.h
-GenericTaintChecker.o: DeclNodes.inc.h
-GenericTaintChecker.o: DiagnosticCommonKinds.inc.h
-GenericTaintChecker.o: StmtNodes.inc.h
-GenericTaintChecker.po: AttrList.inc.h
-GenericTaintChecker.po: Attrs.inc.h
-GenericTaintChecker.po: Checkers.inc.h
-GenericTaintChecker.po: CommentCommandList.inc.h
-GenericTaintChecker.po: DeclNodes.inc.h
-GenericTaintChecker.po: DiagnosticCommonKinds.inc.h
-GenericTaintChecker.po: StmtNodes.inc.h
-IdenticalExprChecker.o: AttrList.inc.h
-IdenticalExprChecker.o: AttrVisitor.inc.h
-IdenticalExprChecker.o: Attrs.inc.h
-IdenticalExprChecker.o: Checkers.inc.h
-IdenticalExprChecker.o: CommentCommandList.inc.h
-IdenticalExprChecker.o: DeclNodes.inc.h
-IdenticalExprChecker.o: DiagnosticCommonKinds.inc.h
-IdenticalExprChecker.o: StmtNodes.inc.h
-IdenticalExprChecker.po: AttrList.inc.h
-IdenticalExprChecker.po: AttrVisitor.inc.h
-IdenticalExprChecker.po: Attrs.inc.h
-IdenticalExprChecker.po: Checkers.inc.h
-IdenticalExprChecker.po: CommentCommandList.inc.h
-IdenticalExprChecker.po: DeclNodes.inc.h
-IdenticalExprChecker.po: DiagnosticCommonKinds.inc.h
-IdenticalExprChecker.po: StmtNodes.inc.h
-IvarInvalidationChecker.o: AttrList.inc.h
-IvarInvalidationChecker.o: Attrs.inc.h
-IvarInvalidationChecker.o: Checkers.inc.h
-IvarInvalidationChecker.o: CommentCommandList.inc.h
-IvarInvalidationChecker.o: DeclNodes.inc.h
-IvarInvalidationChecker.o: DiagnosticCommonKinds.inc.h
-IvarInvalidationChecker.o: StmtNodes.inc.h
-IvarInvalidationChecker.po: AttrList.inc.h
-IvarInvalidationChecker.po: Attrs.inc.h
-IvarInvalidationChecker.po: Checkers.inc.h
-IvarInvalidationChecker.po: CommentCommandList.inc.h
-IvarInvalidationChecker.po: DeclNodes.inc.h
-IvarInvalidationChecker.po: DiagnosticCommonKinds.inc.h
-IvarInvalidationChecker.po: StmtNodes.inc.h
-LLVMConventionsChecker.o: AttrList.inc.h
-LLVMConventionsChecker.o: Attrs.inc.h
-LLVMConventionsChecker.o: Checkers.inc.h
-LLVMConventionsChecker.o: CommentCommandList.inc.h
-LLVMConventionsChecker.o: DeclNodes.inc.h
-LLVMConventionsChecker.o: DiagnosticCommonKinds.inc.h
-LLVMConventionsChecker.o: StmtNodes.inc.h
-LLVMConventionsChecker.po: AttrList.inc.h
-LLVMConventionsChecker.po: Attrs.inc.h
-LLVMConventionsChecker.po: Checkers.inc.h
-LLVMConventionsChecker.po: CommentCommandList.inc.h
-LLVMConventionsChecker.po: DeclNodes.inc.h
-LLVMConventionsChecker.po: DiagnosticCommonKinds.inc.h
-LLVMConventionsChecker.po: StmtNodes.inc.h
-MacOSKeychainAPIChecker.o: Checkers.inc.h
-MacOSKeychainAPIChecker.o: CommentCommandList.inc.h
-MacOSKeychainAPIChecker.o: DeclNodes.inc.h
-MacOSKeychainAPIChecker.o: DiagnosticCommonKinds.inc.h
-MacOSKeychainAPIChecker.o: StmtNodes.inc.h
-MacOSKeychainAPIChecker.po: Checkers.inc.h
-MacOSKeychainAPIChecker.po: CommentCommandList.inc.h
-MacOSKeychainAPIChecker.po: DeclNodes.inc.h
-MacOSKeychainAPIChecker.po: DiagnosticCommonKinds.inc.h
-MacOSKeychainAPIChecker.po: StmtNodes.inc.h
-MacOSXAPIChecker.o: Checkers.inc.h
-MacOSXAPIChecker.o: CommentCommandList.inc.h
-MacOSXAPIChecker.o: DeclNodes.inc.h
-MacOSXAPIChecker.o: DiagnosticCommonKinds.inc.h
-MacOSXAPIChecker.o: StmtNodes.inc.h
-MacOSXAPIChecker.po: Checkers.inc.h
-MacOSXAPIChecker.po: CommentCommandList.inc.h
-MacOSXAPIChecker.po: DeclNodes.inc.h
-MacOSXAPIChecker.po: DiagnosticCommonKinds.inc.h
-MacOSXAPIChecker.po: StmtNodes.inc.h
-MallocChecker.o: AttrList.inc.h
-MallocChecker.o: Attrs.inc.h
-MallocChecker.o: Checkers.inc.h
-MallocChecker.o: CommentCommandList.inc.h
-MallocChecker.o: DeclNodes.inc.h
-MallocChecker.o: DiagnosticCommonKinds.inc.h
-MallocChecker.o: StmtNodes.inc.h
-MallocChecker.po: AttrList.inc.h
-MallocChecker.po: Attrs.inc.h
-MallocChecker.po: Checkers.inc.h
-MallocChecker.po: CommentCommandList.inc.h
-MallocChecker.po: DeclNodes.inc.h
-MallocChecker.po: DiagnosticCommonKinds.inc.h
-MallocChecker.po: StmtNodes.inc.h
-MallocOverflowSecurityChecker.o: AttrList.inc.h
-MallocOverflowSecurityChecker.o: Attrs.inc.h
-MallocOverflowSecurityChecker.o: Checkers.inc.h
-MallocOverflowSecurityChecker.o: CommentCommandList.inc.h
-MallocOverflowSecurityChecker.o: DeclNodes.inc.h
-MallocOverflowSecurityChecker.o: DiagnosticCommonKinds.inc.h
-MallocOverflowSecurityChecker.o: StmtNodes.inc.h
-MallocOverflowSecurityChecker.po: AttrList.inc.h
-MallocOverflowSecurityChecker.po: Attrs.inc.h
-MallocOverflowSecurityChecker.po: Checkers.inc.h
-MallocOverflowSecurityChecker.po: CommentCommandList.inc.h
-MallocOverflowSecurityChecker.po: DeclNodes.inc.h
-MallocOverflowSecurityChecker.po: DiagnosticCommonKinds.inc.h
-MallocOverflowSecurityChecker.po: StmtNodes.inc.h
-MallocSizeofChecker.o: Checkers.inc.h
-MallocSizeofChecker.o: CommentCommandList.inc.h
-MallocSizeofChecker.o: DeclNodes.inc.h
-MallocSizeofChecker.o: DiagnosticCommonKinds.inc.h
-MallocSizeofChecker.o: StmtNodes.inc.h
-MallocSizeofChecker.po: Checkers.inc.h
-MallocSizeofChecker.po: CommentCommandList.inc.h
-MallocSizeofChecker.po: DeclNodes.inc.h
-MallocSizeofChecker.po: DiagnosticCommonKinds.inc.h
-MallocSizeofChecker.po: StmtNodes.inc.h
-NSAutoreleasePoolChecker.o: AttrList.inc.h
-NSAutoreleasePoolChecker.o: Attrs.inc.h
-NSAutoreleasePoolChecker.o: Checkers.inc.h
-NSAutoreleasePoolChecker.o: CommentCommandList.inc.h
-NSAutoreleasePoolChecker.o: DeclNodes.inc.h
-NSAutoreleasePoolChecker.o: DiagnosticCommonKinds.inc.h
-NSAutoreleasePoolChecker.o: StmtNodes.inc.h
-NSAutoreleasePoolChecker.po: AttrList.inc.h
-NSAutoreleasePoolChecker.po: Attrs.inc.h
-NSAutoreleasePoolChecker.po: Checkers.inc.h
-NSAutoreleasePoolChecker.po: CommentCommandList.inc.h
-NSAutoreleasePoolChecker.po: DeclNodes.inc.h
-NSAutoreleasePoolChecker.po: DiagnosticCommonKinds.inc.h
-NSAutoreleasePoolChecker.po: StmtNodes.inc.h
-NSErrorChecker.o: Checkers.inc.h
-NSErrorChecker.o: CommentCommandList.inc.h
-NSErrorChecker.o: DeclNodes.inc.h
-NSErrorChecker.o: DiagnosticCommonKinds.inc.h
-NSErrorChecker.o: StmtNodes.inc.h
-NSErrorChecker.po: Checkers.inc.h
-NSErrorChecker.po: CommentCommandList.inc.h
-NSErrorChecker.po: DeclNodes.inc.h
-NSErrorChecker.po: DiagnosticCommonKinds.inc.h
-NSErrorChecker.po: StmtNodes.inc.h
-NoReturnFunctionChecker.o: AttrList.inc.h
-NoReturnFunctionChecker.o: Attrs.inc.h
-NoReturnFunctionChecker.o: Checkers.inc.h
-NoReturnFunctionChecker.o: CommentCommandList.inc.h
-NoReturnFunctionChecker.o: DeclNodes.inc.h
-NoReturnFunctionChecker.o: DiagnosticCommonKinds.inc.h
-NoReturnFunctionChecker.o: StmtNodes.inc.h
-NoReturnFunctionChecker.po: AttrList.inc.h
-NoReturnFunctionChecker.po: Attrs.inc.h
-NoReturnFunctionChecker.po: Checkers.inc.h
-NoReturnFunctionChecker.po: CommentCommandList.inc.h
-NoReturnFunctionChecker.po: DeclNodes.inc.h
-NoReturnFunctionChecker.po: DiagnosticCommonKinds.inc.h
-NoReturnFunctionChecker.po: StmtNodes.inc.h
-NonNullParamChecker.o: AttrList.inc.h
-NonNullParamChecker.o: Attrs.inc.h
-NonNullParamChecker.o: Checkers.inc.h
-NonNullParamChecker.o: CommentCommandList.inc.h
-NonNullParamChecker.o: DeclNodes.inc.h
-NonNullParamChecker.o: DiagnosticCommonKinds.inc.h
-NonNullParamChecker.o: StmtNodes.inc.h
-NonNullParamChecker.po: AttrList.inc.h
-NonNullParamChecker.po: Attrs.inc.h
-NonNullParamChecker.po: Checkers.inc.h
-NonNullParamChecker.po: CommentCommandList.inc.h
-NonNullParamChecker.po: DeclNodes.inc.h
-NonNullParamChecker.po: DiagnosticCommonKinds.inc.h
-NonNullParamChecker.po: StmtNodes.inc.h
-ObjCAtSyncChecker.o: Checkers.inc.h
-ObjCAtSyncChecker.o: CommentCommandList.inc.h
-ObjCAtSyncChecker.o: DeclNodes.inc.h
-ObjCAtSyncChecker.o: DiagnosticCommonKinds.inc.h
-ObjCAtSyncChecker.o: StmtNodes.inc.h
-ObjCAtSyncChecker.po: Checkers.inc.h
-ObjCAtSyncChecker.po: CommentCommandList.inc.h
-ObjCAtSyncChecker.po: DeclNodes.inc.h
-ObjCAtSyncChecker.po: DiagnosticCommonKinds.inc.h
-ObjCAtSyncChecker.po: StmtNodes.inc.h
-ObjCContainersASTChecker.o: Checkers.inc.h
-ObjCContainersASTChecker.o: CommentCommandList.inc.h
-ObjCContainersASTChecker.o: DeclNodes.inc.h
-ObjCContainersASTChecker.o: DiagnosticCommonKinds.inc.h
-ObjCContainersASTChecker.o: StmtNodes.inc.h
-ObjCContainersASTChecker.po: Checkers.inc.h
-ObjCContainersASTChecker.po: CommentCommandList.inc.h
-ObjCContainersASTChecker.po: DeclNodes.inc.h
-ObjCContainersASTChecker.po: DiagnosticCommonKinds.inc.h
-ObjCContainersASTChecker.po: StmtNodes.inc.h
-ObjCContainersChecker.o: Checkers.inc.h
-ObjCContainersChecker.o: CommentCommandList.inc.h
-ObjCContainersChecker.o: DeclNodes.inc.h
-ObjCContainersChecker.o: DiagnosticCommonKinds.inc.h
-ObjCContainersChecker.o: StmtNodes.inc.h
-ObjCContainersChecker.po: Checkers.inc.h
-ObjCContainersChecker.po: CommentCommandList.inc.h
-ObjCContainersChecker.po: DeclNodes.inc.h
-ObjCContainersChecker.po: DiagnosticCommonKinds.inc.h
-ObjCContainersChecker.po: StmtNodes.inc.h
-ObjCMissingSuperCallChecker.o: AttrList.inc.h
-ObjCMissingSuperCallChecker.o: AttrVisitor.inc.h
-ObjCMissingSuperCallChecker.o: Attrs.inc.h
-ObjCMissingSuperCallChecker.o: Checkers.inc.h
-ObjCMissingSuperCallChecker.o: CommentCommandList.inc.h
-ObjCMissingSuperCallChecker.o: DeclNodes.inc.h
-ObjCMissingSuperCallChecker.o: DiagnosticCommonKinds.inc.h
-ObjCMissingSuperCallChecker.o: StmtNodes.inc.h
-ObjCMissingSuperCallChecker.po: AttrList.inc.h
-ObjCMissingSuperCallChecker.po: AttrVisitor.inc.h
-ObjCMissingSuperCallChecker.po: Attrs.inc.h
-ObjCMissingSuperCallChecker.po: Checkers.inc.h
-ObjCMissingSuperCallChecker.po: CommentCommandList.inc.h
-ObjCMissingSuperCallChecker.po: DeclNodes.inc.h
-ObjCMissingSuperCallChecker.po: DiagnosticCommonKinds.inc.h
-ObjCMissingSuperCallChecker.po: StmtNodes.inc.h
-ObjCSelfInitChecker.o: AttrList.inc.h
-ObjCSelfInitChecker.o: Attrs.inc.h
-ObjCSelfInitChecker.o: Checkers.inc.h
-ObjCSelfInitChecker.o: CommentCommandList.inc.h
-ObjCSelfInitChecker.o: DeclNodes.inc.h
-ObjCSelfInitChecker.o: DiagnosticCommonKinds.inc.h
-ObjCSelfInitChecker.o: StmtNodes.inc.h
-ObjCSelfInitChecker.po: AttrList.inc.h
-ObjCSelfInitChecker.po: Attrs.inc.h
-ObjCSelfInitChecker.po: Checkers.inc.h
-ObjCSelfInitChecker.po: CommentCommandList.inc.h
-ObjCSelfInitChecker.po: DeclNodes.inc.h
-ObjCSelfInitChecker.po: DiagnosticCommonKinds.inc.h
-ObjCSelfInitChecker.po: StmtNodes.inc.h
-ObjCUnusedIVarsChecker.o: AttrList.inc.h
-ObjCUnusedIVarsChecker.o: Attrs.inc.h
-ObjCUnusedIVarsChecker.o: Checkers.inc.h
-ObjCUnusedIVarsChecker.o: CommentCommandList.inc.h
-ObjCUnusedIVarsChecker.o: DeclNodes.inc.h
-ObjCUnusedIVarsChecker.o: DiagnosticCommonKinds.inc.h
-ObjCUnusedIVarsChecker.o: StmtNodes.inc.h
-ObjCUnusedIVarsChecker.po: AttrList.inc.h
-ObjCUnusedIVarsChecker.po: Attrs.inc.h
-ObjCUnusedIVarsChecker.po: Checkers.inc.h
-ObjCUnusedIVarsChecker.po: CommentCommandList.inc.h
-ObjCUnusedIVarsChecker.po: DeclNodes.inc.h
-ObjCUnusedIVarsChecker.po: DiagnosticCommonKinds.inc.h
-ObjCUnusedIVarsChecker.po: StmtNodes.inc.h
-PointerArithChecker.o: Checkers.inc.h
-PointerArithChecker.o: CommentCommandList.inc.h
-PointerArithChecker.o: DeclNodes.inc.h
-PointerArithChecker.o: DiagnosticCommonKinds.inc.h
-PointerArithChecker.o: StmtNodes.inc.h
-PointerArithChecker.po: Checkers.inc.h
-PointerArithChecker.po: CommentCommandList.inc.h
-PointerArithChecker.po: DeclNodes.inc.h
-PointerArithChecker.po: DiagnosticCommonKinds.inc.h
-PointerArithChecker.po: StmtNodes.inc.h
-PointerSubChecker.o: Checkers.inc.h
-PointerSubChecker.o: CommentCommandList.inc.h
-PointerSubChecker.o: DeclNodes.inc.h
-PointerSubChecker.o: DiagnosticCommonKinds.inc.h
-PointerSubChecker.o: StmtNodes.inc.h
-PointerSubChecker.po: Checkers.inc.h
-PointerSubChecker.po: CommentCommandList.inc.h
-PointerSubChecker.po: DeclNodes.inc.h
-PointerSubChecker.po: DiagnosticCommonKinds.inc.h
-PointerSubChecker.po: StmtNodes.inc.h
-PthreadLockChecker.o: Checkers.inc.h
-PthreadLockChecker.o: CommentCommandList.inc.h
-PthreadLockChecker.o: DeclNodes.inc.h
-PthreadLockChecker.o: DiagnosticCommonKinds.inc.h
-PthreadLockChecker.o: StmtNodes.inc.h
-PthreadLockChecker.po: Checkers.inc.h
-PthreadLockChecker.po: CommentCommandList.inc.h
-PthreadLockChecker.po: DeclNodes.inc.h
-PthreadLockChecker.po: DiagnosticCommonKinds.inc.h
-PthreadLockChecker.po: StmtNodes.inc.h
-RetainCountChecker.o: AttrList.inc.h
-RetainCountChecker.o: Attrs.inc.h
-RetainCountChecker.o: Checkers.inc.h
-RetainCountChecker.o: CommentCommandList.inc.h
-RetainCountChecker.o: DeclNodes.inc.h
-RetainCountChecker.o: DiagnosticCommonKinds.inc.h
-RetainCountChecker.o: StmtNodes.inc.h
-RetainCountChecker.po: AttrList.inc.h
-RetainCountChecker.po: Attrs.inc.h
-RetainCountChecker.po: Checkers.inc.h
-RetainCountChecker.po: CommentCommandList.inc.h
-RetainCountChecker.po: DeclNodes.inc.h
-RetainCountChecker.po: DiagnosticCommonKinds.inc.h
-RetainCountChecker.po: StmtNodes.inc.h
-ReturnPointerRangeChecker.o: Checkers.inc.h
-ReturnPointerRangeChecker.o: CommentCommandList.inc.h
-ReturnPointerRangeChecker.o: DeclNodes.inc.h
-ReturnPointerRangeChecker.o: DiagnosticCommonKinds.inc.h
-ReturnPointerRangeChecker.o: StmtNodes.inc.h
-ReturnPointerRangeChecker.po: Checkers.inc.h
-ReturnPointerRangeChecker.po: CommentCommandList.inc.h
-ReturnPointerRangeChecker.po: DeclNodes.inc.h
-ReturnPointerRangeChecker.po: DiagnosticCommonKinds.inc.h
-ReturnPointerRangeChecker.po: StmtNodes.inc.h
-ReturnUndefChecker.o: AttrList.inc.h
-ReturnUndefChecker.o: Attrs.inc.h
-ReturnUndefChecker.o: Checkers.inc.h
-ReturnUndefChecker.o: CommentCommandList.inc.h
-ReturnUndefChecker.o: DeclNodes.inc.h
-ReturnUndefChecker.o: DiagnosticCommonKinds.inc.h
-ReturnUndefChecker.o: StmtNodes.inc.h
-ReturnUndefChecker.po: AttrList.inc.h
-ReturnUndefChecker.po: Attrs.inc.h
-ReturnUndefChecker.po: Checkers.inc.h
-ReturnUndefChecker.po: CommentCommandList.inc.h
-ReturnUndefChecker.po: DeclNodes.inc.h
-ReturnUndefChecker.po: DiagnosticCommonKinds.inc.h
-ReturnUndefChecker.po: StmtNodes.inc.h
-SimpleStreamChecker.o: AttrList.inc.h
-SimpleStreamChecker.o: Attrs.inc.h
-SimpleStreamChecker.o: Checkers.inc.h
-SimpleStreamChecker.o: CommentCommandList.inc.h
-SimpleStreamChecker.o: DeclNodes.inc.h
-SimpleStreamChecker.o: DiagnosticCommonKinds.inc.h
-SimpleStreamChecker.o: StmtNodes.inc.h
-SimpleStreamChecker.po: AttrList.inc.h
-SimpleStreamChecker.po: Attrs.inc.h
-SimpleStreamChecker.po: Checkers.inc.h
-SimpleStreamChecker.po: CommentCommandList.inc.h
-SimpleStreamChecker.po: DeclNodes.inc.h
-SimpleStreamChecker.po: DiagnosticCommonKinds.inc.h
-SimpleStreamChecker.po: StmtNodes.inc.h
-StackAddrEscapeChecker.o: Checkers.inc.h
-StackAddrEscapeChecker.o: CommentCommandList.inc.h
-StackAddrEscapeChecker.o: DeclNodes.inc.h
-StackAddrEscapeChecker.o: DiagnosticCommonKinds.inc.h
-StackAddrEscapeChecker.o: StmtNodes.inc.h
-StackAddrEscapeChecker.po: Checkers.inc.h
-StackAddrEscapeChecker.po: CommentCommandList.inc.h
-StackAddrEscapeChecker.po: DeclNodes.inc.h
-StackAddrEscapeChecker.po: DiagnosticCommonKinds.inc.h
-StackAddrEscapeChecker.po: StmtNodes.inc.h
-StreamChecker.o: Checkers.inc.h
-StreamChecker.o: CommentCommandList.inc.h
-StreamChecker.o: DeclNodes.inc.h
-StreamChecker.o: DiagnosticCommonKinds.inc.h
-StreamChecker.o: StmtNodes.inc.h
-StreamChecker.po: Checkers.inc.h
-StreamChecker.po: CommentCommandList.inc.h
-StreamChecker.po: DeclNodes.inc.h
-StreamChecker.po: DiagnosticCommonKinds.inc.h
-StreamChecker.po: StmtNodes.inc.h
-TaintTesterChecker.o: Checkers.inc.h
-TaintTesterChecker.o: CommentCommandList.inc.h
-TaintTesterChecker.o: DeclNodes.inc.h
-TaintTesterChecker.o: DiagnosticCommonKinds.inc.h
-TaintTesterChecker.o: StmtNodes.inc.h
-TaintTesterChecker.po: Checkers.inc.h
-TaintTesterChecker.po: CommentCommandList.inc.h
-TaintTesterChecker.po: DeclNodes.inc.h
-TaintTesterChecker.po: DiagnosticCommonKinds.inc.h
-TaintTesterChecker.po: StmtNodes.inc.h
-TestAfterDivZeroChecker.o: AttrList.inc.h
-TestAfterDivZeroChecker.o: Attrs.inc.h
-TestAfterDivZeroChecker.o: Checkers.inc.h
-TestAfterDivZeroChecker.o: CommentCommandList.inc.h
-TestAfterDivZeroChecker.o: DeclNodes.inc.h
-TestAfterDivZeroChecker.o: DiagnosticCommonKinds.inc.h
-TestAfterDivZeroChecker.o: StmtNodes.inc.h
-TestAfterDivZeroChecker.po: AttrList.inc.h
-TestAfterDivZeroChecker.po: Attrs.inc.h
-TestAfterDivZeroChecker.po: Checkers.inc.h
-TestAfterDivZeroChecker.po: CommentCommandList.inc.h
-TestAfterDivZeroChecker.po: DeclNodes.inc.h
-TestAfterDivZeroChecker.po: DiagnosticCommonKinds.inc.h
-TestAfterDivZeroChecker.po: StmtNodes.inc.h
-TraversalChecker.o: AttrList.inc.h
-TraversalChecker.o: Attrs.inc.h
-TraversalChecker.o: Checkers.inc.h
-TraversalChecker.o: CommentCommandList.inc.h
-TraversalChecker.o: DeclNodes.inc.h
-TraversalChecker.o: DiagnosticCommonKinds.inc.h
-TraversalChecker.o: StmtNodes.inc.h
-TraversalChecker.po: AttrList.inc.h
-TraversalChecker.po: Attrs.inc.h
-TraversalChecker.po: Checkers.inc.h
-TraversalChecker.po: CommentCommandList.inc.h
-TraversalChecker.po: DeclNodes.inc.h
-TraversalChecker.po: DiagnosticCommonKinds.inc.h
-TraversalChecker.po: StmtNodes.inc.h
-UndefBranchChecker.o: Checkers.inc.h
-UndefBranchChecker.o: CommentCommandList.inc.h
-UndefBranchChecker.o: DeclNodes.inc.h
-UndefBranchChecker.o: DiagnosticCommonKinds.inc.h
-UndefBranchChecker.o: StmtNodes.inc.h
-UndefBranchChecker.po: Checkers.inc.h
-UndefBranchChecker.po: CommentCommandList.inc.h
-UndefBranchChecker.po: DeclNodes.inc.h
-UndefBranchChecker.po: DiagnosticCommonKinds.inc.h
-UndefBranchChecker.po: StmtNodes.inc.h
-UndefCapturedBlockVarChecker.o: AttrList.inc.h
-UndefCapturedBlockVarChecker.o: Attrs.inc.h
-UndefCapturedBlockVarChecker.o: Checkers.inc.h
-UndefCapturedBlockVarChecker.o: CommentCommandList.inc.h
-UndefCapturedBlockVarChecker.o: DeclNodes.inc.h
-UndefCapturedBlockVarChecker.o: DiagnosticCommonKinds.inc.h
-UndefCapturedBlockVarChecker.o: StmtNodes.inc.h
-UndefCapturedBlockVarChecker.po: AttrList.inc.h
-UndefCapturedBlockVarChecker.po: Attrs.inc.h
-UndefCapturedBlockVarChecker.po: Checkers.inc.h
-UndefCapturedBlockVarChecker.po: CommentCommandList.inc.h
-UndefCapturedBlockVarChecker.po: DeclNodes.inc.h
-UndefCapturedBlockVarChecker.po: DiagnosticCommonKinds.inc.h
-UndefCapturedBlockVarChecker.po: StmtNodes.inc.h
-UndefResultChecker.o: Checkers.inc.h
-UndefResultChecker.o: CommentCommandList.inc.h
-UndefResultChecker.o: DeclNodes.inc.h
-UndefResultChecker.o: DiagnosticCommonKinds.inc.h
-UndefResultChecker.o: StmtNodes.inc.h
-UndefResultChecker.po: Checkers.inc.h
-UndefResultChecker.po: CommentCommandList.inc.h
-UndefResultChecker.po: DeclNodes.inc.h
-UndefResultChecker.po: DiagnosticCommonKinds.inc.h
-UndefResultChecker.po: StmtNodes.inc.h
-UndefinedArraySubscriptChecker.o: AttrList.inc.h
-UndefinedArraySubscriptChecker.o: Attrs.inc.h
-UndefinedArraySubscriptChecker.o: Checkers.inc.h
-UndefinedArraySubscriptChecker.o: CommentCommandList.inc.h
-UndefinedArraySubscriptChecker.o: DeclNodes.inc.h
-UndefinedArraySubscriptChecker.o: DiagnosticCommonKinds.inc.h
-UndefinedArraySubscriptChecker.o: StmtNodes.inc.h
-UndefinedArraySubscriptChecker.po: AttrList.inc.h
-UndefinedArraySubscriptChecker.po: Attrs.inc.h
-UndefinedArraySubscriptChecker.po: Checkers.inc.h
-UndefinedArraySubscriptChecker.po: CommentCommandList.inc.h
-UndefinedArraySubscriptChecker.po: DeclNodes.inc.h
-UndefinedArraySubscriptChecker.po: DiagnosticCommonKinds.inc.h
-UndefinedArraySubscriptChecker.po: StmtNodes.inc.h
-UndefinedAssignmentChecker.o: Checkers.inc.h
-UndefinedAssignmentChecker.o: CommentCommandList.inc.h
-UndefinedAssignmentChecker.o: DeclNodes.inc.h
-UndefinedAssignmentChecker.o: DiagnosticCommonKinds.inc.h
-UndefinedAssignmentChecker.o: StmtNodes.inc.h
-UndefinedAssignmentChecker.po: Checkers.inc.h
-UndefinedAssignmentChecker.po: CommentCommandList.inc.h
-UndefinedAssignmentChecker.po: DeclNodes.inc.h
-UndefinedAssignmentChecker.po: DiagnosticCommonKinds.inc.h
-UndefinedAssignmentChecker.po: StmtNodes.inc.h
-UnixAPIChecker.o: Checkers.inc.h
-UnixAPIChecker.o: CommentCommandList.inc.h
-UnixAPIChecker.o: DeclNodes.inc.h
-UnixAPIChecker.o: DiagnosticCommonKinds.inc.h
-UnixAPIChecker.o: StmtNodes.inc.h
-UnixAPIChecker.po: Checkers.inc.h
-UnixAPIChecker.po: CommentCommandList.inc.h
-UnixAPIChecker.po: DeclNodes.inc.h
-UnixAPIChecker.po: DiagnosticCommonKinds.inc.h
-UnixAPIChecker.po: StmtNodes.inc.h
-UnreachableCodeChecker.o: Checkers.inc.h
-UnreachableCodeChecker.o: CommentCommandList.inc.h
-UnreachableCodeChecker.o: DeclNodes.inc.h
-UnreachableCodeChecker.o: DiagnosticCommonKinds.inc.h
-UnreachableCodeChecker.o: StmtNodes.inc.h
-UnreachableCodeChecker.po: Checkers.inc.h
-UnreachableCodeChecker.po: CommentCommandList.inc.h
-UnreachableCodeChecker.po: DeclNodes.inc.h
-UnreachableCodeChecker.po: DiagnosticCommonKinds.inc.h
-UnreachableCodeChecker.po: StmtNodes.inc.h
-VLASizeChecker.o: Checkers.inc.h
-VLASizeChecker.o: CommentCommandList.inc.h
-VLASizeChecker.o: DeclNodes.inc.h
-VLASizeChecker.o: DiagnosticCommonKinds.inc.h
-VLASizeChecker.o: StmtNodes.inc.h
-VLASizeChecker.po: Checkers.inc.h
-VLASizeChecker.po: CommentCommandList.inc.h
-VLASizeChecker.po: DeclNodes.inc.h
-VLASizeChecker.po: DiagnosticCommonKinds.inc.h
-VLASizeChecker.po: StmtNodes.inc.h
-VirtualCallChecker.o: AttrList.inc.h
-VirtualCallChecker.o: Attrs.inc.h
-VirtualCallChecker.o: Checkers.inc.h
-VirtualCallChecker.o: CommentCommandList.inc.h
-VirtualCallChecker.o: DeclNodes.inc.h
-VirtualCallChecker.o: DiagnosticCommonKinds.inc.h
-VirtualCallChecker.o: StmtNodes.inc.h
-VirtualCallChecker.po: AttrList.inc.h
-VirtualCallChecker.po: Attrs.inc.h
-VirtualCallChecker.po: Checkers.inc.h
-VirtualCallChecker.po: CommentCommandList.inc.h
-VirtualCallChecker.po: DeclNodes.inc.h
-VirtualCallChecker.po: DiagnosticCommonKinds.inc.h
-VirtualCallChecker.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
index 5dfb2ffb..264ede1 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend
@@ -13,330 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalysisManager.o: CommentCommandList.inc.h
-AnalysisManager.o: DeclNodes.inc.h
-AnalysisManager.o: DiagnosticCommonKinds.inc.h
-AnalysisManager.o: StmtNodes.inc.h
-AnalysisManager.po: CommentCommandList.inc.h
-AnalysisManager.po: DeclNodes.inc.h
-AnalysisManager.po: DiagnosticCommonKinds.inc.h
-AnalysisManager.po: StmtNodes.inc.h
-AnalyzerOptions.o: CommentCommandList.inc.h
-AnalyzerOptions.o: DeclNodes.inc.h
-AnalyzerOptions.o: DiagnosticCommonKinds.inc.h
-AnalyzerOptions.o: StmtNodes.inc.h
-AnalyzerOptions.po: CommentCommandList.inc.h
-AnalyzerOptions.po: DeclNodes.inc.h
-AnalyzerOptions.po: DiagnosticCommonKinds.inc.h
-AnalyzerOptions.po: StmtNodes.inc.h
-BasicValueFactory.o: CommentCommandList.inc.h
-BasicValueFactory.o: DeclNodes.inc.h
-BasicValueFactory.o: DiagnosticCommonKinds.inc.h
-BasicValueFactory.o: StmtNodes.inc.h
-BasicValueFactory.po: CommentCommandList.inc.h
-BasicValueFactory.po: DeclNodes.inc.h
-BasicValueFactory.po: DiagnosticCommonKinds.inc.h
-BasicValueFactory.po: StmtNodes.inc.h
-BugReporter.o: CommentCommandList.inc.h
-BugReporter.o: DeclNodes.inc.h
-BugReporter.o: DiagnosticCommonKinds.inc.h
-BugReporter.o: StmtNodes.inc.h
-BugReporter.po: CommentCommandList.inc.h
-BugReporter.po: DeclNodes.inc.h
-BugReporter.po: DiagnosticCommonKinds.inc.h
-BugReporter.po: StmtNodes.inc.h
-BugReporterVisitors.o: AttrList.inc.h
-BugReporterVisitors.o: Attrs.inc.h
-BugReporterVisitors.o: CommentCommandList.inc.h
-BugReporterVisitors.o: DeclNodes.inc.h
-BugReporterVisitors.o: DiagnosticCommonKinds.inc.h
-BugReporterVisitors.o: StmtNodes.inc.h
-BugReporterVisitors.po: AttrList.inc.h
-BugReporterVisitors.po: Attrs.inc.h
-BugReporterVisitors.po: CommentCommandList.inc.h
-BugReporterVisitors.po: DeclNodes.inc.h
-BugReporterVisitors.po: DiagnosticCommonKinds.inc.h
-BugReporterVisitors.po: StmtNodes.inc.h
-CallEvent.o: AttrList.inc.h
-CallEvent.o: Attrs.inc.h
-CallEvent.o: CommentCommandList.inc.h
-CallEvent.o: DeclNodes.inc.h
-CallEvent.o: DiagnosticCommonKinds.inc.h
-CallEvent.o: StmtNodes.inc.h
-CallEvent.po: AttrList.inc.h
-CallEvent.po: Attrs.inc.h
-CallEvent.po: CommentCommandList.inc.h
-CallEvent.po: DeclNodes.inc.h
-CallEvent.po: DiagnosticCommonKinds.inc.h
-CallEvent.po: StmtNodes.inc.h
-Checker.o: CommentCommandList.inc.h
-Checker.o: DeclNodes.inc.h
-Checker.o: DiagnosticCommonKinds.inc.h
-Checker.o: StmtNodes.inc.h
-Checker.po: CommentCommandList.inc.h
-Checker.po: DeclNodes.inc.h
-Checker.po: DiagnosticCommonKinds.inc.h
-Checker.po: StmtNodes.inc.h
-CheckerContext.o: CommentCommandList.inc.h
-CheckerContext.o: DeclNodes.inc.h
-CheckerContext.o: DiagnosticCommonKinds.inc.h
-CheckerContext.o: StmtNodes.inc.h
-CheckerContext.po: CommentCommandList.inc.h
-CheckerContext.po: DeclNodes.inc.h
-CheckerContext.po: DiagnosticCommonKinds.inc.h
-CheckerContext.po: StmtNodes.inc.h
-CheckerHelpers.o: DeclNodes.inc.h
-CheckerHelpers.o: DiagnosticCommonKinds.inc.h
-CheckerHelpers.o: StmtNodes.inc.h
-CheckerHelpers.po: DeclNodes.inc.h
-CheckerHelpers.po: DiagnosticCommonKinds.inc.h
-CheckerHelpers.po: StmtNodes.inc.h
-CheckerManager.o: AttrList.inc.h
-CheckerManager.o: Attrs.inc.h
-CheckerManager.o: CommentCommandList.inc.h
-CheckerManager.o: DeclNodes.inc.h
-CheckerManager.o: DiagnosticCommonKinds.inc.h
-CheckerManager.o: StmtNodes.inc.h
-CheckerManager.po: AttrList.inc.h
-CheckerManager.po: Attrs.inc.h
-CheckerManager.po: CommentCommandList.inc.h
-CheckerManager.po: DeclNodes.inc.h
-CheckerManager.po: DiagnosticCommonKinds.inc.h
-CheckerManager.po: StmtNodes.inc.h
-CheckerRegistry.o: CommentCommandList.inc.h
-CheckerRegistry.o: DeclNodes.inc.h
-CheckerRegistry.o: DiagnosticCommonKinds.inc.h
-CheckerRegistry.o: DiagnosticFrontendKinds.inc.h
-CheckerRegistry.o: StmtNodes.inc.h
-CheckerRegistry.po: CommentCommandList.inc.h
-CheckerRegistry.po: DeclNodes.inc.h
-CheckerRegistry.po: DiagnosticCommonKinds.inc.h
-CheckerRegistry.po: DiagnosticFrontendKinds.inc.h
-CheckerRegistry.po: StmtNodes.inc.h
-ConstraintManager.o: CommentCommandList.inc.h
-ConstraintManager.o: DeclNodes.inc.h
-ConstraintManager.o: DiagnosticCommonKinds.inc.h
-ConstraintManager.o: StmtNodes.inc.h
-ConstraintManager.po: CommentCommandList.inc.h
-ConstraintManager.po: DeclNodes.inc.h
-ConstraintManager.po: DiagnosticCommonKinds.inc.h
-ConstraintManager.po: StmtNodes.inc.h
-CoreEngine.o: CommentCommandList.inc.h
-CoreEngine.o: DeclNodes.inc.h
-CoreEngine.o: DiagnosticCommonKinds.inc.h
-CoreEngine.o: StmtNodes.inc.h
-CoreEngine.po: CommentCommandList.inc.h
-CoreEngine.po: DeclNodes.inc.h
-CoreEngine.po: DiagnosticCommonKinds.inc.h
-CoreEngine.po: StmtNodes.inc.h
-Environment.o: CommentCommandList.inc.h
-Environment.o: DeclNodes.inc.h
-Environment.o: DiagnosticCommonKinds.inc.h
-Environment.o: StmtNodes.inc.h
-Environment.po: CommentCommandList.inc.h
-Environment.po: DeclNodes.inc.h
-Environment.po: DiagnosticCommonKinds.inc.h
-Environment.po: StmtNodes.inc.h
-ExplodedGraph.o: AttrList.inc.h
-ExplodedGraph.o: Attrs.inc.h
-ExplodedGraph.o: CommentCommandList.inc.h
-ExplodedGraph.o: DeclNodes.inc.h
-ExplodedGraph.o: DiagnosticCommonKinds.inc.h
-ExplodedGraph.o: StmtNodes.inc.h
-ExplodedGraph.po: AttrList.inc.h
-ExplodedGraph.po: Attrs.inc.h
-ExplodedGraph.po: CommentCommandList.inc.h
-ExplodedGraph.po: DeclNodes.inc.h
-ExplodedGraph.po: DiagnosticCommonKinds.inc.h
-ExplodedGraph.po: StmtNodes.inc.h
-ExprEngine.o: AttrList.inc.h
-ExprEngine.o: Attrs.inc.h
-ExprEngine.o: CommentCommandList.inc.h
-ExprEngine.o: DeclNodes.inc.h
-ExprEngine.o: DiagnosticCommonKinds.inc.h
-ExprEngine.o: StmtNodes.inc.h
-ExprEngine.po: AttrList.inc.h
-ExprEngine.po: Attrs.inc.h
-ExprEngine.po: CommentCommandList.inc.h
-ExprEngine.po: DeclNodes.inc.h
-ExprEngine.po: DiagnosticCommonKinds.inc.h
-ExprEngine.po: StmtNodes.inc.h
-ExprEngineC.o: CommentCommandList.inc.h
-ExprEngineC.o: DeclNodes.inc.h
-ExprEngineC.o: DiagnosticCommonKinds.inc.h
-ExprEngineC.o: StmtNodes.inc.h
-ExprEngineC.po: CommentCommandList.inc.h
-ExprEngineC.po: DeclNodes.inc.h
-ExprEngineC.po: DiagnosticCommonKinds.inc.h
-ExprEngineC.po: StmtNodes.inc.h
-ExprEngineCXX.o: AttrList.inc.h
-ExprEngineCXX.o: Attrs.inc.h
-ExprEngineCXX.o: CommentCommandList.inc.h
-ExprEngineCXX.o: DeclNodes.inc.h
-ExprEngineCXX.o: DiagnosticCommonKinds.inc.h
-ExprEngineCXX.o: StmtNodes.inc.h
-ExprEngineCXX.po: AttrList.inc.h
-ExprEngineCXX.po: Attrs.inc.h
-ExprEngineCXX.po: CommentCommandList.inc.h
-ExprEngineCXX.po: DeclNodes.inc.h
-ExprEngineCXX.po: DiagnosticCommonKinds.inc.h
-ExprEngineCXX.po: StmtNodes.inc.h
-ExprEngineCallAndReturn.o: AttrList.inc.h
-ExprEngineCallAndReturn.o: Attrs.inc.h
-ExprEngineCallAndReturn.o: CommentCommandList.inc.h
-ExprEngineCallAndReturn.o: DeclNodes.inc.h
-ExprEngineCallAndReturn.o: DiagnosticCommonKinds.inc.h
-ExprEngineCallAndReturn.o: StmtNodes.inc.h
-ExprEngineCallAndReturn.po: AttrList.inc.h
-ExprEngineCallAndReturn.po: Attrs.inc.h
-ExprEngineCallAndReturn.po: CommentCommandList.inc.h
-ExprEngineCallAndReturn.po: DeclNodes.inc.h
-ExprEngineCallAndReturn.po: DiagnosticCommonKinds.inc.h
-ExprEngineCallAndReturn.po: StmtNodes.inc.h
-ExprEngineObjC.o: AttrList.inc.h
-ExprEngineObjC.o: Attrs.inc.h
-ExprEngineObjC.o: CommentCommandList.inc.h
-ExprEngineObjC.o: DeclNodes.inc.h
-ExprEngineObjC.o: DiagnosticCommonKinds.inc.h
-ExprEngineObjC.o: StmtNodes.inc.h
-ExprEngineObjC.po: AttrList.inc.h
-ExprEngineObjC.po: Attrs.inc.h
-ExprEngineObjC.po: CommentCommandList.inc.h
-ExprEngineObjC.po: DeclNodes.inc.h
-ExprEngineObjC.po: DiagnosticCommonKinds.inc.h
-ExprEngineObjC.po: StmtNodes.inc.h
-HTMLDiagnostics.o: CommentCommandList.inc.h
-HTMLDiagnostics.o: DeclNodes.inc.h
-HTMLDiagnostics.o: DiagnosticCommonKinds.inc.h
-HTMLDiagnostics.o: StmtNodes.inc.h
-HTMLDiagnostics.po: CommentCommandList.inc.h
-HTMLDiagnostics.po: DeclNodes.inc.h
-HTMLDiagnostics.po: DiagnosticCommonKinds.inc.h
-HTMLDiagnostics.po: StmtNodes.inc.h
-MemRegion.o: AttrList.inc.h
-MemRegion.o: Attrs.inc.h
-MemRegion.o: CommentCommandList.inc.h
-MemRegion.o: DeclNodes.inc.h
-MemRegion.o: DiagnosticCommonKinds.inc.h
-MemRegion.o: StmtNodes.inc.h
-MemRegion.po: AttrList.inc.h
-MemRegion.po: Attrs.inc.h
-MemRegion.po: CommentCommandList.inc.h
-MemRegion.po: DeclNodes.inc.h
-MemRegion.po: DiagnosticCommonKinds.inc.h
-MemRegion.po: StmtNodes.inc.h
-PathDiagnostic.o: AttrList.inc.h
-PathDiagnostic.o: Attrs.inc.h
-PathDiagnostic.o: CommentCommandList.inc.h
-PathDiagnostic.o: DeclNodes.inc.h
-PathDiagnostic.o: DiagnosticCommonKinds.inc.h
-PathDiagnostic.o: StmtNodes.inc.h
-PathDiagnostic.po: AttrList.inc.h
-PathDiagnostic.po: Attrs.inc.h
-PathDiagnostic.po: CommentCommandList.inc.h
-PathDiagnostic.po: DeclNodes.inc.h
-PathDiagnostic.po: DiagnosticCommonKinds.inc.h
-PathDiagnostic.po: StmtNodes.inc.h
-PlistDiagnostics.o: DeclNodes.inc.h
-PlistDiagnostics.o: DiagnosticCommonKinds.inc.h
-PlistDiagnostics.o: StmtNodes.inc.h
-PlistDiagnostics.po: DeclNodes.inc.h
-PlistDiagnostics.po: DiagnosticCommonKinds.inc.h
-PlistDiagnostics.po: StmtNodes.inc.h
-ProgramState.o: AttrList.inc.h
-ProgramState.o: Attrs.inc.h
-ProgramState.o: CommentCommandList.inc.h
-ProgramState.o: DeclNodes.inc.h
-ProgramState.o: DiagnosticCommonKinds.inc.h
-ProgramState.o: StmtNodes.inc.h
-ProgramState.po: AttrList.inc.h
-ProgramState.po: Attrs.inc.h
-ProgramState.po: CommentCommandList.inc.h
-ProgramState.po: DeclNodes.inc.h
-ProgramState.po: DiagnosticCommonKinds.inc.h
-ProgramState.po: StmtNodes.inc.h
-RangeConstraintManager.o: CommentCommandList.inc.h
-RangeConstraintManager.o: DeclNodes.inc.h
-RangeConstraintManager.o: DiagnosticCommonKinds.inc.h
-RangeConstraintManager.o: StmtNodes.inc.h
-RangeConstraintManager.po: CommentCommandList.inc.h
-RangeConstraintManager.po: DeclNodes.inc.h
-RangeConstraintManager.po: DiagnosticCommonKinds.inc.h
-RangeConstraintManager.po: StmtNodes.inc.h
-RegionStore.o: AttrList.inc.h
-RegionStore.o: Attrs.inc.h
-RegionStore.o: CommentCommandList.inc.h
-RegionStore.o: DeclNodes.inc.h
-RegionStore.o: DiagnosticCommonKinds.inc.h
-RegionStore.o: StmtNodes.inc.h
-RegionStore.po: AttrList.inc.h
-RegionStore.po: Attrs.inc.h
-RegionStore.po: CommentCommandList.inc.h
-RegionStore.po: DeclNodes.inc.h
-RegionStore.po: DiagnosticCommonKinds.inc.h
-RegionStore.po: StmtNodes.inc.h
-SValBuilder.o: AttrList.inc.h
-SValBuilder.o: Attrs.inc.h
-SValBuilder.o: CommentCommandList.inc.h
-SValBuilder.o: DeclNodes.inc.h
-SValBuilder.o: DiagnosticCommonKinds.inc.h
-SValBuilder.o: StmtNodes.inc.h
-SValBuilder.po: AttrList.inc.h
-SValBuilder.po: Attrs.inc.h
-SValBuilder.po: CommentCommandList.inc.h
-SValBuilder.po: DeclNodes.inc.h
-SValBuilder.po: DiagnosticCommonKinds.inc.h
-SValBuilder.po: StmtNodes.inc.h
-SVals.o: CommentCommandList.inc.h
-SVals.o: DeclNodes.inc.h
-SVals.o: DiagnosticCommonKinds.inc.h
-SVals.o: StmtNodes.inc.h
-SVals.po: CommentCommandList.inc.h
-SVals.po: DeclNodes.inc.h
-SVals.po: DiagnosticCommonKinds.inc.h
-SVals.po: StmtNodes.inc.h
-SimpleConstraintManager.o: CommentCommandList.inc.h
-SimpleConstraintManager.o: DeclNodes.inc.h
-SimpleConstraintManager.o: DiagnosticCommonKinds.inc.h
-SimpleConstraintManager.o: StmtNodes.inc.h
-SimpleConstraintManager.po: CommentCommandList.inc.h
-SimpleConstraintManager.po: DeclNodes.inc.h
-SimpleConstraintManager.po: DiagnosticCommonKinds.inc.h
-SimpleConstraintManager.po: StmtNodes.inc.h
-SimpleSValBuilder.o: CommentCommandList.inc.h
-SimpleSValBuilder.o: DeclNodes.inc.h
-SimpleSValBuilder.o: DiagnosticCommonKinds.inc.h
-SimpleSValBuilder.o: StmtNodes.inc.h
-SimpleSValBuilder.po: CommentCommandList.inc.h
-SimpleSValBuilder.po: DeclNodes.inc.h
-SimpleSValBuilder.po: DiagnosticCommonKinds.inc.h
-SimpleSValBuilder.po: StmtNodes.inc.h
-Store.o: AttrList.inc.h
-Store.o: Attrs.inc.h
-Store.o: CommentCommandList.inc.h
-Store.o: DeclNodes.inc.h
-Store.o: DiagnosticCommonKinds.inc.h
-Store.o: StmtNodes.inc.h
-Store.po: AttrList.inc.h
-Store.po: Attrs.inc.h
-Store.po: CommentCommandList.inc.h
-Store.po: DeclNodes.inc.h
-Store.po: DiagnosticCommonKinds.inc.h
-Store.po: StmtNodes.inc.h
-SubEngine.o: CommentCommandList.inc.h
-SubEngine.o: DeclNodes.inc.h
-SubEngine.o: DiagnosticCommonKinds.inc.h
-SubEngine.o: StmtNodes.inc.h
-SubEngine.po: CommentCommandList.inc.h
-SubEngine.po: DeclNodes.inc.h
-SubEngine.po: DiagnosticCommonKinds.inc.h
-SubEngine.po: StmtNodes.inc.h
-SymbolManager.o: CommentCommandList.inc.h
-SymbolManager.o: DeclNodes.inc.h
-SymbolManager.o: DiagnosticCommonKinds.inc.h
-SymbolManager.o: StmtNodes.inc.h
-SymbolManager.po: CommentCommandList.inc.h
-SymbolManager.po: DeclNodes.inc.h
-SymbolManager.po: DiagnosticCommonKinds.inc.h
-SymbolManager.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
index 77ea2dd..264ede1 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
@@ -13,54 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalysisConsumer.o: AttrList.inc.h
-AnalysisConsumer.o: AttrVisitor.inc.h
-AnalysisConsumer.o: Attrs.inc.h
-AnalysisConsumer.o: CommentCommandList.inc.h
-AnalysisConsumer.o: DeclNodes.inc.h
-AnalysisConsumer.o: DiagnosticCommonKinds.inc.h
-AnalysisConsumer.o: StmtNodes.inc.h
-AnalysisConsumer.po: AttrList.inc.h
-AnalysisConsumer.po: AttrVisitor.inc.h
-AnalysisConsumer.po: Attrs.inc.h
-AnalysisConsumer.po: CommentCommandList.inc.h
-AnalysisConsumer.po: DeclNodes.inc.h
-AnalysisConsumer.po: DiagnosticCommonKinds.inc.h
-AnalysisConsumer.po: StmtNodes.inc.h
-CheckerRegistration.o: CommentCommandList.inc.h
-CheckerRegistration.o: DeclNodes.inc.h
-CheckerRegistration.o: DiagnosticCommonKinds.inc.h
-CheckerRegistration.o: DiagnosticFrontendKinds.inc.h
-CheckerRegistration.o: StmtNodes.inc.h
-CheckerRegistration.po: CommentCommandList.inc.h
-CheckerRegistration.po: DeclNodes.inc.h
-CheckerRegistration.po: DiagnosticCommonKinds.inc.h
-CheckerRegistration.po: DiagnosticFrontendKinds.inc.h
-CheckerRegistration.po: StmtNodes.inc.h
-FrontendActions.o: CommentCommandList.inc.h
-FrontendActions.o: DeclNodes.inc.h
-FrontendActions.o: DiagnosticCommonKinds.inc.h
-FrontendActions.o: StmtNodes.inc.h
-FrontendActions.po: CommentCommandList.inc.h
-FrontendActions.po: DeclNodes.inc.h
-FrontendActions.po: DiagnosticCommonKinds.inc.h
-FrontendActions.po: StmtNodes.inc.h
-ModelConsumer.o: DeclNodes.inc.h
-ModelConsumer.o: DiagnosticCommonKinds.inc.h
-ModelConsumer.po: DeclNodes.inc.h
-ModelConsumer.po: DiagnosticCommonKinds.inc.h
-ModelInjector.o: AttrList.inc.h
-ModelInjector.o: AttrParsedAttrList.inc.h
-ModelInjector.o: Attrs.inc.h
-ModelInjector.o: CommentCommandList.inc.h
-ModelInjector.o: DeclNodes.inc.h
-ModelInjector.o: DiagnosticCommonKinds.inc.h
-ModelInjector.o: StmtNodes.inc.h
-ModelInjector.po: AttrList.inc.h
-ModelInjector.po: AttrParsedAttrList.inc.h
-ModelInjector.po: Attrs.inc.h
-ModelInjector.po: CommentCommandList.inc.h
-ModelInjector.po: DeclNodes.inc.h
-ModelInjector.po: DiagnosticCommonKinds.inc.h
-ModelInjector.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbAPI/Makefile.depend b/lib/clang/liblldbAPI/Makefile.depend
index b2cd7b6..264ede1 100644
--- a/lib/clang/liblldbAPI/Makefile.depend
+++ b/lib/clang/liblldbAPI/Makefile.depend
@@ -13,152 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SBBlock.o: DiagnosticCommonKinds.inc.h
-SBBlock.po: DiagnosticCommonKinds.inc.h
-SBCompileUnit.o: DiagnosticCommonKinds.inc.h
-SBCompileUnit.po: DiagnosticCommonKinds.inc.h
-SBDebugger.o: AttrList.inc.h
-SBDebugger.o: Attrs.inc.h
-SBDebugger.o: CommentCommandList.inc.h
-SBDebugger.o: DeclNodes.inc.h
-SBDebugger.o: DiagnosticCommonKinds.inc.h
-SBDebugger.o: StmtNodes.inc.h
-SBDebugger.po: AttrList.inc.h
-SBDebugger.po: Attrs.inc.h
-SBDebugger.po: CommentCommandList.inc.h
-SBDebugger.po: DeclNodes.inc.h
-SBDebugger.po: DiagnosticCommonKinds.inc.h
-SBDebugger.po: StmtNodes.inc.h
-SBFrame.o: DiagnosticCommonKinds.inc.h
-SBFrame.po: DiagnosticCommonKinds.inc.h
-SBFunction.o: DiagnosticCommonKinds.inc.h
-SBFunction.po: DiagnosticCommonKinds.inc.h
-SBLanguageRuntime.o: DiagnosticCommonKinds.inc.h
-SBLanguageRuntime.po: DiagnosticCommonKinds.inc.h
-SBModule.o: CommentCommandList.inc.h
-SBModule.o: DeclNodes.inc.h
-SBModule.o: DiagnosticCommonKinds.inc.h
-SBModule.o: StmtNodes.inc.h
-SBModule.po: CommentCommandList.inc.h
-SBModule.po: DeclNodes.inc.h
-SBModule.po: DiagnosticCommonKinds.inc.h
-SBModule.po: StmtNodes.inc.h
-SBSymbolContext.o: DiagnosticCommonKinds.inc.h
-SBSymbolContext.po: DiagnosticCommonKinds.inc.h
-SBTarget.o: CommentCommandList.inc.h
-SBTarget.o: DeclNodes.inc.h
-SBTarget.o: DiagnosticCommonKinds.inc.h
-SBTarget.o: StmtNodes.inc.h
-SBTarget.po: CommentCommandList.inc.h
-SBTarget.po: DeclNodes.inc.h
-SBTarget.po: DiagnosticCommonKinds.inc.h
-SBTarget.po: StmtNodes.inc.h
-SBThread.o: DiagnosticCommonKinds.inc.h
-SBThread.po: DiagnosticCommonKinds.inc.h
-SBThreadPlan.o: DiagnosticCommonKinds.inc.h
-SBThreadPlan.po: DiagnosticCommonKinds.inc.h
-SBType.o: CommentCommandList.inc.h
-SBType.o: DeclNodes.inc.h
-SBType.o: DiagnosticCommonKinds.inc.h
-SBType.o: StmtNodes.inc.h
-SBType.po: CommentCommandList.inc.h
-SBType.po: DeclNodes.inc.h
-SBType.po: DiagnosticCommonKinds.inc.h
-SBType.po: StmtNodes.inc.h
-SBTypeCategory.o: AttrList.inc.h
-SBTypeCategory.o: Attrs.inc.h
-SBTypeCategory.o: CommentCommandList.inc.h
-SBTypeCategory.o: DeclNodes.inc.h
-SBTypeCategory.o: DiagnosticCommonKinds.inc.h
-SBTypeCategory.o: StmtNodes.inc.h
-SBTypeCategory.po: AttrList.inc.h
-SBTypeCategory.po: Attrs.inc.h
-SBTypeCategory.po: CommentCommandList.inc.h
-SBTypeCategory.po: DeclNodes.inc.h
-SBTypeCategory.po: DiagnosticCommonKinds.inc.h
-SBTypeCategory.po: StmtNodes.inc.h
-SBTypeEnumMember.o: DiagnosticCommonKinds.inc.h
-SBTypeEnumMember.po: DiagnosticCommonKinds.inc.h
-SBTypeFilter.o: AttrList.inc.h
-SBTypeFilter.o: Attrs.inc.h
-SBTypeFilter.o: CommentCommandList.inc.h
-SBTypeFilter.o: DeclNodes.inc.h
-SBTypeFilter.o: DiagnosticCommonKinds.inc.h
-SBTypeFilter.o: StmtNodes.inc.h
-SBTypeFilter.po: AttrList.inc.h
-SBTypeFilter.po: Attrs.inc.h
-SBTypeFilter.po: CommentCommandList.inc.h
-SBTypeFilter.po: DeclNodes.inc.h
-SBTypeFilter.po: DiagnosticCommonKinds.inc.h
-SBTypeFilter.po: StmtNodes.inc.h
-SBTypeFormat.o: AttrList.inc.h
-SBTypeFormat.o: Attrs.inc.h
-SBTypeFormat.o: CommentCommandList.inc.h
-SBTypeFormat.o: DeclNodes.inc.h
-SBTypeFormat.o: DiagnosticCommonKinds.inc.h
-SBTypeFormat.o: StmtNodes.inc.h
-SBTypeFormat.po: AttrList.inc.h
-SBTypeFormat.po: Attrs.inc.h
-SBTypeFormat.po: CommentCommandList.inc.h
-SBTypeFormat.po: DeclNodes.inc.h
-SBTypeFormat.po: DiagnosticCommonKinds.inc.h
-SBTypeFormat.po: StmtNodes.inc.h
-SBTypeNameSpecifier.o: AttrList.inc.h
-SBTypeNameSpecifier.o: Attrs.inc.h
-SBTypeNameSpecifier.o: CommentCommandList.inc.h
-SBTypeNameSpecifier.o: DeclNodes.inc.h
-SBTypeNameSpecifier.o: DiagnosticCommonKinds.inc.h
-SBTypeNameSpecifier.o: StmtNodes.inc.h
-SBTypeNameSpecifier.po: AttrList.inc.h
-SBTypeNameSpecifier.po: Attrs.inc.h
-SBTypeNameSpecifier.po: CommentCommandList.inc.h
-SBTypeNameSpecifier.po: DeclNodes.inc.h
-SBTypeNameSpecifier.po: DiagnosticCommonKinds.inc.h
-SBTypeNameSpecifier.po: StmtNodes.inc.h
-SBTypeSummary.o: AttrList.inc.h
-SBTypeSummary.o: Attrs.inc.h
-SBTypeSummary.o: CommentCommandList.inc.h
-SBTypeSummary.o: DeclNodes.inc.h
-SBTypeSummary.o: DiagnosticCommonKinds.inc.h
-SBTypeSummary.o: StmtNodes.inc.h
-SBTypeSummary.po: AttrList.inc.h
-SBTypeSummary.po: Attrs.inc.h
-SBTypeSummary.po: CommentCommandList.inc.h
-SBTypeSummary.po: DeclNodes.inc.h
-SBTypeSummary.po: DiagnosticCommonKinds.inc.h
-SBTypeSummary.po: StmtNodes.inc.h
-SBTypeSynthetic.o: AttrList.inc.h
-SBTypeSynthetic.o: Attrs.inc.h
-SBTypeSynthetic.o: CommentCommandList.inc.h
-SBTypeSynthetic.o: DeclNodes.inc.h
-SBTypeSynthetic.o: DiagnosticCommonKinds.inc.h
-SBTypeSynthetic.o: StmtNodes.inc.h
-SBTypeSynthetic.po: AttrList.inc.h
-SBTypeSynthetic.po: Attrs.inc.h
-SBTypeSynthetic.po: CommentCommandList.inc.h
-SBTypeSynthetic.po: DeclNodes.inc.h
-SBTypeSynthetic.po: DiagnosticCommonKinds.inc.h
-SBTypeSynthetic.po: StmtNodes.inc.h
-SBValue.o: AttrList.inc.h
-SBValue.o: Attrs.inc.h
-SBValue.o: CommentCommandList.inc.h
-SBValue.o: DeclNodes.inc.h
-SBValue.o: DiagnosticCommonKinds.inc.h
-SBValue.o: StmtNodes.inc.h
-SBValue.po: AttrList.inc.h
-SBValue.po: Attrs.inc.h
-SBValue.po: CommentCommandList.inc.h
-SBValue.po: DeclNodes.inc.h
-SBValue.po: DiagnosticCommonKinds.inc.h
-SBValue.po: StmtNodes.inc.h
-SBWatchpoint.o: DiagnosticCommonKinds.inc.h
-SBWatchpoint.po: DiagnosticCommonKinds.inc.h
-SystemInitializerFull.o: CommentCommandList.inc.h
-SystemInitializerFull.o: DeclNodes.inc.h
-SystemInitializerFull.o: DiagnosticCommonKinds.inc.h
-SystemInitializerFull.o: StmtNodes.inc.h
-SystemInitializerFull.po: CommentCommandList.inc.h
-SystemInitializerFull.po: DeclNodes.inc.h
-SystemInitializerFull.po: DiagnosticCommonKinds.inc.h
-SystemInitializerFull.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbBreakpoint/Makefile.depend b/lib/clang/liblldbBreakpoint/Makefile.depend
index 2dfc006..264ede1 100644
--- a/lib/clang/liblldbBreakpoint/Makefile.depend
+++ b/lib/clang/liblldbBreakpoint/Makefile.depend
@@ -13,30 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Breakpoint.o: DiagnosticCommonKinds.inc.h
-Breakpoint.po: DiagnosticCommonKinds.inc.h
-BreakpointLocation.o: DiagnosticCommonKinds.inc.h
-BreakpointLocation.po: DiagnosticCommonKinds.inc.h
-BreakpointOptions.o: DiagnosticCommonKinds.inc.h
-BreakpointOptions.po: DiagnosticCommonKinds.inc.h
-BreakpointResolver.o: DiagnosticCommonKinds.inc.h
-BreakpointResolver.po: DiagnosticCommonKinds.inc.h
-BreakpointResolverFileLine.o: DiagnosticCommonKinds.inc.h
-BreakpointResolverFileLine.po: DiagnosticCommonKinds.inc.h
-BreakpointResolverFileRegex.o: DiagnosticCommonKinds.inc.h
-BreakpointResolverFileRegex.po: DiagnosticCommonKinds.inc.h
-BreakpointResolverName.o: DiagnosticCommonKinds.inc.h
-BreakpointResolverName.po: DiagnosticCommonKinds.inc.h
-Watchpoint.o: CommentCommandList.inc.h
-Watchpoint.o: DeclNodes.inc.h
-Watchpoint.o: DiagnosticCommonKinds.inc.h
-Watchpoint.o: StmtNodes.inc.h
-Watchpoint.po: CommentCommandList.inc.h
-Watchpoint.po: DeclNodes.inc.h
-Watchpoint.po: DiagnosticCommonKinds.inc.h
-Watchpoint.po: StmtNodes.inc.h
-WatchpointList.o: DiagnosticCommonKinds.inc.h
-WatchpointList.po: DiagnosticCommonKinds.inc.h
-WatchpointOptions.o: DiagnosticCommonKinds.inc.h
-WatchpointOptions.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbCommands/Makefile.depend b/lib/clang/liblldbCommands/Makefile.depend
index e1d128a..264ede1 100644
--- a/lib/clang/liblldbCommands/Makefile.depend
+++ b/lib/clang/liblldbCommands/Makefile.depend
@@ -13,62 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-CommandCompletions.o: DiagnosticCommonKinds.inc.h
-CommandCompletions.po: DiagnosticCommonKinds.inc.h
-CommandObjectArgs.o: CommentCommandList.inc.h
-CommandObjectArgs.o: DeclNodes.inc.h
-CommandObjectArgs.o: DiagnosticCommonKinds.inc.h
-CommandObjectArgs.o: StmtNodes.inc.h
-CommandObjectArgs.po: CommentCommandList.inc.h
-CommandObjectArgs.po: DeclNodes.inc.h
-CommandObjectArgs.po: DiagnosticCommonKinds.inc.h
-CommandObjectArgs.po: StmtNodes.inc.h
-CommandObjectBreakpoint.o: DiagnosticCommonKinds.inc.h
-CommandObjectBreakpoint.po: DiagnosticCommonKinds.inc.h
-CommandObjectDisassemble.o: DiagnosticCommonKinds.inc.h
-CommandObjectDisassemble.po: DiagnosticCommonKinds.inc.h
-CommandObjectExpression.o: DiagnosticCommonKinds.inc.h
-CommandObjectExpression.po: DiagnosticCommonKinds.inc.h
-CommandObjectFrame.o: AttrList.inc.h
-CommandObjectFrame.o: Attrs.inc.h
-CommandObjectFrame.o: CommentCommandList.inc.h
-CommandObjectFrame.o: DeclNodes.inc.h
-CommandObjectFrame.o: DiagnosticCommonKinds.inc.h
-CommandObjectFrame.o: StmtNodes.inc.h
-CommandObjectFrame.po: AttrList.inc.h
-CommandObjectFrame.po: Attrs.inc.h
-CommandObjectFrame.po: CommentCommandList.inc.h
-CommandObjectFrame.po: DeclNodes.inc.h
-CommandObjectFrame.po: DiagnosticCommonKinds.inc.h
-CommandObjectFrame.po: StmtNodes.inc.h
-CommandObjectLanguage.o: DiagnosticCommonKinds.inc.h
-CommandObjectLanguage.po: DiagnosticCommonKinds.inc.h
-CommandObjectLog.o: DiagnosticCommonKinds.inc.h
-CommandObjectLog.po: DiagnosticCommonKinds.inc.h
-CommandObjectMemory.o: DeclNodes.inc.h
-CommandObjectMemory.o: DiagnosticCommonKinds.inc.h
-CommandObjectMemory.po: DeclNodes.inc.h
-CommandObjectMemory.po: DiagnosticCommonKinds.inc.h
-CommandObjectSource.o: DiagnosticCommonKinds.inc.h
-CommandObjectSource.po: DiagnosticCommonKinds.inc.h
-CommandObjectTarget.o: DiagnosticCommonKinds.inc.h
-CommandObjectTarget.po: DiagnosticCommonKinds.inc.h
-CommandObjectThread.o: DiagnosticCommonKinds.inc.h
-CommandObjectThread.po: DiagnosticCommonKinds.inc.h
-CommandObjectType.o: AttrList.inc.h
-CommandObjectType.o: Attrs.inc.h
-CommandObjectType.o: CommentCommandList.inc.h
-CommandObjectType.o: DeclNodes.inc.h
-CommandObjectType.o: DiagnosticCommonKinds.inc.h
-CommandObjectType.o: StmtNodes.inc.h
-CommandObjectType.po: AttrList.inc.h
-CommandObjectType.po: Attrs.inc.h
-CommandObjectType.po: CommentCommandList.inc.h
-CommandObjectType.po: DeclNodes.inc.h
-CommandObjectType.po: DiagnosticCommonKinds.inc.h
-CommandObjectType.po: StmtNodes.inc.h
-CommandObjectWatchpoint.o: DiagnosticCommonKinds.inc.h
-CommandObjectWatchpoint.po: DiagnosticCommonKinds.inc.h
-CommandObjectWatchpointCommand.o: DiagnosticCommonKinds.inc.h
-CommandObjectWatchpointCommand.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbCore/Makefile.depend b/lib/clang/liblldbCore/Makefile.depend
index f48a002..fdb79da 100644
--- a/lib/clang/liblldbCore/Makefile.depend
+++ b/lib/clang/liblldbCore/Makefile.depend
@@ -16,116 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Address.o: DiagnosticCommonKinds.inc.h
-Address.po: DiagnosticCommonKinds.inc.h
-AddressResolverFileLine.o: DiagnosticCommonKinds.inc.h
-AddressResolverFileLine.po: DiagnosticCommonKinds.inc.h
-AddressResolverName.o: DiagnosticCommonKinds.inc.h
-AddressResolverName.po: DiagnosticCommonKinds.inc.h
-DataExtractor.o: CommentCommandList.inc.h
-DataExtractor.o: DeclNodes.inc.h
-DataExtractor.o: DiagnosticCommonKinds.inc.h
-DataExtractor.o: StmtNodes.inc.h
-DataExtractor.po: CommentCommandList.inc.h
-DataExtractor.po: DeclNodes.inc.h
-DataExtractor.po: DiagnosticCommonKinds.inc.h
-DataExtractor.po: StmtNodes.inc.h
-Debugger.o: AttrList.inc.h
-Debugger.o: Attrs.inc.h
-Debugger.o: CommentCommandList.inc.h
-Debugger.o: DeclNodes.inc.h
-Debugger.o: DiagnosticCommonKinds.inc.h
-Debugger.o: StmtNodes.inc.h
-Debugger.po: AttrList.inc.h
-Debugger.po: Attrs.inc.h
-Debugger.po: CommentCommandList.inc.h
-Debugger.po: DeclNodes.inc.h
-Debugger.po: DiagnosticCommonKinds.inc.h
-Debugger.po: StmtNodes.inc.h
-Disassembler.o: DiagnosticCommonKinds.inc.h
-Disassembler.po: DiagnosticCommonKinds.inc.h
-FileLineResolver.o: DiagnosticCommonKinds.inc.h
-FileLineResolver.po: DiagnosticCommonKinds.inc.h
-FormatEntity.o: AttrList.inc.h
-FormatEntity.o: Attrs.inc.h
-FormatEntity.o: CommentCommandList.inc.h
-FormatEntity.o: DeclNodes.inc.h
-FormatEntity.o: DiagnosticCommonKinds.inc.h
-FormatEntity.o: StmtNodes.inc.h
-FormatEntity.po: AttrList.inc.h
-FormatEntity.po: Attrs.inc.h
-FormatEntity.po: CommentCommandList.inc.h
-FormatEntity.po: DeclNodes.inc.h
-FormatEntity.po: DiagnosticCommonKinds.inc.h
-FormatEntity.po: StmtNodes.inc.h
-IOHandler.o: DiagnosticCommonKinds.inc.h
-IOHandler.po: DiagnosticCommonKinds.inc.h
-Mangled.o: DiagnosticCommonKinds.inc.h
-Mangled.po: DiagnosticCommonKinds.inc.h
-Module.o: CommentCommandList.inc.h
-Module.o: DeclNodes.inc.h
-Module.o: DiagnosticCommonKinds.inc.h
-Module.o: StmtNodes.inc.h
-Module.po: CommentCommandList.inc.h
-Module.po: DeclNodes.inc.h
-Module.po: DiagnosticCommonKinds.inc.h
-Module.po: StmtNodes.inc.h
-SearchFilter.o: DiagnosticCommonKinds.inc.h
-SearchFilter.po: DiagnosticCommonKinds.inc.h
-SourceManager.o: DiagnosticCommonKinds.inc.h
-SourceManager.po: DiagnosticCommonKinds.inc.h
-Value.o: CommentCommandList.inc.h
-Value.o: DeclNodes.inc.h
-Value.o: DiagnosticCommonKinds.inc.h
-Value.o: StmtNodes.inc.h
-Value.po: CommentCommandList.inc.h
-Value.po: DeclNodes.inc.h
-Value.po: DiagnosticCommonKinds.inc.h
-Value.po: StmtNodes.inc.h
-ValueObject.o: AttrList.inc.h
-ValueObject.o: Attrs.inc.h
-ValueObject.o: CommentCommandList.inc.h
-ValueObject.o: DeclNodes.inc.h
-ValueObject.o: DiagnosticCommonKinds.inc.h
-ValueObject.o: StmtNodes.inc.h
-ValueObject.po: AttrList.inc.h
-ValueObject.po: Attrs.inc.h
-ValueObject.po: CommentCommandList.inc.h
-ValueObject.po: DeclNodes.inc.h
-ValueObject.po: DiagnosticCommonKinds.inc.h
-ValueObject.po: StmtNodes.inc.h
-ValueObjectCast.o: DiagnosticCommonKinds.inc.h
-ValueObjectCast.po: DiagnosticCommonKinds.inc.h
-ValueObjectChild.o: DiagnosticCommonKinds.inc.h
-ValueObjectChild.po: DiagnosticCommonKinds.inc.h
-ValueObjectConstResult.o: DiagnosticCommonKinds.inc.h
-ValueObjectConstResult.po: DiagnosticCommonKinds.inc.h
-ValueObjectConstResultChild.o: CommentCommandList.inc.h
-ValueObjectConstResultChild.o: DeclNodes.inc.h
-ValueObjectConstResultChild.o: DiagnosticCommonKinds.inc.h
-ValueObjectConstResultChild.o: StmtNodes.inc.h
-ValueObjectConstResultChild.po: CommentCommandList.inc.h
-ValueObjectConstResultChild.po: DeclNodes.inc.h
-ValueObjectConstResultChild.po: DiagnosticCommonKinds.inc.h
-ValueObjectConstResultChild.po: StmtNodes.inc.h
-ValueObjectConstResultImpl.o: DiagnosticCommonKinds.inc.h
-ValueObjectConstResultImpl.po: DiagnosticCommonKinds.inc.h
-ValueObjectDynamicValue.o: DiagnosticCommonKinds.inc.h
-ValueObjectDynamicValue.po: DiagnosticCommonKinds.inc.h
-ValueObjectList.o: DiagnosticCommonKinds.inc.h
-ValueObjectList.po: DiagnosticCommonKinds.inc.h
-ValueObjectMemory.o: DiagnosticCommonKinds.inc.h
-ValueObjectMemory.po: DiagnosticCommonKinds.inc.h
-ValueObjectRegister.o: CommentCommandList.inc.h
-ValueObjectRegister.o: DeclNodes.inc.h
-ValueObjectRegister.o: DiagnosticCommonKinds.inc.h
-ValueObjectRegister.o: StmtNodes.inc.h
-ValueObjectRegister.po: CommentCommandList.inc.h
-ValueObjectRegister.po: DeclNodes.inc.h
-ValueObjectRegister.po: DiagnosticCommonKinds.inc.h
-ValueObjectRegister.po: StmtNodes.inc.h
-ValueObjectSyntheticFilter.o: DiagnosticCommonKinds.inc.h
-ValueObjectSyntheticFilter.po: DiagnosticCommonKinds.inc.h
-ValueObjectVariable.o: DiagnosticCommonKinds.inc.h
-ValueObjectVariable.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbDataFormatters/Makefile.depend b/lib/clang/liblldbDataFormatters/Makefile.depend
index 951ee74..264ede1 100644
--- a/lib/clang/liblldbDataFormatters/Makefile.depend
+++ b/lib/clang/liblldbDataFormatters/Makefile.depend
@@ -13,210 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-CF.o: CommentCommandList.inc.h
-CF.o: DeclNodes.inc.h
-CF.o: DiagnosticCommonKinds.inc.h
-CF.o: StmtNodes.inc.h
-CF.po: CommentCommandList.inc.h
-CF.po: DeclNodes.inc.h
-CF.po: DiagnosticCommonKinds.inc.h
-CF.po: StmtNodes.inc.h
-CXXFormatterFunctions.o: CommentCommandList.inc.h
-CXXFormatterFunctions.o: DeclNodes.inc.h
-CXXFormatterFunctions.o: DiagnosticCommonKinds.inc.h
-CXXFormatterFunctions.o: StmtNodes.inc.h
-CXXFormatterFunctions.po: CommentCommandList.inc.h
-CXXFormatterFunctions.po: DeclNodes.inc.h
-CXXFormatterFunctions.po: DiagnosticCommonKinds.inc.h
-CXXFormatterFunctions.po: StmtNodes.inc.h
-Cocoa.o: CommentCommandList.inc.h
-Cocoa.o: DeclNodes.inc.h
-Cocoa.o: DiagnosticCommonKinds.inc.h
-Cocoa.o: StmtNodes.inc.h
-Cocoa.po: CommentCommandList.inc.h
-Cocoa.po: DeclNodes.inc.h
-Cocoa.po: DiagnosticCommonKinds.inc.h
-Cocoa.po: StmtNodes.inc.h
-DataVisualization.o: AttrList.inc.h
-DataVisualization.o: Attrs.inc.h
-DataVisualization.o: CommentCommandList.inc.h
-DataVisualization.o: DeclNodes.inc.h
-DataVisualization.o: DiagnosticCommonKinds.inc.h
-DataVisualization.o: StmtNodes.inc.h
-DataVisualization.po: AttrList.inc.h
-DataVisualization.po: Attrs.inc.h
-DataVisualization.po: CommentCommandList.inc.h
-DataVisualization.po: DeclNodes.inc.h
-DataVisualization.po: DiagnosticCommonKinds.inc.h
-DataVisualization.po: StmtNodes.inc.h
-FormatCache.o: DiagnosticCommonKinds.inc.h
-FormatCache.po: DiagnosticCommonKinds.inc.h
-FormatClasses.o: DiagnosticCommonKinds.inc.h
-FormatClasses.po: DiagnosticCommonKinds.inc.h
-FormatManager.o: AttrList.inc.h
-FormatManager.o: Attrs.inc.h
-FormatManager.o: CommentCommandList.inc.h
-FormatManager.o: DeclNodes.inc.h
-FormatManager.o: DiagnosticCommonKinds.inc.h
-FormatManager.o: StmtNodes.inc.h
-FormatManager.po: AttrList.inc.h
-FormatManager.po: Attrs.inc.h
-FormatManager.po: CommentCommandList.inc.h
-FormatManager.po: DeclNodes.inc.h
-FormatManager.po: DiagnosticCommonKinds.inc.h
-FormatManager.po: StmtNodes.inc.h
-LibCxx.o: CommentCommandList.inc.h
-LibCxx.o: DeclNodes.inc.h
-LibCxx.o: DiagnosticCommonKinds.inc.h
-LibCxx.o: StmtNodes.inc.h
-LibCxx.po: CommentCommandList.inc.h
-LibCxx.po: DeclNodes.inc.h
-LibCxx.po: DiagnosticCommonKinds.inc.h
-LibCxx.po: StmtNodes.inc.h
-LibCxxInitializerList.o: CommentCommandList.inc.h
-LibCxxInitializerList.o: DeclNodes.inc.h
-LibCxxInitializerList.o: DiagnosticCommonKinds.inc.h
-LibCxxInitializerList.o: StmtNodes.inc.h
-LibCxxInitializerList.po: CommentCommandList.inc.h
-LibCxxInitializerList.po: DeclNodes.inc.h
-LibCxxInitializerList.po: DiagnosticCommonKinds.inc.h
-LibCxxInitializerList.po: StmtNodes.inc.h
-LibCxxList.o: CommentCommandList.inc.h
-LibCxxList.o: DeclNodes.inc.h
-LibCxxList.o: DiagnosticCommonKinds.inc.h
-LibCxxList.o: StmtNodes.inc.h
-LibCxxList.po: CommentCommandList.inc.h
-LibCxxList.po: DeclNodes.inc.h
-LibCxxList.po: DiagnosticCommonKinds.inc.h
-LibCxxList.po: StmtNodes.inc.h
-LibCxxMap.o: CommentCommandList.inc.h
-LibCxxMap.o: DeclNodes.inc.h
-LibCxxMap.o: DiagnosticCommonKinds.inc.h
-LibCxxMap.o: StmtNodes.inc.h
-LibCxxMap.po: CommentCommandList.inc.h
-LibCxxMap.po: DeclNodes.inc.h
-LibCxxMap.po: DiagnosticCommonKinds.inc.h
-LibCxxMap.po: StmtNodes.inc.h
-LibCxxUnorderedMap.o: CommentCommandList.inc.h
-LibCxxUnorderedMap.o: DeclNodes.inc.h
-LibCxxUnorderedMap.o: DiagnosticCommonKinds.inc.h
-LibCxxUnorderedMap.o: StmtNodes.inc.h
-LibCxxUnorderedMap.po: CommentCommandList.inc.h
-LibCxxUnorderedMap.po: DeclNodes.inc.h
-LibCxxUnorderedMap.po: DiagnosticCommonKinds.inc.h
-LibCxxUnorderedMap.po: StmtNodes.inc.h
-LibCxxVector.o: CommentCommandList.inc.h
-LibCxxVector.o: DeclNodes.inc.h
-LibCxxVector.o: DiagnosticCommonKinds.inc.h
-LibCxxVector.o: StmtNodes.inc.h
-LibCxxVector.po: CommentCommandList.inc.h
-LibCxxVector.po: DeclNodes.inc.h
-LibCxxVector.po: DiagnosticCommonKinds.inc.h
-LibCxxVector.po: StmtNodes.inc.h
-LibStdcpp.o: CommentCommandList.inc.h
-LibStdcpp.o: DeclNodes.inc.h
-LibStdcpp.o: DiagnosticCommonKinds.inc.h
-LibStdcpp.o: StmtNodes.inc.h
-LibStdcpp.po: CommentCommandList.inc.h
-LibStdcpp.po: DeclNodes.inc.h
-LibStdcpp.po: DiagnosticCommonKinds.inc.h
-LibStdcpp.po: StmtNodes.inc.h
-NSArray.o: CommentCommandList.inc.h
-NSArray.o: DeclNodes.inc.h
-NSArray.o: DiagnosticCommonKinds.inc.h
-NSArray.o: StmtNodes.inc.h
-NSArray.po: CommentCommandList.inc.h
-NSArray.po: DeclNodes.inc.h
-NSArray.po: DiagnosticCommonKinds.inc.h
-NSArray.po: StmtNodes.inc.h
-NSDictionary.o: AttrList.inc.h
-NSDictionary.o: Attrs.inc.h
-NSDictionary.o: CommentCommandList.inc.h
-NSDictionary.o: DeclNodes.inc.h
-NSDictionary.o: DiagnosticCommonKinds.inc.h
-NSDictionary.o: StmtNodes.inc.h
-NSDictionary.po: AttrList.inc.h
-NSDictionary.po: Attrs.inc.h
-NSDictionary.po: CommentCommandList.inc.h
-NSDictionary.po: DeclNodes.inc.h
-NSDictionary.po: DiagnosticCommonKinds.inc.h
-NSDictionary.po: StmtNodes.inc.h
-NSIndexPath.o: CommentCommandList.inc.h
-NSIndexPath.o: DeclNodes.inc.h
-NSIndexPath.o: DiagnosticCommonKinds.inc.h
-NSIndexPath.o: StmtNodes.inc.h
-NSIndexPath.po: CommentCommandList.inc.h
-NSIndexPath.po: DeclNodes.inc.h
-NSIndexPath.po: DiagnosticCommonKinds.inc.h
-NSIndexPath.po: StmtNodes.inc.h
-NSSet.o: CommentCommandList.inc.h
-NSSet.o: DeclNodes.inc.h
-NSSet.o: DiagnosticCommonKinds.inc.h
-NSSet.o: StmtNodes.inc.h
-NSSet.po: CommentCommandList.inc.h
-NSSet.po: DeclNodes.inc.h
-NSSet.po: DiagnosticCommonKinds.inc.h
-NSSet.po: StmtNodes.inc.h
-StringPrinter.o: DiagnosticCommonKinds.inc.h
-StringPrinter.po: DiagnosticCommonKinds.inc.h
-TypeCategory.o: AttrList.inc.h
-TypeCategory.o: Attrs.inc.h
-TypeCategory.o: CommentCommandList.inc.h
-TypeCategory.o: DeclNodes.inc.h
-TypeCategory.o: DiagnosticCommonKinds.inc.h
-TypeCategory.o: StmtNodes.inc.h
-TypeCategory.po: AttrList.inc.h
-TypeCategory.po: Attrs.inc.h
-TypeCategory.po: CommentCommandList.inc.h
-TypeCategory.po: DeclNodes.inc.h
-TypeCategory.po: DiagnosticCommonKinds.inc.h
-TypeCategory.po: StmtNodes.inc.h
-TypeCategoryMap.o: AttrList.inc.h
-TypeCategoryMap.o: Attrs.inc.h
-TypeCategoryMap.o: CommentCommandList.inc.h
-TypeCategoryMap.o: DeclNodes.inc.h
-TypeCategoryMap.o: DiagnosticCommonKinds.inc.h
-TypeCategoryMap.o: StmtNodes.inc.h
-TypeCategoryMap.po: AttrList.inc.h
-TypeCategoryMap.po: Attrs.inc.h
-TypeCategoryMap.po: CommentCommandList.inc.h
-TypeCategoryMap.po: DeclNodes.inc.h
-TypeCategoryMap.po: DiagnosticCommonKinds.inc.h
-TypeCategoryMap.po: StmtNodes.inc.h
-TypeFormat.o: AttrList.inc.h
-TypeFormat.o: Attrs.inc.h
-TypeFormat.o: CommentCommandList.inc.h
-TypeFormat.o: DeclNodes.inc.h
-TypeFormat.o: DiagnosticCommonKinds.inc.h
-TypeFormat.o: StmtNodes.inc.h
-TypeFormat.po: AttrList.inc.h
-TypeFormat.po: Attrs.inc.h
-TypeFormat.po: CommentCommandList.inc.h
-TypeFormat.po: DeclNodes.inc.h
-TypeFormat.po: DiagnosticCommonKinds.inc.h
-TypeFormat.po: StmtNodes.inc.h
-TypeSummary.o: DiagnosticCommonKinds.inc.h
-TypeSummary.po: DiagnosticCommonKinds.inc.h
-TypeSynthetic.o: DiagnosticCommonKinds.inc.h
-TypeSynthetic.po: DiagnosticCommonKinds.inc.h
-ValueObjectPrinter.o: AttrList.inc.h
-ValueObjectPrinter.o: Attrs.inc.h
-ValueObjectPrinter.o: CommentCommandList.inc.h
-ValueObjectPrinter.o: DeclNodes.inc.h
-ValueObjectPrinter.o: DiagnosticCommonKinds.inc.h
-ValueObjectPrinter.o: StmtNodes.inc.h
-ValueObjectPrinter.po: AttrList.inc.h
-ValueObjectPrinter.po: Attrs.inc.h
-ValueObjectPrinter.po: CommentCommandList.inc.h
-ValueObjectPrinter.po: DeclNodes.inc.h
-ValueObjectPrinter.po: DiagnosticCommonKinds.inc.h
-ValueObjectPrinter.po: StmtNodes.inc.h
-VectorType.o: CommentCommandList.inc.h
-VectorType.o: DeclNodes.inc.h
-VectorType.o: DiagnosticCommonKinds.inc.h
-VectorType.o: StmtNodes.inc.h
-VectorType.po: CommentCommandList.inc.h
-VectorType.po: DeclNodes.inc.h
-VectorType.po: DiagnosticCommonKinds.inc.h
-VectorType.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbExpression/Makefile.depend b/lib/clang/liblldbExpression/Makefile.depend
index 097e8f7..9a1b84e 100644
--- a/lib/clang/liblldbExpression/Makefile.depend
+++ b/lib/clang/liblldbExpression/Makefile.depend
@@ -14,162 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ASTDumper.o: AttrList.inc.h
-ASTDumper.o: Attrs.inc.h
-ASTDumper.o: DeclNodes.inc.h
-ASTDumper.o: DiagnosticCommonKinds.inc.h
-ASTDumper.o: StmtNodes.inc.h
-ASTDumper.po: AttrList.inc.h
-ASTDumper.po: Attrs.inc.h
-ASTDumper.po: DeclNodes.inc.h
-ASTDumper.po: DiagnosticCommonKinds.inc.h
-ASTDumper.po: StmtNodes.inc.h
-ASTResultSynthesizer.o: AttrList.inc.h
-ASTResultSynthesizer.o: AttrParsedAttrList.inc.h
-ASTResultSynthesizer.o: Attrs.inc.h
-ASTResultSynthesizer.o: CommentCommandList.inc.h
-ASTResultSynthesizer.o: DeclNodes.inc.h
-ASTResultSynthesizer.o: DiagnosticCommonKinds.inc.h
-ASTResultSynthesizer.o: DiagnosticSemaKinds.inc.h
-ASTResultSynthesizer.o: StmtNodes.inc.h
-ASTResultSynthesizer.po: AttrList.inc.h
-ASTResultSynthesizer.po: AttrParsedAttrList.inc.h
-ASTResultSynthesizer.po: Attrs.inc.h
-ASTResultSynthesizer.po: CommentCommandList.inc.h
-ASTResultSynthesizer.po: DeclNodes.inc.h
-ASTResultSynthesizer.po: DiagnosticCommonKinds.inc.h
-ASTResultSynthesizer.po: DiagnosticSemaKinds.inc.h
-ASTResultSynthesizer.po: StmtNodes.inc.h
-ASTStructExtractor.o: AttrList.inc.h
-ASTStructExtractor.o: AttrParsedAttrList.inc.h
-ASTStructExtractor.o: Attrs.inc.h
-ASTStructExtractor.o: CommentCommandList.inc.h
-ASTStructExtractor.o: DeclNodes.inc.h
-ASTStructExtractor.o: DiagnosticCommonKinds.inc.h
-ASTStructExtractor.o: StmtNodes.inc.h
-ASTStructExtractor.po: AttrList.inc.h
-ASTStructExtractor.po: AttrParsedAttrList.inc.h
-ASTStructExtractor.po: Attrs.inc.h
-ASTStructExtractor.po: CommentCommandList.inc.h
-ASTStructExtractor.po: DeclNodes.inc.h
-ASTStructExtractor.po: DiagnosticCommonKinds.inc.h
-ASTStructExtractor.po: StmtNodes.inc.h
-ClangASTSource.o: AttrList.inc.h
-ClangASTSource.o: Attrs.inc.h
-ClangASTSource.o: CommentCommandList.inc.h
-ClangASTSource.o: DeclNodes.inc.h
-ClangASTSource.o: DiagnosticCommonKinds.inc.h
-ClangASTSource.o: StmtNodes.inc.h
-ClangASTSource.po: AttrList.inc.h
-ClangASTSource.po: Attrs.inc.h
-ClangASTSource.po: CommentCommandList.inc.h
-ClangASTSource.po: DeclNodes.inc.h
-ClangASTSource.po: DiagnosticCommonKinds.inc.h
-ClangASTSource.po: StmtNodes.inc.h
-ClangExpressionDeclMap.o: AttrList.inc.h
-ClangExpressionDeclMap.o: Attrs.inc.h
-ClangExpressionDeclMap.o: CommentCommandList.inc.h
-ClangExpressionDeclMap.o: DeclNodes.inc.h
-ClangExpressionDeclMap.o: DiagnosticCommonKinds.inc.h
-ClangExpressionDeclMap.o: StmtNodes.inc.h
-ClangExpressionDeclMap.po: AttrList.inc.h
-ClangExpressionDeclMap.po: Attrs.inc.h
-ClangExpressionDeclMap.po: CommentCommandList.inc.h
-ClangExpressionDeclMap.po: DeclNodes.inc.h
-ClangExpressionDeclMap.po: DiagnosticCommonKinds.inc.h
-ClangExpressionDeclMap.po: StmtNodes.inc.h
-ClangExpressionParser.o: CommentCommandList.inc.h
-ClangExpressionParser.o: DeclNodes.inc.h
-ClangExpressionParser.o: DiagnosticCommonKinds.inc.h
-ClangExpressionParser.o: DiagnosticFrontendKinds.inc.h
-ClangExpressionParser.o: StmtNodes.inc.h
-ClangExpressionParser.po: CommentCommandList.inc.h
-ClangExpressionParser.po: DeclNodes.inc.h
-ClangExpressionParser.po: DiagnosticCommonKinds.inc.h
-ClangExpressionParser.po: DiagnosticFrontendKinds.inc.h
-ClangExpressionParser.po: StmtNodes.inc.h
-ClangExpressionVariable.o: CommentCommandList.inc.h
-ClangExpressionVariable.o: DeclNodes.inc.h
-ClangExpressionVariable.o: DiagnosticCommonKinds.inc.h
-ClangExpressionVariable.o: StmtNodes.inc.h
-ClangExpressionVariable.po: CommentCommandList.inc.h
-ClangExpressionVariable.po: DeclNodes.inc.h
-ClangExpressionVariable.po: DiagnosticCommonKinds.inc.h
-ClangExpressionVariable.po: StmtNodes.inc.h
-ClangFunction.o: AttrList.inc.h
-ClangFunction.o: Attrs.inc.h
-ClangFunction.o: CommentCommandList.inc.h
-ClangFunction.o: DeclNodes.inc.h
-ClangFunction.o: DiagnosticCommonKinds.inc.h
-ClangFunction.o: StmtNodes.inc.h
-ClangFunction.po: AttrList.inc.h
-ClangFunction.po: Attrs.inc.h
-ClangFunction.po: CommentCommandList.inc.h
-ClangFunction.po: DeclNodes.inc.h
-ClangFunction.po: DiagnosticCommonKinds.inc.h
-ClangFunction.po: StmtNodes.inc.h
-ClangModulesDeclVendor.o: AttrList.inc.h
-ClangModulesDeclVendor.o: AttrParsedAttrList.inc.h
-ClangModulesDeclVendor.o: Attrs.inc.h
-ClangModulesDeclVendor.o: CommentCommandList.inc.h
-ClangModulesDeclVendor.o: DeclNodes.inc.h
-ClangModulesDeclVendor.o: DiagnosticCommonKinds.inc.h
-ClangModulesDeclVendor.o: StmtNodes.inc.h
-ClangModulesDeclVendor.po: AttrList.inc.h
-ClangModulesDeclVendor.po: AttrParsedAttrList.inc.h
-ClangModulesDeclVendor.po: Attrs.inc.h
-ClangModulesDeclVendor.po: CommentCommandList.inc.h
-ClangModulesDeclVendor.po: DeclNodes.inc.h
-ClangModulesDeclVendor.po: DiagnosticCommonKinds.inc.h
-ClangModulesDeclVendor.po: StmtNodes.inc.h
-ClangPersistentVariables.o: DiagnosticCommonKinds.inc.h
-ClangPersistentVariables.po: DiagnosticCommonKinds.inc.h
-ClangUserExpression.o: AttrList.inc.h
-ClangUserExpression.o: Attrs.inc.h
-ClangUserExpression.o: CommentCommandList.inc.h
-ClangUserExpression.o: DeclNodes.inc.h
-ClangUserExpression.o: DiagnosticCommonKinds.inc.h
-ClangUserExpression.o: StmtNodes.inc.h
-ClangUserExpression.po: AttrList.inc.h
-ClangUserExpression.po: Attrs.inc.h
-ClangUserExpression.po: CommentCommandList.inc.h
-ClangUserExpression.po: DeclNodes.inc.h
-ClangUserExpression.po: DiagnosticCommonKinds.inc.h
-ClangUserExpression.po: StmtNodes.inc.h
-ClangUtilityFunction.o: DeclNodes.inc.h
-ClangUtilityFunction.o: DiagnosticCommonKinds.inc.h
-ClangUtilityFunction.po: DeclNodes.inc.h
-ClangUtilityFunction.po: DiagnosticCommonKinds.inc.h
-DWARFExpression.o: DeclNodes.inc.h
-DWARFExpression.o: DiagnosticCommonKinds.inc.h
-DWARFExpression.po: DeclNodes.inc.h
-DWARFExpression.po: DiagnosticCommonKinds.inc.h
-ExpressionSourceCode.o: DiagnosticCommonKinds.inc.h
-ExpressionSourceCode.po: DiagnosticCommonKinds.inc.h
-IRDynamicChecks.o: DiagnosticCommonKinds.inc.h
-IRDynamicChecks.po: DiagnosticCommonKinds.inc.h
-IRExecutionUnit.o: DiagnosticCommonKinds.inc.h
-IRExecutionUnit.po: DiagnosticCommonKinds.inc.h
-IRForTarget.o: CommentCommandList.inc.h
-IRForTarget.o: DeclNodes.inc.h
-IRForTarget.o: DiagnosticCommonKinds.inc.h
-IRForTarget.o: Intrinsics.inc.h
-IRForTarget.o: StmtNodes.inc.h
-IRForTarget.po: CommentCommandList.inc.h
-IRForTarget.po: DeclNodes.inc.h
-IRForTarget.po: DiagnosticCommonKinds.inc.h
-IRForTarget.po: Intrinsics.inc.h
-IRForTarget.po: StmtNodes.inc.h
-IRInterpreter.o: DiagnosticCommonKinds.inc.h
-IRInterpreter.o: Intrinsics.inc.h
-IRInterpreter.po: DiagnosticCommonKinds.inc.h
-IRInterpreter.po: Intrinsics.inc.h
-Materializer.o: CommentCommandList.inc.h
-Materializer.o: DeclNodes.inc.h
-Materializer.o: DiagnosticCommonKinds.inc.h
-Materializer.o: StmtNodes.inc.h
-Materializer.po: CommentCommandList.inc.h
-Materializer.po: DeclNodes.inc.h
-Materializer.po: DiagnosticCommonKinds.inc.h
-Materializer.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbInterpreter/Makefile.depend b/lib/clang/liblldbInterpreter/Makefile.depend
index c780fa8..709e511 100644
--- a/lib/clang/liblldbInterpreter/Makefile.depend
+++ b/lib/clang/liblldbInterpreter/Makefile.depend
@@ -14,118 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Args.o: AttrList.inc.h
-Args.o: Attrs.inc.h
-Args.o: CommentCommandList.inc.h
-Args.o: DeclNodes.inc.h
-Args.o: DiagnosticCommonKinds.inc.h
-Args.o: StmtNodes.inc.h
-Args.po: AttrList.inc.h
-Args.po: Attrs.inc.h
-Args.po: CommentCommandList.inc.h
-Args.po: DeclNodes.inc.h
-Args.po: DiagnosticCommonKinds.inc.h
-Args.po: StmtNodes.inc.h
-CommandInterpreter.o: DiagnosticCommonKinds.inc.h
-CommandInterpreter.po: DiagnosticCommonKinds.inc.h
-CommandObject.o: AttrList.inc.h
-CommandObject.o: Attrs.inc.h
-CommandObject.o: CommentCommandList.inc.h
-CommandObject.o: DeclNodes.inc.h
-CommandObject.o: DiagnosticCommonKinds.inc.h
-CommandObject.o: StmtNodes.inc.h
-CommandObject.po: AttrList.inc.h
-CommandObject.po: Attrs.inc.h
-CommandObject.po: CommentCommandList.inc.h
-CommandObject.po: DeclNodes.inc.h
-CommandObject.po: DiagnosticCommonKinds.inc.h
-CommandObject.po: StmtNodes.inc.h
-CommandObjectScript.o: AttrList.inc.h
-CommandObjectScript.o: Attrs.inc.h
-CommandObjectScript.o: CommentCommandList.inc.h
-CommandObjectScript.o: DeclNodes.inc.h
-CommandObjectScript.o: DiagnosticCommonKinds.inc.h
-CommandObjectScript.o: StmtNodes.inc.h
-CommandObjectScript.po: AttrList.inc.h
-CommandObjectScript.po: Attrs.inc.h
-CommandObjectScript.po: CommentCommandList.inc.h
-CommandObjectScript.po: DeclNodes.inc.h
-CommandObjectScript.po: DiagnosticCommonKinds.inc.h
-CommandObjectScript.po: StmtNodes.inc.h
-OptionGroupValueObjectDisplay.o: DiagnosticCommonKinds.inc.h
-OptionGroupValueObjectDisplay.po: DiagnosticCommonKinds.inc.h
-OptionGroupVariable.o: AttrList.inc.h
-OptionGroupVariable.o: Attrs.inc.h
-OptionGroupVariable.o: CommentCommandList.inc.h
-OptionGroupVariable.o: DeclNodes.inc.h
-OptionGroupVariable.o: DiagnosticCommonKinds.inc.h
-OptionGroupVariable.o: StmtNodes.inc.h
-OptionGroupVariable.po: AttrList.inc.h
-OptionGroupVariable.po: Attrs.inc.h
-OptionGroupVariable.po: CommentCommandList.inc.h
-OptionGroupVariable.po: DeclNodes.inc.h
-OptionGroupVariable.po: DiagnosticCommonKinds.inc.h
-OptionGroupVariable.po: StmtNodes.inc.h
-OptionValueArch.o: AttrList.inc.h
-OptionValueArch.o: Attrs.inc.h
-OptionValueArch.o: CommentCommandList.inc.h
-OptionValueArch.o: DeclNodes.inc.h
-OptionValueArch.o: DiagnosticCommonKinds.inc.h
-OptionValueArch.o: StmtNodes.inc.h
-OptionValueArch.po: AttrList.inc.h
-OptionValueArch.po: Attrs.inc.h
-OptionValueArch.po: CommentCommandList.inc.h
-OptionValueArch.po: DeclNodes.inc.h
-OptionValueArch.po: DiagnosticCommonKinds.inc.h
-OptionValueArch.po: StmtNodes.inc.h
-OptionValueDictionary.o: AttrList.inc.h
-OptionValueDictionary.o: Attrs.inc.h
-OptionValueDictionary.o: CommentCommandList.inc.h
-OptionValueDictionary.o: DeclNodes.inc.h
-OptionValueDictionary.o: DiagnosticCommonKinds.inc.h
-OptionValueDictionary.o: StmtNodes.inc.h
-OptionValueDictionary.po: AttrList.inc.h
-OptionValueDictionary.po: Attrs.inc.h
-OptionValueDictionary.po: CommentCommandList.inc.h
-OptionValueDictionary.po: DeclNodes.inc.h
-OptionValueDictionary.po: DiagnosticCommonKinds.inc.h
-OptionValueDictionary.po: StmtNodes.inc.h
-OptionValueFileSpec.o: AttrList.inc.h
-OptionValueFileSpec.o: Attrs.inc.h
-OptionValueFileSpec.o: CommentCommandList.inc.h
-OptionValueFileSpec.o: DeclNodes.inc.h
-OptionValueFileSpec.o: DiagnosticCommonKinds.inc.h
-OptionValueFileSpec.o: StmtNodes.inc.h
-OptionValueFileSpec.po: AttrList.inc.h
-OptionValueFileSpec.po: Attrs.inc.h
-OptionValueFileSpec.po: CommentCommandList.inc.h
-OptionValueFileSpec.po: DeclNodes.inc.h
-OptionValueFileSpec.po: DiagnosticCommonKinds.inc.h
-OptionValueFileSpec.po: StmtNodes.inc.h
-OptionValueFormat.o: AttrList.inc.h
-OptionValueFormat.o: Attrs.inc.h
-OptionValueFormat.o: CommentCommandList.inc.h
-OptionValueFormat.o: DeclNodes.inc.h
-OptionValueFormat.o: DiagnosticCommonKinds.inc.h
-OptionValueFormat.o: StmtNodes.inc.h
-OptionValueFormat.po: AttrList.inc.h
-OptionValueFormat.po: Attrs.inc.h
-OptionValueFormat.po: CommentCommandList.inc.h
-OptionValueFormat.po: DeclNodes.inc.h
-OptionValueFormat.po: DiagnosticCommonKinds.inc.h
-OptionValueFormat.po: StmtNodes.inc.h
-OptionValueLanguage.o: AttrList.inc.h
-OptionValueLanguage.o: Attrs.inc.h
-OptionValueLanguage.o: CommentCommandList.inc.h
-OptionValueLanguage.o: DeclNodes.inc.h
-OptionValueLanguage.o: DiagnosticCommonKinds.inc.h
-OptionValueLanguage.o: StmtNodes.inc.h
-OptionValueLanguage.po: AttrList.inc.h
-OptionValueLanguage.po: Attrs.inc.h
-OptionValueLanguage.po: CommentCommandList.inc.h
-OptionValueLanguage.po: DeclNodes.inc.h
-OptionValueLanguage.po: DiagnosticCommonKinds.inc.h
-OptionValueLanguage.po: StmtNodes.inc.h
-Property.o: DiagnosticCommonKinds.inc.h
-Property.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_arm/Makefile.depend b/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
index a5e736f..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_arm.o: CommentCommandList.inc.h
-ABISysV_arm.o: DeclNodes.inc.h
-ABISysV_arm.o: DiagnosticCommonKinds.inc.h
-ABISysV_arm.o: StmtNodes.inc.h
-ABISysV_arm.po: CommentCommandList.inc.h
-ABISysV_arm.po: DeclNodes.inc.h
-ABISysV_arm.po: DiagnosticCommonKinds.inc.h
-ABISysV_arm.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend b/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
index 90d6b63..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_arm64.o: CommentCommandList.inc.h
-ABISysV_arm64.o: DeclNodes.inc.h
-ABISysV_arm64.o: DiagnosticCommonKinds.inc.h
-ABISysV_arm64.o: StmtNodes.inc.h
-ABISysV_arm64.po: CommentCommandList.inc.h
-ABISysV_arm64.po: DeclNodes.inc.h
-ABISysV_arm64.po: DiagnosticCommonKinds.inc.h
-ABISysV_arm64.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_i386/Makefile.depend b/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
index c7685d3..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_i386.o: CommentCommandList.inc.h
-ABISysV_i386.o: DeclNodes.inc.h
-ABISysV_i386.o: DiagnosticCommonKinds.inc.h
-ABISysV_i386.o: StmtNodes.inc.h
-ABISysV_i386.po: CommentCommandList.inc.h
-ABISysV_i386.po: DeclNodes.inc.h
-ABISysV_i386.po: DiagnosticCommonKinds.inc.h
-ABISysV_i386.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_mips/Makefile.depend b/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
index 00072db..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_mips.o: CommentCommandList.inc.h
-ABISysV_mips.o: DeclNodes.inc.h
-ABISysV_mips.o: DiagnosticCommonKinds.inc.h
-ABISysV_mips.o: StmtNodes.inc.h
-ABISysV_mips.po: CommentCommandList.inc.h
-ABISysV_mips.po: DeclNodes.inc.h
-ABISysV_mips.po: DiagnosticCommonKinds.inc.h
-ABISysV_mips.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend b/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
index 49c95aa..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_mips64.o: CommentCommandList.inc.h
-ABISysV_mips64.o: DeclNodes.inc.h
-ABISysV_mips64.o: DiagnosticCommonKinds.inc.h
-ABISysV_mips64.o: StmtNodes.inc.h
-ABISysV_mips64.po: CommentCommandList.inc.h
-ABISysV_mips64.po: DeclNodes.inc.h
-ABISysV_mips64.po: DiagnosticCommonKinds.inc.h
-ABISysV_mips64.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend b/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
index 99d245e..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_ppc.o: CommentCommandList.inc.h
-ABISysV_ppc.o: DeclNodes.inc.h
-ABISysV_ppc.o: DiagnosticCommonKinds.inc.h
-ABISysV_ppc.o: StmtNodes.inc.h
-ABISysV_ppc.po: CommentCommandList.inc.h
-ABISysV_ppc.po: DeclNodes.inc.h
-ABISysV_ppc.po: DiagnosticCommonKinds.inc.h
-ABISysV_ppc.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend b/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
index 7b45794..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_ppc64.o: CommentCommandList.inc.h
-ABISysV_ppc64.o: DeclNodes.inc.h
-ABISysV_ppc64.o: DiagnosticCommonKinds.inc.h
-ABISysV_ppc64.o: StmtNodes.inc.h
-ABISysV_ppc64.po: CommentCommandList.inc.h
-ABISysV_ppc64.po: DeclNodes.inc.h
-ABISysV_ppc64.po: DiagnosticCommonKinds.inc.h
-ABISysV_ppc64.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend b/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
index 219b76f..264ede1 100644
--- a/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
+++ b/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABISysV_x86_64.o: CommentCommandList.inc.h
-ABISysV_x86_64.o: DeclNodes.inc.h
-ABISysV_x86_64.o: DiagnosticCommonKinds.inc.h
-ABISysV_x86_64.o: StmtNodes.inc.h
-ABISysV_x86_64.po: CommentCommandList.inc.h
-ABISysV_x86_64.po: DeclNodes.inc.h
-ABISysV_x86_64.po: DiagnosticCommonKinds.inc.h
-ABISysV_x86_64.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend b/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
index 2307823..264ede1 100644
--- a/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
+++ b/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ItaniumABILanguageRuntime.o: CommentCommandList.inc.h
-ItaniumABILanguageRuntime.o: DeclNodes.inc.h
-ItaniumABILanguageRuntime.o: DiagnosticCommonKinds.inc.h
-ItaniumABILanguageRuntime.o: StmtNodes.inc.h
-ItaniumABILanguageRuntime.po: CommentCommandList.inc.h
-ItaniumABILanguageRuntime.po: DeclNodes.inc.h
-ItaniumABILanguageRuntime.po: DiagnosticCommonKinds.inc.h
-ItaniumABILanguageRuntime.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend b/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
index b3a3a61..264ede1 100644
--- a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
+++ b/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-DynamicLoaderPOSIXDYLD.o: DiagnosticCommonKinds.inc.h
-DynamicLoaderPOSIXDYLD.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
index 627c2cc..264ede1 100644
--- a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
+++ b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AddressSanitizerRuntime.o: DiagnosticCommonKinds.inc.h
-AddressSanitizerRuntime.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend b/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
index fc64e4a..264ede1 100644
--- a/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
+++ b/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-JITLoaderGDB.o: DiagnosticCommonKinds.inc.h
-JITLoaderGDB.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend b/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
index c514f27..264ede1 100644
--- a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
+++ b/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-MemoryHistoryASan.o: DiagnosticCommonKinds.inc.h
-MemoryHistoryASan.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend b/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
index a384d93..264ede1 100644
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
+++ b/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
@@ -13,8 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-POSIXThread.o: DiagnosticCommonKinds.inc.h
-POSIXThread.po: DiagnosticCommonKinds.inc.h
-ProcessPOSIX.o: DiagnosticCommonKinds.inc.h
-ProcessPOSIX.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend b/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
index 10a0dc2..264ede1 100644
--- a/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
+++ b/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
@@ -13,18 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ProcessGDBRemote.o: AttrList.inc.h
-ProcessGDBRemote.o: Attrs.inc.h
-ProcessGDBRemote.o: CommentCommandList.inc.h
-ProcessGDBRemote.o: DeclNodes.inc.h
-ProcessGDBRemote.o: DiagnosticCommonKinds.inc.h
-ProcessGDBRemote.o: StmtNodes.inc.h
-ProcessGDBRemote.po: AttrList.inc.h
-ProcessGDBRemote.po: Attrs.inc.h
-ProcessGDBRemote.po: CommentCommandList.inc.h
-ProcessGDBRemote.po: DeclNodes.inc.h
-ProcessGDBRemote.po: DiagnosticCommonKinds.inc.h
-ProcessGDBRemote.po: StmtNodes.inc.h
-ThreadGDBRemote.o: DiagnosticCommonKinds.inc.h
-ThreadGDBRemote.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile.depend b/lib/clang/liblldbPluginProcessUtility/Makefile.depend
index 06a1433..264ede1 100644
--- a/lib/clang/liblldbPluginProcessUtility/Makefile.depend
+++ b/lib/clang/liblldbPluginProcessUtility/Makefile.depend
@@ -13,36 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-DynamicRegisterInfo.o: AttrList.inc.h
-DynamicRegisterInfo.o: Attrs.inc.h
-DynamicRegisterInfo.o: CommentCommandList.inc.h
-DynamicRegisterInfo.o: DeclNodes.inc.h
-DynamicRegisterInfo.o: DiagnosticCommonKinds.inc.h
-DynamicRegisterInfo.o: StmtNodes.inc.h
-DynamicRegisterInfo.po: AttrList.inc.h
-DynamicRegisterInfo.po: Attrs.inc.h
-DynamicRegisterInfo.po: CommentCommandList.inc.h
-DynamicRegisterInfo.po: DeclNodes.inc.h
-DynamicRegisterInfo.po: DiagnosticCommonKinds.inc.h
-DynamicRegisterInfo.po: StmtNodes.inc.h
-InferiorCallPOSIX.o: CommentCommandList.inc.h
-InferiorCallPOSIX.o: DeclNodes.inc.h
-InferiorCallPOSIX.o: DiagnosticCommonKinds.inc.h
-InferiorCallPOSIX.o: StmtNodes.inc.h
-InferiorCallPOSIX.po: CommentCommandList.inc.h
-InferiorCallPOSIX.po: DeclNodes.inc.h
-InferiorCallPOSIX.po: DiagnosticCommonKinds.inc.h
-InferiorCallPOSIX.po: StmtNodes.inc.h
-RegisterContextDummy.o: DiagnosticCommonKinds.inc.h
-RegisterContextDummy.po: DiagnosticCommonKinds.inc.h
-RegisterContextHistory.o: DiagnosticCommonKinds.inc.h
-RegisterContextHistory.po: DiagnosticCommonKinds.inc.h
-RegisterContextLLDB.o: DiagnosticCommonKinds.inc.h
-RegisterContextLLDB.po: DiagnosticCommonKinds.inc.h
-StopInfoMachException.o: DiagnosticCommonKinds.inc.h
-StopInfoMachException.po: DiagnosticCommonKinds.inc.h
-UnwindLLDB.o: DiagnosticCommonKinds.inc.h
-UnwindLLDB.po: DiagnosticCommonKinds.inc.h
-UnwindMacOSXFrameBackchain.o: DiagnosticCommonKinds.inc.h
-UnwindMacOSXFrameBackchain.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
index bd5227d..9a1b84e 100644
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
+++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
@@ -14,186 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-DWARFAbbreviationDeclaration.o: CommentCommandList.inc.h
-DWARFAbbreviationDeclaration.o: DeclNodes.inc.h
-DWARFAbbreviationDeclaration.o: DiagnosticCommonKinds.inc.h
-DWARFAbbreviationDeclaration.o: StmtNodes.inc.h
-DWARFAbbreviationDeclaration.po: CommentCommandList.inc.h
-DWARFAbbreviationDeclaration.po: DeclNodes.inc.h
-DWARFAbbreviationDeclaration.po: DiagnosticCommonKinds.inc.h
-DWARFAbbreviationDeclaration.po: StmtNodes.inc.h
-DWARFCompileUnit.o: CommentCommandList.inc.h
-DWARFCompileUnit.o: DeclNodes.inc.h
-DWARFCompileUnit.o: DiagnosticCommonKinds.inc.h
-DWARFCompileUnit.o: StmtNodes.inc.h
-DWARFCompileUnit.po: CommentCommandList.inc.h
-DWARFCompileUnit.po: DeclNodes.inc.h
-DWARFCompileUnit.po: DiagnosticCommonKinds.inc.h
-DWARFCompileUnit.po: StmtNodes.inc.h
-DWARFDIECollection.o: CommentCommandList.inc.h
-DWARFDIECollection.o: DeclNodes.inc.h
-DWARFDIECollection.o: DiagnosticCommonKinds.inc.h
-DWARFDIECollection.o: StmtNodes.inc.h
-DWARFDIECollection.po: CommentCommandList.inc.h
-DWARFDIECollection.po: DeclNodes.inc.h
-DWARFDIECollection.po: DiagnosticCommonKinds.inc.h
-DWARFDIECollection.po: StmtNodes.inc.h
-DWARFDebugAbbrev.o: CommentCommandList.inc.h
-DWARFDebugAbbrev.o: DeclNodes.inc.h
-DWARFDebugAbbrev.o: DiagnosticCommonKinds.inc.h
-DWARFDebugAbbrev.o: StmtNodes.inc.h
-DWARFDebugAbbrev.po: CommentCommandList.inc.h
-DWARFDebugAbbrev.po: DeclNodes.inc.h
-DWARFDebugAbbrev.po: DiagnosticCommonKinds.inc.h
-DWARFDebugAbbrev.po: StmtNodes.inc.h
-DWARFDebugArangeSet.o: CommentCommandList.inc.h
-DWARFDebugArangeSet.o: DeclNodes.inc.h
-DWARFDebugArangeSet.o: DiagnosticCommonKinds.inc.h
-DWARFDebugArangeSet.o: StmtNodes.inc.h
-DWARFDebugArangeSet.po: CommentCommandList.inc.h
-DWARFDebugArangeSet.po: DeclNodes.inc.h
-DWARFDebugArangeSet.po: DiagnosticCommonKinds.inc.h
-DWARFDebugArangeSet.po: StmtNodes.inc.h
-DWARFDebugAranges.o: CommentCommandList.inc.h
-DWARFDebugAranges.o: DeclNodes.inc.h
-DWARFDebugAranges.o: DiagnosticCommonKinds.inc.h
-DWARFDebugAranges.o: StmtNodes.inc.h
-DWARFDebugAranges.po: CommentCommandList.inc.h
-DWARFDebugAranges.po: DeclNodes.inc.h
-DWARFDebugAranges.po: DiagnosticCommonKinds.inc.h
-DWARFDebugAranges.po: StmtNodes.inc.h
-DWARFDebugInfo.o: CommentCommandList.inc.h
-DWARFDebugInfo.o: DeclNodes.inc.h
-DWARFDebugInfo.o: DiagnosticCommonKinds.inc.h
-DWARFDebugInfo.o: StmtNodes.inc.h
-DWARFDebugInfo.po: CommentCommandList.inc.h
-DWARFDebugInfo.po: DeclNodes.inc.h
-DWARFDebugInfo.po: DiagnosticCommonKinds.inc.h
-DWARFDebugInfo.po: StmtNodes.inc.h
-DWARFDebugInfoEntry.o: CommentCommandList.inc.h
-DWARFDebugInfoEntry.o: DeclNodes.inc.h
-DWARFDebugInfoEntry.o: DiagnosticCommonKinds.inc.h
-DWARFDebugInfoEntry.o: StmtNodes.inc.h
-DWARFDebugInfoEntry.po: CommentCommandList.inc.h
-DWARFDebugInfoEntry.po: DeclNodes.inc.h
-DWARFDebugInfoEntry.po: DiagnosticCommonKinds.inc.h
-DWARFDebugInfoEntry.po: StmtNodes.inc.h
-DWARFDebugLine.o: CommentCommandList.inc.h
-DWARFDebugLine.o: DeclNodes.inc.h
-DWARFDebugLine.o: DiagnosticCommonKinds.inc.h
-DWARFDebugLine.o: StmtNodes.inc.h
-DWARFDebugLine.po: CommentCommandList.inc.h
-DWARFDebugLine.po: DeclNodes.inc.h
-DWARFDebugLine.po: DiagnosticCommonKinds.inc.h
-DWARFDebugLine.po: StmtNodes.inc.h
-DWARFDebugMacinfo.o: CommentCommandList.inc.h
-DWARFDebugMacinfo.o: DeclNodes.inc.h
-DWARFDebugMacinfo.o: DiagnosticCommonKinds.inc.h
-DWARFDebugMacinfo.o: StmtNodes.inc.h
-DWARFDebugMacinfo.po: CommentCommandList.inc.h
-DWARFDebugMacinfo.po: DeclNodes.inc.h
-DWARFDebugMacinfo.po: DiagnosticCommonKinds.inc.h
-DWARFDebugMacinfo.po: StmtNodes.inc.h
-DWARFDebugMacinfoEntry.o: CommentCommandList.inc.h
-DWARFDebugMacinfoEntry.o: DeclNodes.inc.h
-DWARFDebugMacinfoEntry.o: DiagnosticCommonKinds.inc.h
-DWARFDebugMacinfoEntry.o: StmtNodes.inc.h
-DWARFDebugMacinfoEntry.po: CommentCommandList.inc.h
-DWARFDebugMacinfoEntry.po: DeclNodes.inc.h
-DWARFDebugMacinfoEntry.po: DiagnosticCommonKinds.inc.h
-DWARFDebugMacinfoEntry.po: StmtNodes.inc.h
-DWARFDebugPubnames.o: CommentCommandList.inc.h
-DWARFDebugPubnames.o: DeclNodes.inc.h
-DWARFDebugPubnames.o: DiagnosticCommonKinds.inc.h
-DWARFDebugPubnames.o: StmtNodes.inc.h
-DWARFDebugPubnames.po: CommentCommandList.inc.h
-DWARFDebugPubnames.po: DeclNodes.inc.h
-DWARFDebugPubnames.po: DiagnosticCommonKinds.inc.h
-DWARFDebugPubnames.po: StmtNodes.inc.h
-DWARFDebugPubnamesSet.o: CommentCommandList.inc.h
-DWARFDebugPubnamesSet.o: DeclNodes.inc.h
-DWARFDebugPubnamesSet.o: DiagnosticCommonKinds.inc.h
-DWARFDebugPubnamesSet.o: StmtNodes.inc.h
-DWARFDebugPubnamesSet.po: CommentCommandList.inc.h
-DWARFDebugPubnamesSet.po: DeclNodes.inc.h
-DWARFDebugPubnamesSet.po: DiagnosticCommonKinds.inc.h
-DWARFDebugPubnamesSet.po: StmtNodes.inc.h
-DWARFDebugRanges.o: CommentCommandList.inc.h
-DWARFDebugRanges.o: DeclNodes.inc.h
-DWARFDebugRanges.o: DiagnosticCommonKinds.inc.h
-DWARFDebugRanges.o: StmtNodes.inc.h
-DWARFDebugRanges.po: CommentCommandList.inc.h
-DWARFDebugRanges.po: DeclNodes.inc.h
-DWARFDebugRanges.po: DiagnosticCommonKinds.inc.h
-DWARFDebugRanges.po: StmtNodes.inc.h
-DWARFFormValue.o: CommentCommandList.inc.h
-DWARFFormValue.o: DeclNodes.inc.h
-DWARFFormValue.o: DiagnosticCommonKinds.inc.h
-DWARFFormValue.o: StmtNodes.inc.h
-DWARFFormValue.po: CommentCommandList.inc.h
-DWARFFormValue.po: DeclNodes.inc.h
-DWARFFormValue.po: DiagnosticCommonKinds.inc.h
-DWARFFormValue.po: StmtNodes.inc.h
-DWARFLocationDescription.o: CommentCommandList.inc.h
-DWARFLocationDescription.o: DeclNodes.inc.h
-DWARFLocationDescription.o: DiagnosticCommonKinds.inc.h
-DWARFLocationDescription.o: StmtNodes.inc.h
-DWARFLocationDescription.po: CommentCommandList.inc.h
-DWARFLocationDescription.po: DeclNodes.inc.h
-DWARFLocationDescription.po: DiagnosticCommonKinds.inc.h
-DWARFLocationDescription.po: StmtNodes.inc.h
-DWARFLocationList.o: CommentCommandList.inc.h
-DWARFLocationList.o: DeclNodes.inc.h
-DWARFLocationList.o: DiagnosticCommonKinds.inc.h
-DWARFLocationList.o: StmtNodes.inc.h
-DWARFLocationList.po: CommentCommandList.inc.h
-DWARFLocationList.po: DeclNodes.inc.h
-DWARFLocationList.po: DiagnosticCommonKinds.inc.h
-DWARFLocationList.po: StmtNodes.inc.h
-LogChannelDWARF.o: CommentCommandList.inc.h
-LogChannelDWARF.o: DeclNodes.inc.h
-LogChannelDWARF.o: DiagnosticCommonKinds.inc.h
-LogChannelDWARF.o: StmtNodes.inc.h
-LogChannelDWARF.po: CommentCommandList.inc.h
-LogChannelDWARF.po: DeclNodes.inc.h
-LogChannelDWARF.po: DiagnosticCommonKinds.inc.h
-LogChannelDWARF.po: StmtNodes.inc.h
-NameToDIE.o: CommentCommandList.inc.h
-NameToDIE.o: DeclNodes.inc.h
-NameToDIE.o: DiagnosticCommonKinds.inc.h
-NameToDIE.o: StmtNodes.inc.h
-NameToDIE.po: CommentCommandList.inc.h
-NameToDIE.po: DeclNodes.inc.h
-NameToDIE.po: DiagnosticCommonKinds.inc.h
-NameToDIE.po: StmtNodes.inc.h
-SymbolFileDWARF.o: AttrList.inc.h
-SymbolFileDWARF.o: AttrParsedAttrList.inc.h
-SymbolFileDWARF.o: Attrs.inc.h
-SymbolFileDWARF.o: CommentCommandList.inc.h
-SymbolFileDWARF.o: DeclNodes.inc.h
-SymbolFileDWARF.o: DiagnosticCommonKinds.inc.h
-SymbolFileDWARF.o: StmtNodes.inc.h
-SymbolFileDWARF.po: AttrList.inc.h
-SymbolFileDWARF.po: AttrParsedAttrList.inc.h
-SymbolFileDWARF.po: Attrs.inc.h
-SymbolFileDWARF.po: CommentCommandList.inc.h
-SymbolFileDWARF.po: DeclNodes.inc.h
-SymbolFileDWARF.po: DiagnosticCommonKinds.inc.h
-SymbolFileDWARF.po: StmtNodes.inc.h
-SymbolFileDWARFDebugMap.o: CommentCommandList.inc.h
-SymbolFileDWARFDebugMap.o: DeclNodes.inc.h
-SymbolFileDWARFDebugMap.o: DiagnosticCommonKinds.inc.h
-SymbolFileDWARFDebugMap.o: StmtNodes.inc.h
-SymbolFileDWARFDebugMap.po: CommentCommandList.inc.h
-SymbolFileDWARFDebugMap.po: DeclNodes.inc.h
-SymbolFileDWARFDebugMap.po: DiagnosticCommonKinds.inc.h
-SymbolFileDWARFDebugMap.po: StmtNodes.inc.h
-UniqueDWARFASTType.o: CommentCommandList.inc.h
-UniqueDWARFASTType.o: DeclNodes.inc.h
-UniqueDWARFASTType.o: DiagnosticCommonKinds.inc.h
-UniqueDWARFASTType.o: StmtNodes.inc.h
-UniqueDWARFASTType.po: CommentCommandList.inc.h
-UniqueDWARFASTType.po: DeclNodes.inc.h
-UniqueDWARFASTType.po: DiagnosticCommonKinds.inc.h
-UniqueDWARFASTType.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend b/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
index 4231228..264ede1 100644
--- a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
+++ b/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
@@ -13,8 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SymbolFileSymtab.o: DeclNodes.inc.h
-SymbolFileSymtab.o: DiagnosticCommonKinds.inc.h
-SymbolFileSymtab.po: DeclNodes.inc.h
-SymbolFileSymtab.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend b/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
index 810f65c..264ede1 100644
--- a/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
+++ b/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SymbolVendorELF.o: DiagnosticCommonKinds.inc.h
-SymbolVendorELF.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbSymbol/Makefile.depend b/lib/clang/liblldbSymbol/Makefile.depend
index aa337b3..264ede1 100644
--- a/lib/clang/liblldbSymbol/Makefile.depend
+++ b/lib/clang/liblldbSymbol/Makefile.depend
@@ -13,108 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Block.o: DiagnosticCommonKinds.inc.h
-Block.po: DiagnosticCommonKinds.inc.h
-ClangASTContext.o: AttrList.inc.h
-ClangASTContext.o: Attrs.inc.h
-ClangASTContext.o: CommentCommandList.inc.h
-ClangASTContext.o: DeclNodes.inc.h
-ClangASTContext.o: DiagnosticCommonKinds.inc.h
-ClangASTContext.o: StmtNodes.inc.h
-ClangASTContext.po: AttrList.inc.h
-ClangASTContext.po: Attrs.inc.h
-ClangASTContext.po: CommentCommandList.inc.h
-ClangASTContext.po: DeclNodes.inc.h
-ClangASTContext.po: DiagnosticCommonKinds.inc.h
-ClangASTContext.po: StmtNodes.inc.h
-ClangASTImporter.o: AttrList.inc.h
-ClangASTImporter.o: Attrs.inc.h
-ClangASTImporter.o: CommentCommandList.inc.h
-ClangASTImporter.o: DeclNodes.inc.h
-ClangASTImporter.o: DiagnosticCommonKinds.inc.h
-ClangASTImporter.o: StmtNodes.inc.h
-ClangASTImporter.po: AttrList.inc.h
-ClangASTImporter.po: Attrs.inc.h
-ClangASTImporter.po: CommentCommandList.inc.h
-ClangASTImporter.po: DeclNodes.inc.h
-ClangASTImporter.po: DiagnosticCommonKinds.inc.h
-ClangASTImporter.po: StmtNodes.inc.h
-ClangASTType.o: AttrList.inc.h
-ClangASTType.o: Attrs.inc.h
-ClangASTType.o: CommentCommandList.inc.h
-ClangASTType.o: DeclNodes.inc.h
-ClangASTType.o: DiagnosticCommonKinds.inc.h
-ClangASTType.o: StmtNodes.inc.h
-ClangASTType.po: AttrList.inc.h
-ClangASTType.po: Attrs.inc.h
-ClangASTType.po: CommentCommandList.inc.h
-ClangASTType.po: DeclNodes.inc.h
-ClangASTType.po: DiagnosticCommonKinds.inc.h
-ClangASTType.po: StmtNodes.inc.h
-ClangExternalASTSourceCallbacks.o: DeclNodes.inc.h
-ClangExternalASTSourceCallbacks.o: DiagnosticCommonKinds.inc.h
-ClangExternalASTSourceCallbacks.po: DeclNodes.inc.h
-ClangExternalASTSourceCallbacks.po: DiagnosticCommonKinds.inc.h
-ClangExternalASTSourceCommon.o: DeclNodes.inc.h
-ClangExternalASTSourceCommon.o: DiagnosticCommonKinds.inc.h
-ClangExternalASTSourceCommon.po: DeclNodes.inc.h
-ClangExternalASTSourceCommon.po: DiagnosticCommonKinds.inc.h
-ClangNamespaceDecl.o: DeclNodes.inc.h
-ClangNamespaceDecl.o: DiagnosticCommonKinds.inc.h
-ClangNamespaceDecl.po: DeclNodes.inc.h
-ClangNamespaceDecl.po: DiagnosticCommonKinds.inc.h
-CompileUnit.o: DiagnosticCommonKinds.inc.h
-CompileUnit.po: DiagnosticCommonKinds.inc.h
-Function.o: DiagnosticCommonKinds.inc.h
-Function.po: DiagnosticCommonKinds.inc.h
-LineEntry.o: DiagnosticCommonKinds.inc.h
-LineEntry.po: DiagnosticCommonKinds.inc.h
-LineTable.o: DiagnosticCommonKinds.inc.h
-LineTable.po: DiagnosticCommonKinds.inc.h
-ObjectFile.o: DiagnosticCommonKinds.inc.h
-ObjectFile.po: DiagnosticCommonKinds.inc.h
-Symbol.o: DiagnosticCommonKinds.inc.h
-Symbol.po: DiagnosticCommonKinds.inc.h
-SymbolContext.o: CommentCommandList.inc.h
-SymbolContext.o: DeclNodes.inc.h
-SymbolContext.o: DiagnosticCommonKinds.inc.h
-SymbolContext.o: StmtNodes.inc.h
-SymbolContext.po: CommentCommandList.inc.h
-SymbolContext.po: DeclNodes.inc.h
-SymbolContext.po: DiagnosticCommonKinds.inc.h
-SymbolContext.po: StmtNodes.inc.h
-SymbolFile.o: DiagnosticCommonKinds.inc.h
-SymbolFile.po: DiagnosticCommonKinds.inc.h
-SymbolVendor.o: DiagnosticCommonKinds.inc.h
-SymbolVendor.po: DiagnosticCommonKinds.inc.h
-Symtab.o: DiagnosticCommonKinds.inc.h
-Symtab.po: DiagnosticCommonKinds.inc.h
-Type.o: CommentCommandList.inc.h
-Type.o: DeclNodes.inc.h
-Type.o: DiagnosticCommonKinds.inc.h
-Type.o: StmtNodes.inc.h
-Type.po: CommentCommandList.inc.h
-Type.po: DeclNodes.inc.h
-Type.po: DiagnosticCommonKinds.inc.h
-Type.po: StmtNodes.inc.h
-TypeList.o: AttrList.inc.h
-TypeList.o: Attrs.inc.h
-TypeList.o: CommentCommandList.inc.h
-TypeList.o: DeclNodes.inc.h
-TypeList.o: DiagnosticCommonKinds.inc.h
-TypeList.o: StmtNodes.inc.h
-TypeList.po: AttrList.inc.h
-TypeList.po: Attrs.inc.h
-TypeList.po: CommentCommandList.inc.h
-TypeList.po: DeclNodes.inc.h
-TypeList.po: DiagnosticCommonKinds.inc.h
-TypeList.po: StmtNodes.inc.h
-Variable.o: DiagnosticCommonKinds.inc.h
-Variable.po: DiagnosticCommonKinds.inc.h
-VariableList.o: DiagnosticCommonKinds.inc.h
-VariableList.po: DiagnosticCommonKinds.inc.h
-VerifyDecl.o: DeclNodes.inc.h
-VerifyDecl.o: DiagnosticCommonKinds.inc.h
-VerifyDecl.po: DeclNodes.inc.h
-VerifyDecl.po: DiagnosticCommonKinds.inc.h
.endif
diff --git a/lib/clang/liblldbTarget/Makefile.depend b/lib/clang/liblldbTarget/Makefile.depend
index 811b401..264ede1 100644
--- a/lib/clang/liblldbTarget/Makefile.depend
+++ b/lib/clang/liblldbTarget/Makefile.depend
@@ -13,82 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ABI.o: DiagnosticCommonKinds.inc.h
-ABI.po: DiagnosticCommonKinds.inc.h
-CPPLanguageRuntime.o: DiagnosticCommonKinds.inc.h
-CPPLanguageRuntime.po: DiagnosticCommonKinds.inc.h
-LanguageRuntime.o: DiagnosticCommonKinds.inc.h
-LanguageRuntime.po: DiagnosticCommonKinds.inc.h
-ObjCLanguageRuntime.o: CommentCommandList.inc.h
-ObjCLanguageRuntime.o: DeclNodes.inc.h
-ObjCLanguageRuntime.o: DiagnosticCommonKinds.inc.h
-ObjCLanguageRuntime.o: StmtNodes.inc.h
-ObjCLanguageRuntime.po: CommentCommandList.inc.h
-ObjCLanguageRuntime.po: DeclNodes.inc.h
-ObjCLanguageRuntime.po: DiagnosticCommonKinds.inc.h
-ObjCLanguageRuntime.po: StmtNodes.inc.h
-Process.o: DiagnosticCommonKinds.inc.h
-Process.po: DiagnosticCommonKinds.inc.h
-SectionLoadList.o: DiagnosticCommonKinds.inc.h
-SectionLoadList.po: DiagnosticCommonKinds.inc.h
-StackFrame.o: DiagnosticCommonKinds.inc.h
-StackFrame.po: DiagnosticCommonKinds.inc.h
-StackFrameList.o: DiagnosticCommonKinds.inc.h
-StackFrameList.po: DiagnosticCommonKinds.inc.h
-StackID.o: DiagnosticCommonKinds.inc.h
-StackID.po: DiagnosticCommonKinds.inc.h
-StopInfo.o: DiagnosticCommonKinds.inc.h
-StopInfo.po: DiagnosticCommonKinds.inc.h
-Target.o: CommentCommandList.inc.h
-Target.o: DeclNodes.inc.h
-Target.o: DiagnosticCommonKinds.inc.h
-Target.o: StmtNodes.inc.h
-Target.po: CommentCommandList.inc.h
-Target.po: DeclNodes.inc.h
-Target.po: DiagnosticCommonKinds.inc.h
-Target.po: StmtNodes.inc.h
-Thread.o: DiagnosticCommonKinds.inc.h
-Thread.po: DiagnosticCommonKinds.inc.h
-ThreadList.o: DiagnosticCommonKinds.inc.h
-ThreadList.po: DiagnosticCommonKinds.inc.h
-ThreadPlan.o: DiagnosticCommonKinds.inc.h
-ThreadPlan.po: DiagnosticCommonKinds.inc.h
-ThreadPlanBase.o: DiagnosticCommonKinds.inc.h
-ThreadPlanBase.po: DiagnosticCommonKinds.inc.h
-ThreadPlanCallFunction.o: DiagnosticCommonKinds.inc.h
-ThreadPlanCallFunction.po: DiagnosticCommonKinds.inc.h
-ThreadPlanCallFunctionUsingABI.o: DiagnosticCommonKinds.inc.h
-ThreadPlanCallFunctionUsingABI.po: DiagnosticCommonKinds.inc.h
-ThreadPlanCallUserExpression.o: DiagnosticCommonKinds.inc.h
-ThreadPlanCallUserExpression.po: DiagnosticCommonKinds.inc.h
-ThreadPlanPython.o: DiagnosticCommonKinds.inc.h
-ThreadPlanPython.po: DiagnosticCommonKinds.inc.h
-ThreadPlanRunToAddress.o: DiagnosticCommonKinds.inc.h
-ThreadPlanRunToAddress.po: DiagnosticCommonKinds.inc.h
-ThreadPlanShouldStopHere.o: DiagnosticCommonKinds.inc.h
-ThreadPlanShouldStopHere.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepInRange.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepInRange.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepInstruction.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepInstruction.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOut.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOut.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOverBreakpoint.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOverBreakpoint.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOverRange.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepOverRange.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepRange.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepRange.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepThrough.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepThrough.po: DiagnosticCommonKinds.inc.h
-ThreadPlanStepUntil.o: DiagnosticCommonKinds.inc.h
-ThreadPlanStepUntil.po: DiagnosticCommonKinds.inc.h
-ThreadPlanTracer.o: CommentCommandList.inc.h
-ThreadPlanTracer.o: DeclNodes.inc.h
-ThreadPlanTracer.o: DiagnosticCommonKinds.inc.h
-ThreadPlanTracer.o: StmtNodes.inc.h
-ThreadPlanTracer.po: CommentCommandList.inc.h
-ThreadPlanTracer.po: DeclNodes.inc.h
-ThreadPlanTracer.po: DiagnosticCommonKinds.inc.h
-ThreadPlanTracer.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libllvmaarch64asmparser/Makefile.depend b/lib/clang/libllvmaarch64asmparser/Makefile.depend
index 745dfbc..385072f 100644
--- a/lib/clang/libllvmaarch64asmparser/Makefile.depend
+++ b/lib/clang/libllvmaarch64asmparser/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AArch64AsmParser.o: AArch64GenAsmMatcher.inc.h
-AArch64AsmParser.o: AArch64GenInstrInfo.inc.h
-AArch64AsmParser.o: AArch64GenRegisterInfo.inc.h
-AArch64AsmParser.o: AArch64GenSubtargetInfo.inc.h
-AArch64AsmParser.po: AArch64GenAsmMatcher.inc.h
-AArch64AsmParser.po: AArch64GenInstrInfo.inc.h
-AArch64AsmParser.po: AArch64GenRegisterInfo.inc.h
-AArch64AsmParser.po: AArch64GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmaarch64codegen/Makefile.depend b/lib/clang/libllvmaarch64codegen/Makefile.depend
index 56b7560..385072f 100644
--- a/lib/clang/libllvmaarch64codegen/Makefile.depend
+++ b/lib/clang/libllvmaarch64codegen/Makefile.depend
@@ -13,194 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AArch64A53Fix835769.o: AArch64GenInstrInfo.inc.h
-AArch64A53Fix835769.o: AArch64GenRegisterInfo.inc.h
-AArch64A53Fix835769.o: AArch64GenSubtargetInfo.inc.h
-AArch64A53Fix835769.po: AArch64GenInstrInfo.inc.h
-AArch64A53Fix835769.po: AArch64GenRegisterInfo.inc.h
-AArch64A53Fix835769.po: AArch64GenSubtargetInfo.inc.h
-AArch64A57FPLoadBalancing.o: AArch64GenInstrInfo.inc.h
-AArch64A57FPLoadBalancing.o: AArch64GenRegisterInfo.inc.h
-AArch64A57FPLoadBalancing.o: AArch64GenSubtargetInfo.inc.h
-AArch64A57FPLoadBalancing.po: AArch64GenInstrInfo.inc.h
-AArch64A57FPLoadBalancing.po: AArch64GenRegisterInfo.inc.h
-AArch64A57FPLoadBalancing.po: AArch64GenSubtargetInfo.inc.h
-AArch64AddressTypePromotion.o: AArch64GenInstrInfo.inc.h
-AArch64AddressTypePromotion.o: AArch64GenRegisterInfo.inc.h
-AArch64AddressTypePromotion.o: AArch64GenSubtargetInfo.inc.h
-AArch64AddressTypePromotion.po: AArch64GenInstrInfo.inc.h
-AArch64AddressTypePromotion.po: AArch64GenRegisterInfo.inc.h
-AArch64AddressTypePromotion.po: AArch64GenSubtargetInfo.inc.h
-AArch64AdvSIMDScalarPass.o: AArch64GenInstrInfo.inc.h
-AArch64AdvSIMDScalarPass.o: AArch64GenRegisterInfo.inc.h
-AArch64AdvSIMDScalarPass.o: AArch64GenSubtargetInfo.inc.h
-AArch64AdvSIMDScalarPass.po: AArch64GenInstrInfo.inc.h
-AArch64AdvSIMDScalarPass.po: AArch64GenRegisterInfo.inc.h
-AArch64AdvSIMDScalarPass.po: AArch64GenSubtargetInfo.inc.h
-AArch64AsmPrinter.o: AArch64GenInstrInfo.inc.h
-AArch64AsmPrinter.o: AArch64GenMCPseudoLowering.inc.h
-AArch64AsmPrinter.o: AArch64GenRegisterInfo.inc.h
-AArch64AsmPrinter.o: AArch64GenSubtargetInfo.inc.h
-AArch64AsmPrinter.po: AArch64GenInstrInfo.inc.h
-AArch64AsmPrinter.po: AArch64GenMCPseudoLowering.inc.h
-AArch64AsmPrinter.po: AArch64GenRegisterInfo.inc.h
-AArch64AsmPrinter.po: AArch64GenSubtargetInfo.inc.h
-AArch64BranchRelaxation.o: AArch64GenInstrInfo.inc.h
-AArch64BranchRelaxation.o: AArch64GenRegisterInfo.inc.h
-AArch64BranchRelaxation.o: AArch64GenSubtargetInfo.inc.h
-AArch64BranchRelaxation.po: AArch64GenInstrInfo.inc.h
-AArch64BranchRelaxation.po: AArch64GenRegisterInfo.inc.h
-AArch64BranchRelaxation.po: AArch64GenSubtargetInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.o: AArch64GenInstrInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.o: AArch64GenRegisterInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.o: AArch64GenSubtargetInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.po: AArch64GenInstrInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.po: AArch64GenRegisterInfo.inc.h
-AArch64CleanupLocalDynamicTLSPass.po: AArch64GenSubtargetInfo.inc.h
-AArch64CollectLOH.o: AArch64GenInstrInfo.inc.h
-AArch64CollectLOH.o: AArch64GenRegisterInfo.inc.h
-AArch64CollectLOH.o: AArch64GenSubtargetInfo.inc.h
-AArch64CollectLOH.po: AArch64GenInstrInfo.inc.h
-AArch64CollectLOH.po: AArch64GenRegisterInfo.inc.h
-AArch64CollectLOH.po: AArch64GenSubtargetInfo.inc.h
-AArch64ConditionOptimizer.o: AArch64GenInstrInfo.inc.h
-AArch64ConditionOptimizer.o: AArch64GenRegisterInfo.inc.h
-AArch64ConditionOptimizer.o: AArch64GenSubtargetInfo.inc.h
-AArch64ConditionOptimizer.po: AArch64GenInstrInfo.inc.h
-AArch64ConditionOptimizer.po: AArch64GenRegisterInfo.inc.h
-AArch64ConditionOptimizer.po: AArch64GenSubtargetInfo.inc.h
-AArch64ConditionalCompares.o: AArch64GenInstrInfo.inc.h
-AArch64ConditionalCompares.o: AArch64GenRegisterInfo.inc.h
-AArch64ConditionalCompares.o: AArch64GenSubtargetInfo.inc.h
-AArch64ConditionalCompares.po: AArch64GenInstrInfo.inc.h
-AArch64ConditionalCompares.po: AArch64GenRegisterInfo.inc.h
-AArch64ConditionalCompares.po: AArch64GenSubtargetInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.o: AArch64GenInstrInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.o: AArch64GenRegisterInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.o: AArch64GenSubtargetInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.po: AArch64GenInstrInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.po: AArch64GenRegisterInfo.inc.h
-AArch64DeadRegisterDefinitionsPass.po: AArch64GenSubtargetInfo.inc.h
-AArch64ExpandPseudoInsts.o: AArch64GenInstrInfo.inc.h
-AArch64ExpandPseudoInsts.o: AArch64GenRegisterInfo.inc.h
-AArch64ExpandPseudoInsts.o: AArch64GenSubtargetInfo.inc.h
-AArch64ExpandPseudoInsts.po: AArch64GenInstrInfo.inc.h
-AArch64ExpandPseudoInsts.po: AArch64GenRegisterInfo.inc.h
-AArch64ExpandPseudoInsts.po: AArch64GenSubtargetInfo.inc.h
-AArch64FastISel.o: AArch64GenCallingConv.inc.h
-AArch64FastISel.o: AArch64GenFastISel.inc.h
-AArch64FastISel.o: AArch64GenInstrInfo.inc.h
-AArch64FastISel.o: AArch64GenRegisterInfo.inc.h
-AArch64FastISel.o: AArch64GenSubtargetInfo.inc.h
-AArch64FastISel.o: Intrinsics.inc.h
-AArch64FastISel.po: AArch64GenCallingConv.inc.h
-AArch64FastISel.po: AArch64GenFastISel.inc.h
-AArch64FastISel.po: AArch64GenInstrInfo.inc.h
-AArch64FastISel.po: AArch64GenRegisterInfo.inc.h
-AArch64FastISel.po: AArch64GenSubtargetInfo.inc.h
-AArch64FastISel.po: Intrinsics.inc.h
-AArch64FrameLowering.o: AArch64GenInstrInfo.inc.h
-AArch64FrameLowering.o: AArch64GenRegisterInfo.inc.h
-AArch64FrameLowering.o: AArch64GenSubtargetInfo.inc.h
-AArch64FrameLowering.po: AArch64GenInstrInfo.inc.h
-AArch64FrameLowering.po: AArch64GenRegisterInfo.inc.h
-AArch64FrameLowering.po: AArch64GenSubtargetInfo.inc.h
-AArch64ISelDAGToDAG.o: AArch64GenDAGISel.inc.h
-AArch64ISelDAGToDAG.o: AArch64GenInstrInfo.inc.h
-AArch64ISelDAGToDAG.o: AArch64GenRegisterInfo.inc.h
-AArch64ISelDAGToDAG.o: AArch64GenSubtargetInfo.inc.h
-AArch64ISelDAGToDAG.o: Intrinsics.inc.h
-AArch64ISelDAGToDAG.po: AArch64GenDAGISel.inc.h
-AArch64ISelDAGToDAG.po: AArch64GenInstrInfo.inc.h
-AArch64ISelDAGToDAG.po: AArch64GenRegisterInfo.inc.h
-AArch64ISelDAGToDAG.po: AArch64GenSubtargetInfo.inc.h
-AArch64ISelDAGToDAG.po: Intrinsics.inc.h
-AArch64ISelLowering.o: AArch64GenCallingConv.inc.h
-AArch64ISelLowering.o: AArch64GenInstrInfo.inc.h
-AArch64ISelLowering.o: AArch64GenRegisterInfo.inc.h
-AArch64ISelLowering.o: AArch64GenSubtargetInfo.inc.h
-AArch64ISelLowering.o: Intrinsics.inc.h
-AArch64ISelLowering.po: AArch64GenCallingConv.inc.h
-AArch64ISelLowering.po: AArch64GenInstrInfo.inc.h
-AArch64ISelLowering.po: AArch64GenRegisterInfo.inc.h
-AArch64ISelLowering.po: AArch64GenSubtargetInfo.inc.h
-AArch64ISelLowering.po: Intrinsics.inc.h
-AArch64InstrInfo.o: AArch64GenInstrInfo.inc.h
-AArch64InstrInfo.o: AArch64GenRegisterInfo.inc.h
-AArch64InstrInfo.o: AArch64GenSubtargetInfo.inc.h
-AArch64InstrInfo.po: AArch64GenInstrInfo.inc.h
-AArch64InstrInfo.po: AArch64GenRegisterInfo.inc.h
-AArch64InstrInfo.po: AArch64GenSubtargetInfo.inc.h
-AArch64LoadStoreOptimizer.o: AArch64GenInstrInfo.inc.h
-AArch64LoadStoreOptimizer.o: AArch64GenRegisterInfo.inc.h
-AArch64LoadStoreOptimizer.o: AArch64GenSubtargetInfo.inc.h
-AArch64LoadStoreOptimizer.po: AArch64GenInstrInfo.inc.h
-AArch64LoadStoreOptimizer.po: AArch64GenRegisterInfo.inc.h
-AArch64LoadStoreOptimizer.po: AArch64GenSubtargetInfo.inc.h
-AArch64MCInstLower.o: AArch64GenInstrInfo.inc.h
-AArch64MCInstLower.o: AArch64GenRegisterInfo.inc.h
-AArch64MCInstLower.o: AArch64GenSubtargetInfo.inc.h
-AArch64MCInstLower.po: AArch64GenInstrInfo.inc.h
-AArch64MCInstLower.po: AArch64GenRegisterInfo.inc.h
-AArch64MCInstLower.po: AArch64GenSubtargetInfo.inc.h
-AArch64PBQPRegAlloc.o: AArch64GenInstrInfo.inc.h
-AArch64PBQPRegAlloc.o: AArch64GenRegisterInfo.inc.h
-AArch64PBQPRegAlloc.o: AArch64GenSubtargetInfo.inc.h
-AArch64PBQPRegAlloc.po: AArch64GenInstrInfo.inc.h
-AArch64PBQPRegAlloc.po: AArch64GenRegisterInfo.inc.h
-AArch64PBQPRegAlloc.po: AArch64GenSubtargetInfo.inc.h
-AArch64PromoteConstant.o: AArch64GenInstrInfo.inc.h
-AArch64PromoteConstant.o: AArch64GenRegisterInfo.inc.h
-AArch64PromoteConstant.o: AArch64GenSubtargetInfo.inc.h
-AArch64PromoteConstant.o: Intrinsics.inc.h
-AArch64PromoteConstant.po: AArch64GenInstrInfo.inc.h
-AArch64PromoteConstant.po: AArch64GenRegisterInfo.inc.h
-AArch64PromoteConstant.po: AArch64GenSubtargetInfo.inc.h
-AArch64PromoteConstant.po: Intrinsics.inc.h
-AArch64RegisterInfo.o: AArch64GenInstrInfo.inc.h
-AArch64RegisterInfo.o: AArch64GenRegisterInfo.inc.h
-AArch64RegisterInfo.o: AArch64GenSubtargetInfo.inc.h
-AArch64RegisterInfo.po: AArch64GenInstrInfo.inc.h
-AArch64RegisterInfo.po: AArch64GenRegisterInfo.inc.h
-AArch64RegisterInfo.po: AArch64GenSubtargetInfo.inc.h
-AArch64SelectionDAGInfo.o: AArch64GenInstrInfo.inc.h
-AArch64SelectionDAGInfo.o: AArch64GenRegisterInfo.inc.h
-AArch64SelectionDAGInfo.o: AArch64GenSubtargetInfo.inc.h
-AArch64SelectionDAGInfo.po: AArch64GenInstrInfo.inc.h
-AArch64SelectionDAGInfo.po: AArch64GenRegisterInfo.inc.h
-AArch64SelectionDAGInfo.po: AArch64GenSubtargetInfo.inc.h
-AArch64StorePairSuppress.o: AArch64GenInstrInfo.inc.h
-AArch64StorePairSuppress.o: AArch64GenRegisterInfo.inc.h
-AArch64StorePairSuppress.o: AArch64GenSubtargetInfo.inc.h
-AArch64StorePairSuppress.po: AArch64GenInstrInfo.inc.h
-AArch64StorePairSuppress.po: AArch64GenRegisterInfo.inc.h
-AArch64StorePairSuppress.po: AArch64GenSubtargetInfo.inc.h
-AArch64Subtarget.o: AArch64GenInstrInfo.inc.h
-AArch64Subtarget.o: AArch64GenRegisterInfo.inc.h
-AArch64Subtarget.o: AArch64GenSubtargetInfo.inc.h
-AArch64Subtarget.po: AArch64GenInstrInfo.inc.h
-AArch64Subtarget.po: AArch64GenRegisterInfo.inc.h
-AArch64Subtarget.po: AArch64GenSubtargetInfo.inc.h
-AArch64TargetMachine.o: AArch64GenInstrInfo.inc.h
-AArch64TargetMachine.o: AArch64GenRegisterInfo.inc.h
-AArch64TargetMachine.o: AArch64GenSubtargetInfo.inc.h
-AArch64TargetMachine.o: Intrinsics.inc.h
-AArch64TargetMachine.po: AArch64GenInstrInfo.inc.h
-AArch64TargetMachine.po: AArch64GenRegisterInfo.inc.h
-AArch64TargetMachine.po: AArch64GenSubtargetInfo.inc.h
-AArch64TargetMachine.po: Intrinsics.inc.h
-AArch64TargetObjectFile.o: AArch64GenInstrInfo.inc.h
-AArch64TargetObjectFile.o: AArch64GenRegisterInfo.inc.h
-AArch64TargetObjectFile.o: AArch64GenSubtargetInfo.inc.h
-AArch64TargetObjectFile.po: AArch64GenInstrInfo.inc.h
-AArch64TargetObjectFile.po: AArch64GenRegisterInfo.inc.h
-AArch64TargetObjectFile.po: AArch64GenSubtargetInfo.inc.h
-AArch64TargetTransformInfo.o: AArch64GenInstrInfo.inc.h
-AArch64TargetTransformInfo.o: AArch64GenRegisterInfo.inc.h
-AArch64TargetTransformInfo.o: AArch64GenSubtargetInfo.inc.h
-AArch64TargetTransformInfo.o: Intrinsics.inc.h
-AArch64TargetTransformInfo.po: AArch64GenInstrInfo.inc.h
-AArch64TargetTransformInfo.po: AArch64GenRegisterInfo.inc.h
-AArch64TargetTransformInfo.po: AArch64GenSubtargetInfo.inc.h
-AArch64TargetTransformInfo.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmaarch64desc/Makefile.depend b/lib/clang/libllvmaarch64desc/Makefile.depend
index b21faa8..385072f 100644
--- a/lib/clang/libllvmaarch64desc/Makefile.depend
+++ b/lib/clang/libllvmaarch64desc/Makefile.depend
@@ -13,36 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AArch64AsmBackend.o: AArch64GenInstrInfo.inc.h
-AArch64AsmBackend.o: AArch64GenRegisterInfo.inc.h
-AArch64AsmBackend.o: AArch64GenSubtargetInfo.inc.h
-AArch64AsmBackend.po: AArch64GenInstrInfo.inc.h
-AArch64AsmBackend.po: AArch64GenRegisterInfo.inc.h
-AArch64AsmBackend.po: AArch64GenSubtargetInfo.inc.h
-AArch64ELFObjectWriter.o: AArch64GenInstrInfo.inc.h
-AArch64ELFObjectWriter.o: AArch64GenRegisterInfo.inc.h
-AArch64ELFObjectWriter.o: AArch64GenSubtargetInfo.inc.h
-AArch64ELFObjectWriter.po: AArch64GenInstrInfo.inc.h
-AArch64ELFObjectWriter.po: AArch64GenRegisterInfo.inc.h
-AArch64ELFObjectWriter.po: AArch64GenSubtargetInfo.inc.h
-AArch64MCCodeEmitter.o: AArch64GenInstrInfo.inc.h
-AArch64MCCodeEmitter.o: AArch64GenMCCodeEmitter.inc.h
-AArch64MCCodeEmitter.o: AArch64GenRegisterInfo.inc.h
-AArch64MCCodeEmitter.o: AArch64GenSubtargetInfo.inc.h
-AArch64MCCodeEmitter.po: AArch64GenInstrInfo.inc.h
-AArch64MCCodeEmitter.po: AArch64GenMCCodeEmitter.inc.h
-AArch64MCCodeEmitter.po: AArch64GenRegisterInfo.inc.h
-AArch64MCCodeEmitter.po: AArch64GenSubtargetInfo.inc.h
-AArch64MCTargetDesc.o: AArch64GenInstrInfo.inc.h
-AArch64MCTargetDesc.o: AArch64GenRegisterInfo.inc.h
-AArch64MCTargetDesc.o: AArch64GenSubtargetInfo.inc.h
-AArch64MCTargetDesc.po: AArch64GenInstrInfo.inc.h
-AArch64MCTargetDesc.po: AArch64GenRegisterInfo.inc.h
-AArch64MCTargetDesc.po: AArch64GenSubtargetInfo.inc.h
-AArch64MachObjectWriter.o: AArch64GenInstrInfo.inc.h
-AArch64MachObjectWriter.o: AArch64GenRegisterInfo.inc.h
-AArch64MachObjectWriter.o: AArch64GenSubtargetInfo.inc.h
-AArch64MachObjectWriter.po: AArch64GenInstrInfo.inc.h
-AArch64MachObjectWriter.po: AArch64GenRegisterInfo.inc.h
-AArch64MachObjectWriter.po: AArch64GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile.depend b/lib/clang/libllvmaarch64disassembler/Makefile.depend
index bbe0f2e..385072f 100644
--- a/lib/clang/libllvmaarch64disassembler/Makefile.depend
+++ b/lib/clang/libllvmaarch64disassembler/Makefile.depend
@@ -13,18 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AArch64Disassembler.o: AArch64GenDisassemblerTables.inc.h
-AArch64Disassembler.o: AArch64GenInstrInfo.inc.h
-AArch64Disassembler.o: AArch64GenRegisterInfo.inc.h
-AArch64Disassembler.o: AArch64GenSubtargetInfo.inc.h
-AArch64Disassembler.po: AArch64GenDisassemblerTables.inc.h
-AArch64Disassembler.po: AArch64GenInstrInfo.inc.h
-AArch64Disassembler.po: AArch64GenRegisterInfo.inc.h
-AArch64Disassembler.po: AArch64GenSubtargetInfo.inc.h
-AArch64ExternalSymbolizer.o: AArch64GenInstrInfo.inc.h
-AArch64ExternalSymbolizer.o: AArch64GenRegisterInfo.inc.h
-AArch64ExternalSymbolizer.o: AArch64GenSubtargetInfo.inc.h
-AArch64ExternalSymbolizer.po: AArch64GenInstrInfo.inc.h
-AArch64ExternalSymbolizer.po: AArch64GenRegisterInfo.inc.h
-AArch64ExternalSymbolizer.po: AArch64GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmaarch64utils/Makefile.depend b/lib/clang/libllvmaarch64utils/Makefile.depend
index c7f43d4..385072f 100644
--- a/lib/clang/libllvmaarch64utils/Makefile.depend
+++ b/lib/clang/libllvmaarch64utils/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AArch64BaseInfo.o: AArch64GenInstrInfo.inc.h
-AArch64BaseInfo.o: AArch64GenRegisterInfo.inc.h
-AArch64BaseInfo.o: AArch64GenSubtargetInfo.inc.h
-AArch64BaseInfo.po: AArch64GenInstrInfo.inc.h
-AArch64BaseInfo.po: AArch64GenRegisterInfo.inc.h
-AArch64BaseInfo.po: AArch64GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
index 6c96816..385072f 100644
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ b/lib/clang/libllvmanalysis/Makefile.depend
@@ -13,52 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AliasAnalysis.o: Intrinsics.inc.h
-AliasAnalysis.po: Intrinsics.inc.h
-AliasSetTracker.o: Intrinsics.inc.h
-AliasSetTracker.po: Intrinsics.inc.h
-AssumptionCache.o: Intrinsics.inc.h
-AssumptionCache.po: Intrinsics.inc.h
-BasicAliasAnalysis.o: Intrinsics.inc.h
-BasicAliasAnalysis.po: Intrinsics.inc.h
-CFLAliasAnalysis.o: Intrinsics.inc.h
-CFLAliasAnalysis.po: Intrinsics.inc.h
-CodeMetrics.o: Intrinsics.inc.h
-CodeMetrics.po: Intrinsics.inc.h
-ConstantFolding.o: Intrinsics.inc.h
-ConstantFolding.po: Intrinsics.inc.h
-CostModel.o: Intrinsics.inc.h
-CostModel.po: Intrinsics.inc.h
-DivergenceAnalysis.o: Intrinsics.inc.h
-DivergenceAnalysis.po: Intrinsics.inc.h
-InstCount.o: Intrinsics.inc.h
-InstCount.po: Intrinsics.inc.h
-InstructionSimplify.o: Intrinsics.inc.h
-InstructionSimplify.po: Intrinsics.inc.h
-LazyCallGraph.o: Intrinsics.inc.h
-LazyCallGraph.po: Intrinsics.inc.h
-LazyValueInfo.o: Intrinsics.inc.h
-LazyValueInfo.po: Intrinsics.inc.h
-Lint.o: Intrinsics.inc.h
-Lint.po: Intrinsics.inc.h
-Loads.o: Intrinsics.inc.h
-Loads.po: Intrinsics.inc.h
-LoopAccessAnalysis.o: Intrinsics.inc.h
-LoopAccessAnalysis.po: Intrinsics.inc.h
-MemoryBuiltins.o: Intrinsics.inc.h
-MemoryBuiltins.po: Intrinsics.inc.h
-MemoryDependenceAnalysis.o: Intrinsics.inc.h
-MemoryDependenceAnalysis.po: Intrinsics.inc.h
-MemoryLocation.o: Intrinsics.inc.h
-MemoryLocation.po: Intrinsics.inc.h
-PtrUseVisitor.o: Intrinsics.inc.h
-PtrUseVisitor.po: Intrinsics.inc.h
-ScalarEvolutionExpander.o: Intrinsics.inc.h
-ScalarEvolutionExpander.po: Intrinsics.inc.h
-TargetTransformInfo.o: Intrinsics.inc.h
-TargetTransformInfo.po: Intrinsics.inc.h
-ValueTracking.o: Intrinsics.inc.h
-ValueTracking.po: Intrinsics.inc.h
-VectorUtils.o: Intrinsics.inc.h
-VectorUtils.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
index 6fa25b5..385072f 100644
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ b/lib/clang/libllvmarmasmparser/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARMAsmParser.o: ARMGenAsmMatcher.inc.h
-ARMAsmParser.o: ARMGenInstrInfo.inc.h
-ARMAsmParser.o: ARMGenRegisterInfo.inc.h
-ARMAsmParser.o: ARMGenSubtargetInfo.inc.h
-ARMAsmParser.po: ARMGenAsmMatcher.inc.h
-ARMAsmParser.po: ARMGenInstrInfo.inc.h
-ARMAsmParser.po: ARMGenRegisterInfo.inc.h
-ARMAsmParser.po: ARMGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
index 9819e3b..385072f 100644
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ b/lib/clang/libllvmarmcodegen/Makefile.depend
@@ -13,198 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-A15SDOptimizer.o: ARMGenInstrInfo.inc.h
-A15SDOptimizer.o: ARMGenRegisterInfo.inc.h
-A15SDOptimizer.o: ARMGenSubtargetInfo.inc.h
-A15SDOptimizer.po: ARMGenInstrInfo.inc.h
-A15SDOptimizer.po: ARMGenRegisterInfo.inc.h
-A15SDOptimizer.po: ARMGenSubtargetInfo.inc.h
-ARMAsmPrinter.o: ARMGenInstrInfo.inc.h
-ARMAsmPrinter.o: ARMGenMCPseudoLowering.inc.h
-ARMAsmPrinter.o: ARMGenRegisterInfo.inc.h
-ARMAsmPrinter.o: ARMGenSubtargetInfo.inc.h
-ARMAsmPrinter.po: ARMGenInstrInfo.inc.h
-ARMAsmPrinter.po: ARMGenMCPseudoLowering.inc.h
-ARMAsmPrinter.po: ARMGenRegisterInfo.inc.h
-ARMAsmPrinter.po: ARMGenSubtargetInfo.inc.h
-ARMBaseInstrInfo.o: ARMGenInstrInfo.inc.h
-ARMBaseInstrInfo.o: ARMGenRegisterInfo.inc.h
-ARMBaseInstrInfo.o: ARMGenSubtargetInfo.inc.h
-ARMBaseInstrInfo.po: ARMGenInstrInfo.inc.h
-ARMBaseInstrInfo.po: ARMGenRegisterInfo.inc.h
-ARMBaseInstrInfo.po: ARMGenSubtargetInfo.inc.h
-ARMBaseRegisterInfo.o: ARMGenInstrInfo.inc.h
-ARMBaseRegisterInfo.o: ARMGenRegisterInfo.inc.h
-ARMBaseRegisterInfo.o: ARMGenSubtargetInfo.inc.h
-ARMBaseRegisterInfo.po: ARMGenInstrInfo.inc.h
-ARMBaseRegisterInfo.po: ARMGenRegisterInfo.inc.h
-ARMBaseRegisterInfo.po: ARMGenSubtargetInfo.inc.h
-ARMConstantIslandPass.o: ARMGenInstrInfo.inc.h
-ARMConstantIslandPass.o: ARMGenRegisterInfo.inc.h
-ARMConstantIslandPass.o: ARMGenSubtargetInfo.inc.h
-ARMConstantIslandPass.po: ARMGenInstrInfo.inc.h
-ARMConstantIslandPass.po: ARMGenRegisterInfo.inc.h
-ARMConstantIslandPass.po: ARMGenSubtargetInfo.inc.h
-ARMExpandPseudoInsts.o: ARMGenInstrInfo.inc.h
-ARMExpandPseudoInsts.o: ARMGenRegisterInfo.inc.h
-ARMExpandPseudoInsts.o: ARMGenSubtargetInfo.inc.h
-ARMExpandPseudoInsts.po: ARMGenInstrInfo.inc.h
-ARMExpandPseudoInsts.po: ARMGenRegisterInfo.inc.h
-ARMExpandPseudoInsts.po: ARMGenSubtargetInfo.inc.h
-ARMFastISel.o: ARMGenCallingConv.inc.h
-ARMFastISel.o: ARMGenFastISel.inc.h
-ARMFastISel.o: ARMGenInstrInfo.inc.h
-ARMFastISel.o: ARMGenRegisterInfo.inc.h
-ARMFastISel.o: ARMGenSubtargetInfo.inc.h
-ARMFastISel.o: Intrinsics.inc.h
-ARMFastISel.po: ARMGenCallingConv.inc.h
-ARMFastISel.po: ARMGenFastISel.inc.h
-ARMFastISel.po: ARMGenInstrInfo.inc.h
-ARMFastISel.po: ARMGenRegisterInfo.inc.h
-ARMFastISel.po: ARMGenSubtargetInfo.inc.h
-ARMFastISel.po: Intrinsics.inc.h
-ARMFrameLowering.o: ARMGenInstrInfo.inc.h
-ARMFrameLowering.o: ARMGenRegisterInfo.inc.h
-ARMFrameLowering.o: ARMGenSubtargetInfo.inc.h
-ARMFrameLowering.po: ARMGenInstrInfo.inc.h
-ARMFrameLowering.po: ARMGenRegisterInfo.inc.h
-ARMFrameLowering.po: ARMGenSubtargetInfo.inc.h
-ARMHazardRecognizer.o: ARMGenInstrInfo.inc.h
-ARMHazardRecognizer.o: ARMGenRegisterInfo.inc.h
-ARMHazardRecognizer.o: ARMGenSubtargetInfo.inc.h
-ARMHazardRecognizer.po: ARMGenInstrInfo.inc.h
-ARMHazardRecognizer.po: ARMGenRegisterInfo.inc.h
-ARMHazardRecognizer.po: ARMGenSubtargetInfo.inc.h
-ARMISelDAGToDAG.o: ARMGenDAGISel.inc.h
-ARMISelDAGToDAG.o: ARMGenInstrInfo.inc.h
-ARMISelDAGToDAG.o: ARMGenRegisterInfo.inc.h
-ARMISelDAGToDAG.o: ARMGenSubtargetInfo.inc.h
-ARMISelDAGToDAG.o: Intrinsics.inc.h
-ARMISelDAGToDAG.po: ARMGenDAGISel.inc.h
-ARMISelDAGToDAG.po: ARMGenInstrInfo.inc.h
-ARMISelDAGToDAG.po: ARMGenRegisterInfo.inc.h
-ARMISelDAGToDAG.po: ARMGenSubtargetInfo.inc.h
-ARMISelDAGToDAG.po: Intrinsics.inc.h
-ARMISelLowering.o: ARMGenCallingConv.inc.h
-ARMISelLowering.o: ARMGenInstrInfo.inc.h
-ARMISelLowering.o: ARMGenRegisterInfo.inc.h
-ARMISelLowering.o: ARMGenSubtargetInfo.inc.h
-ARMISelLowering.o: Intrinsics.inc.h
-ARMISelLowering.po: ARMGenCallingConv.inc.h
-ARMISelLowering.po: ARMGenInstrInfo.inc.h
-ARMISelLowering.po: ARMGenRegisterInfo.inc.h
-ARMISelLowering.po: ARMGenSubtargetInfo.inc.h
-ARMISelLowering.po: Intrinsics.inc.h
-ARMInstrInfo.o: ARMGenInstrInfo.inc.h
-ARMInstrInfo.o: ARMGenRegisterInfo.inc.h
-ARMInstrInfo.o: ARMGenSubtargetInfo.inc.h
-ARMInstrInfo.po: ARMGenInstrInfo.inc.h
-ARMInstrInfo.po: ARMGenRegisterInfo.inc.h
-ARMInstrInfo.po: ARMGenSubtargetInfo.inc.h
-ARMLoadStoreOptimizer.o: ARMGenInstrInfo.inc.h
-ARMLoadStoreOptimizer.o: ARMGenRegisterInfo.inc.h
-ARMLoadStoreOptimizer.o: ARMGenSubtargetInfo.inc.h
-ARMLoadStoreOptimizer.po: ARMGenInstrInfo.inc.h
-ARMLoadStoreOptimizer.po: ARMGenRegisterInfo.inc.h
-ARMLoadStoreOptimizer.po: ARMGenSubtargetInfo.inc.h
-ARMMCInstLower.o: ARMGenInstrInfo.inc.h
-ARMMCInstLower.o: ARMGenRegisterInfo.inc.h
-ARMMCInstLower.o: ARMGenSubtargetInfo.inc.h
-ARMMCInstLower.po: ARMGenInstrInfo.inc.h
-ARMMCInstLower.po: ARMGenRegisterInfo.inc.h
-ARMMCInstLower.po: ARMGenSubtargetInfo.inc.h
-ARMMachineFunctionInfo.o: ARMGenInstrInfo.inc.h
-ARMMachineFunctionInfo.o: ARMGenRegisterInfo.inc.h
-ARMMachineFunctionInfo.o: ARMGenSubtargetInfo.inc.h
-ARMMachineFunctionInfo.po: ARMGenInstrInfo.inc.h
-ARMMachineFunctionInfo.po: ARMGenRegisterInfo.inc.h
-ARMMachineFunctionInfo.po: ARMGenSubtargetInfo.inc.h
-ARMOptimizeBarriersPass.o: ARMGenInstrInfo.inc.h
-ARMOptimizeBarriersPass.o: ARMGenRegisterInfo.inc.h
-ARMOptimizeBarriersPass.o: ARMGenSubtargetInfo.inc.h
-ARMOptimizeBarriersPass.po: ARMGenInstrInfo.inc.h
-ARMOptimizeBarriersPass.po: ARMGenRegisterInfo.inc.h
-ARMOptimizeBarriersPass.po: ARMGenSubtargetInfo.inc.h
-ARMRegisterInfo.o: ARMGenInstrInfo.inc.h
-ARMRegisterInfo.o: ARMGenRegisterInfo.inc.h
-ARMRegisterInfo.o: ARMGenSubtargetInfo.inc.h
-ARMRegisterInfo.po: ARMGenInstrInfo.inc.h
-ARMRegisterInfo.po: ARMGenRegisterInfo.inc.h
-ARMRegisterInfo.po: ARMGenSubtargetInfo.inc.h
-ARMSelectionDAGInfo.o: ARMGenInstrInfo.inc.h
-ARMSelectionDAGInfo.o: ARMGenRegisterInfo.inc.h
-ARMSelectionDAGInfo.o: ARMGenSubtargetInfo.inc.h
-ARMSelectionDAGInfo.po: ARMGenInstrInfo.inc.h
-ARMSelectionDAGInfo.po: ARMGenRegisterInfo.inc.h
-ARMSelectionDAGInfo.po: ARMGenSubtargetInfo.inc.h
-ARMSubtarget.o: ARMGenInstrInfo.inc.h
-ARMSubtarget.o: ARMGenRegisterInfo.inc.h
-ARMSubtarget.o: ARMGenSubtargetInfo.inc.h
-ARMSubtarget.po: ARMGenInstrInfo.inc.h
-ARMSubtarget.po: ARMGenRegisterInfo.inc.h
-ARMSubtarget.po: ARMGenSubtargetInfo.inc.h
-ARMTargetMachine.o: ARMGenInstrInfo.inc.h
-ARMTargetMachine.o: ARMGenRegisterInfo.inc.h
-ARMTargetMachine.o: ARMGenSubtargetInfo.inc.h
-ARMTargetMachine.o: Intrinsics.inc.h
-ARMTargetMachine.po: ARMGenInstrInfo.inc.h
-ARMTargetMachine.po: ARMGenRegisterInfo.inc.h
-ARMTargetMachine.po: ARMGenSubtargetInfo.inc.h
-ARMTargetMachine.po: Intrinsics.inc.h
-ARMTargetObjectFile.o: ARMGenInstrInfo.inc.h
-ARMTargetObjectFile.o: ARMGenRegisterInfo.inc.h
-ARMTargetObjectFile.o: ARMGenSubtargetInfo.inc.h
-ARMTargetObjectFile.po: ARMGenInstrInfo.inc.h
-ARMTargetObjectFile.po: ARMGenRegisterInfo.inc.h
-ARMTargetObjectFile.po: ARMGenSubtargetInfo.inc.h
-ARMTargetTransformInfo.o: ARMGenInstrInfo.inc.h
-ARMTargetTransformInfo.o: ARMGenRegisterInfo.inc.h
-ARMTargetTransformInfo.o: ARMGenSubtargetInfo.inc.h
-ARMTargetTransformInfo.o: Intrinsics.inc.h
-ARMTargetTransformInfo.po: ARMGenInstrInfo.inc.h
-ARMTargetTransformInfo.po: ARMGenRegisterInfo.inc.h
-ARMTargetTransformInfo.po: ARMGenSubtargetInfo.inc.h
-ARMTargetTransformInfo.po: Intrinsics.inc.h
-MLxExpansionPass.o: ARMGenInstrInfo.inc.h
-MLxExpansionPass.o: ARMGenRegisterInfo.inc.h
-MLxExpansionPass.o: ARMGenSubtargetInfo.inc.h
-MLxExpansionPass.po: ARMGenInstrInfo.inc.h
-MLxExpansionPass.po: ARMGenRegisterInfo.inc.h
-MLxExpansionPass.po: ARMGenSubtargetInfo.inc.h
-Thumb1FrameLowering.o: ARMGenInstrInfo.inc.h
-Thumb1FrameLowering.o: ARMGenRegisterInfo.inc.h
-Thumb1FrameLowering.o: ARMGenSubtargetInfo.inc.h
-Thumb1FrameLowering.po: ARMGenInstrInfo.inc.h
-Thumb1FrameLowering.po: ARMGenRegisterInfo.inc.h
-Thumb1FrameLowering.po: ARMGenSubtargetInfo.inc.h
-Thumb1InstrInfo.o: ARMGenInstrInfo.inc.h
-Thumb1InstrInfo.o: ARMGenRegisterInfo.inc.h
-Thumb1InstrInfo.o: ARMGenSubtargetInfo.inc.h
-Thumb1InstrInfo.po: ARMGenInstrInfo.inc.h
-Thumb1InstrInfo.po: ARMGenRegisterInfo.inc.h
-Thumb1InstrInfo.po: ARMGenSubtargetInfo.inc.h
-Thumb2ITBlockPass.o: ARMGenInstrInfo.inc.h
-Thumb2ITBlockPass.o: ARMGenRegisterInfo.inc.h
-Thumb2ITBlockPass.o: ARMGenSubtargetInfo.inc.h
-Thumb2ITBlockPass.po: ARMGenInstrInfo.inc.h
-Thumb2ITBlockPass.po: ARMGenRegisterInfo.inc.h
-Thumb2ITBlockPass.po: ARMGenSubtargetInfo.inc.h
-Thumb2InstrInfo.o: ARMGenInstrInfo.inc.h
-Thumb2InstrInfo.o: ARMGenRegisterInfo.inc.h
-Thumb2InstrInfo.o: ARMGenSubtargetInfo.inc.h
-Thumb2InstrInfo.po: ARMGenInstrInfo.inc.h
-Thumb2InstrInfo.po: ARMGenRegisterInfo.inc.h
-Thumb2InstrInfo.po: ARMGenSubtargetInfo.inc.h
-Thumb2SizeReduction.o: ARMGenInstrInfo.inc.h
-Thumb2SizeReduction.o: ARMGenRegisterInfo.inc.h
-Thumb2SizeReduction.o: ARMGenSubtargetInfo.inc.h
-Thumb2SizeReduction.po: ARMGenInstrInfo.inc.h
-Thumb2SizeReduction.po: ARMGenRegisterInfo.inc.h
-Thumb2SizeReduction.po: ARMGenSubtargetInfo.inc.h
-ThumbRegisterInfo.o: ARMGenInstrInfo.inc.h
-ThumbRegisterInfo.o: ARMGenRegisterInfo.inc.h
-ThumbRegisterInfo.o: ARMGenSubtargetInfo.inc.h
-ThumbRegisterInfo.po: ARMGenInstrInfo.inc.h
-ThumbRegisterInfo.po: ARMGenRegisterInfo.inc.h
-ThumbRegisterInfo.po: ARMGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
index 1d70a65..385072f 100644
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ b/lib/clang/libllvmarmdesc/Makefile.depend
@@ -13,54 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARMAsmBackend.o: ARMGenInstrInfo.inc.h
-ARMAsmBackend.o: ARMGenRegisterInfo.inc.h
-ARMAsmBackend.o: ARMGenSubtargetInfo.inc.h
-ARMAsmBackend.po: ARMGenInstrInfo.inc.h
-ARMAsmBackend.po: ARMGenRegisterInfo.inc.h
-ARMAsmBackend.po: ARMGenSubtargetInfo.inc.h
-ARMELFObjectWriter.o: ARMGenInstrInfo.inc.h
-ARMELFObjectWriter.o: ARMGenRegisterInfo.inc.h
-ARMELFObjectWriter.o: ARMGenSubtargetInfo.inc.h
-ARMELFObjectWriter.po: ARMGenInstrInfo.inc.h
-ARMELFObjectWriter.po: ARMGenRegisterInfo.inc.h
-ARMELFObjectWriter.po: ARMGenSubtargetInfo.inc.h
-ARMELFStreamer.o: ARMGenInstrInfo.inc.h
-ARMELFStreamer.o: ARMGenRegisterInfo.inc.h
-ARMELFStreamer.o: ARMGenSubtargetInfo.inc.h
-ARMELFStreamer.po: ARMGenInstrInfo.inc.h
-ARMELFStreamer.po: ARMGenRegisterInfo.inc.h
-ARMELFStreamer.po: ARMGenSubtargetInfo.inc.h
-ARMMCCodeEmitter.o: ARMGenInstrInfo.inc.h
-ARMMCCodeEmitter.o: ARMGenMCCodeEmitter.inc.h
-ARMMCCodeEmitter.o: ARMGenRegisterInfo.inc.h
-ARMMCCodeEmitter.o: ARMGenSubtargetInfo.inc.h
-ARMMCCodeEmitter.po: ARMGenInstrInfo.inc.h
-ARMMCCodeEmitter.po: ARMGenMCCodeEmitter.inc.h
-ARMMCCodeEmitter.po: ARMGenRegisterInfo.inc.h
-ARMMCCodeEmitter.po: ARMGenSubtargetInfo.inc.h
-ARMMCTargetDesc.o: ARMGenInstrInfo.inc.h
-ARMMCTargetDesc.o: ARMGenRegisterInfo.inc.h
-ARMMCTargetDesc.o: ARMGenSubtargetInfo.inc.h
-ARMMCTargetDesc.po: ARMGenInstrInfo.inc.h
-ARMMCTargetDesc.po: ARMGenRegisterInfo.inc.h
-ARMMCTargetDesc.po: ARMGenSubtargetInfo.inc.h
-ARMMachORelocationInfo.o: ARMGenInstrInfo.inc.h
-ARMMachORelocationInfo.o: ARMGenRegisterInfo.inc.h
-ARMMachORelocationInfo.o: ARMGenSubtargetInfo.inc.h
-ARMMachORelocationInfo.po: ARMGenInstrInfo.inc.h
-ARMMachORelocationInfo.po: ARMGenRegisterInfo.inc.h
-ARMMachORelocationInfo.po: ARMGenSubtargetInfo.inc.h
-ARMMachObjectWriter.o: ARMGenInstrInfo.inc.h
-ARMMachObjectWriter.o: ARMGenRegisterInfo.inc.h
-ARMMachObjectWriter.o: ARMGenSubtargetInfo.inc.h
-ARMMachObjectWriter.po: ARMGenInstrInfo.inc.h
-ARMMachObjectWriter.po: ARMGenRegisterInfo.inc.h
-ARMMachObjectWriter.po: ARMGenSubtargetInfo.inc.h
-ARMWinCOFFStreamer.o: ARMGenInstrInfo.inc.h
-ARMWinCOFFStreamer.o: ARMGenRegisterInfo.inc.h
-ARMWinCOFFStreamer.o: ARMGenSubtargetInfo.inc.h
-ARMWinCOFFStreamer.po: ARMGenInstrInfo.inc.h
-ARMWinCOFFStreamer.po: ARMGenRegisterInfo.inc.h
-ARMWinCOFFStreamer.po: ARMGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
index 59787f1..385072f 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ b/lib/clang/libllvmarmdisassembler/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARMDisassembler.o: ARMGenDisassemblerTables.inc.h
-ARMDisassembler.o: ARMGenInstrInfo.inc.h
-ARMDisassembler.o: ARMGenRegisterInfo.inc.h
-ARMDisassembler.o: ARMGenSubtargetInfo.inc.h
-ARMDisassembler.po: ARMGenDisassemblerTables.inc.h
-ARMDisassembler.po: ARMGenInstrInfo.inc.h
-ARMDisassembler.po: ARMGenRegisterInfo.inc.h
-ARMDisassembler.po: ARMGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
index eb09777..385072f 100644
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ b/lib/clang/libllvmarminfo/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARMTargetInfo.o: ARMGenInstrInfo.inc.h
-ARMTargetInfo.o: ARMGenRegisterInfo.inc.h
-ARMTargetInfo.o: ARMGenSubtargetInfo.inc.h
-ARMTargetInfo.po: ARMGenInstrInfo.inc.h
-ARMTargetInfo.po: ARMGenRegisterInfo.inc.h
-ARMTargetInfo.po: ARMGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
index ed98ab4..385072f 100644
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ b/lib/clang/libllvmasmprinter/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ErlangGCPrinter.o: Intrinsics.inc.h
-ErlangGCPrinter.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
index 387067c..385072f 100644
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ b/lib/clang/libllvmbitreader/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-BitcodeReader.o: Intrinsics.inc.h
-BitcodeReader.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
index 888f72f..385072f 100644
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ b/lib/clang/libllvmcodegen/Makefile.depend
@@ -13,34 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Analysis.o: Intrinsics.inc.h
-Analysis.po: Intrinsics.inc.h
-AtomicExpandPass.o: Intrinsics.inc.h
-AtomicExpandPass.po: Intrinsics.inc.h
-BasicTargetTransformInfo.o: Intrinsics.inc.h
-BasicTargetTransformInfo.po: Intrinsics.inc.h
-CodeGenPrepare.o: Intrinsics.inc.h
-CodeGenPrepare.po: Intrinsics.inc.h
-DwarfEHPrepare.o: Intrinsics.inc.h
-DwarfEHPrepare.po: Intrinsics.inc.h
-GCRootLowering.o: Intrinsics.inc.h
-GCRootLowering.po: Intrinsics.inc.h
-GlobalMerge.o: Intrinsics.inc.h
-GlobalMerge.po: Intrinsics.inc.h
-IntrinsicLowering.o: Intrinsics.inc.h
-IntrinsicLowering.po: Intrinsics.inc.h
-LLVMTargetMachine.o: Intrinsics.inc.h
-LLVMTargetMachine.po: Intrinsics.inc.h
-LocalStackSlotAllocation.o: Intrinsics.inc.h
-LocalStackSlotAllocation.po: Intrinsics.inc.h
-ShadowStackGC.o: Intrinsics.inc.h
-ShadowStackGC.po: Intrinsics.inc.h
-ShadowStackGCLowering.o: Intrinsics.inc.h
-ShadowStackGCLowering.po: Intrinsics.inc.h
-SjLjEHPrepare.o: Intrinsics.inc.h
-SjLjEHPrepare.po: Intrinsics.inc.h
-StackProtector.o: Intrinsics.inc.h
-StackProtector.po: Intrinsics.inc.h
-WinEHPrepare.o: Intrinsics.inc.h
-WinEHPrepare.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
index 7393881..385072f 100644
--- a/lib/clang/libllvmcore/Makefile.depend
+++ b/lib/clang/libllvmcore/Makefile.depend
@@ -13,30 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AsmWriter.o: Intrinsics.inc.h
-AsmWriter.po: Intrinsics.inc.h
-AutoUpgrade.o: Intrinsics.inc.h
-AutoUpgrade.po: Intrinsics.inc.h
-BasicBlock.o: Intrinsics.inc.h
-BasicBlock.po: Intrinsics.inc.h
-ConstantFold.o: Intrinsics.inc.h
-ConstantFold.po: Intrinsics.inc.h
-Core.o: Intrinsics.inc.h
-Core.po: Intrinsics.inc.h
-DIBuilder.o: Intrinsics.inc.h
-DIBuilder.po: Intrinsics.inc.h
-DebugInfo.o: Intrinsics.inc.h
-DebugInfo.po: Intrinsics.inc.h
-Function.o: Intrinsics.inc.h
-Function.po: Intrinsics.inc.h
-IRBuilder.o: Intrinsics.inc.h
-IRBuilder.po: Intrinsics.inc.h
-IntrinsicInst.o: Intrinsics.inc.h
-IntrinsicInst.po: Intrinsics.inc.h
-Statepoint.o: Intrinsics.inc.h
-Statepoint.po: Intrinsics.inc.h
-Value.o: Intrinsics.inc.h
-Value.po: Intrinsics.inc.h
-Verifier.o: Intrinsics.inc.h
-Verifier.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
index d2df3e5..385072f 100644
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ b/lib/clang/libllvminstcombine/Makefile.depend
@@ -13,30 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-InstCombineAddSub.o: Intrinsics.inc.h
-InstCombineAddSub.po: Intrinsics.inc.h
-InstCombineAndOrXor.o: Intrinsics.inc.h
-InstCombineAndOrXor.po: Intrinsics.inc.h
-InstCombineCalls.o: Intrinsics.inc.h
-InstCombineCalls.po: Intrinsics.inc.h
-InstCombineCasts.o: Intrinsics.inc.h
-InstCombineCasts.po: Intrinsics.inc.h
-InstCombineCompares.o: Intrinsics.inc.h
-InstCombineCompares.po: Intrinsics.inc.h
-InstCombineLoadStoreAlloca.o: Intrinsics.inc.h
-InstCombineLoadStoreAlloca.po: Intrinsics.inc.h
-InstCombineMulDivRem.o: Intrinsics.inc.h
-InstCombineMulDivRem.po: Intrinsics.inc.h
-InstCombinePHI.o: Intrinsics.inc.h
-InstCombinePHI.po: Intrinsics.inc.h
-InstCombineSelect.o: Intrinsics.inc.h
-InstCombineSelect.po: Intrinsics.inc.h
-InstCombineShifts.o: Intrinsics.inc.h
-InstCombineShifts.po: Intrinsics.inc.h
-InstCombineSimplifyDemanded.o: Intrinsics.inc.h
-InstCombineSimplifyDemanded.po: Intrinsics.inc.h
-InstCombineVectorOps.o: Intrinsics.inc.h
-InstCombineVectorOps.po: Intrinsics.inc.h
-InstructionCombining.o: Intrinsics.inc.h
-InstructionCombining.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
index 2718ddd..385072f 100644
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ b/lib/clang/libllvminstrumentation/Makefile.depend
@@ -13,20 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AddressSanitizer.o: Intrinsics.inc.h
-AddressSanitizer.po: Intrinsics.inc.h
-BoundsChecking.o: Intrinsics.inc.h
-BoundsChecking.po: Intrinsics.inc.h
-DataFlowSanitizer.o: Intrinsics.inc.h
-DataFlowSanitizer.po: Intrinsics.inc.h
-GCOVProfiling.o: Intrinsics.inc.h
-GCOVProfiling.po: Intrinsics.inc.h
-InstrProfiling.o: Intrinsics.inc.h
-InstrProfiling.po: Intrinsics.inc.h
-MemorySanitizer.o: Intrinsics.inc.h
-MemorySanitizer.po: Intrinsics.inc.h
-SafeStack.o: Intrinsics.inc.h
-SafeStack.po: Intrinsics.inc.h
-ThreadSanitizer.o: Intrinsics.inc.h
-ThreadSanitizer.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend
index ff32938..385072f 100644
--- a/lib/clang/libllvminterpreter/Makefile.depend
+++ b/lib/clang/libllvminterpreter/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Execution.o: Intrinsics.inc.h
-Execution.po: Intrinsics.inc.h
-ExternalFunctions.o: Intrinsics.inc.h
-ExternalFunctions.po: Intrinsics.inc.h
-Interpreter.o: Intrinsics.inc.h
-Interpreter.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
index 84342a0..385072f 100644
--- a/lib/clang/libllvmipo/Makefile.depend
+++ b/lib/clang/libllvmipo/Makefile.depend
@@ -13,24 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ArgumentPromotion.o: Intrinsics.inc.h
-ArgumentPromotion.po: Intrinsics.inc.h
-DeadArgumentElimination.o: Intrinsics.inc.h
-DeadArgumentElimination.po: Intrinsics.inc.h
-FunctionAttrs.o: Intrinsics.inc.h
-FunctionAttrs.po: Intrinsics.inc.h
-GlobalOpt.o: Intrinsics.inc.h
-GlobalOpt.po: Intrinsics.inc.h
-InlineAlways.o: Intrinsics.inc.h
-InlineAlways.po: Intrinsics.inc.h
-InlineSimple.o: Intrinsics.inc.h
-InlineSimple.po: Intrinsics.inc.h
-Inliner.o: Intrinsics.inc.h
-Inliner.po: Intrinsics.inc.h
-Internalize.o: Intrinsics.inc.h
-Internalize.po: Intrinsics.inc.h
-LowerBitSets.o: Intrinsics.inc.h
-LowerBitSets.po: Intrinsics.inc.h
-PruneEH.o: Intrinsics.inc.h
-PruneEH.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmlibdriver/Makefile.depend b/lib/clang/libllvmlibdriver/Makefile.depend
index 731ea8a..385072f 100644
--- a/lib/clang/libllvmlibdriver/Makefile.depend
+++ b/lib/clang/libllvmlibdriver/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-LibDriver.o: Options.inc.h
-LibDriver.po: Options.inc.h
.endif
diff --git a/lib/clang/libllvmlto/Makefile.depend b/lib/clang/libllvmlto/Makefile.depend
index 642380b..385072f 100644
--- a/lib/clang/libllvmlto/Makefile.depend
+++ b/lib/clang/libllvmlto/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-LTOCodeGenerator.o: Intrinsics.inc.h
-LTOCodeGenerator.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend
index 541f726..385072f 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ b/lib/clang/libllvmmipsasmparser/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-MipsAsmParser.o: MipsGenAsmMatcher.inc.h
-MipsAsmParser.o: MipsGenInstrInfo.inc.h
-MipsAsmParser.o: MipsGenRegisterInfo.inc.h
-MipsAsmParser.o: MipsGenSubtargetInfo.inc.h
-MipsAsmParser.po: MipsGenAsmMatcher.inc.h
-MipsAsmParser.po: MipsGenInstrInfo.inc.h
-MipsAsmParser.po: MipsGenRegisterInfo.inc.h
-MipsAsmParser.po: MipsGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
index 30c9f8f..385072f 100644
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ b/lib/clang/libllvmmipscodegen/Makefile.depend
@@ -13,252 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-Mips16FrameLowering.o: MipsGenInstrInfo.inc.h
-Mips16FrameLowering.o: MipsGenRegisterInfo.inc.h
-Mips16FrameLowering.o: MipsGenSubtargetInfo.inc.h
-Mips16FrameLowering.po: MipsGenInstrInfo.inc.h
-Mips16FrameLowering.po: MipsGenRegisterInfo.inc.h
-Mips16FrameLowering.po: MipsGenSubtargetInfo.inc.h
-Mips16HardFloat.o: Intrinsics.inc.h
-Mips16HardFloat.o: MipsGenInstrInfo.inc.h
-Mips16HardFloat.o: MipsGenRegisterInfo.inc.h
-Mips16HardFloat.o: MipsGenSubtargetInfo.inc.h
-Mips16HardFloat.po: Intrinsics.inc.h
-Mips16HardFloat.po: MipsGenInstrInfo.inc.h
-Mips16HardFloat.po: MipsGenRegisterInfo.inc.h
-Mips16HardFloat.po: MipsGenSubtargetInfo.inc.h
-Mips16ISelDAGToDAG.o: Intrinsics.inc.h
-Mips16ISelDAGToDAG.o: MipsGenDAGISel.inc.h
-Mips16ISelDAGToDAG.o: MipsGenInstrInfo.inc.h
-Mips16ISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
-Mips16ISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
-Mips16ISelDAGToDAG.po: Intrinsics.inc.h
-Mips16ISelDAGToDAG.po: MipsGenDAGISel.inc.h
-Mips16ISelDAGToDAG.po: MipsGenInstrInfo.inc.h
-Mips16ISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
-Mips16ISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
-Mips16ISelLowering.o: Intrinsics.inc.h
-Mips16ISelLowering.o: MipsGenInstrInfo.inc.h
-Mips16ISelLowering.o: MipsGenRegisterInfo.inc.h
-Mips16ISelLowering.o: MipsGenSubtargetInfo.inc.h
-Mips16ISelLowering.po: Intrinsics.inc.h
-Mips16ISelLowering.po: MipsGenInstrInfo.inc.h
-Mips16ISelLowering.po: MipsGenRegisterInfo.inc.h
-Mips16ISelLowering.po: MipsGenSubtargetInfo.inc.h
-Mips16InstrInfo.o: Intrinsics.inc.h
-Mips16InstrInfo.o: MipsGenInstrInfo.inc.h
-Mips16InstrInfo.o: MipsGenRegisterInfo.inc.h
-Mips16InstrInfo.o: MipsGenSubtargetInfo.inc.h
-Mips16InstrInfo.po: Intrinsics.inc.h
-Mips16InstrInfo.po: MipsGenInstrInfo.inc.h
-Mips16InstrInfo.po: MipsGenRegisterInfo.inc.h
-Mips16InstrInfo.po: MipsGenSubtargetInfo.inc.h
-Mips16RegisterInfo.o: MipsGenInstrInfo.inc.h
-Mips16RegisterInfo.o: MipsGenRegisterInfo.inc.h
-Mips16RegisterInfo.o: MipsGenSubtargetInfo.inc.h
-Mips16RegisterInfo.po: MipsGenInstrInfo.inc.h
-Mips16RegisterInfo.po: MipsGenRegisterInfo.inc.h
-Mips16RegisterInfo.po: MipsGenSubtargetInfo.inc.h
-MipsAnalyzeImmediate.o: MipsGenInstrInfo.inc.h
-MipsAnalyzeImmediate.o: MipsGenRegisterInfo.inc.h
-MipsAnalyzeImmediate.o: MipsGenSubtargetInfo.inc.h
-MipsAnalyzeImmediate.po: MipsGenInstrInfo.inc.h
-MipsAnalyzeImmediate.po: MipsGenRegisterInfo.inc.h
-MipsAnalyzeImmediate.po: MipsGenSubtargetInfo.inc.h
-MipsAsmPrinter.o: Intrinsics.inc.h
-MipsAsmPrinter.o: MipsGenInstrInfo.inc.h
-MipsAsmPrinter.o: MipsGenMCPseudoLowering.inc.h
-MipsAsmPrinter.o: MipsGenRegisterInfo.inc.h
-MipsAsmPrinter.o: MipsGenSubtargetInfo.inc.h
-MipsAsmPrinter.po: Intrinsics.inc.h
-MipsAsmPrinter.po: MipsGenInstrInfo.inc.h
-MipsAsmPrinter.po: MipsGenMCPseudoLowering.inc.h
-MipsAsmPrinter.po: MipsGenRegisterInfo.inc.h
-MipsAsmPrinter.po: MipsGenSubtargetInfo.inc.h
-MipsCCState.o: MipsGenInstrInfo.inc.h
-MipsCCState.o: MipsGenRegisterInfo.inc.h
-MipsCCState.o: MipsGenSubtargetInfo.inc.h
-MipsCCState.po: MipsGenInstrInfo.inc.h
-MipsCCState.po: MipsGenRegisterInfo.inc.h
-MipsCCState.po: MipsGenSubtargetInfo.inc.h
-MipsConstantIslandPass.o: Intrinsics.inc.h
-MipsConstantIslandPass.o: MipsGenInstrInfo.inc.h
-MipsConstantIslandPass.o: MipsGenRegisterInfo.inc.h
-MipsConstantIslandPass.o: MipsGenSubtargetInfo.inc.h
-MipsConstantIslandPass.po: Intrinsics.inc.h
-MipsConstantIslandPass.po: MipsGenInstrInfo.inc.h
-MipsConstantIslandPass.po: MipsGenRegisterInfo.inc.h
-MipsConstantIslandPass.po: MipsGenSubtargetInfo.inc.h
-MipsDelaySlotFiller.o: Intrinsics.inc.h
-MipsDelaySlotFiller.o: MipsGenInstrInfo.inc.h
-MipsDelaySlotFiller.o: MipsGenRegisterInfo.inc.h
-MipsDelaySlotFiller.o: MipsGenSubtargetInfo.inc.h
-MipsDelaySlotFiller.po: Intrinsics.inc.h
-MipsDelaySlotFiller.po: MipsGenInstrInfo.inc.h
-MipsDelaySlotFiller.po: MipsGenRegisterInfo.inc.h
-MipsDelaySlotFiller.po: MipsGenSubtargetInfo.inc.h
-MipsFastISel.o: Intrinsics.inc.h
-MipsFastISel.o: MipsGenCallingConv.inc.h
-MipsFastISel.o: MipsGenFastISel.inc.h
-MipsFastISel.o: MipsGenInstrInfo.inc.h
-MipsFastISel.o: MipsGenRegisterInfo.inc.h
-MipsFastISel.o: MipsGenSubtargetInfo.inc.h
-MipsFastISel.po: Intrinsics.inc.h
-MipsFastISel.po: MipsGenCallingConv.inc.h
-MipsFastISel.po: MipsGenFastISel.inc.h
-MipsFastISel.po: MipsGenInstrInfo.inc.h
-MipsFastISel.po: MipsGenRegisterInfo.inc.h
-MipsFastISel.po: MipsGenSubtargetInfo.inc.h
-MipsFrameLowering.o: Intrinsics.inc.h
-MipsFrameLowering.o: MipsGenInstrInfo.inc.h
-MipsFrameLowering.o: MipsGenRegisterInfo.inc.h
-MipsFrameLowering.o: MipsGenSubtargetInfo.inc.h
-MipsFrameLowering.po: Intrinsics.inc.h
-MipsFrameLowering.po: MipsGenInstrInfo.inc.h
-MipsFrameLowering.po: MipsGenRegisterInfo.inc.h
-MipsFrameLowering.po: MipsGenSubtargetInfo.inc.h
-MipsISelDAGToDAG.o: Intrinsics.inc.h
-MipsISelDAGToDAG.o: MipsGenDAGISel.inc.h
-MipsISelDAGToDAG.o: MipsGenInstrInfo.inc.h
-MipsISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
-MipsISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
-MipsISelDAGToDAG.po: Intrinsics.inc.h
-MipsISelDAGToDAG.po: MipsGenDAGISel.inc.h
-MipsISelDAGToDAG.po: MipsGenInstrInfo.inc.h
-MipsISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
-MipsISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
-MipsISelLowering.o: Intrinsics.inc.h
-MipsISelLowering.o: MipsGenCallingConv.inc.h
-MipsISelLowering.o: MipsGenInstrInfo.inc.h
-MipsISelLowering.o: MipsGenRegisterInfo.inc.h
-MipsISelLowering.o: MipsGenSubtargetInfo.inc.h
-MipsISelLowering.po: Intrinsics.inc.h
-MipsISelLowering.po: MipsGenCallingConv.inc.h
-MipsISelLowering.po: MipsGenInstrInfo.inc.h
-MipsISelLowering.po: MipsGenRegisterInfo.inc.h
-MipsISelLowering.po: MipsGenSubtargetInfo.inc.h
-MipsInstrInfo.o: MipsGenInstrInfo.inc.h
-MipsInstrInfo.o: MipsGenRegisterInfo.inc.h
-MipsInstrInfo.o: MipsGenSubtargetInfo.inc.h
-MipsInstrInfo.po: MipsGenInstrInfo.inc.h
-MipsInstrInfo.po: MipsGenRegisterInfo.inc.h
-MipsInstrInfo.po: MipsGenSubtargetInfo.inc.h
-MipsLongBranch.o: Intrinsics.inc.h
-MipsLongBranch.o: MipsGenInstrInfo.inc.h
-MipsLongBranch.o: MipsGenRegisterInfo.inc.h
-MipsLongBranch.o: MipsGenSubtargetInfo.inc.h
-MipsLongBranch.po: Intrinsics.inc.h
-MipsLongBranch.po: MipsGenInstrInfo.inc.h
-MipsLongBranch.po: MipsGenRegisterInfo.inc.h
-MipsLongBranch.po: MipsGenSubtargetInfo.inc.h
-MipsMCInstLower.o: MipsGenInstrInfo.inc.h
-MipsMCInstLower.o: MipsGenRegisterInfo.inc.h
-MipsMCInstLower.o: MipsGenSubtargetInfo.inc.h
-MipsMCInstLower.po: MipsGenInstrInfo.inc.h
-MipsMCInstLower.po: MipsGenRegisterInfo.inc.h
-MipsMCInstLower.po: MipsGenSubtargetInfo.inc.h
-MipsMachineFunction.o: Intrinsics.inc.h
-MipsMachineFunction.o: MipsGenInstrInfo.inc.h
-MipsMachineFunction.o: MipsGenRegisterInfo.inc.h
-MipsMachineFunction.o: MipsGenSubtargetInfo.inc.h
-MipsMachineFunction.po: Intrinsics.inc.h
-MipsMachineFunction.po: MipsGenInstrInfo.inc.h
-MipsMachineFunction.po: MipsGenRegisterInfo.inc.h
-MipsMachineFunction.po: MipsGenSubtargetInfo.inc.h
-MipsModuleISelDAGToDAG.o: Intrinsics.inc.h
-MipsModuleISelDAGToDAG.o: MipsGenInstrInfo.inc.h
-MipsModuleISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
-MipsModuleISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
-MipsModuleISelDAGToDAG.po: Intrinsics.inc.h
-MipsModuleISelDAGToDAG.po: MipsGenInstrInfo.inc.h
-MipsModuleISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
-MipsModuleISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
-MipsOptimizePICCall.o: Intrinsics.inc.h
-MipsOptimizePICCall.o: MipsGenInstrInfo.inc.h
-MipsOptimizePICCall.o: MipsGenRegisterInfo.inc.h
-MipsOptimizePICCall.o: MipsGenSubtargetInfo.inc.h
-MipsOptimizePICCall.po: Intrinsics.inc.h
-MipsOptimizePICCall.po: MipsGenInstrInfo.inc.h
-MipsOptimizePICCall.po: MipsGenRegisterInfo.inc.h
-MipsOptimizePICCall.po: MipsGenSubtargetInfo.inc.h
-MipsOs16.o: MipsGenInstrInfo.inc.h
-MipsOs16.o: MipsGenRegisterInfo.inc.h
-MipsOs16.o: MipsGenSubtargetInfo.inc.h
-MipsOs16.po: MipsGenInstrInfo.inc.h
-MipsOs16.po: MipsGenRegisterInfo.inc.h
-MipsOs16.po: MipsGenSubtargetInfo.inc.h
-MipsRegisterInfo.o: Intrinsics.inc.h
-MipsRegisterInfo.o: MipsGenInstrInfo.inc.h
-MipsRegisterInfo.o: MipsGenRegisterInfo.inc.h
-MipsRegisterInfo.o: MipsGenSubtargetInfo.inc.h
-MipsRegisterInfo.po: Intrinsics.inc.h
-MipsRegisterInfo.po: MipsGenInstrInfo.inc.h
-MipsRegisterInfo.po: MipsGenRegisterInfo.inc.h
-MipsRegisterInfo.po: MipsGenSubtargetInfo.inc.h
-MipsSEFrameLowering.o: MipsGenInstrInfo.inc.h
-MipsSEFrameLowering.o: MipsGenRegisterInfo.inc.h
-MipsSEFrameLowering.o: MipsGenSubtargetInfo.inc.h
-MipsSEFrameLowering.po: MipsGenInstrInfo.inc.h
-MipsSEFrameLowering.po: MipsGenRegisterInfo.inc.h
-MipsSEFrameLowering.po: MipsGenSubtargetInfo.inc.h
-MipsSEISelDAGToDAG.o: Intrinsics.inc.h
-MipsSEISelDAGToDAG.o: MipsGenDAGISel.inc.h
-MipsSEISelDAGToDAG.o: MipsGenInstrInfo.inc.h
-MipsSEISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
-MipsSEISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
-MipsSEISelDAGToDAG.po: Intrinsics.inc.h
-MipsSEISelDAGToDAG.po: MipsGenDAGISel.inc.h
-MipsSEISelDAGToDAG.po: MipsGenInstrInfo.inc.h
-MipsSEISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
-MipsSEISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
-MipsSEISelLowering.o: Intrinsics.inc.h
-MipsSEISelLowering.o: MipsGenInstrInfo.inc.h
-MipsSEISelLowering.o: MipsGenRegisterInfo.inc.h
-MipsSEISelLowering.o: MipsGenSubtargetInfo.inc.h
-MipsSEISelLowering.po: Intrinsics.inc.h
-MipsSEISelLowering.po: MipsGenInstrInfo.inc.h
-MipsSEISelLowering.po: MipsGenRegisterInfo.inc.h
-MipsSEISelLowering.po: MipsGenSubtargetInfo.inc.h
-MipsSEInstrInfo.o: Intrinsics.inc.h
-MipsSEInstrInfo.o: MipsGenInstrInfo.inc.h
-MipsSEInstrInfo.o: MipsGenRegisterInfo.inc.h
-MipsSEInstrInfo.o: MipsGenSubtargetInfo.inc.h
-MipsSEInstrInfo.po: Intrinsics.inc.h
-MipsSEInstrInfo.po: MipsGenInstrInfo.inc.h
-MipsSEInstrInfo.po: MipsGenRegisterInfo.inc.h
-MipsSEInstrInfo.po: MipsGenSubtargetInfo.inc.h
-MipsSERegisterInfo.o: Intrinsics.inc.h
-MipsSERegisterInfo.o: MipsGenInstrInfo.inc.h
-MipsSERegisterInfo.o: MipsGenRegisterInfo.inc.h
-MipsSERegisterInfo.o: MipsGenSubtargetInfo.inc.h
-MipsSERegisterInfo.po: Intrinsics.inc.h
-MipsSERegisterInfo.po: MipsGenInstrInfo.inc.h
-MipsSERegisterInfo.po: MipsGenRegisterInfo.inc.h
-MipsSERegisterInfo.po: MipsGenSubtargetInfo.inc.h
-MipsSubtarget.o: Intrinsics.inc.h
-MipsSubtarget.o: MipsGenInstrInfo.inc.h
-MipsSubtarget.o: MipsGenRegisterInfo.inc.h
-MipsSubtarget.o: MipsGenSubtargetInfo.inc.h
-MipsSubtarget.po: Intrinsics.inc.h
-MipsSubtarget.po: MipsGenInstrInfo.inc.h
-MipsSubtarget.po: MipsGenRegisterInfo.inc.h
-MipsSubtarget.po: MipsGenSubtargetInfo.inc.h
-MipsTargetMachine.o: Intrinsics.inc.h
-MipsTargetMachine.o: MipsGenDAGISel.inc.h
-MipsTargetMachine.o: MipsGenInstrInfo.inc.h
-MipsTargetMachine.o: MipsGenRegisterInfo.inc.h
-MipsTargetMachine.o: MipsGenSubtargetInfo.inc.h
-MipsTargetMachine.po: Intrinsics.inc.h
-MipsTargetMachine.po: MipsGenDAGISel.inc.h
-MipsTargetMachine.po: MipsGenInstrInfo.inc.h
-MipsTargetMachine.po: MipsGenRegisterInfo.inc.h
-MipsTargetMachine.po: MipsGenSubtargetInfo.inc.h
-MipsTargetObjectFile.o: Intrinsics.inc.h
-MipsTargetObjectFile.o: MipsGenInstrInfo.inc.h
-MipsTargetObjectFile.o: MipsGenRegisterInfo.inc.h
-MipsTargetObjectFile.o: MipsGenSubtargetInfo.inc.h
-MipsTargetObjectFile.po: Intrinsics.inc.h
-MipsTargetObjectFile.po: MipsGenInstrInfo.inc.h
-MipsTargetObjectFile.po: MipsGenRegisterInfo.inc.h
-MipsTargetObjectFile.po: MipsGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
index ccc26d1..385072f 100644
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ b/lib/clang/libllvmmipsdesc/Makefile.depend
@@ -13,60 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-MipsABIInfo.o: MipsGenInstrInfo.inc.h
-MipsABIInfo.o: MipsGenRegisterInfo.inc.h
-MipsABIInfo.o: MipsGenSubtargetInfo.inc.h
-MipsABIInfo.po: MipsGenInstrInfo.inc.h
-MipsABIInfo.po: MipsGenRegisterInfo.inc.h
-MipsABIInfo.po: MipsGenSubtargetInfo.inc.h
-MipsAsmBackend.o: MipsGenInstrInfo.inc.h
-MipsAsmBackend.o: MipsGenRegisterInfo.inc.h
-MipsAsmBackend.o: MipsGenSubtargetInfo.inc.h
-MipsAsmBackend.po: MipsGenInstrInfo.inc.h
-MipsAsmBackend.po: MipsGenRegisterInfo.inc.h
-MipsAsmBackend.po: MipsGenSubtargetInfo.inc.h
-MipsELFObjectWriter.o: MipsGenInstrInfo.inc.h
-MipsELFObjectWriter.o: MipsGenRegisterInfo.inc.h
-MipsELFObjectWriter.o: MipsGenSubtargetInfo.inc.h
-MipsELFObjectWriter.po: MipsGenInstrInfo.inc.h
-MipsELFObjectWriter.po: MipsGenRegisterInfo.inc.h
-MipsELFObjectWriter.po: MipsGenSubtargetInfo.inc.h
-MipsELFStreamer.o: MipsGenInstrInfo.inc.h
-MipsELFStreamer.o: MipsGenRegisterInfo.inc.h
-MipsELFStreamer.o: MipsGenSubtargetInfo.inc.h
-MipsELFStreamer.po: MipsGenInstrInfo.inc.h
-MipsELFStreamer.po: MipsGenRegisterInfo.inc.h
-MipsELFStreamer.po: MipsGenSubtargetInfo.inc.h
-MipsMCCodeEmitter.o: MipsGenInstrInfo.inc.h
-MipsMCCodeEmitter.o: MipsGenMCCodeEmitter.inc.h
-MipsMCCodeEmitter.o: MipsGenRegisterInfo.inc.h
-MipsMCCodeEmitter.o: MipsGenSubtargetInfo.inc.h
-MipsMCCodeEmitter.po: MipsGenInstrInfo.inc.h
-MipsMCCodeEmitter.po: MipsGenMCCodeEmitter.inc.h
-MipsMCCodeEmitter.po: MipsGenRegisterInfo.inc.h
-MipsMCCodeEmitter.po: MipsGenSubtargetInfo.inc.h
-MipsMCTargetDesc.o: MipsGenInstrInfo.inc.h
-MipsMCTargetDesc.o: MipsGenRegisterInfo.inc.h
-MipsMCTargetDesc.o: MipsGenSubtargetInfo.inc.h
-MipsMCTargetDesc.po: MipsGenInstrInfo.inc.h
-MipsMCTargetDesc.po: MipsGenRegisterInfo.inc.h
-MipsMCTargetDesc.po: MipsGenSubtargetInfo.inc.h
-MipsNaClELFStreamer.o: MipsGenInstrInfo.inc.h
-MipsNaClELFStreamer.o: MipsGenRegisterInfo.inc.h
-MipsNaClELFStreamer.o: MipsGenSubtargetInfo.inc.h
-MipsNaClELFStreamer.po: MipsGenInstrInfo.inc.h
-MipsNaClELFStreamer.po: MipsGenRegisterInfo.inc.h
-MipsNaClELFStreamer.po: MipsGenSubtargetInfo.inc.h
-MipsOptionRecord.o: MipsGenInstrInfo.inc.h
-MipsOptionRecord.o: MipsGenRegisterInfo.inc.h
-MipsOptionRecord.o: MipsGenSubtargetInfo.inc.h
-MipsOptionRecord.po: MipsGenInstrInfo.inc.h
-MipsOptionRecord.po: MipsGenRegisterInfo.inc.h
-MipsOptionRecord.po: MipsGenSubtargetInfo.inc.h
-MipsTargetStreamer.o: MipsGenInstrInfo.inc.h
-MipsTargetStreamer.o: MipsGenRegisterInfo.inc.h
-MipsTargetStreamer.o: MipsGenSubtargetInfo.inc.h
-MipsTargetStreamer.po: MipsGenInstrInfo.inc.h
-MipsTargetStreamer.po: MipsGenRegisterInfo.inc.h
-MipsTargetStreamer.po: MipsGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile.depend b/lib/clang/libllvmmipsdisassembler/Makefile.depend
index 5e10f87..385072f 100644
--- a/lib/clang/libllvmmipsdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmipsdisassembler/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-MipsDisassembler.o: MipsGenDisassemblerTables.inc.h
-MipsDisassembler.o: MipsGenInstrInfo.inc.h
-MipsDisassembler.o: MipsGenRegisterInfo.inc.h
-MipsDisassembler.o: MipsGenSubtargetInfo.inc.h
-MipsDisassembler.po: MipsGenDisassemblerTables.inc.h
-MipsDisassembler.po: MipsGenInstrInfo.inc.h
-MipsDisassembler.po: MipsGenRegisterInfo.inc.h
-MipsDisassembler.po: MipsGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
index 04d7394..385072f 100644
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ b/lib/clang/libllvmmipsinfo/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-MipsTargetInfo.o: MipsGenInstrInfo.inc.h
-MipsTargetInfo.o: MipsGenRegisterInfo.inc.h
-MipsTargetInfo.o: MipsGenSubtargetInfo.inc.h
-MipsTargetInfo.po: MipsGenInstrInfo.inc.h
-MipsTargetInfo.po: MipsGenRegisterInfo.inc.h
-MipsTargetInfo.po: MipsGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmobjcarcopts/Makefile.depend b/lib/clang/libllvmobjcarcopts/Makefile.depend
index d71c7bc..385072f 100644
--- a/lib/clang/libllvmobjcarcopts/Makefile.depend
+++ b/lib/clang/libllvmobjcarcopts/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARCInstKind.o: Intrinsics.inc.h
-ARCInstKind.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmpasses/Makefile.depend b/lib/clang/libllvmpasses/Makefile.depend
index c40b54a..385072f 100644
--- a/lib/clang/libllvmpasses/Makefile.depend
+++ b/lib/clang/libllvmpasses/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PassBuilder.o: Intrinsics.inc.h
-PassBuilder.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcasmparser/Makefile.depend b/lib/clang/libllvmpowerpcasmparser/Makefile.depend
index 6a84c65..385072f 100644
--- a/lib/clang/libllvmpowerpcasmparser/Makefile.depend
+++ b/lib/clang/libllvmpowerpcasmparser/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PPCAsmParser.o: PPCGenAsmMatcher.inc.h
-PPCAsmParser.o: PPCGenInstrInfo.inc.h
-PPCAsmParser.o: PPCGenRegisterInfo.inc.h
-PPCAsmParser.o: PPCGenSubtargetInfo.inc.h
-PPCAsmParser.po: PPCGenAsmMatcher.inc.h
-PPCAsmParser.po: PPCGenInstrInfo.inc.h
-PPCAsmParser.po: PPCGenRegisterInfo.inc.h
-PPCAsmParser.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
index 6b3e1d6..385072f 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend
@@ -13,160 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PPCAsmPrinter.o: PPCGenInstrInfo.inc.h
-PPCAsmPrinter.o: PPCGenRegisterInfo.inc.h
-PPCAsmPrinter.o: PPCGenSubtargetInfo.inc.h
-PPCAsmPrinter.po: PPCGenInstrInfo.inc.h
-PPCAsmPrinter.po: PPCGenRegisterInfo.inc.h
-PPCAsmPrinter.po: PPCGenSubtargetInfo.inc.h
-PPCBranchSelector.o: PPCGenInstrInfo.inc.h
-PPCBranchSelector.o: PPCGenRegisterInfo.inc.h
-PPCBranchSelector.o: PPCGenSubtargetInfo.inc.h
-PPCBranchSelector.po: PPCGenInstrInfo.inc.h
-PPCBranchSelector.po: PPCGenRegisterInfo.inc.h
-PPCBranchSelector.po: PPCGenSubtargetInfo.inc.h
-PPCCTRLoops.o: Intrinsics.inc.h
-PPCCTRLoops.o: PPCGenInstrInfo.inc.h
-PPCCTRLoops.o: PPCGenRegisterInfo.inc.h
-PPCCTRLoops.o: PPCGenSubtargetInfo.inc.h
-PPCCTRLoops.po: Intrinsics.inc.h
-PPCCTRLoops.po: PPCGenInstrInfo.inc.h
-PPCCTRLoops.po: PPCGenRegisterInfo.inc.h
-PPCCTRLoops.po: PPCGenSubtargetInfo.inc.h
-PPCEarlyReturn.o: PPCGenInstrInfo.inc.h
-PPCEarlyReturn.o: PPCGenRegisterInfo.inc.h
-PPCEarlyReturn.o: PPCGenSubtargetInfo.inc.h
-PPCEarlyReturn.po: PPCGenInstrInfo.inc.h
-PPCEarlyReturn.po: PPCGenRegisterInfo.inc.h
-PPCEarlyReturn.po: PPCGenSubtargetInfo.inc.h
-PPCFastISel.o: Intrinsics.inc.h
-PPCFastISel.o: PPCGenCallingConv.inc.h
-PPCFastISel.o: PPCGenFastISel.inc.h
-PPCFastISel.o: PPCGenInstrInfo.inc.h
-PPCFastISel.o: PPCGenRegisterInfo.inc.h
-PPCFastISel.o: PPCGenSubtargetInfo.inc.h
-PPCFastISel.po: Intrinsics.inc.h
-PPCFastISel.po: PPCGenCallingConv.inc.h
-PPCFastISel.po: PPCGenFastISel.inc.h
-PPCFastISel.po: PPCGenInstrInfo.inc.h
-PPCFastISel.po: PPCGenRegisterInfo.inc.h
-PPCFastISel.po: PPCGenSubtargetInfo.inc.h
-PPCFrameLowering.o: PPCGenInstrInfo.inc.h
-PPCFrameLowering.o: PPCGenRegisterInfo.inc.h
-PPCFrameLowering.o: PPCGenSubtargetInfo.inc.h
-PPCFrameLowering.po: PPCGenInstrInfo.inc.h
-PPCFrameLowering.po: PPCGenRegisterInfo.inc.h
-PPCFrameLowering.po: PPCGenSubtargetInfo.inc.h
-PPCHazardRecognizers.o: PPCGenInstrInfo.inc.h
-PPCHazardRecognizers.o: PPCGenRegisterInfo.inc.h
-PPCHazardRecognizers.o: PPCGenSubtargetInfo.inc.h
-PPCHazardRecognizers.po: PPCGenInstrInfo.inc.h
-PPCHazardRecognizers.po: PPCGenRegisterInfo.inc.h
-PPCHazardRecognizers.po: PPCGenSubtargetInfo.inc.h
-PPCISelDAGToDAG.o: Intrinsics.inc.h
-PPCISelDAGToDAG.o: PPCGenDAGISel.inc.h
-PPCISelDAGToDAG.o: PPCGenInstrInfo.inc.h
-PPCISelDAGToDAG.o: PPCGenRegisterInfo.inc.h
-PPCISelDAGToDAG.o: PPCGenSubtargetInfo.inc.h
-PPCISelDAGToDAG.po: Intrinsics.inc.h
-PPCISelDAGToDAG.po: PPCGenDAGISel.inc.h
-PPCISelDAGToDAG.po: PPCGenInstrInfo.inc.h
-PPCISelDAGToDAG.po: PPCGenRegisterInfo.inc.h
-PPCISelDAGToDAG.po: PPCGenSubtargetInfo.inc.h
-PPCISelLowering.o: Intrinsics.inc.h
-PPCISelLowering.o: PPCGenCallingConv.inc.h
-PPCISelLowering.o: PPCGenInstrInfo.inc.h
-PPCISelLowering.o: PPCGenRegisterInfo.inc.h
-PPCISelLowering.o: PPCGenSubtargetInfo.inc.h
-PPCISelLowering.po: Intrinsics.inc.h
-PPCISelLowering.po: PPCGenCallingConv.inc.h
-PPCISelLowering.po: PPCGenInstrInfo.inc.h
-PPCISelLowering.po: PPCGenRegisterInfo.inc.h
-PPCISelLowering.po: PPCGenSubtargetInfo.inc.h
-PPCInstrInfo.o: PPCGenInstrInfo.inc.h
-PPCInstrInfo.o: PPCGenRegisterInfo.inc.h
-PPCInstrInfo.o: PPCGenSubtargetInfo.inc.h
-PPCInstrInfo.po: PPCGenInstrInfo.inc.h
-PPCInstrInfo.po: PPCGenRegisterInfo.inc.h
-PPCInstrInfo.po: PPCGenSubtargetInfo.inc.h
-PPCLoopDataPrefetch.o: Intrinsics.inc.h
-PPCLoopDataPrefetch.o: PPCGenInstrInfo.inc.h
-PPCLoopDataPrefetch.o: PPCGenRegisterInfo.inc.h
-PPCLoopDataPrefetch.o: PPCGenSubtargetInfo.inc.h
-PPCLoopDataPrefetch.po: Intrinsics.inc.h
-PPCLoopDataPrefetch.po: PPCGenInstrInfo.inc.h
-PPCLoopDataPrefetch.po: PPCGenRegisterInfo.inc.h
-PPCLoopDataPrefetch.po: PPCGenSubtargetInfo.inc.h
-PPCLoopPreIncPrep.o: Intrinsics.inc.h
-PPCLoopPreIncPrep.o: PPCGenInstrInfo.inc.h
-PPCLoopPreIncPrep.o: PPCGenRegisterInfo.inc.h
-PPCLoopPreIncPrep.o: PPCGenSubtargetInfo.inc.h
-PPCLoopPreIncPrep.po: Intrinsics.inc.h
-PPCLoopPreIncPrep.po: PPCGenInstrInfo.inc.h
-PPCLoopPreIncPrep.po: PPCGenRegisterInfo.inc.h
-PPCLoopPreIncPrep.po: PPCGenSubtargetInfo.inc.h
-PPCMCInstLower.o: PPCGenInstrInfo.inc.h
-PPCMCInstLower.o: PPCGenRegisterInfo.inc.h
-PPCMCInstLower.o: PPCGenSubtargetInfo.inc.h
-PPCMCInstLower.po: PPCGenInstrInfo.inc.h
-PPCMCInstLower.po: PPCGenRegisterInfo.inc.h
-PPCMCInstLower.po: PPCGenSubtargetInfo.inc.h
-PPCRegisterInfo.o: PPCGenInstrInfo.inc.h
-PPCRegisterInfo.o: PPCGenRegisterInfo.inc.h
-PPCRegisterInfo.o: PPCGenSubtargetInfo.inc.h
-PPCRegisterInfo.po: PPCGenInstrInfo.inc.h
-PPCRegisterInfo.po: PPCGenRegisterInfo.inc.h
-PPCRegisterInfo.po: PPCGenSubtargetInfo.inc.h
-PPCSubtarget.o: PPCGenInstrInfo.inc.h
-PPCSubtarget.o: PPCGenRegisterInfo.inc.h
-PPCSubtarget.o: PPCGenSubtargetInfo.inc.h
-PPCSubtarget.po: PPCGenInstrInfo.inc.h
-PPCSubtarget.po: PPCGenRegisterInfo.inc.h
-PPCSubtarget.po: PPCGenSubtargetInfo.inc.h
-PPCTLSDynamicCall.o: PPCGenInstrInfo.inc.h
-PPCTLSDynamicCall.o: PPCGenRegisterInfo.inc.h
-PPCTLSDynamicCall.o: PPCGenSubtargetInfo.inc.h
-PPCTLSDynamicCall.po: PPCGenInstrInfo.inc.h
-PPCTLSDynamicCall.po: PPCGenRegisterInfo.inc.h
-PPCTLSDynamicCall.po: PPCGenSubtargetInfo.inc.h
-PPCTOCRegDeps.o: PPCGenInstrInfo.inc.h
-PPCTOCRegDeps.o: PPCGenRegisterInfo.inc.h
-PPCTOCRegDeps.o: PPCGenSubtargetInfo.inc.h
-PPCTOCRegDeps.po: PPCGenInstrInfo.inc.h
-PPCTOCRegDeps.po: PPCGenRegisterInfo.inc.h
-PPCTOCRegDeps.po: PPCGenSubtargetInfo.inc.h
-PPCTargetMachine.o: Intrinsics.inc.h
-PPCTargetMachine.o: PPCGenInstrInfo.inc.h
-PPCTargetMachine.o: PPCGenRegisterInfo.inc.h
-PPCTargetMachine.o: PPCGenSubtargetInfo.inc.h
-PPCTargetMachine.po: Intrinsics.inc.h
-PPCTargetMachine.po: PPCGenInstrInfo.inc.h
-PPCTargetMachine.po: PPCGenRegisterInfo.inc.h
-PPCTargetMachine.po: PPCGenSubtargetInfo.inc.h
-PPCTargetTransformInfo.o: Intrinsics.inc.h
-PPCTargetTransformInfo.o: PPCGenInstrInfo.inc.h
-PPCTargetTransformInfo.o: PPCGenRegisterInfo.inc.h
-PPCTargetTransformInfo.o: PPCGenSubtargetInfo.inc.h
-PPCTargetTransformInfo.po: Intrinsics.inc.h
-PPCTargetTransformInfo.po: PPCGenInstrInfo.inc.h
-PPCTargetTransformInfo.po: PPCGenRegisterInfo.inc.h
-PPCTargetTransformInfo.po: PPCGenSubtargetInfo.inc.h
-PPCVSXCopy.o: PPCGenInstrInfo.inc.h
-PPCVSXCopy.o: PPCGenRegisterInfo.inc.h
-PPCVSXCopy.o: PPCGenSubtargetInfo.inc.h
-PPCVSXCopy.po: PPCGenInstrInfo.inc.h
-PPCVSXCopy.po: PPCGenRegisterInfo.inc.h
-PPCVSXCopy.po: PPCGenSubtargetInfo.inc.h
-PPCVSXFMAMutate.o: PPCGenInstrInfo.inc.h
-PPCVSXFMAMutate.o: PPCGenRegisterInfo.inc.h
-PPCVSXFMAMutate.o: PPCGenSubtargetInfo.inc.h
-PPCVSXFMAMutate.po: PPCGenInstrInfo.inc.h
-PPCVSXFMAMutate.po: PPCGenRegisterInfo.inc.h
-PPCVSXFMAMutate.po: PPCGenSubtargetInfo.inc.h
-PPCVSXSwapRemoval.o: PPCGenInstrInfo.inc.h
-PPCVSXSwapRemoval.o: PPCGenRegisterInfo.inc.h
-PPCVSXSwapRemoval.o: PPCGenSubtargetInfo.inc.h
-PPCVSXSwapRemoval.po: PPCGenInstrInfo.inc.h
-PPCVSXSwapRemoval.po: PPCGenRegisterInfo.inc.h
-PPCVSXSwapRemoval.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
index cb4da9d..385072f 100644
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend
@@ -13,36 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PPCAsmBackend.o: PPCGenInstrInfo.inc.h
-PPCAsmBackend.o: PPCGenRegisterInfo.inc.h
-PPCAsmBackend.o: PPCGenSubtargetInfo.inc.h
-PPCAsmBackend.po: PPCGenInstrInfo.inc.h
-PPCAsmBackend.po: PPCGenRegisterInfo.inc.h
-PPCAsmBackend.po: PPCGenSubtargetInfo.inc.h
-PPCELFObjectWriter.o: PPCGenInstrInfo.inc.h
-PPCELFObjectWriter.o: PPCGenRegisterInfo.inc.h
-PPCELFObjectWriter.o: PPCGenSubtargetInfo.inc.h
-PPCELFObjectWriter.po: PPCGenInstrInfo.inc.h
-PPCELFObjectWriter.po: PPCGenRegisterInfo.inc.h
-PPCELFObjectWriter.po: PPCGenSubtargetInfo.inc.h
-PPCMCCodeEmitter.o: PPCGenInstrInfo.inc.h
-PPCMCCodeEmitter.o: PPCGenMCCodeEmitter.inc.h
-PPCMCCodeEmitter.o: PPCGenRegisterInfo.inc.h
-PPCMCCodeEmitter.o: PPCGenSubtargetInfo.inc.h
-PPCMCCodeEmitter.po: PPCGenInstrInfo.inc.h
-PPCMCCodeEmitter.po: PPCGenMCCodeEmitter.inc.h
-PPCMCCodeEmitter.po: PPCGenRegisterInfo.inc.h
-PPCMCCodeEmitter.po: PPCGenSubtargetInfo.inc.h
-PPCMCTargetDesc.o: PPCGenInstrInfo.inc.h
-PPCMCTargetDesc.o: PPCGenRegisterInfo.inc.h
-PPCMCTargetDesc.o: PPCGenSubtargetInfo.inc.h
-PPCMCTargetDesc.po: PPCGenInstrInfo.inc.h
-PPCMCTargetDesc.po: PPCGenRegisterInfo.inc.h
-PPCMCTargetDesc.po: PPCGenSubtargetInfo.inc.h
-PPCMachObjectWriter.o: PPCGenInstrInfo.inc.h
-PPCMachObjectWriter.o: PPCGenRegisterInfo.inc.h
-PPCMachObjectWriter.o: PPCGenSubtargetInfo.inc.h
-PPCMachObjectWriter.po: PPCGenInstrInfo.inc.h
-PPCMachObjectWriter.po: PPCGenRegisterInfo.inc.h
-PPCMachObjectWriter.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend b/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
index ae1219e..385072f 100644
--- a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PPCDisassembler.o: PPCGenDisassemblerTables.inc.h
-PPCDisassembler.o: PPCGenInstrInfo.inc.h
-PPCDisassembler.o: PPCGenRegisterInfo.inc.h
-PPCDisassembler.o: PPCGenSubtargetInfo.inc.h
-PPCDisassembler.po: PPCGenDisassemblerTables.inc.h
-PPCDisassembler.po: PPCGenInstrInfo.inc.h
-PPCDisassembler.po: PPCGenRegisterInfo.inc.h
-PPCDisassembler.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
index 2b87d9d..385072f 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-PowerPCTargetInfo.o: PPCGenInstrInfo.inc.h
-PowerPCTargetInfo.o: PPCGenRegisterInfo.inc.h
-PowerPCTargetInfo.o: PPCGenSubtargetInfo.inc.h
-PowerPCTargetInfo.po: PPCGenInstrInfo.inc.h
-PowerPCTargetInfo.po: PPCGenRegisterInfo.inc.h
-PowerPCTargetInfo.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend
index 3c665f0..385072f 100644
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ b/lib/clang/libllvmscalaropts/Makefile.depend
@@ -13,80 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ADCE.o: Intrinsics.inc.h
-ADCE.po: Intrinsics.inc.h
-AlignmentFromAssumptions.o: Intrinsics.inc.h
-AlignmentFromAssumptions.po: Intrinsics.inc.h
-BDCE.o: Intrinsics.inc.h
-BDCE.po: Intrinsics.inc.h
-ConstantHoisting.o: Intrinsics.inc.h
-ConstantHoisting.po: Intrinsics.inc.h
-DeadStoreElimination.o: Intrinsics.inc.h
-DeadStoreElimination.po: Intrinsics.inc.h
-EarlyCSE.o: Intrinsics.inc.h
-EarlyCSE.po: Intrinsics.inc.h
-GVN.o: Intrinsics.inc.h
-GVN.po: Intrinsics.inc.h
-IndVarSimplify.o: Intrinsics.inc.h
-IndVarSimplify.po: Intrinsics.inc.h
-InductiveRangeCheckElimination.o: Intrinsics.inc.h
-InductiveRangeCheckElimination.po: Intrinsics.inc.h
-JumpThreading.o: Intrinsics.inc.h
-JumpThreading.po: Intrinsics.inc.h
-LICM.o: Intrinsics.inc.h
-LICM.po: Intrinsics.inc.h
-LoopIdiomRecognize.o: Intrinsics.inc.h
-LoopIdiomRecognize.po: Intrinsics.inc.h
-LoopInterchange.o: Intrinsics.inc.h
-LoopInterchange.po: Intrinsics.inc.h
-LoopRerollPass.o: Intrinsics.inc.h
-LoopRerollPass.po: Intrinsics.inc.h
-LoopRotation.o: Intrinsics.inc.h
-LoopRotation.po: Intrinsics.inc.h
-LoopStrengthReduce.o: Intrinsics.inc.h
-LoopStrengthReduce.po: Intrinsics.inc.h
-LoopUnrollPass.o: Intrinsics.inc.h
-LoopUnrollPass.po: Intrinsics.inc.h
-LoopUnswitch.o: Intrinsics.inc.h
-LoopUnswitch.po: Intrinsics.inc.h
-LowerAtomic.o: Intrinsics.inc.h
-LowerAtomic.po: Intrinsics.inc.h
-LowerExpectIntrinsic.o: Intrinsics.inc.h
-LowerExpectIntrinsic.po: Intrinsics.inc.h
-MemCpyOptimizer.o: Intrinsics.inc.h
-MemCpyOptimizer.po: Intrinsics.inc.h
-MergedLoadStoreMotion.o: Intrinsics.inc.h
-MergedLoadStoreMotion.po: Intrinsics.inc.h
-NaryReassociate.o: Intrinsics.inc.h
-NaryReassociate.po: Intrinsics.inc.h
-PartiallyInlineLibCalls.o: Intrinsics.inc.h
-PartiallyInlineLibCalls.po: Intrinsics.inc.h
-PlaceSafepoints.o: Intrinsics.inc.h
-PlaceSafepoints.po: Intrinsics.inc.h
-Reassociate.o: Intrinsics.inc.h
-Reassociate.po: Intrinsics.inc.h
-RewriteStatepointsForGC.o: Intrinsics.inc.h
-RewriteStatepointsForGC.po: Intrinsics.inc.h
-SCCP.o: Intrinsics.inc.h
-SCCP.po: Intrinsics.inc.h
-SROA.o: Intrinsics.inc.h
-SROA.po: Intrinsics.inc.h
-ScalarReplAggregates.o: Intrinsics.inc.h
-ScalarReplAggregates.po: Intrinsics.inc.h
-Scalarizer.o: Intrinsics.inc.h
-Scalarizer.po: Intrinsics.inc.h
-SeparateConstOffsetFromGEP.o: Intrinsics.inc.h
-SeparateConstOffsetFromGEP.po: Intrinsics.inc.h
-SimplifyCFGPass.o: Intrinsics.inc.h
-SimplifyCFGPass.po: Intrinsics.inc.h
-Sink.o: Intrinsics.inc.h
-Sink.po: Intrinsics.inc.h
-SpeculativeExecution.o: Intrinsics.inc.h
-SpeculativeExecution.po: Intrinsics.inc.h
-StraightLineStrengthReduce.o: Intrinsics.inc.h
-StraightLineStrengthReduce.po: Intrinsics.inc.h
-StructurizeCFG.o: Intrinsics.inc.h
-StructurizeCFG.po: Intrinsics.inc.h
-TailRecursionElimination.o: Intrinsics.inc.h
-TailRecursionElimination.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
index 9dbab9a..385072f 100644
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ b/lib/clang/libllvmselectiondag/Makefile.depend
@@ -13,18 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-FastISel.o: Intrinsics.inc.h
-FastISel.po: Intrinsics.inc.h
-FunctionLoweringInfo.o: Intrinsics.inc.h
-FunctionLoweringInfo.po: Intrinsics.inc.h
-SelectionDAG.o: Intrinsics.inc.h
-SelectionDAG.po: Intrinsics.inc.h
-SelectionDAGBuilder.o: Intrinsics.inc.h
-SelectionDAGBuilder.po: Intrinsics.inc.h
-SelectionDAGDumper.o: Intrinsics.inc.h
-SelectionDAGDumper.po: Intrinsics.inc.h
-SelectionDAGISel.o: Intrinsics.inc.h
-SelectionDAGISel.po: Intrinsics.inc.h
-StatepointLowering.o: Intrinsics.inc.h
-StatepointLowering.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmsparcasmparser/Makefile.depend b/lib/clang/libllvmsparcasmparser/Makefile.depend
index 256ccd8..385072f 100644
--- a/lib/clang/libllvmsparcasmparser/Makefile.depend
+++ b/lib/clang/libllvmsparcasmparser/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SparcAsmParser.o: SparcGenAsmMatcher.inc.h
-SparcAsmParser.o: SparcGenInstrInfo.inc.h
-SparcAsmParser.o: SparcGenRegisterInfo.inc.h
-SparcAsmParser.o: SparcGenSubtargetInfo.inc.h
-SparcAsmParser.po: SparcGenAsmMatcher.inc.h
-SparcAsmParser.po: SparcGenInstrInfo.inc.h
-SparcAsmParser.po: SparcGenRegisterInfo.inc.h
-SparcAsmParser.po: SparcGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmsparccodegen/Makefile.depend b/lib/clang/libllvmsparccodegen/Makefile.depend
index 64226f6..385072f 100644
--- a/lib/clang/libllvmsparccodegen/Makefile.depend
+++ b/lib/clang/libllvmsparccodegen/Makefile.depend
@@ -13,70 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-DelaySlotFiller.o: SparcGenInstrInfo.inc.h
-DelaySlotFiller.o: SparcGenRegisterInfo.inc.h
-DelaySlotFiller.o: SparcGenSubtargetInfo.inc.h
-DelaySlotFiller.po: SparcGenInstrInfo.inc.h
-DelaySlotFiller.po: SparcGenRegisterInfo.inc.h
-DelaySlotFiller.po: SparcGenSubtargetInfo.inc.h
-SparcAsmPrinter.o: SparcGenInstrInfo.inc.h
-SparcAsmPrinter.o: SparcGenRegisterInfo.inc.h
-SparcAsmPrinter.o: SparcGenSubtargetInfo.inc.h
-SparcAsmPrinter.po: SparcGenInstrInfo.inc.h
-SparcAsmPrinter.po: SparcGenRegisterInfo.inc.h
-SparcAsmPrinter.po: SparcGenSubtargetInfo.inc.h
-SparcFrameLowering.o: SparcGenInstrInfo.inc.h
-SparcFrameLowering.o: SparcGenRegisterInfo.inc.h
-SparcFrameLowering.o: SparcGenSubtargetInfo.inc.h
-SparcFrameLowering.po: SparcGenInstrInfo.inc.h
-SparcFrameLowering.po: SparcGenRegisterInfo.inc.h
-SparcFrameLowering.po: SparcGenSubtargetInfo.inc.h
-SparcISelDAGToDAG.o: Intrinsics.inc.h
-SparcISelDAGToDAG.o: SparcGenDAGISel.inc.h
-SparcISelDAGToDAG.o: SparcGenInstrInfo.inc.h
-SparcISelDAGToDAG.o: SparcGenRegisterInfo.inc.h
-SparcISelDAGToDAG.o: SparcGenSubtargetInfo.inc.h
-SparcISelDAGToDAG.po: Intrinsics.inc.h
-SparcISelDAGToDAG.po: SparcGenDAGISel.inc.h
-SparcISelDAGToDAG.po: SparcGenInstrInfo.inc.h
-SparcISelDAGToDAG.po: SparcGenRegisterInfo.inc.h
-SparcISelDAGToDAG.po: SparcGenSubtargetInfo.inc.h
-SparcISelLowering.o: SparcGenCallingConv.inc.h
-SparcISelLowering.o: SparcGenInstrInfo.inc.h
-SparcISelLowering.o: SparcGenRegisterInfo.inc.h
-SparcISelLowering.o: SparcGenSubtargetInfo.inc.h
-SparcISelLowering.po: SparcGenCallingConv.inc.h
-SparcISelLowering.po: SparcGenInstrInfo.inc.h
-SparcISelLowering.po: SparcGenRegisterInfo.inc.h
-SparcISelLowering.po: SparcGenSubtargetInfo.inc.h
-SparcInstrInfo.o: SparcGenInstrInfo.inc.h
-SparcInstrInfo.o: SparcGenRegisterInfo.inc.h
-SparcInstrInfo.o: SparcGenSubtargetInfo.inc.h
-SparcInstrInfo.po: SparcGenInstrInfo.inc.h
-SparcInstrInfo.po: SparcGenRegisterInfo.inc.h
-SparcInstrInfo.po: SparcGenSubtargetInfo.inc.h
-SparcMCInstLower.o: SparcGenInstrInfo.inc.h
-SparcMCInstLower.o: SparcGenRegisterInfo.inc.h
-SparcMCInstLower.o: SparcGenSubtargetInfo.inc.h
-SparcMCInstLower.po: SparcGenInstrInfo.inc.h
-SparcMCInstLower.po: SparcGenRegisterInfo.inc.h
-SparcMCInstLower.po: SparcGenSubtargetInfo.inc.h
-SparcRegisterInfo.o: SparcGenInstrInfo.inc.h
-SparcRegisterInfo.o: SparcGenRegisterInfo.inc.h
-SparcRegisterInfo.o: SparcGenSubtargetInfo.inc.h
-SparcRegisterInfo.po: SparcGenInstrInfo.inc.h
-SparcRegisterInfo.po: SparcGenRegisterInfo.inc.h
-SparcRegisterInfo.po: SparcGenSubtargetInfo.inc.h
-SparcSubtarget.o: SparcGenInstrInfo.inc.h
-SparcSubtarget.o: SparcGenRegisterInfo.inc.h
-SparcSubtarget.o: SparcGenSubtargetInfo.inc.h
-SparcSubtarget.po: SparcGenInstrInfo.inc.h
-SparcSubtarget.po: SparcGenRegisterInfo.inc.h
-SparcSubtarget.po: SparcGenSubtargetInfo.inc.h
-SparcTargetMachine.o: SparcGenInstrInfo.inc.h
-SparcTargetMachine.o: SparcGenRegisterInfo.inc.h
-SparcTargetMachine.o: SparcGenSubtargetInfo.inc.h
-SparcTargetMachine.po: SparcGenInstrInfo.inc.h
-SparcTargetMachine.po: SparcGenRegisterInfo.inc.h
-SparcTargetMachine.po: SparcGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmsparcdesc/Makefile.depend b/lib/clang/libllvmsparcdesc/Makefile.depend
index 5b5db5f..385072f 100644
--- a/lib/clang/libllvmsparcdesc/Makefile.depend
+++ b/lib/clang/libllvmsparcdesc/Makefile.depend
@@ -13,30 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SparcAsmBackend.o: SparcGenInstrInfo.inc.h
-SparcAsmBackend.o: SparcGenRegisterInfo.inc.h
-SparcAsmBackend.o: SparcGenSubtargetInfo.inc.h
-SparcAsmBackend.po: SparcGenInstrInfo.inc.h
-SparcAsmBackend.po: SparcGenRegisterInfo.inc.h
-SparcAsmBackend.po: SparcGenSubtargetInfo.inc.h
-SparcELFObjectWriter.o: SparcGenInstrInfo.inc.h
-SparcELFObjectWriter.o: SparcGenRegisterInfo.inc.h
-SparcELFObjectWriter.o: SparcGenSubtargetInfo.inc.h
-SparcELFObjectWriter.po: SparcGenInstrInfo.inc.h
-SparcELFObjectWriter.po: SparcGenRegisterInfo.inc.h
-SparcELFObjectWriter.po: SparcGenSubtargetInfo.inc.h
-SparcMCCodeEmitter.o: SparcGenInstrInfo.inc.h
-SparcMCCodeEmitter.o: SparcGenMCCodeEmitter.inc.h
-SparcMCCodeEmitter.o: SparcGenRegisterInfo.inc.h
-SparcMCCodeEmitter.o: SparcGenSubtargetInfo.inc.h
-SparcMCCodeEmitter.po: SparcGenInstrInfo.inc.h
-SparcMCCodeEmitter.po: SparcGenMCCodeEmitter.inc.h
-SparcMCCodeEmitter.po: SparcGenRegisterInfo.inc.h
-SparcMCCodeEmitter.po: SparcGenSubtargetInfo.inc.h
-SparcMCTargetDesc.o: SparcGenInstrInfo.inc.h
-SparcMCTargetDesc.o: SparcGenRegisterInfo.inc.h
-SparcMCTargetDesc.o: SparcGenSubtargetInfo.inc.h
-SparcMCTargetDesc.po: SparcGenInstrInfo.inc.h
-SparcMCTargetDesc.po: SparcGenRegisterInfo.inc.h
-SparcMCTargetDesc.po: SparcGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmsparcdisassembler/Makefile.depend b/lib/clang/libllvmsparcdisassembler/Makefile.depend
index 213789e..385072f 100644
--- a/lib/clang/libllvmsparcdisassembler/Makefile.depend
+++ b/lib/clang/libllvmsparcdisassembler/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SparcDisassembler.o: SparcGenDisassemblerTables.inc.h
-SparcDisassembler.o: SparcGenInstrInfo.inc.h
-SparcDisassembler.o: SparcGenRegisterInfo.inc.h
-SparcDisassembler.o: SparcGenSubtargetInfo.inc.h
-SparcDisassembler.po: SparcGenDisassemblerTables.inc.h
-SparcDisassembler.po: SparcGenInstrInfo.inc.h
-SparcDisassembler.po: SparcGenRegisterInfo.inc.h
-SparcDisassembler.po: SparcGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmsparcinfo/Makefile.depend b/lib/clang/libllvmsparcinfo/Makefile.depend
index ac56ca5..385072f 100644
--- a/lib/clang/libllvmsparcinfo/Makefile.depend
+++ b/lib/clang/libllvmsparcinfo/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-SparcTargetInfo.o: SparcGenInstrInfo.inc.h
-SparcTargetInfo.o: SparcGenRegisterInfo.inc.h
-SparcTargetInfo.o: SparcGenSubtargetInfo.inc.h
-SparcTargetInfo.po: SparcGenInstrInfo.inc.h
-SparcTargetInfo.po: SparcGenRegisterInfo.inc.h
-SparcTargetInfo.po: SparcGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend
index afcaff0..385072f 100644
--- a/lib/clang/libllvmtarget/Makefile.depend
+++ b/lib/clang/libllvmtarget/Makefile.depend
@@ -13,8 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-TargetMachine.o: Intrinsics.inc.h
-TargetMachine.po: Intrinsics.inc.h
-TargetMachineC.o: Intrinsics.inc.h
-TargetMachineC.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
index 7d4d09d..385072f 100644
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ b/lib/clang/libllvmtransformutils/Makefile.depend
@@ -13,34 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-BasicBlockUtils.o: Intrinsics.inc.h
-BasicBlockUtils.po: Intrinsics.inc.h
-BuildLibCalls.o: Intrinsics.inc.h
-BuildLibCalls.po: Intrinsics.inc.h
-CloneFunction.o: Intrinsics.inc.h
-CloneFunction.po: Intrinsics.inc.h
-CodeExtractor.o: Intrinsics.inc.h
-CodeExtractor.po: Intrinsics.inc.h
-GlobalStatus.o: Intrinsics.inc.h
-GlobalStatus.po: Intrinsics.inc.h
-InlineFunction.o: Intrinsics.inc.h
-InlineFunction.po: Intrinsics.inc.h
-IntegerDivision.o: Intrinsics.inc.h
-IntegerDivision.po: Intrinsics.inc.h
-Local.o: Intrinsics.inc.h
-Local.po: Intrinsics.inc.h
-LoopSimplify.o: Intrinsics.inc.h
-LoopSimplify.po: Intrinsics.inc.h
-LoopUtils.o: Intrinsics.inc.h
-LoopUtils.po: Intrinsics.inc.h
-PromoteMemoryToRegister.o: Intrinsics.inc.h
-PromoteMemoryToRegister.po: Intrinsics.inc.h
-SSAUpdater.o: Intrinsics.inc.h
-SSAUpdater.po: Intrinsics.inc.h
-SimplifyCFG.o: Intrinsics.inc.h
-SimplifyCFG.po: Intrinsics.inc.h
-SimplifyIndVar.o: Intrinsics.inc.h
-SimplifyIndVar.po: Intrinsics.inc.h
-SimplifyLibCalls.o: Intrinsics.inc.h
-SimplifyLibCalls.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
index daeb031..385072f 100644
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ b/lib/clang/libllvmvectorize/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-BBVectorize.o: Intrinsics.inc.h
-BBVectorize.po: Intrinsics.inc.h
-LoopVectorize.o: Intrinsics.inc.h
-LoopVectorize.po: Intrinsics.inc.h
-SLPVectorizer.o: Intrinsics.inc.h
-SLPVectorizer.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend
index d4b04c6..385072f 100644
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ b/lib/clang/libllvmx86asmparser/Makefile.depend
@@ -13,18 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-X86AsmInstrumentation.o: X86GenInstrInfo.inc.h
-X86AsmInstrumentation.o: X86GenRegisterInfo.inc.h
-X86AsmInstrumentation.o: X86GenSubtargetInfo.inc.h
-X86AsmInstrumentation.po: X86GenInstrInfo.inc.h
-X86AsmInstrumentation.po: X86GenRegisterInfo.inc.h
-X86AsmInstrumentation.po: X86GenSubtargetInfo.inc.h
-X86AsmParser.o: X86GenAsmMatcher.inc.h
-X86AsmParser.o: X86GenInstrInfo.inc.h
-X86AsmParser.o: X86GenRegisterInfo.inc.h
-X86AsmParser.o: X86GenSubtargetInfo.inc.h
-X86AsmParser.po: X86GenAsmMatcher.inc.h
-X86AsmParser.po: X86GenInstrInfo.inc.h
-X86AsmParser.po: X86GenRegisterInfo.inc.h
-X86AsmParser.po: X86GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
index ad7daaf..385072f 100644
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ b/lib/clang/libllvmx86codegen/Makefile.depend
@@ -13,134 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-X86AsmPrinter.o: X86GenInstrInfo.inc.h
-X86AsmPrinter.o: X86GenRegisterInfo.inc.h
-X86AsmPrinter.o: X86GenSubtargetInfo.inc.h
-X86AsmPrinter.po: X86GenInstrInfo.inc.h
-X86AsmPrinter.po: X86GenRegisterInfo.inc.h
-X86AsmPrinter.po: X86GenSubtargetInfo.inc.h
-X86CallFrameOptimization.o: X86GenInstrInfo.inc.h
-X86CallFrameOptimization.o: X86GenRegisterInfo.inc.h
-X86CallFrameOptimization.o: X86GenSubtargetInfo.inc.h
-X86CallFrameOptimization.po: X86GenInstrInfo.inc.h
-X86CallFrameOptimization.po: X86GenRegisterInfo.inc.h
-X86CallFrameOptimization.po: X86GenSubtargetInfo.inc.h
-X86ExpandPseudo.o: X86GenInstrInfo.inc.h
-X86ExpandPseudo.o: X86GenRegisterInfo.inc.h
-X86ExpandPseudo.o: X86GenSubtargetInfo.inc.h
-X86ExpandPseudo.po: X86GenInstrInfo.inc.h
-X86ExpandPseudo.po: X86GenRegisterInfo.inc.h
-X86ExpandPseudo.po: X86GenSubtargetInfo.inc.h
-X86FastISel.o: Intrinsics.inc.h
-X86FastISel.o: X86GenCallingConv.inc.h
-X86FastISel.o: X86GenFastISel.inc.h
-X86FastISel.o: X86GenInstrInfo.inc.h
-X86FastISel.o: X86GenRegisterInfo.inc.h
-X86FastISel.o: X86GenSubtargetInfo.inc.h
-X86FastISel.po: Intrinsics.inc.h
-X86FastISel.po: X86GenCallingConv.inc.h
-X86FastISel.po: X86GenFastISel.inc.h
-X86FastISel.po: X86GenInstrInfo.inc.h
-X86FastISel.po: X86GenRegisterInfo.inc.h
-X86FastISel.po: X86GenSubtargetInfo.inc.h
-X86FixupLEAs.o: X86GenInstrInfo.inc.h
-X86FixupLEAs.o: X86GenRegisterInfo.inc.h
-X86FixupLEAs.o: X86GenSubtargetInfo.inc.h
-X86FixupLEAs.po: X86GenInstrInfo.inc.h
-X86FixupLEAs.po: X86GenRegisterInfo.inc.h
-X86FixupLEAs.po: X86GenSubtargetInfo.inc.h
-X86FloatingPoint.o: X86GenInstrInfo.inc.h
-X86FloatingPoint.o: X86GenRegisterInfo.inc.h
-X86FloatingPoint.o: X86GenSubtargetInfo.inc.h
-X86FloatingPoint.po: X86GenInstrInfo.inc.h
-X86FloatingPoint.po: X86GenRegisterInfo.inc.h
-X86FloatingPoint.po: X86GenSubtargetInfo.inc.h
-X86FrameLowering.o: X86GenInstrInfo.inc.h
-X86FrameLowering.o: X86GenRegisterInfo.inc.h
-X86FrameLowering.o: X86GenSubtargetInfo.inc.h
-X86FrameLowering.po: X86GenInstrInfo.inc.h
-X86FrameLowering.po: X86GenRegisterInfo.inc.h
-X86FrameLowering.po: X86GenSubtargetInfo.inc.h
-X86ISelDAGToDAG.o: Intrinsics.inc.h
-X86ISelDAGToDAG.o: X86GenDAGISel.inc.h
-X86ISelDAGToDAG.o: X86GenInstrInfo.inc.h
-X86ISelDAGToDAG.o: X86GenRegisterInfo.inc.h
-X86ISelDAGToDAG.o: X86GenSubtargetInfo.inc.h
-X86ISelDAGToDAG.po: Intrinsics.inc.h
-X86ISelDAGToDAG.po: X86GenDAGISel.inc.h
-X86ISelDAGToDAG.po: X86GenInstrInfo.inc.h
-X86ISelDAGToDAG.po: X86GenRegisterInfo.inc.h
-X86ISelDAGToDAG.po: X86GenSubtargetInfo.inc.h
-X86ISelLowering.o: Intrinsics.inc.h
-X86ISelLowering.o: X86GenCallingConv.inc.h
-X86ISelLowering.o: X86GenInstrInfo.inc.h
-X86ISelLowering.o: X86GenRegisterInfo.inc.h
-X86ISelLowering.o: X86GenSubtargetInfo.inc.h
-X86ISelLowering.po: Intrinsics.inc.h
-X86ISelLowering.po: X86GenCallingConv.inc.h
-X86ISelLowering.po: X86GenInstrInfo.inc.h
-X86ISelLowering.po: X86GenRegisterInfo.inc.h
-X86ISelLowering.po: X86GenSubtargetInfo.inc.h
-X86InstrInfo.o: X86GenInstrInfo.inc.h
-X86InstrInfo.o: X86GenRegisterInfo.inc.h
-X86InstrInfo.o: X86GenSubtargetInfo.inc.h
-X86InstrInfo.po: X86GenInstrInfo.inc.h
-X86InstrInfo.po: X86GenRegisterInfo.inc.h
-X86InstrInfo.po: X86GenSubtargetInfo.inc.h
-X86MCInstLower.o: X86GenInstrInfo.inc.h
-X86MCInstLower.o: X86GenRegisterInfo.inc.h
-X86MCInstLower.o: X86GenSubtargetInfo.inc.h
-X86MCInstLower.po: X86GenInstrInfo.inc.h
-X86MCInstLower.po: X86GenRegisterInfo.inc.h
-X86MCInstLower.po: X86GenSubtargetInfo.inc.h
-X86MachineFunctionInfo.o: X86GenRegisterInfo.inc.h
-X86MachineFunctionInfo.po: X86GenRegisterInfo.inc.h
-X86PadShortFunction.o: X86GenInstrInfo.inc.h
-X86PadShortFunction.o: X86GenRegisterInfo.inc.h
-X86PadShortFunction.o: X86GenSubtargetInfo.inc.h
-X86PadShortFunction.po: X86GenInstrInfo.inc.h
-X86PadShortFunction.po: X86GenRegisterInfo.inc.h
-X86PadShortFunction.po: X86GenSubtargetInfo.inc.h
-X86RegisterInfo.o: X86GenInstrInfo.inc.h
-X86RegisterInfo.o: X86GenRegisterInfo.inc.h
-X86RegisterInfo.o: X86GenSubtargetInfo.inc.h
-X86RegisterInfo.po: X86GenInstrInfo.inc.h
-X86RegisterInfo.po: X86GenRegisterInfo.inc.h
-X86RegisterInfo.po: X86GenSubtargetInfo.inc.h
-X86SelectionDAGInfo.o: X86GenInstrInfo.inc.h
-X86SelectionDAGInfo.o: X86GenRegisterInfo.inc.h
-X86SelectionDAGInfo.o: X86GenSubtargetInfo.inc.h
-X86SelectionDAGInfo.po: X86GenInstrInfo.inc.h
-X86SelectionDAGInfo.po: X86GenRegisterInfo.inc.h
-X86SelectionDAGInfo.po: X86GenSubtargetInfo.inc.h
-X86Subtarget.o: X86GenInstrInfo.inc.h
-X86Subtarget.o: X86GenRegisterInfo.inc.h
-X86Subtarget.o: X86GenSubtargetInfo.inc.h
-X86Subtarget.po: X86GenInstrInfo.inc.h
-X86Subtarget.po: X86GenRegisterInfo.inc.h
-X86Subtarget.po: X86GenSubtargetInfo.inc.h
-X86TargetMachine.o: Intrinsics.inc.h
-X86TargetMachine.o: X86GenInstrInfo.inc.h
-X86TargetMachine.o: X86GenRegisterInfo.inc.h
-X86TargetMachine.o: X86GenSubtargetInfo.inc.h
-X86TargetMachine.po: Intrinsics.inc.h
-X86TargetMachine.po: X86GenInstrInfo.inc.h
-X86TargetMachine.po: X86GenRegisterInfo.inc.h
-X86TargetMachine.po: X86GenSubtargetInfo.inc.h
-X86TargetTransformInfo.o: Intrinsics.inc.h
-X86TargetTransformInfo.o: X86GenInstrInfo.inc.h
-X86TargetTransformInfo.o: X86GenRegisterInfo.inc.h
-X86TargetTransformInfo.o: X86GenSubtargetInfo.inc.h
-X86TargetTransformInfo.po: Intrinsics.inc.h
-X86TargetTransformInfo.po: X86GenInstrInfo.inc.h
-X86TargetTransformInfo.po: X86GenRegisterInfo.inc.h
-X86TargetTransformInfo.po: X86GenSubtargetInfo.inc.h
-X86VZeroUpper.o: X86GenInstrInfo.inc.h
-X86VZeroUpper.o: X86GenRegisterInfo.inc.h
-X86VZeroUpper.o: X86GenSubtargetInfo.inc.h
-X86VZeroUpper.po: X86GenInstrInfo.inc.h
-X86VZeroUpper.po: X86GenRegisterInfo.inc.h
-X86VZeroUpper.po: X86GenSubtargetInfo.inc.h
-X86WinEHState.o: Intrinsics.inc.h
-X86WinEHState.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
index b68230d..385072f 100644
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ b/lib/clang/libllvmx86desc/Makefile.depend
@@ -13,58 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-X86AsmBackend.o: X86GenInstrInfo.inc.h
-X86AsmBackend.o: X86GenRegisterInfo.inc.h
-X86AsmBackend.o: X86GenSubtargetInfo.inc.h
-X86AsmBackend.po: X86GenInstrInfo.inc.h
-X86AsmBackend.po: X86GenRegisterInfo.inc.h
-X86AsmBackend.po: X86GenSubtargetInfo.inc.h
-X86ELFObjectWriter.o: X86GenInstrInfo.inc.h
-X86ELFObjectWriter.o: X86GenRegisterInfo.inc.h
-X86ELFObjectWriter.o: X86GenSubtargetInfo.inc.h
-X86ELFObjectWriter.po: X86GenInstrInfo.inc.h
-X86ELFObjectWriter.po: X86GenRegisterInfo.inc.h
-X86ELFObjectWriter.po: X86GenSubtargetInfo.inc.h
-X86ELFRelocationInfo.o: X86GenInstrInfo.inc.h
-X86ELFRelocationInfo.o: X86GenRegisterInfo.inc.h
-X86ELFRelocationInfo.o: X86GenSubtargetInfo.inc.h
-X86ELFRelocationInfo.po: X86GenInstrInfo.inc.h
-X86ELFRelocationInfo.po: X86GenRegisterInfo.inc.h
-X86ELFRelocationInfo.po: X86GenSubtargetInfo.inc.h
-X86MCCodeEmitter.o: X86GenInstrInfo.inc.h
-X86MCCodeEmitter.o: X86GenRegisterInfo.inc.h
-X86MCCodeEmitter.o: X86GenSubtargetInfo.inc.h
-X86MCCodeEmitter.po: X86GenInstrInfo.inc.h
-X86MCCodeEmitter.po: X86GenRegisterInfo.inc.h
-X86MCCodeEmitter.po: X86GenSubtargetInfo.inc.h
-X86MCTargetDesc.o: X86GenInstrInfo.inc.h
-X86MCTargetDesc.o: X86GenRegisterInfo.inc.h
-X86MCTargetDesc.o: X86GenSubtargetInfo.inc.h
-X86MCTargetDesc.po: X86GenInstrInfo.inc.h
-X86MCTargetDesc.po: X86GenRegisterInfo.inc.h
-X86MCTargetDesc.po: X86GenSubtargetInfo.inc.h
-X86MachORelocationInfo.o: X86GenInstrInfo.inc.h
-X86MachORelocationInfo.o: X86GenRegisterInfo.inc.h
-X86MachORelocationInfo.o: X86GenSubtargetInfo.inc.h
-X86MachORelocationInfo.po: X86GenInstrInfo.inc.h
-X86MachORelocationInfo.po: X86GenRegisterInfo.inc.h
-X86MachORelocationInfo.po: X86GenSubtargetInfo.inc.h
-X86MachObjectWriter.o: X86GenInstrInfo.inc.h
-X86MachObjectWriter.o: X86GenRegisterInfo.inc.h
-X86MachObjectWriter.o: X86GenSubtargetInfo.inc.h
-X86MachObjectWriter.po: X86GenInstrInfo.inc.h
-X86MachObjectWriter.po: X86GenRegisterInfo.inc.h
-X86MachObjectWriter.po: X86GenSubtargetInfo.inc.h
-X86WinCOFFObjectWriter.o: X86GenInstrInfo.inc.h
-X86WinCOFFObjectWriter.o: X86GenRegisterInfo.inc.h
-X86WinCOFFObjectWriter.o: X86GenSubtargetInfo.inc.h
-X86WinCOFFObjectWriter.po: X86GenInstrInfo.inc.h
-X86WinCOFFObjectWriter.po: X86GenRegisterInfo.inc.h
-X86WinCOFFObjectWriter.po: X86GenSubtargetInfo.inc.h
-X86WinCOFFStreamer.o: X86GenInstrInfo.inc.h
-X86WinCOFFStreamer.o: X86GenRegisterInfo.inc.h
-X86WinCOFFStreamer.o: X86GenSubtargetInfo.inc.h
-X86WinCOFFStreamer.po: X86GenInstrInfo.inc.h
-X86WinCOFFStreamer.po: X86GenRegisterInfo.inc.h
-X86WinCOFFStreamer.po: X86GenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
index 6f0ac76..385072f 100644
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ b/lib/clang/libllvmx86disassembler/Makefile.depend
@@ -13,12 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-X86Disassembler.o: X86GenInstrInfo.inc.h
-X86Disassembler.o: X86GenRegisterInfo.inc.h
-X86Disassembler.o: X86GenSubtargetInfo.inc.h
-X86Disassembler.po: X86GenInstrInfo.inc.h
-X86Disassembler.po: X86GenRegisterInfo.inc.h
-X86Disassembler.po: X86GenSubtargetInfo.inc.h
-X86DisassemblerDecoder.o: X86GenDisassemblerTables.inc.h
-X86DisassemblerDecoder.po: X86GenDisassemblerTables.inc.h
.endif
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
index 511a4d1..385072f 100644
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ b/lib/clang/libllvmx86info/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-X86TargetInfo.o: X86GenInstrInfo.inc.h
-X86TargetInfo.o: X86GenRegisterInfo.inc.h
-X86TargetInfo.o: X86GenSubtargetInfo.inc.h
-X86TargetInfo.po: X86GenInstrInfo.inc.h
-X86TargetInfo.po: X86GenRegisterInfo.inc.h
-X86TargetInfo.po: X86GenSubtargetInfo.inc.h
.endif
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index 39735a8..c609e5d 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -17,22 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cxxrt_auxhelper.o: cxxrt_auxhelper.cc
-cxxrt_auxhelper.po: cxxrt_auxhelper.cc
-cxxrt_dynamic_cast.o: cxxrt_dynamic_cast.cc
-cxxrt_dynamic_cast.po: cxxrt_dynamic_cast.cc
-cxxrt_exception.o: cxxrt_exception.cc
-cxxrt_exception.po: cxxrt_exception.cc
-cxxrt_guard.o: cxxrt_guard.cc
-cxxrt_guard.po: cxxrt_guard.cc
-cxxrt_libelftc_dem_gnu3.o: cxxrt_libelftc_dem_gnu3.c
-cxxrt_libelftc_dem_gnu3.po: cxxrt_libelftc_dem_gnu3.c
-cxxrt_memory.o: cxxrt_memory.cc
-cxxrt_memory.po: cxxrt_memory.cc
-cxxrt_stdexcept.o: cxxrt_stdexcept.cc
-cxxrt_stdexcept.po: cxxrt_stdexcept.cc
-cxxrt_terminate.o: cxxrt_terminate.cc
-cxxrt_terminate.po: cxxrt_terminate.cc
-cxxrt_typeinfo.o: cxxrt_typeinfo.cc
-cxxrt_typeinfo.po: cxxrt_typeinfo.cc
.endif
diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend
index 02168e8..c38d79a 100644
--- a/lib/libc/Makefile.depend
+++ b/lib/libc/Makefile.depend
@@ -15,157 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cancelpoints_sem.So: cancelpoints_sem.c
-cancelpoints_sem.o: cancelpoints_sem.c
-cancelpoints_sem.po: cancelpoints_sem.c
-cancelpoints_sem_new.So: cancelpoints_sem_new.c
-cancelpoints_sem_new.o: cancelpoints_sem_new.c
-cancelpoints_sem_new.po: cancelpoints_sem_new.c
-crypt_clnt.So: crypt.h
-crypt_clnt.So: crypt_clnt.c
-crypt_clnt.o: crypt.h
-crypt_clnt.o: crypt_clnt.c
-crypt_clnt.po: crypt.h
-crypt_clnt.po: crypt_clnt.c
-crypt_xdr.So: crypt.h
-crypt_xdr.So: crypt_xdr.c
-crypt_xdr.o: crypt.h
-crypt_xdr.o: crypt_xdr.c
-crypt_xdr.po: crypt.h
-crypt_xdr.po: crypt_xdr.c
-gdtoa_dmisc.So: gdtoa_dmisc.c
-gdtoa_dmisc.o: gdtoa_dmisc.c
-gdtoa_dmisc.po: gdtoa_dmisc.c
-gdtoa_dtoa.So: gdtoa_dtoa.c
-gdtoa_dtoa.o: gdtoa_dtoa.c
-gdtoa_dtoa.po: gdtoa_dtoa.c
-gdtoa_gdtoa.So: gdtoa_gdtoa.c
-gdtoa_gdtoa.o: gdtoa_gdtoa.c
-gdtoa_gdtoa.po: gdtoa_gdtoa.c
-gdtoa_gethex.So: gdtoa_gethex.c
-gdtoa_gethex.o: gdtoa_gethex.c
-gdtoa_gethex.po: gdtoa_gethex.c
-gdtoa_gmisc.So: gdtoa_gmisc.c
-gdtoa_gmisc.o: gdtoa_gmisc.c
-gdtoa_gmisc.po: gdtoa_gmisc.c
-gdtoa_hd_init.So: gdtoa_hd_init.c
-gdtoa_hd_init.o: gdtoa_hd_init.c
-gdtoa_hd_init.po: gdtoa_hd_init.c
-gdtoa_hexnan.So: gdtoa_hexnan.c
-gdtoa_hexnan.o: gdtoa_hexnan.c
-gdtoa_hexnan.po: gdtoa_hexnan.c
-gdtoa_misc.So: gdtoa_misc.c
-gdtoa_misc.o: gdtoa_misc.c
-gdtoa_misc.po: gdtoa_misc.c
-gdtoa_smisc.So: gdtoa_smisc.c
-gdtoa_smisc.o: gdtoa_smisc.c
-gdtoa_smisc.po: gdtoa_smisc.c
-gdtoa_strtod.So: gdtoa_strtod.c
-gdtoa_strtod.o: gdtoa_strtod.c
-gdtoa_strtod.po: gdtoa_strtod.c
-gdtoa_strtodg.So: gdtoa_strtodg.c
-gdtoa_strtodg.o: gdtoa_strtodg.c
-gdtoa_strtodg.po: gdtoa_strtodg.c
-gdtoa_strtof.So: gdtoa_strtof.c
-gdtoa_strtof.o: gdtoa_strtof.c
-gdtoa_strtof.po: gdtoa_strtof.c
-gdtoa_strtord.So: gdtoa_strtord.c
-gdtoa_strtord.o: gdtoa_strtord.c
-gdtoa_strtord.po: gdtoa_strtord.c
-gdtoa_strtorx.So: gdtoa_strtorx.c
-gdtoa_strtorx.o: gdtoa_strtorx.c
-gdtoa_strtorx.po: gdtoa_strtorx.c
-gdtoa_sum.So: gdtoa_sum.c
-gdtoa_sum.o: gdtoa_sum.c
-gdtoa_sum.po: gdtoa_sum.c
-gdtoa_ulp.So: gdtoa_ulp.c
-gdtoa_ulp.o: gdtoa_ulp.c
-gdtoa_ulp.po: gdtoa_ulp.c
-jemalloc_arena.So: jemalloc_arena.c
-jemalloc_arena.o: jemalloc_arena.c
-jemalloc_arena.po: jemalloc_arena.c
-jemalloc_atomic.So: jemalloc_atomic.c
-jemalloc_atomic.o: jemalloc_atomic.c
-jemalloc_atomic.po: jemalloc_atomic.c
-jemalloc_base.So: jemalloc_base.c
-jemalloc_base.o: jemalloc_base.c
-jemalloc_base.po: jemalloc_base.c
-jemalloc_bitmap.So: jemalloc_bitmap.c
-jemalloc_bitmap.o: jemalloc_bitmap.c
-jemalloc_bitmap.po: jemalloc_bitmap.c
-jemalloc_chunk.So: jemalloc_chunk.c
-jemalloc_chunk.o: jemalloc_chunk.c
-jemalloc_chunk.po: jemalloc_chunk.c
-jemalloc_chunk_dss.So: jemalloc_chunk_dss.c
-jemalloc_chunk_dss.o: jemalloc_chunk_dss.c
-jemalloc_chunk_dss.po: jemalloc_chunk_dss.c
-jemalloc_chunk_mmap.So: jemalloc_chunk_mmap.c
-jemalloc_chunk_mmap.o: jemalloc_chunk_mmap.c
-jemalloc_chunk_mmap.po: jemalloc_chunk_mmap.c
-jemalloc_ckh.So: jemalloc_ckh.c
-jemalloc_ckh.o: jemalloc_ckh.c
-jemalloc_ckh.po: jemalloc_ckh.c
-jemalloc_ctl.So: jemalloc_ctl.c
-jemalloc_ctl.o: jemalloc_ctl.c
-jemalloc_ctl.po: jemalloc_ctl.c
-jemalloc_extent.So: jemalloc_extent.c
-jemalloc_extent.o: jemalloc_extent.c
-jemalloc_extent.po: jemalloc_extent.c
-jemalloc_hash.So: jemalloc_hash.c
-jemalloc_hash.o: jemalloc_hash.c
-jemalloc_hash.po: jemalloc_hash.c
-jemalloc_huge.So: jemalloc_huge.c
-jemalloc_huge.o: jemalloc_huge.c
-jemalloc_huge.po: jemalloc_huge.c
-jemalloc_jemalloc.So: jemalloc_jemalloc.c
-jemalloc_jemalloc.o: jemalloc_jemalloc.c
-jemalloc_jemalloc.po: jemalloc_jemalloc.c
-jemalloc_mb.So: jemalloc_mb.c
-jemalloc_mb.o: jemalloc_mb.c
-jemalloc_mb.po: jemalloc_mb.c
-jemalloc_mutex.So: jemalloc_mutex.c
-jemalloc_mutex.o: jemalloc_mutex.c
-jemalloc_mutex.po: jemalloc_mutex.c
-jemalloc_pages.So: jemalloc_pages.c
-jemalloc_pages.o: jemalloc_pages.c
-jemalloc_pages.po: jemalloc_pages.c
-jemalloc_prof.So: jemalloc_prof.c
-jemalloc_prof.o: jemalloc_prof.c
-jemalloc_prof.po: jemalloc_prof.c
-jemalloc_quarantine.So: jemalloc_quarantine.c
-jemalloc_quarantine.o: jemalloc_quarantine.c
-jemalloc_quarantine.po: jemalloc_quarantine.c
-jemalloc_rtree.So: jemalloc_rtree.c
-jemalloc_rtree.o: jemalloc_rtree.c
-jemalloc_rtree.po: jemalloc_rtree.c
-jemalloc_stats.So: jemalloc_stats.c
-jemalloc_stats.o: jemalloc_stats.c
-jemalloc_stats.po: jemalloc_stats.c
-jemalloc_tcache.So: jemalloc_tcache.c
-jemalloc_tcache.o: jemalloc_tcache.c
-jemalloc_tcache.po: jemalloc_tcache.c
-jemalloc_tsd.So: jemalloc_tsd.c
-jemalloc_tsd.o: jemalloc_tsd.c
-jemalloc_tsd.po: jemalloc_tsd.c
-jemalloc_util.So: jemalloc_util.c
-jemalloc_util.o: jemalloc_util.c
-jemalloc_util.po: jemalloc_util.c
-nslexer.So: nslexer.c
-nslexer.So: nsparser.h
-nslexer.o: nslexer.c
-nslexer.o: nsparser.h
-nslexer.po: nslexer.c
-nslexer.po: nsparser.h
-nsparser.So: nsparser.c
-nsparser.o: nsparser.c
-nsparser.po: nsparser.c
-subr_acl_nfs4.So: subr_acl_nfs4.c
-subr_acl_nfs4.o: subr_acl_nfs4.c
-subr_acl_nfs4.po: subr_acl_nfs4.c
-yp_xdr.So: yp.h
-yp_xdr.So: yp_xdr.c
-yp_xdr.o: yp.h
-yp_xdr.o: yp_xdr.c
-yp_xdr.po: yp.h
-yp_xdr.po: yp_xdr.c
.endif
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index f0db406..d42105d 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -236,9 +236,12 @@ __bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
WR_BINTERNAL(dest, nksize ? nksize : bl->ksize,
rchild->pgno, bl->flags & P_BIGKEY);
memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
- if (bl->flags & P_BIGKEY &&
- bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
- goto err1;
+ if (bl->flags & P_BIGKEY) {
+ pgno_t pgno;
+ memcpy(&pgno, bl->bytes, sizeof(pgno));
+ if (bt_preserve(t, pgno) == RET_ERROR)
+ goto err1;
+ }
break;
case P_RINTERNAL:
/*
@@ -544,9 +547,12 @@ bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
* If the key is on an overflow page, mark the overflow chain
* so it isn't deleted when the leaf copy of the key is deleted.
*/
- if (bl->flags & P_BIGKEY &&
- bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
- return (RET_ERROR);
+ if (bl->flags & P_BIGKEY) {
+ pgno_t pgno;
+ memcpy(&pgno, bl->bytes, sizeof(pgno));
+ if (bt_preserve(t, pgno) == RET_ERROR)
+ return (RET_ERROR);
+ }
break;
case P_BINTERNAL:
bi = GETBINTERNAL(r, 0);
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index e6da5fe..02503ee 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -422,8 +422,10 @@ hdestroy(HTAB *hashp)
if (hashp->tmp_buf)
free(hashp->tmp_buf);
- if (hashp->fp != -1)
+ if (hashp->fp != -1) {
+ (void)_fsync(hashp->fp);
(void)_close(hashp->fp);
+ }
free(hashp);
@@ -458,6 +460,8 @@ hash_sync(const DB *dbp, u_int32_t flags)
return (0);
if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
return (ERROR);
+ if (hashp->fp != -1 && _fsync(hashp->fp) != 0)
+ return (ERROR);
hashp->new_file = 0;
return (0);
}
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
index 441cced..68e6e85 100644
--- a/lib/libc/db/recno/rec_put.c
+++ b/lib/libc/db/recno/rec_put.c
@@ -140,8 +140,7 @@ einval: errno = EINVAL;
return (RET_ERROR);
if (nrec > t->bt_nrecs + 1) {
if (F_ISSET(t, R_FIXLEN)) {
- if ((tdata.data =
- (void *)malloc(t->bt_reclen)) == NULL)
+ if ((tdata.data = malloc(t->bt_reclen)) == NULL)
return (RET_ERROR);
tdata.size = t->bt_reclen;
memset(tdata.data, t->bt_bval, tdata.size);
@@ -208,7 +207,7 @@ __rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
return (RET_ERROR);
tdata.data = db;
tdata.size = NOVFLSIZE;
- *(pgno_t *)db = pg;
+ memcpy(db, &pg, sizeof(pg));
*(u_int32_t *)(db + sizeof(pgno_t)) = data->size;
dflags = P_BIGDATA;
data = &tdata;
diff --git a/lib/libcxxrt/Makefile.depend.host b/lib/libcxxrt/Makefile.depend.host
index 971c379..f80275d 100644
--- a/lib/libcxxrt/Makefile.depend.host
+++ b/lib/libcxxrt/Makefile.depend.host
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/clang/clang \
.include <dirdeps.mk>
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index ea167ef..b767569 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -16,37 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-dwarf_funcs.So: dwarf_funcs.c
-dwarf_funcs.o: dwarf_funcs.c
-dwarf_funcs.po: dwarf_funcs.c
-dwarf_pro_funcs.So: dwarf_pro_funcs.c
-dwarf_pro_funcs.o: dwarf_pro_funcs.c
-dwarf_pro_funcs.po: dwarf_pro_funcs.c
-dwarf_pro_pubnames.So: dwarf_pro_pubnames.c
-dwarf_pro_pubnames.o: dwarf_pro_pubnames.c
-dwarf_pro_pubnames.po: dwarf_pro_pubnames.c
-dwarf_pro_types.So: dwarf_pro_types.c
-dwarf_pro_types.o: dwarf_pro_types.c
-dwarf_pro_types.po: dwarf_pro_types.c
-dwarf_pro_vars.So: dwarf_pro_vars.c
-dwarf_pro_vars.o: dwarf_pro_vars.c
-dwarf_pro_vars.po: dwarf_pro_vars.c
-dwarf_pro_weaks.So: dwarf_pro_weaks.c
-dwarf_pro_weaks.o: dwarf_pro_weaks.c
-dwarf_pro_weaks.po: dwarf_pro_weaks.c
-dwarf_pubnames.So: dwarf_pubnames.c
-dwarf_pubnames.o: dwarf_pubnames.c
-dwarf_pubnames.po: dwarf_pubnames.c
-dwarf_pubtypes.So: dwarf_pubtypes.c
-dwarf_pubtypes.o: dwarf_pubtypes.c
-dwarf_pubtypes.po: dwarf_pubtypes.c
-dwarf_types.So: dwarf_types.c
-dwarf_types.o: dwarf_types.c
-dwarf_types.po: dwarf_types.c
-dwarf_vars.So: dwarf_vars.c
-dwarf_vars.o: dwarf_vars.c
-dwarf_vars.po: dwarf_vars.c
-dwarf_weaks.So: dwarf_weaks.c
-dwarf_weaks.o: dwarf_weaks.c
-dwarf_weaks.po: dwarf_weaks.c
.endif
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index 607ebe0..59bc828 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -16,49 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-editline.So: common.h
-editline.So: editline.c
-editline.So: emacs.h
-editline.So: fcns.c
-editline.So: fcns.h
-editline.So: help.c
-editline.So: help.h
-editline.So: vi.h
-editline.o: common.h
-editline.o: editline.c
-editline.o: emacs.h
-editline.o: fcns.c
-editline.o: fcns.h
-editline.o: help.c
-editline.o: help.h
-editline.o: vi.h
-editline.po: common.h
-editline.po: editline.c
-editline.po: emacs.h
-editline.po: fcns.c
-editline.po: fcns.h
-editline.po: help.c
-editline.po: help.h
-editline.po: vi.h
-historyn.So: historyn.c
-historyn.o: historyn.c
-historyn.po: historyn.c
-readline.So: common.h
-readline.So: emacs.h
-readline.So: fcns.h
-readline.So: help.h
-readline.So: vi.h
-readline.o: common.h
-readline.o: emacs.h
-readline.o: fcns.h
-readline.o: help.h
-readline.o: vi.h
-readline.po: common.h
-readline.po: emacs.h
-readline.po: fcns.h
-readline.po: help.h
-readline.po: vi.h
-tokenizern.So: tokenizern.c
-tokenizern.o: tokenizern.c
-tokenizern.po: tokenizern.c
.endif
diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend
index 814c094..3646e2e 100644
--- a/lib/libelf/Makefile.depend
+++ b/lib/libelf/Makefile.depend
@@ -15,13 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-libelf_convert.So: libelf_convert.c
-libelf_convert.o: libelf_convert.c
-libelf_convert.po: libelf_convert.c
-libelf_fsize.So: libelf_fsize.c
-libelf_fsize.o: libelf_fsize.c
-libelf_fsize.po: libelf_fsize.c
-libelf_msize.So: libelf_msize.c
-libelf_msize.o: libelf_msize.c
-libelf_msize.po: libelf_msize.c
.endif
diff --git a/lib/libfetch/Makefile.depend b/lib/libfetch/Makefile.depend
index 3de4148..9d5105e 100644
--- a/lib/libfetch/Makefile.depend
+++ b/lib/libfetch/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ftp.So: ftperr.h
-ftp.o: ftperr.h
-ftp.po: ftperr.h
-http.So: httperr.h
-http.o: httperr.h
-http.po: httperr.h
.endif
diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend
index 7583d24..75e2766 100644
--- a/lib/libipsec/Makefile.depend
+++ b/lib/libipsec/Makefile.depend
@@ -17,13 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-policy_parse.So: policy_parse.c
-policy_parse.o: policy_parse.c
-policy_parse.po: policy_parse.c
-policy_token.So: policy_token.c
-policy_token.So: y.tab.h
-policy_token.o: policy_token.c
-policy_token.o: y.tab.h
-policy_token.po: policy_token.c
-policy_token.po: y.tab.h
.endif
diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend
index e3acaaf..3646e2e 100644
--- a/lib/libmd/Makefile.depend
+++ b/lib/libmd/Makefile.depend
@@ -15,28 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-md4hl.So: md4hl.c
-md4hl.o: md4hl.c
-md4hl.po: md4hl.c
-md5hl.So: md5hl.c
-md5hl.o: md5hl.c
-md5hl.po: md5hl.c
-rmd160hl.So: rmd160hl.c
-rmd160hl.o: rmd160hl.c
-rmd160hl.po: rmd160hl.c
-sha0hl.So: sha0hl.c
-sha0hl.o: sha0hl.c
-sha0hl.po: sha0hl.c
-sha1hl.So: sha1hl.c
-sha1hl.o: sha1hl.c
-sha1hl.po: sha1hl.c
-sha256hl.So: sha256hl.c
-sha256hl.o: sha256hl.c
-sha256hl.po: sha256hl.c
-sha384hl.So: sha384hl.c
-sha384hl.o: sha384hl.c
-sha384hl.po: sha384hl.c
-sha512hl.So: sha512hl.c
-sha512hl.o: sha512hl.c
-sha512hl.po: sha512hl.c
.endif
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index b1db669..54c1f6f 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -16,40 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-comm.So: sm_os.h
-comm.o: sm_os.h
-comm.po: sm_os.h
-engine.So: sm_os.h
-engine.o: sm_os.h
-engine.po: sm_os.h
-errstring.So: sm_os.h
-errstring.o: sm_os.h
-errstring.po: sm_os.h
-handler.So: sm_os.h
-handler.o: sm_os.h
-handler.po: sm_os.h
-listener.So: sm_os.h
-listener.o: sm_os.h
-listener.po: sm_os.h
-main.So: sm_os.h
-main.o: sm_os.h
-main.po: sm_os.h
-monitor.So: sm_os.h
-monitor.o: sm_os.h
-monitor.po: sm_os.h
-signal.So: sm_os.h
-signal.o: sm_os.h
-signal.po: sm_os.h
-sm_gethost.So: sm_os.h
-sm_gethost.o: sm_os.h
-sm_gethost.po: sm_os.h
-smfi.So: sm_os.h
-smfi.o: sm_os.h
-smfi.po: sm_os.h
-strl.So: sm_os.h
-strl.o: sm_os.h
-strl.po: sm_os.h
-worker.So: sm_os.h
-worker.o: sm_os.h
-worker.po: sm_os.h
.endif
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 7dd09cc..75e2766 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -17,19 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-grammar.So: grammar.c
-grammar.o: grammar.c
-grammar.po: grammar.c
-pcap.So: version.h
-pcap.o: version.h
-pcap.po: version.h
-scanner.So: scanner.c
-scanner.So: tokdefs.h
-scanner.o: scanner.c
-scanner.o: tokdefs.h
-scanner.po: scanner.c
-scanner.po: tokdefs.h
-version.So: version.c
-version.o: version.c
-version.po: version.c
.endif
diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend
index 0c8b021..ddd5dbd 100644
--- a/lib/librpcsvc/Makefile.depend
+++ b/lib/librpcsvc/Makefile.depend
@@ -17,46 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-klm_prot_xdr.So: klm_prot_xdr.c
-klm_prot_xdr.o: klm_prot_xdr.c
-klm_prot_xdr.po: klm_prot_xdr.c
-mount_xdr.So: mount_xdr.c
-mount_xdr.o: mount_xdr.c
-mount_xdr.po: mount_xdr.c
-nfs_prot_xdr.So: nfs_prot_xdr.c
-nfs_prot_xdr.o: nfs_prot_xdr.c
-nfs_prot_xdr.po: nfs_prot_xdr.c
-nlm_prot_xdr.So: nlm_prot_xdr.c
-nlm_prot_xdr.o: nlm_prot_xdr.c
-nlm_prot_xdr.po: nlm_prot_xdr.c
-rex_xdr.So: rex_xdr.c
-rex_xdr.o: rex_xdr.c
-rex_xdr.po: rex_xdr.c
-rnusers_xdr.So: rnusers_xdr.c
-rnusers_xdr.o: rnusers_xdr.c
-rnusers_xdr.po: rnusers_xdr.c
-rquota_xdr.So: rquota_xdr.c
-rquota_xdr.o: rquota_xdr.c
-rquota_xdr.po: rquota_xdr.c
-rstat_xdr.So: rstat_xdr.c
-rstat_xdr.o: rstat_xdr.c
-rstat_xdr.po: rstat_xdr.c
-rwall_xdr.So: rwall_xdr.c
-rwall_xdr.o: rwall_xdr.c
-rwall_xdr.po: rwall_xdr.c
-sm_inter_xdr.So: sm_inter_xdr.c
-sm_inter_xdr.o: sm_inter_xdr.c
-sm_inter_xdr.po: sm_inter_xdr.c
-spray_xdr.So: spray_xdr.c
-spray_xdr.o: spray_xdr.c
-spray_xdr.po: spray_xdr.c
-yppasswd_xdr.So: yppasswd_xdr.c
-yppasswd_xdr.o: yppasswd_xdr.c
-yppasswd_xdr.po: yppasswd_xdr.c
-ypupdate_prot_xdr.So: ypupdate_prot_xdr.c
-ypupdate_prot_xdr.o: ypupdate_prot_xdr.c
-ypupdate_prot_xdr.po: ypupdate_prot_xdr.c
-ypxfrd_xdr.So: ypxfrd_xdr.c
-ypxfrd_xdr.o: ypxfrd_xdr.c
-ypxfrd_xdr.po: ypxfrd_xdr.c
.endif
diff --git a/lib/libsm/Makefile.depend b/lib/libsm/Makefile.depend
index 661f59f..18be76b 100644
--- a/lib/libsm/Makefile.depend
+++ b/lib/libsm/Makefile.depend
@@ -10,142 +10,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-assert.o: sm_os.h
-assert.po: sm_os.h
-cf.o: sm_os.h
-cf.po: sm_os.h
-clock.o: sm_os.h
-clock.po: sm_os.h
-clrerr.o: sm_os.h
-clrerr.po: sm_os.h
-config.o: sm_os.h
-config.po: sm_os.h
-debug.o: sm_os.h
-debug.po: sm_os.h
-errstring.o: sm_os.h
-errstring.po: sm_os.h
-exc.o: sm_os.h
-exc.po: sm_os.h
-fclose.o: sm_os.h
-fclose.po: sm_os.h
-feof.o: sm_os.h
-feof.po: sm_os.h
-ferror.o: sm_os.h
-ferror.po: sm_os.h
-fflush.o: sm_os.h
-fflush.po: sm_os.h
-fget.o: sm_os.h
-fget.po: sm_os.h
-findfp.o: sm_os.h
-findfp.po: sm_os.h
-flags.o: sm_os.h
-flags.po: sm_os.h
-fopen.o: sm_os.h
-fopen.po: sm_os.h
-fpos.o: sm_os.h
-fpos.po: sm_os.h
-fprintf.o: sm_os.h
-fprintf.po: sm_os.h
-fpurge.o: sm_os.h
-fpurge.po: sm_os.h
-fput.o: sm_os.h
-fput.po: sm_os.h
-fread.o: sm_os.h
-fread.po: sm_os.h
-fscanf.o: sm_os.h
-fscanf.po: sm_os.h
-fseek.o: sm_os.h
-fseek.po: sm_os.h
-fvwrite.o: sm_os.h
-fvwrite.po: sm_os.h
-fwalk.o: sm_os.h
-fwalk.po: sm_os.h
-fwrite.o: sm_os.h
-fwrite.po: sm_os.h
-get.o: sm_os.h
-get.po: sm_os.h
-heap.o: sm_os.h
-heap.po: sm_os.h
-inet6_ntop.o: sm_os.h
-inet6_ntop.po: sm_os.h
-ldap.o: sm_os.h
-ldap.po: sm_os.h
-makebuf.o: sm_os.h
-makebuf.po: sm_os.h
-match.o: sm_os.h
-match.po: sm_os.h
-mbdb.o: sm_os.h
-mbdb.po: sm_os.h
-memstat.o: sm_os.h
-memstat.po: sm_os.h
-mpeix.o: sm_os.h
-mpeix.po: sm_os.h
-niprop.o: sm_os.h
-niprop.po: sm_os.h
-put.o: sm_os.h
-put.po: sm_os.h
-refill.o: sm_os.h
-refill.po: sm_os.h
-rewind.o: sm_os.h
-rewind.po: sm_os.h
-rpool.o: sm_os.h
-rpool.po: sm_os.h
-sem.o: sm_os.h
-sem.po: sm_os.h
-setvbuf.o: sm_os.h
-setvbuf.po: sm_os.h
-shm.o: sm_os.h
-shm.po: sm_os.h
-signal.o: sm_os.h
-signal.po: sm_os.h
-smstdio.o: sm_os.h
-smstdio.po: sm_os.h
-snprintf.o: sm_os.h
-snprintf.po: sm_os.h
-sscanf.o: sm_os.h
-sscanf.po: sm_os.h
-stdio.o: sm_os.h
-stdio.po: sm_os.h
-strcasecmp.o: sm_os.h
-strcasecmp.po: sm_os.h
-strdup.o: sm_os.h
-strdup.po: sm_os.h
-strerror.o: sm_os.h
-strerror.po: sm_os.h
-strexit.o: sm_os.h
-strexit.po: sm_os.h
-string.o: sm_os.h
-string.po: sm_os.h
-stringf.o: sm_os.h
-stringf.po: sm_os.h
-strio.o: sm_os.h
-strio.po: sm_os.h
-strl.o: sm_os.h
-strl.po: sm_os.h
-strrevcmp.o: sm_os.h
-strrevcmp.po: sm_os.h
-strto.o: sm_os.h
-strto.po: sm_os.h
-test.o: sm_os.h
-test.po: sm_os.h
-ungetc.o: sm_os.h
-ungetc.po: sm_os.h
-util.o: sm_os.h
-util.po: sm_os.h
-vasprintf.o: sm_os.h
-vasprintf.po: sm_os.h
-vfprintf.o: sm_os.h
-vfprintf.po: sm_os.h
-vfscanf.o: sm_os.h
-vfscanf.po: sm_os.h
-vprintf.o: sm_os.h
-vprintf.po: sm_os.h
-vsnprintf.o: sm_os.h
-vsnprintf.po: sm_os.h
-wbuf.o: sm_os.h
-wbuf.po: sm_os.h
-wsetup.o: sm_os.h
-wsetup.po: sm_os.h
-xtrap.o: sm_os.h
-xtrap.po: sm_os.h
.endif
diff --git a/lib/libsmdb/Makefile.depend b/lib/libsmdb/Makefile.depend
index 302046a..18be76b 100644
--- a/lib/libsmdb/Makefile.depend
+++ b/lib/libsmdb/Makefile.depend
@@ -10,12 +10,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-smdb.o: sm_os.h
-smdb.po: sm_os.h
-smdb1.o: sm_os.h
-smdb1.po: sm_os.h
-smdb2.o: sm_os.h
-smdb2.po: sm_os.h
-smndbm.o: sm_os.h
-smndbm.po: sm_os.h
.endif
diff --git a/lib/libsmutil/Makefile.depend b/lib/libsmutil/Makefile.depend
index c3fe50f..56ba329 100644
--- a/lib/libsmutil/Makefile.depend
+++ b/lib/libsmutil/Makefile.depend
@@ -11,16 +11,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cf.o: sm_os.h
-cf.po: sm_os.h
-debug.o: sm_os.h
-debug.po: sm_os.h
-err.o: sm_os.h
-err.po: sm_os.h
-lockfile.o: sm_os.h
-lockfile.po: sm_os.h
-safefile.o: sm_os.h
-safefile.po: sm_os.h
-snprintf.o: sm_os.h
-snprintf.po: sm_os.h
.endif
diff --git a/lib/libstand/Makefile.depend b/lib/libstand/Makefile.depend
index 57cd80c..1d86fce 100644
--- a/lib/libstand/Makefile.depend
+++ b/lib/libstand/Makefile.depend
@@ -12,46 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-_bzlib.o: _bzlib.c
-_bzlib.o: libstand_bzlib_private.h
-_bzlib.po: _bzlib.c
-_bzlib.po: libstand_bzlib_private.h
-_crctable.o: _crctable.c
-_crctable.o: libstand_bzlib_private.h
-_crctable.po: _crctable.c
-_crctable.po: libstand_bzlib_private.h
-_decompress.o: _decompress.c
-_decompress.o: libstand_bzlib_private.h
-_decompress.po: _decompress.c
-_decompress.po: libstand_bzlib_private.h
-_huffman.o: _huffman.c
-_huffman.o: libstand_bzlib_private.h
-_huffman.po: _huffman.c
-_huffman.po: libstand_bzlib_private.h
-_infback.o: _infback.c
-_infback.o: libstand_zutil.h
-_infback.po: _infback.c
-_infback.po: libstand_zutil.h
-_inffast.o: _inffast.c
-_inffast.o: libstand_zutil.h
-_inffast.po: _inffast.c
-_inffast.po: libstand_zutil.h
-_inflate.o: _inflate.c
-_inflate.o: libstand_zutil.h
-_inflate.po: _inflate.c
-_inflate.po: libstand_zutil.h
-_inftrees.o: _inftrees.c
-_inftrees.o: libstand_zutil.h
-_inftrees.po: _inftrees.c
-_inftrees.po: libstand_zutil.h
-_randtable.o: _randtable.c
-_randtable.o: libstand_bzlib_private.h
-_randtable.po: _randtable.c
-_randtable.po: libstand_bzlib_private.h
-_zutil.o: _zutil.c
-_zutil.o: libstand_gzguts.h
-_zutil.o: libstand_zutil.h
-_zutil.po: _zutil.c
-_zutil.po: libstand_gzguts.h
-_zutil.po: libstand_zutil.h
.endif
diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile
index e1e69fe..405cab8 100644
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@@ -4,15 +4,17 @@
LIB= sysdecode
-SRCS= ioctl.c syscallnames.c utrace.c
+SRCS= errno.c ioctl.c syscallnames.c utrace.c
INCS= sysdecode.h
CFLAGS+= -I${.CURDIR}/../../sys
MAN+= sysdecode.3 \
+ sysdecode_abi_to_freebsd_errno.3 \
sysdecode_ioctlname.3 \
sysdecode_syscallnames.3 \
sysdecode_utrace.3
+MLINKS+= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3
CLEANFILES= ioctl.c
diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend
index 653f526..1061516 100644
--- a/lib/libsysdecode/Makefile.depend
+++ b/lib/libsysdecode/Makefile.depend
@@ -16,7 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ioctl.So: ioctl.c
-ioctl.o: ioctl.c
-ioctl.po: ioctl.c
.endif
diff --git a/lib/libsysdecode/errno.c b/lib/libsysdecode/errno.c
new file mode 100644
index 0000000..1e863bb
--- /dev/null
+++ b/lib/libsysdecode/errno.c
@@ -0,0 +1,209 @@
+/*-
+ * Copyright (c) 2015 John H. Baldwin <jhb@FreeBSD.org>
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <sysdecode.h>
+
+#if defined(__i386__) || defined(__amd64__)
+/*
+ * Linux syscalls return negative errno's, we do positive and map them
+ * Reference:
+ * FreeBSD: src/sys/sys/errno.h
+ * Linux: linux-2.6.17.8/include/asm-generic/errno-base.h
+ * linux-2.6.17.8/include/asm-generic/errno.h
+ */
+static int bsd_to_linux_errno[ELAST + 1] = {
+ -0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
+ -10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
+ -20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
+ -30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
+ -90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
+ -100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
+ -110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
+ -116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
+ -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
+ -72, -67, -71
+};
+#endif
+
+#if defined(__aarch64__) || defined(__amd64__)
+#include <compat/cloudabi/cloudabi_syscalldefs.h>
+
+static const int cloudabi_errno_table[] = {
+ [CLOUDABI_E2BIG] = E2BIG,
+ [CLOUDABI_EACCES] = EACCES,
+ [CLOUDABI_EADDRINUSE] = EADDRINUSE,
+ [CLOUDABI_EADDRNOTAVAIL] = EADDRNOTAVAIL,
+ [CLOUDABI_EAFNOSUPPORT] = EAFNOSUPPORT,
+ [CLOUDABI_EAGAIN] = EAGAIN,
+ [CLOUDABI_EALREADY] = EALREADY,
+ [CLOUDABI_EBADF] = EBADF,
+ [CLOUDABI_EBADMSG] = EBADMSG,
+ [CLOUDABI_EBUSY] = EBUSY,
+ [CLOUDABI_ECANCELED] = ECANCELED,
+ [CLOUDABI_ECHILD] = ECHILD,
+ [CLOUDABI_ECONNABORTED] = ECONNABORTED,
+ [CLOUDABI_ECONNREFUSED] = ECONNREFUSED,
+ [CLOUDABI_ECONNRESET] = ECONNRESET,
+ [CLOUDABI_EDEADLK] = EDEADLK,
+ [CLOUDABI_EDESTADDRREQ] = EDESTADDRREQ,
+ [CLOUDABI_EDOM] = EDOM,
+ [CLOUDABI_EDQUOT] = EDQUOT,
+ [CLOUDABI_EEXIST] = EEXIST,
+ [CLOUDABI_EFAULT] = EFAULT,
+ [CLOUDABI_EFBIG] = EFBIG,
+ [CLOUDABI_EHOSTUNREACH] = EHOSTUNREACH,
+ [CLOUDABI_EIDRM] = EIDRM,
+ [CLOUDABI_EILSEQ] = EILSEQ,
+ [CLOUDABI_EINPROGRESS] = EINPROGRESS,
+ [CLOUDABI_EINTR] = EINTR,
+ [CLOUDABI_EINVAL] = EINVAL,
+ [CLOUDABI_EIO] = EIO,
+ [CLOUDABI_EISCONN] = EISCONN,
+ [CLOUDABI_EISDIR] = EISDIR,
+ [CLOUDABI_ELOOP] = ELOOP,
+ [CLOUDABI_EMFILE] = EMFILE,
+ [CLOUDABI_EMLINK] = EMLINK,
+ [CLOUDABI_EMSGSIZE] = EMSGSIZE,
+ [CLOUDABI_EMULTIHOP] = EMULTIHOP,
+ [CLOUDABI_ENAMETOOLONG] = ENAMETOOLONG,
+ [CLOUDABI_ENETDOWN] = ENETDOWN,
+ [CLOUDABI_ENETRESET] = ENETRESET,
+ [CLOUDABI_ENETUNREACH] = ENETUNREACH,
+ [CLOUDABI_ENFILE] = ENFILE,
+ [CLOUDABI_ENOBUFS] = ENOBUFS,
+ [CLOUDABI_ENODEV] = ENODEV,
+ [CLOUDABI_ENOENT] = ENOENT,
+ [CLOUDABI_ENOEXEC] = ENOEXEC,
+ [CLOUDABI_ENOLCK] = ENOLCK,
+ [CLOUDABI_ENOLINK] = ENOLINK,
+ [CLOUDABI_ENOMEM] = ENOMEM,
+ [CLOUDABI_ENOMSG] = ENOMSG,
+ [CLOUDABI_ENOPROTOOPT] = ENOPROTOOPT,
+ [CLOUDABI_ENOSPC] = ENOSPC,
+ [CLOUDABI_ENOSYS] = ENOSYS,
+ [CLOUDABI_ENOTCONN] = ENOTCONN,
+ [CLOUDABI_ENOTDIR] = ENOTDIR,
+ [CLOUDABI_ENOTEMPTY] = ENOTEMPTY,
+ [CLOUDABI_ENOTRECOVERABLE] = ENOTRECOVERABLE,
+ [CLOUDABI_ENOTSOCK] = ENOTSOCK,
+ [CLOUDABI_ENOTSUP] = ENOTSUP,
+ [CLOUDABI_ENOTTY] = ENOTTY,
+ [CLOUDABI_ENXIO] = ENXIO,
+ [CLOUDABI_EOVERFLOW] = EOVERFLOW,
+ [CLOUDABI_EOWNERDEAD] = EOWNERDEAD,
+ [CLOUDABI_EPERM] = EPERM,
+ [CLOUDABI_EPIPE] = EPIPE,
+ [CLOUDABI_EPROTO] = EPROTO,
+ [CLOUDABI_EPROTONOSUPPORT] = EPROTONOSUPPORT,
+ [CLOUDABI_EPROTOTYPE] = EPROTOTYPE,
+ [CLOUDABI_ERANGE] = ERANGE,
+ [CLOUDABI_EROFS] = EROFS,
+ [CLOUDABI_ESPIPE] = ESPIPE,
+ [CLOUDABI_ESRCH] = ESRCH,
+ [CLOUDABI_ESTALE] = ESTALE,
+ [CLOUDABI_ETIMEDOUT] = ETIMEDOUT,
+ [CLOUDABI_ETXTBSY] = ETXTBSY,
+ [CLOUDABI_EXDEV] = EXDEV,
+ [CLOUDABI_ENOTCAPABLE] = ENOTCAPABLE,
+};
+#endif
+
+int
+sysdecode_abi_to_freebsd_errno(enum sysdecode_abi abi, int error)
+{
+
+ switch (abi) {
+ case SYSDECODE_ABI_FREEBSD:
+ case SYSDECODE_ABI_FREEBSD32:
+ return (error);
+#if defined(__i386__) || defined(__amd64__)
+ case SYSDECODE_ABI_LINUX:
+ case SYSDECODE_ABI_LINUX32: {
+ unsigned int i;
+
+ /*
+ * This is imprecise since it returns the first
+ * matching errno.
+ */
+ for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
+ if (error == bsd_to_linux_errno[i])
+ return (i);
+ }
+ break;
+ }
+#endif
+#if defined(__aarch64__) || defined(__amd64__)
+ case SYSDECODE_ABI_CLOUDABI64:
+ if (error >= 0 &&
+ (unsigned int)error < nitems(cloudabi_errno_table))
+ return (cloudabi_errno_table[error]);
+ break;
+#endif
+ default:
+ break;
+ }
+ return (INT_MAX);
+}
+
+int
+sysdecode_freebsd_to_abi_errno(enum sysdecode_abi abi, int error)
+{
+
+ switch (abi) {
+ case SYSDECODE_ABI_FREEBSD:
+ case SYSDECODE_ABI_FREEBSD32:
+ return (error);
+#if defined(__i386__) || defined(__amd64__)
+ case SYSDECODE_ABI_LINUX:
+ case SYSDECODE_ABI_LINUX32:
+ if (error >= 0 && error <= ELAST)
+ return (bsd_to_linux_errno[error]);
+ break;
+#endif
+#if defined(__aarch64__) || defined(__amd64__)
+ case SYSDECODE_ABI_CLOUDABI64: {
+ unsigned int i;
+
+ for (i = 0; i < nitems(cloudabi_errno_table); i++) {
+ if (error == cloudabi_errno_table[i])
+ return (i);
+ }
+ break;
+ }
+#endif
+ default:
+ break;
+ }
+ return (INT_MAX);
+}
+
diff --git a/lib/libsysdecode/sysdecode.3 b/lib/libsysdecode/sysdecode.3
index f058f59..ab7e972 100644
--- a/lib/libsysdecode/sysdecode.3
+++ b/lib/libsysdecode/sysdecode.3
@@ -64,6 +64,7 @@ Supported on aarch64 and amd64.
A placeholder for use when the ABI is not known.
.El
.Sh SEE ALSO
+.Xr sysdecode_abi_to_freebsd_errno 3 ,
.Xr sysdecode_ioctlname 3 ,
.Xr sysdecode_syscallnames 3 ,
.Xr sysdecode_utrace 3
diff --git a/lib/libsysdecode/sysdecode.h b/lib/libsysdecode/sysdecode.h
index fa00716..8a30206 100644
--- a/lib/libsysdecode/sysdecode.h
+++ b/lib/libsysdecode/sysdecode.h
@@ -38,6 +38,8 @@ enum sysdecode_abi {
SYSDECODE_ABI_CLOUDABI64
};
+int sysdecode_abi_to_freebsd_errno(enum sysdecode_abi _abi, int _error);
+int sysdecode_freebsd_to_abi_errno(enum sysdecode_abi _abi, int _error);
const char *sysdecode_ioctlname(unsigned long _val);
const char *sysdecode_syscallname(enum sysdecode_abi _abi, unsigned int _code);
int sysdecode_utrace(FILE *_fp, void *_buf, size_t _len);
diff --git a/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 b/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
new file mode 100644
index 0000000..74826f8
--- /dev/null
+++ b/lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3
@@ -0,0 +1,94 @@
+.\"
+.\" Copyright (c) 2016 John Baldwin <jhb@FreeBSD.org>
+.\" 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 23, 2016
+.Dt sysdecode_abi_to_freebsd_errno 3
+.Os
+.Sh NAME
+.Nm sysdecode_abi_to_freebsd_errno ,
+.Nm sysdecode_freebsd_to_abi_errno
+.Nd translate error numbers between process ABIs
+.Sh LIBRARY
+.Lb libsysdecode
+.Sh SYNOPSIS
+.Ft int
+.Fn sysdecode_abi_to_freebsd_errno "enum sysdecode_abi abi" "int error"
+.Ft int
+.Fn sysdecode_freebsd_to_abi_errno "enum sysdecode_abi abi" "int error"
+.Sh DESCRIPTION
+The
+.Fn sysdecode_abi_to_freebsd_errno
+function returns the native
+.Xr errno 3
+value that corresponds to the error indicated by
+.Fa error
+for the process ABI
+.Fa abi .
+If
+.Fa error
+does not identify a valid error for
+.Fa abi ,
+.Dv INT_MAX
+is returned.
+.Pp
+The
+.Fn sysdecode_freebsd_to_abi_errno
+function the error value for the process ABI
+.Fa abi
+that corresponds to the native
+.Xr errno 3
+value
+.Fa error .
+If
+.Fa error
+does not identify a valid
+.Xr errno 3
+error,
+.Dv INT_MAX
+is returned.
+.Pp
+Note that the mappings between native
+.Xr errno 3
+values and errors for other ABIs are not exhaustive.
+If a mapping does not exist,
+these functions return
+.Dv INT_MAX .
+In addition, multiple error values in one ABI may map to a single
+error in another ABI.
+.Sh RETURN VALUES
+These functions return an error value on success or
+.Dv INT_MAX
+if
+.Fa error
+is not valid.
+.Pp
+For the list of supported ABIs,
+see
+.Xr sysdecode 3 .
+.Sh SEE ALSO
+.Xr sysdecode 3 ,
+.Xr sysdecode_syscallnames 3
diff --git a/lib/libsysdecode/sysdecode_syscallnames.3 b/lib/libsysdecode/sysdecode_syscallnames.3
index 1c75ab6..e920edb 100644
--- a/lib/libsysdecode/sysdecode_syscallnames.3
+++ b/lib/libsysdecode/sysdecode_syscallnames.3
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 24, 2016
+.Dd January 30, 2016
.Dt sysdecode_syscallnames 3
.Os
.Sh NAME
@@ -64,4 +64,5 @@ or
.Fa ABI
is invalid .
.Sh SEE ALSO
-.Xr sysdecode 3
+.Xr sysdecode 3 ,
+.Xr sysdecode_abi_to_freebsd_errno 3
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 900e3ea..cf41f1c 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -20,16 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-config_file.So: configparser.h
-config_file.o: configparser.h
-config_file.po: configparser.h
-configlexer.So: configlexer.c
-configlexer.So: configparser.h
-configlexer.o: configlexer.c
-configlexer.o: configparser.h
-configlexer.po: configlexer.c
-configlexer.po: configparser.h
-configparser.So: configparser.c
-configparser.o: configparser.c
-configparser.po: configparser.c
.endif
diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend
index 8ee531b..ddd5dbd 100644
--- a/lib/libypclnt/Makefile.depend
+++ b/lib/libypclnt/Makefile.depend
@@ -17,37 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-yp_clnt.So: yp.h
-yp_clnt.So: yp_clnt.c
-yp_clnt.o: yp.h
-yp_clnt.o: yp_clnt.c
-yp_clnt.po: yp.h
-yp_clnt.po: yp_clnt.c
-ypclnt_passwd.So: yppasswd_private.h
-ypclnt_passwd.o: yppasswd_private.h
-ypclnt_passwd.po: yppasswd_private.h
-yppasswd_clnt.So: yppasswd.h
-yppasswd_clnt.So: yppasswd_clnt.c
-yppasswd_clnt.o: yppasswd.h
-yppasswd_clnt.o: yppasswd_clnt.c
-yppasswd_clnt.po: yppasswd.h
-yppasswd_clnt.po: yppasswd_clnt.c
-yppasswd_private_clnt.So: yppasswd_private.h
-yppasswd_private_clnt.So: yppasswd_private_clnt.c
-yppasswd_private_clnt.o: yppasswd_private.h
-yppasswd_private_clnt.o: yppasswd_private_clnt.c
-yppasswd_private_clnt.po: yppasswd_private.h
-yppasswd_private_clnt.po: yppasswd_private_clnt.c
-yppasswd_private_xdr.So: yppasswd_private.h
-yppasswd_private_xdr.So: yppasswd_private_xdr.c
-yppasswd_private_xdr.o: yppasswd_private.h
-yppasswd_private_xdr.o: yppasswd_private_xdr.c
-yppasswd_private_xdr.po: yppasswd_private.h
-yppasswd_private_xdr.po: yppasswd_private_xdr.c
-yppasswd_xdr.So: yppasswd.h
-yppasswd_xdr.So: yppasswd_xdr.c
-yppasswd_xdr.o: yppasswd.h
-yppasswd_xdr.o: yppasswd_xdr.c
-yppasswd_xdr.po: yppasswd.h
-yppasswd_xdr.po: yppasswd_xdr.c
.endif
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index 6956fec..8ba6d1d 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -17,121 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-fld_arg.So: ncurses_def.h
-fld_arg.o: ncurses_def.h
-fld_arg.po: ncurses_def.h
-fld_attr.So: ncurses_def.h
-fld_attr.o: ncurses_def.h
-fld_attr.po: ncurses_def.h
-fld_current.So: ncurses_def.h
-fld_current.o: ncurses_def.h
-fld_current.po: ncurses_def.h
-fld_def.So: ncurses_def.h
-fld_def.o: ncurses_def.h
-fld_def.po: ncurses_def.h
-fld_dup.So: ncurses_def.h
-fld_dup.o: ncurses_def.h
-fld_dup.po: ncurses_def.h
-fld_ftchoice.So: ncurses_def.h
-fld_ftchoice.o: ncurses_def.h
-fld_ftchoice.po: ncurses_def.h
-fld_ftlink.So: ncurses_def.h
-fld_ftlink.o: ncurses_def.h
-fld_ftlink.po: ncurses_def.h
-fld_info.So: ncurses_def.h
-fld_info.o: ncurses_def.h
-fld_info.po: ncurses_def.h
-fld_just.So: ncurses_def.h
-fld_just.o: ncurses_def.h
-fld_just.po: ncurses_def.h
-fld_link.So: ncurses_def.h
-fld_link.o: ncurses_def.h
-fld_link.po: ncurses_def.h
-fld_max.So: ncurses_def.h
-fld_max.o: ncurses_def.h
-fld_max.po: ncurses_def.h
-fld_move.So: ncurses_def.h
-fld_move.o: ncurses_def.h
-fld_move.po: ncurses_def.h
-fld_newftyp.So: ncurses_def.h
-fld_newftyp.o: ncurses_def.h
-fld_newftyp.po: ncurses_def.h
-fld_opts.So: ncurses_def.h
-fld_opts.o: ncurses_def.h
-fld_opts.po: ncurses_def.h
-fld_pad.So: ncurses_def.h
-fld_pad.o: ncurses_def.h
-fld_pad.po: ncurses_def.h
-fld_page.So: ncurses_def.h
-fld_page.o: ncurses_def.h
-fld_page.po: ncurses_def.h
-fld_stat.So: ncurses_def.h
-fld_stat.o: ncurses_def.h
-fld_stat.po: ncurses_def.h
-fld_type.So: ncurses_def.h
-fld_type.o: ncurses_def.h
-fld_type.po: ncurses_def.h
-fld_user.So: ncurses_def.h
-fld_user.o: ncurses_def.h
-fld_user.po: ncurses_def.h
-frm_cursor.So: ncurses_def.h
-frm_cursor.o: ncurses_def.h
-frm_cursor.po: ncurses_def.h
-frm_data.So: ncurses_def.h
-frm_data.o: ncurses_def.h
-frm_data.po: ncurses_def.h
-frm_def.So: ncurses_def.h
-frm_def.o: ncurses_def.h
-frm_def.po: ncurses_def.h
-frm_driver.So: ncurses_def.h
-frm_driver.o: ncurses_def.h
-frm_driver.po: ncurses_def.h
-frm_hook.So: ncurses_def.h
-frm_hook.o: ncurses_def.h
-frm_hook.po: ncurses_def.h
-frm_opts.So: ncurses_def.h
-frm_opts.o: ncurses_def.h
-frm_opts.po: ncurses_def.h
-frm_page.So: ncurses_def.h
-frm_page.o: ncurses_def.h
-frm_page.po: ncurses_def.h
-frm_post.So: ncurses_def.h
-frm_post.o: ncurses_def.h
-frm_post.po: ncurses_def.h
-frm_req_name.So: ncurses_def.h
-frm_req_name.o: ncurses_def.h
-frm_req_name.po: ncurses_def.h
-frm_scale.So: ncurses_def.h
-frm_scale.o: ncurses_def.h
-frm_scale.po: ncurses_def.h
-frm_sub.So: ncurses_def.h
-frm_sub.o: ncurses_def.h
-frm_sub.po: ncurses_def.h
-frm_user.So: ncurses_def.h
-frm_user.o: ncurses_def.h
-frm_user.po: ncurses_def.h
-frm_win.So: ncurses_def.h
-frm_win.o: ncurses_def.h
-frm_win.po: ncurses_def.h
-fty_alnum.So: ncurses_def.h
-fty_alnum.o: ncurses_def.h
-fty_alnum.po: ncurses_def.h
-fty_alpha.So: ncurses_def.h
-fty_alpha.o: ncurses_def.h
-fty_alpha.po: ncurses_def.h
-fty_enum.So: ncurses_def.h
-fty_enum.o: ncurses_def.h
-fty_enum.po: ncurses_def.h
-fty_int.So: ncurses_def.h
-fty_int.o: ncurses_def.h
-fty_int.po: ncurses_def.h
-fty_ipv4.So: ncurses_def.h
-fty_ipv4.o: ncurses_def.h
-fty_ipv4.po: ncurses_def.h
-fty_num.So: ncurses_def.h
-fty_num.o: ncurses_def.h
-fty_num.po: ncurses_def.h
-fty_regex.So: ncurses_def.h
-fty_regex.o: ncurses_def.h
-fty_regex.po: ncurses_def.h
.endif
diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend
index 767a760..59bc828 100644
--- a/lib/ncurses/formw/Makefile.depend
+++ b/lib/ncurses/formw/Makefile.depend
@@ -16,121 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-fld_arg.So: ncurses_def.h
-fld_arg.o: ncurses_def.h
-fld_arg.po: ncurses_def.h
-fld_attr.So: ncurses_def.h
-fld_attr.o: ncurses_def.h
-fld_attr.po: ncurses_def.h
-fld_current.So: ncurses_def.h
-fld_current.o: ncurses_def.h
-fld_current.po: ncurses_def.h
-fld_def.So: ncurses_def.h
-fld_def.o: ncurses_def.h
-fld_def.po: ncurses_def.h
-fld_dup.So: ncurses_def.h
-fld_dup.o: ncurses_def.h
-fld_dup.po: ncurses_def.h
-fld_ftchoice.So: ncurses_def.h
-fld_ftchoice.o: ncurses_def.h
-fld_ftchoice.po: ncurses_def.h
-fld_ftlink.So: ncurses_def.h
-fld_ftlink.o: ncurses_def.h
-fld_ftlink.po: ncurses_def.h
-fld_info.So: ncurses_def.h
-fld_info.o: ncurses_def.h
-fld_info.po: ncurses_def.h
-fld_just.So: ncurses_def.h
-fld_just.o: ncurses_def.h
-fld_just.po: ncurses_def.h
-fld_link.So: ncurses_def.h
-fld_link.o: ncurses_def.h
-fld_link.po: ncurses_def.h
-fld_max.So: ncurses_def.h
-fld_max.o: ncurses_def.h
-fld_max.po: ncurses_def.h
-fld_move.So: ncurses_def.h
-fld_move.o: ncurses_def.h
-fld_move.po: ncurses_def.h
-fld_newftyp.So: ncurses_def.h
-fld_newftyp.o: ncurses_def.h
-fld_newftyp.po: ncurses_def.h
-fld_opts.So: ncurses_def.h
-fld_opts.o: ncurses_def.h
-fld_opts.po: ncurses_def.h
-fld_pad.So: ncurses_def.h
-fld_pad.o: ncurses_def.h
-fld_pad.po: ncurses_def.h
-fld_page.So: ncurses_def.h
-fld_page.o: ncurses_def.h
-fld_page.po: ncurses_def.h
-fld_stat.So: ncurses_def.h
-fld_stat.o: ncurses_def.h
-fld_stat.po: ncurses_def.h
-fld_type.So: ncurses_def.h
-fld_type.o: ncurses_def.h
-fld_type.po: ncurses_def.h
-fld_user.So: ncurses_def.h
-fld_user.o: ncurses_def.h
-fld_user.po: ncurses_def.h
-frm_cursor.So: ncurses_def.h
-frm_cursor.o: ncurses_def.h
-frm_cursor.po: ncurses_def.h
-frm_data.So: ncurses_def.h
-frm_data.o: ncurses_def.h
-frm_data.po: ncurses_def.h
-frm_def.So: ncurses_def.h
-frm_def.o: ncurses_def.h
-frm_def.po: ncurses_def.h
-frm_driver.So: ncurses_def.h
-frm_driver.o: ncurses_def.h
-frm_driver.po: ncurses_def.h
-frm_hook.So: ncurses_def.h
-frm_hook.o: ncurses_def.h
-frm_hook.po: ncurses_def.h
-frm_opts.So: ncurses_def.h
-frm_opts.o: ncurses_def.h
-frm_opts.po: ncurses_def.h
-frm_page.So: ncurses_def.h
-frm_page.o: ncurses_def.h
-frm_page.po: ncurses_def.h
-frm_post.So: ncurses_def.h
-frm_post.o: ncurses_def.h
-frm_post.po: ncurses_def.h
-frm_req_name.So: ncurses_def.h
-frm_req_name.o: ncurses_def.h
-frm_req_name.po: ncurses_def.h
-frm_scale.So: ncurses_def.h
-frm_scale.o: ncurses_def.h
-frm_scale.po: ncurses_def.h
-frm_sub.So: ncurses_def.h
-frm_sub.o: ncurses_def.h
-frm_sub.po: ncurses_def.h
-frm_user.So: ncurses_def.h
-frm_user.o: ncurses_def.h
-frm_user.po: ncurses_def.h
-frm_win.So: ncurses_def.h
-frm_win.o: ncurses_def.h
-frm_win.po: ncurses_def.h
-fty_alnum.So: ncurses_def.h
-fty_alnum.o: ncurses_def.h
-fty_alnum.po: ncurses_def.h
-fty_alpha.So: ncurses_def.h
-fty_alpha.o: ncurses_def.h
-fty_alpha.po: ncurses_def.h
-fty_enum.So: ncurses_def.h
-fty_enum.o: ncurses_def.h
-fty_enum.po: ncurses_def.h
-fty_int.So: ncurses_def.h
-fty_int.o: ncurses_def.h
-fty_int.po: ncurses_def.h
-fty_ipv4.So: ncurses_def.h
-fty_ipv4.o: ncurses_def.h
-fty_ipv4.po: ncurses_def.h
-fty_num.So: ncurses_def.h
-fty_num.o: ncurses_def.h
-fty_num.po: ncurses_def.h
-fty_regex.So: ncurses_def.h
-fty_regex.o: ncurses_def.h
-fty_regex.po: ncurses_def.h
.endif
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index fa2fcb4..8ba6d1d 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -17,82 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-m_attribs.So: ncurses_def.h
-m_attribs.o: ncurses_def.h
-m_attribs.po: ncurses_def.h
-m_cursor.So: ncurses_def.h
-m_cursor.o: ncurses_def.h
-m_cursor.po: ncurses_def.h
-m_driver.So: ncurses_def.h
-m_driver.o: ncurses_def.h
-m_driver.po: ncurses_def.h
-m_format.So: ncurses_def.h
-m_format.o: ncurses_def.h
-m_format.po: ncurses_def.h
-m_global.So: ncurses_def.h
-m_global.o: ncurses_def.h
-m_global.po: ncurses_def.h
-m_hook.So: ncurses_def.h
-m_hook.o: ncurses_def.h
-m_hook.po: ncurses_def.h
-m_item_cur.So: ncurses_def.h
-m_item_cur.o: ncurses_def.h
-m_item_cur.po: ncurses_def.h
-m_item_nam.So: ncurses_def.h
-m_item_nam.o: ncurses_def.h
-m_item_nam.po: ncurses_def.h
-m_item_new.So: ncurses_def.h
-m_item_new.o: ncurses_def.h
-m_item_new.po: ncurses_def.h
-m_item_opt.So: ncurses_def.h
-m_item_opt.o: ncurses_def.h
-m_item_opt.po: ncurses_def.h
-m_item_top.So: ncurses_def.h
-m_item_top.o: ncurses_def.h
-m_item_top.po: ncurses_def.h
-m_item_use.So: ncurses_def.h
-m_item_use.o: ncurses_def.h
-m_item_use.po: ncurses_def.h
-m_item_val.So: ncurses_def.h
-m_item_val.o: ncurses_def.h
-m_item_val.po: ncurses_def.h
-m_item_vis.So: ncurses_def.h
-m_item_vis.o: ncurses_def.h
-m_item_vis.po: ncurses_def.h
-m_items.So: ncurses_def.h
-m_items.o: ncurses_def.h
-m_items.po: ncurses_def.h
-m_new.So: ncurses_def.h
-m_new.o: ncurses_def.h
-m_new.po: ncurses_def.h
-m_opts.So: ncurses_def.h
-m_opts.o: ncurses_def.h
-m_opts.po: ncurses_def.h
-m_pad.So: ncurses_def.h
-m_pad.o: ncurses_def.h
-m_pad.po: ncurses_def.h
-m_pattern.So: ncurses_def.h
-m_pattern.o: ncurses_def.h
-m_pattern.po: ncurses_def.h
-m_post.So: ncurses_def.h
-m_post.o: ncurses_def.h
-m_post.po: ncurses_def.h
-m_req_name.So: ncurses_def.h
-m_req_name.o: ncurses_def.h
-m_req_name.po: ncurses_def.h
-m_scale.So: ncurses_def.h
-m_scale.o: ncurses_def.h
-m_scale.po: ncurses_def.h
-m_spacing.So: ncurses_def.h
-m_spacing.o: ncurses_def.h
-m_spacing.po: ncurses_def.h
-m_sub.So: ncurses_def.h
-m_sub.o: ncurses_def.h
-m_sub.po: ncurses_def.h
-m_userptr.So: ncurses_def.h
-m_userptr.o: ncurses_def.h
-m_userptr.po: ncurses_def.h
-m_win.So: ncurses_def.h
-m_win.o: ncurses_def.h
-m_win.po: ncurses_def.h
.endif
diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend
index 6d65e74..59bc828 100644
--- a/lib/ncurses/menuw/Makefile.depend
+++ b/lib/ncurses/menuw/Makefile.depend
@@ -16,82 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-m_attribs.So: ncurses_def.h
-m_attribs.o: ncurses_def.h
-m_attribs.po: ncurses_def.h
-m_cursor.So: ncurses_def.h
-m_cursor.o: ncurses_def.h
-m_cursor.po: ncurses_def.h
-m_driver.So: ncurses_def.h
-m_driver.o: ncurses_def.h
-m_driver.po: ncurses_def.h
-m_format.So: ncurses_def.h
-m_format.o: ncurses_def.h
-m_format.po: ncurses_def.h
-m_global.So: ncurses_def.h
-m_global.o: ncurses_def.h
-m_global.po: ncurses_def.h
-m_hook.So: ncurses_def.h
-m_hook.o: ncurses_def.h
-m_hook.po: ncurses_def.h
-m_item_cur.So: ncurses_def.h
-m_item_cur.o: ncurses_def.h
-m_item_cur.po: ncurses_def.h
-m_item_nam.So: ncurses_def.h
-m_item_nam.o: ncurses_def.h
-m_item_nam.po: ncurses_def.h
-m_item_new.So: ncurses_def.h
-m_item_new.o: ncurses_def.h
-m_item_new.po: ncurses_def.h
-m_item_opt.So: ncurses_def.h
-m_item_opt.o: ncurses_def.h
-m_item_opt.po: ncurses_def.h
-m_item_top.So: ncurses_def.h
-m_item_top.o: ncurses_def.h
-m_item_top.po: ncurses_def.h
-m_item_use.So: ncurses_def.h
-m_item_use.o: ncurses_def.h
-m_item_use.po: ncurses_def.h
-m_item_val.So: ncurses_def.h
-m_item_val.o: ncurses_def.h
-m_item_val.po: ncurses_def.h
-m_item_vis.So: ncurses_def.h
-m_item_vis.o: ncurses_def.h
-m_item_vis.po: ncurses_def.h
-m_items.So: ncurses_def.h
-m_items.o: ncurses_def.h
-m_items.po: ncurses_def.h
-m_new.So: ncurses_def.h
-m_new.o: ncurses_def.h
-m_new.po: ncurses_def.h
-m_opts.So: ncurses_def.h
-m_opts.o: ncurses_def.h
-m_opts.po: ncurses_def.h
-m_pad.So: ncurses_def.h
-m_pad.o: ncurses_def.h
-m_pad.po: ncurses_def.h
-m_pattern.So: ncurses_def.h
-m_pattern.o: ncurses_def.h
-m_pattern.po: ncurses_def.h
-m_post.So: ncurses_def.h
-m_post.o: ncurses_def.h
-m_post.po: ncurses_def.h
-m_req_name.So: ncurses_def.h
-m_req_name.o: ncurses_def.h
-m_req_name.po: ncurses_def.h
-m_scale.So: ncurses_def.h
-m_scale.o: ncurses_def.h
-m_scale.po: ncurses_def.h
-m_spacing.So: ncurses_def.h
-m_spacing.o: ncurses_def.h
-m_spacing.po: ncurses_def.h
-m_sub.So: ncurses_def.h
-m_sub.o: ncurses_def.h
-m_sub.po: ncurses_def.h
-m_userptr.So: ncurses_def.h
-m_userptr.o: ncurses_def.h
-m_userptr.po: ncurses_def.h
-m_win.So: ncurses_def.h
-m_win.o: ncurses_def.h
-m_win.po: ncurses_def.h
.endif
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index 8ad41a6..59bc828 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -16,1783 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-access.So: curses.h
-access.So: ncurses_def.h
-access.So: term.h
-access.So: unctrl.h
-access.o: curses.h
-access.o: ncurses_def.h
-access.o: term.h
-access.o: unctrl.h
-access.po: curses.h
-access.po: ncurses_def.h
-access.po: term.h
-access.po: unctrl.h
-add_tries.So: curses.h
-add_tries.So: ncurses_def.h
-add_tries.So: term.h
-add_tries.So: unctrl.h
-add_tries.o: curses.h
-add_tries.o: ncurses_def.h
-add_tries.o: term.h
-add_tries.o: unctrl.h
-add_tries.po: curses.h
-add_tries.po: ncurses_def.h
-add_tries.po: term.h
-add_tries.po: unctrl.h
-alloc_entry.So: curses.h
-alloc_entry.So: ncurses_def.h
-alloc_entry.So: term.h
-alloc_entry.So: unctrl.h
-alloc_entry.o: curses.h
-alloc_entry.o: ncurses_def.h
-alloc_entry.o: term.h
-alloc_entry.o: unctrl.h
-alloc_entry.po: curses.h
-alloc_entry.po: ncurses_def.h
-alloc_entry.po: term.h
-alloc_entry.po: unctrl.h
-alloc_ttype.So: curses.h
-alloc_ttype.So: ncurses_def.h
-alloc_ttype.So: term.h
-alloc_ttype.So: unctrl.h
-alloc_ttype.o: curses.h
-alloc_ttype.o: ncurses_def.h
-alloc_ttype.o: term.h
-alloc_ttype.o: unctrl.h
-alloc_ttype.po: curses.h
-alloc_ttype.po: ncurses_def.h
-alloc_ttype.po: term.h
-alloc_ttype.po: unctrl.h
-captoinfo.So: curses.h
-captoinfo.So: ncurses_def.h
-captoinfo.So: term.h
-captoinfo.So: unctrl.h
-captoinfo.o: curses.h
-captoinfo.o: ncurses_def.h
-captoinfo.o: term.h
-captoinfo.o: unctrl.h
-captoinfo.po: curses.h
-captoinfo.po: ncurses_def.h
-captoinfo.po: term.h
-captoinfo.po: unctrl.h
-codes.So: codes.c
-codes.So: curses.h
-codes.So: ncurses_def.h
-codes.So: term.h
-codes.So: unctrl.h
-codes.o: codes.c
-codes.o: curses.h
-codes.o: ncurses_def.h
-codes.o: term.h
-codes.o: unctrl.h
-codes.po: codes.c
-codes.po: curses.h
-codes.po: ncurses_def.h
-codes.po: term.h
-codes.po: unctrl.h
-comp_captab.So: comp_captab.c
-comp_captab.So: curses.h
-comp_captab.So: hashsize.h
-comp_captab.So: ncurses_def.h
-comp_captab.So: term.h
-comp_captab.So: unctrl.h
-comp_captab.o: comp_captab.c
-comp_captab.o: curses.h
-comp_captab.o: hashsize.h
-comp_captab.o: ncurses_def.h
-comp_captab.o: term.h
-comp_captab.o: unctrl.h
-comp_captab.po: comp_captab.c
-comp_captab.po: curses.h
-comp_captab.po: hashsize.h
-comp_captab.po: ncurses_def.h
-comp_captab.po: term.h
-comp_captab.po: unctrl.h
-comp_error.So: curses.h
-comp_error.So: ncurses_def.h
-comp_error.So: term.h
-comp_error.So: unctrl.h
-comp_error.o: curses.h
-comp_error.o: ncurses_def.h
-comp_error.o: term.h
-comp_error.o: unctrl.h
-comp_error.po: curses.h
-comp_error.po: ncurses_def.h
-comp_error.po: term.h
-comp_error.po: unctrl.h
-comp_expand.So: curses.h
-comp_expand.So: ncurses_def.h
-comp_expand.So: term.h
-comp_expand.So: unctrl.h
-comp_expand.o: curses.h
-comp_expand.o: ncurses_def.h
-comp_expand.o: term.h
-comp_expand.o: unctrl.h
-comp_expand.po: curses.h
-comp_expand.po: ncurses_def.h
-comp_expand.po: term.h
-comp_expand.po: unctrl.h
-comp_hash.So: curses.h
-comp_hash.So: hashsize.h
-comp_hash.So: ncurses_def.h
-comp_hash.So: term.h
-comp_hash.So: unctrl.h
-comp_hash.o: curses.h
-comp_hash.o: hashsize.h
-comp_hash.o: ncurses_def.h
-comp_hash.o: term.h
-comp_hash.o: unctrl.h
-comp_hash.po: curses.h
-comp_hash.po: hashsize.h
-comp_hash.po: ncurses_def.h
-comp_hash.po: term.h
-comp_hash.po: unctrl.h
-comp_parse.So: curses.h
-comp_parse.So: ncurses_def.h
-comp_parse.So: term.h
-comp_parse.So: unctrl.h
-comp_parse.o: curses.h
-comp_parse.o: ncurses_def.h
-comp_parse.o: term.h
-comp_parse.o: unctrl.h
-comp_parse.po: curses.h
-comp_parse.po: ncurses_def.h
-comp_parse.po: term.h
-comp_parse.po: unctrl.h
-comp_scan.So: curses.h
-comp_scan.So: ncurses_def.h
-comp_scan.So: term.h
-comp_scan.So: unctrl.h
-comp_scan.o: curses.h
-comp_scan.o: ncurses_def.h
-comp_scan.o: term.h
-comp_scan.o: unctrl.h
-comp_scan.po: curses.h
-comp_scan.po: ncurses_def.h
-comp_scan.po: term.h
-comp_scan.po: unctrl.h
-db_iterator.So: curses.h
-db_iterator.So: ncurses_def.h
-db_iterator.So: term.h
-db_iterator.So: unctrl.h
-db_iterator.o: curses.h
-db_iterator.o: ncurses_def.h
-db_iterator.o: term.h
-db_iterator.o: unctrl.h
-db_iterator.po: curses.h
-db_iterator.po: ncurses_def.h
-db_iterator.po: term.h
-db_iterator.po: unctrl.h
-define_key.So: curses.h
-define_key.So: ncurses_def.h
-define_key.So: term.h
-define_key.So: unctrl.h
-define_key.o: curses.h
-define_key.o: ncurses_def.h
-define_key.o: term.h
-define_key.o: unctrl.h
-define_key.po: curses.h
-define_key.po: ncurses_def.h
-define_key.po: term.h
-define_key.po: unctrl.h
-doalloc.So: curses.h
-doalloc.So: ncurses_def.h
-doalloc.So: term.h
-doalloc.So: unctrl.h
-doalloc.o: curses.h
-doalloc.o: ncurses_def.h
-doalloc.o: term.h
-doalloc.o: unctrl.h
-doalloc.po: curses.h
-doalloc.po: ncurses_def.h
-doalloc.po: term.h
-doalloc.po: unctrl.h
-entries.So: curses.h
-entries.So: ncurses_def.h
-entries.So: term.h
-entries.So: unctrl.h
-entries.o: curses.h
-entries.o: ncurses_def.h
-entries.o: term.h
-entries.o: unctrl.h
-entries.po: curses.h
-entries.po: ncurses_def.h
-entries.po: term.h
-entries.po: unctrl.h
-expanded.So: curses.h
-expanded.So: expanded.c
-expanded.So: ncurses_def.h
-expanded.So: term.h
-expanded.So: unctrl.h
-expanded.o: curses.h
-expanded.o: expanded.c
-expanded.o: ncurses_def.h
-expanded.o: term.h
-expanded.o: unctrl.h
-expanded.po: curses.h
-expanded.po: expanded.c
-expanded.po: ncurses_def.h
-expanded.po: term.h
-expanded.po: unctrl.h
-fallback.So: curses.h
-fallback.So: fallback.c
-fallback.So: ncurses_def.h
-fallback.So: term.h
-fallback.So: unctrl.h
-fallback.o: curses.h
-fallback.o: fallback.c
-fallback.o: ncurses_def.h
-fallback.o: term.h
-fallback.o: unctrl.h
-fallback.po: curses.h
-fallback.po: fallback.c
-fallback.po: ncurses_def.h
-fallback.po: term.h
-fallback.po: unctrl.h
-free_ttype.So: curses.h
-free_ttype.So: ncurses_def.h
-free_ttype.So: term.h
-free_ttype.So: unctrl.h
-free_ttype.o: curses.h
-free_ttype.o: ncurses_def.h
-free_ttype.o: term.h
-free_ttype.o: unctrl.h
-free_ttype.po: curses.h
-free_ttype.po: ncurses_def.h
-free_ttype.po: term.h
-free_ttype.po: unctrl.h
-getenv_num.So: curses.h
-getenv_num.So: ncurses_def.h
-getenv_num.So: term.h
-getenv_num.So: unctrl.h
-getenv_num.o: curses.h
-getenv_num.o: ncurses_def.h
-getenv_num.o: term.h
-getenv_num.o: unctrl.h
-getenv_num.po: curses.h
-getenv_num.po: ncurses_def.h
-getenv_num.po: term.h
-getenv_num.po: unctrl.h
-hardscroll.So: curses.h
-hardscroll.So: ncurses_def.h
-hardscroll.So: term.h
-hardscroll.So: unctrl.h
-hardscroll.o: curses.h
-hardscroll.o: ncurses_def.h
-hardscroll.o: term.h
-hardscroll.o: unctrl.h
-hardscroll.po: curses.h
-hardscroll.po: ncurses_def.h
-hardscroll.po: term.h
-hardscroll.po: unctrl.h
-hashed_db.So: curses.h
-hashed_db.So: ncurses_def.h
-hashed_db.So: term.h
-hashed_db.So: unctrl.h
-hashed_db.o: curses.h
-hashed_db.o: ncurses_def.h
-hashed_db.o: term.h
-hashed_db.o: unctrl.h
-hashed_db.po: curses.h
-hashed_db.po: ncurses_def.h
-hashed_db.po: term.h
-hashed_db.po: unctrl.h
-hashmap.So: curses.h
-hashmap.So: ncurses_def.h
-hashmap.So: term.h
-hashmap.So: unctrl.h
-hashmap.o: curses.h
-hashmap.o: ncurses_def.h
-hashmap.o: term.h
-hashmap.o: unctrl.h
-hashmap.po: curses.h
-hashmap.po: ncurses_def.h
-hashmap.po: term.h
-hashmap.po: unctrl.h
-home_terminfo.So: curses.h
-home_terminfo.So: ncurses_def.h
-home_terminfo.So: term.h
-home_terminfo.So: unctrl.h
-home_terminfo.o: curses.h
-home_terminfo.o: ncurses_def.h
-home_terminfo.o: term.h
-home_terminfo.o: unctrl.h
-home_terminfo.po: curses.h
-home_terminfo.po: ncurses_def.h
-home_terminfo.po: term.h
-home_terminfo.po: unctrl.h
-init_keytry.So: curses.h
-init_keytry.So: init_keytry.h
-init_keytry.So: ncurses_def.h
-init_keytry.So: term.h
-init_keytry.So: unctrl.h
-init_keytry.o: curses.h
-init_keytry.o: init_keytry.h
-init_keytry.o: ncurses_def.h
-init_keytry.o: term.h
-init_keytry.o: unctrl.h
-init_keytry.po: curses.h
-init_keytry.po: init_keytry.h
-init_keytry.po: ncurses_def.h
-init_keytry.po: term.h
-init_keytry.po: unctrl.h
-key_defined.So: curses.h
-key_defined.So: ncurses_def.h
-key_defined.So: term.h
-key_defined.So: unctrl.h
-key_defined.o: curses.h
-key_defined.o: ncurses_def.h
-key_defined.o: term.h
-key_defined.o: unctrl.h
-key_defined.po: curses.h
-key_defined.po: ncurses_def.h
-key_defined.po: term.h
-key_defined.po: unctrl.h
-keybound.So: curses.h
-keybound.So: ncurses_def.h
-keybound.So: term.h
-keybound.So: unctrl.h
-keybound.o: curses.h
-keybound.o: ncurses_def.h
-keybound.o: term.h
-keybound.o: unctrl.h
-keybound.po: curses.h
-keybound.po: ncurses_def.h
-keybound.po: term.h
-keybound.po: unctrl.h
-keyok.So: curses.h
-keyok.So: ncurses_def.h
-keyok.So: term.h
-keyok.So: unctrl.h
-keyok.o: curses.h
-keyok.o: ncurses_def.h
-keyok.o: term.h
-keyok.o: unctrl.h
-keyok.po: curses.h
-keyok.po: ncurses_def.h
-keyok.po: term.h
-keyok.po: unctrl.h
-legacy_coding.So: curses.h
-legacy_coding.So: ncurses_def.h
-legacy_coding.So: term.h
-legacy_coding.So: unctrl.h
-legacy_coding.o: curses.h
-legacy_coding.o: ncurses_def.h
-legacy_coding.o: term.h
-legacy_coding.o: unctrl.h
-legacy_coding.po: curses.h
-legacy_coding.po: ncurses_def.h
-legacy_coding.po: term.h
-legacy_coding.po: unctrl.h
-lib_acs.So: curses.h
-lib_acs.So: ncurses_def.h
-lib_acs.So: term.h
-lib_acs.So: unctrl.h
-lib_acs.o: curses.h
-lib_acs.o: ncurses_def.h
-lib_acs.o: term.h
-lib_acs.o: unctrl.h
-lib_acs.po: curses.h
-lib_acs.po: ncurses_def.h
-lib_acs.po: term.h
-lib_acs.po: unctrl.h
-lib_addch.So: curses.h
-lib_addch.So: ncurses_def.h
-lib_addch.So: term.h
-lib_addch.So: unctrl.h
-lib_addch.o: curses.h
-lib_addch.o: ncurses_def.h
-lib_addch.o: term.h
-lib_addch.o: unctrl.h
-lib_addch.po: curses.h
-lib_addch.po: ncurses_def.h
-lib_addch.po: term.h
-lib_addch.po: unctrl.h
-lib_addstr.So: curses.h
-lib_addstr.So: ncurses_def.h
-lib_addstr.So: term.h
-lib_addstr.So: unctrl.h
-lib_addstr.o: curses.h
-lib_addstr.o: ncurses_def.h
-lib_addstr.o: term.h
-lib_addstr.o: unctrl.h
-lib_addstr.po: curses.h
-lib_addstr.po: ncurses_def.h
-lib_addstr.po: term.h
-lib_addstr.po: unctrl.h
-lib_baudrate.So: curses.h
-lib_baudrate.So: ncurses_def.h
-lib_baudrate.So: term.h
-lib_baudrate.So: termcap.h
-lib_baudrate.So: unctrl.h
-lib_baudrate.o: curses.h
-lib_baudrate.o: ncurses_def.h
-lib_baudrate.o: term.h
-lib_baudrate.o: termcap.h
-lib_baudrate.o: unctrl.h
-lib_baudrate.po: curses.h
-lib_baudrate.po: ncurses_def.h
-lib_baudrate.po: term.h
-lib_baudrate.po: termcap.h
-lib_baudrate.po: unctrl.h
-lib_beep.So: curses.h
-lib_beep.So: ncurses_def.h
-lib_beep.So: term.h
-lib_beep.So: unctrl.h
-lib_beep.o: curses.h
-lib_beep.o: ncurses_def.h
-lib_beep.o: term.h
-lib_beep.o: unctrl.h
-lib_beep.po: curses.h
-lib_beep.po: ncurses_def.h
-lib_beep.po: term.h
-lib_beep.po: unctrl.h
-lib_bkgd.So: curses.h
-lib_bkgd.So: ncurses_def.h
-lib_bkgd.So: term.h
-lib_bkgd.So: unctrl.h
-lib_bkgd.o: curses.h
-lib_bkgd.o: ncurses_def.h
-lib_bkgd.o: term.h
-lib_bkgd.o: unctrl.h
-lib_bkgd.po: curses.h
-lib_bkgd.po: ncurses_def.h
-lib_bkgd.po: term.h
-lib_bkgd.po: unctrl.h
-lib_box.So: curses.h
-lib_box.So: ncurses_def.h
-lib_box.So: term.h
-lib_box.So: unctrl.h
-lib_box.o: curses.h
-lib_box.o: ncurses_def.h
-lib_box.o: term.h
-lib_box.o: unctrl.h
-lib_box.po: curses.h
-lib_box.po: ncurses_def.h
-lib_box.po: term.h
-lib_box.po: unctrl.h
-lib_chgat.So: curses.h
-lib_chgat.So: ncurses_def.h
-lib_chgat.So: term.h
-lib_chgat.So: unctrl.h
-lib_chgat.o: curses.h
-lib_chgat.o: ncurses_def.h
-lib_chgat.o: term.h
-lib_chgat.o: unctrl.h
-lib_chgat.po: curses.h
-lib_chgat.po: ncurses_def.h
-lib_chgat.po: term.h
-lib_chgat.po: unctrl.h
-lib_clear.So: curses.h
-lib_clear.So: ncurses_def.h
-lib_clear.So: term.h
-lib_clear.So: unctrl.h
-lib_clear.o: curses.h
-lib_clear.o: ncurses_def.h
-lib_clear.o: term.h
-lib_clear.o: unctrl.h
-lib_clear.po: curses.h
-lib_clear.po: ncurses_def.h
-lib_clear.po: term.h
-lib_clear.po: unctrl.h
-lib_clearok.So: curses.h
-lib_clearok.So: ncurses_def.h
-lib_clearok.So: term.h
-lib_clearok.So: unctrl.h
-lib_clearok.o: curses.h
-lib_clearok.o: ncurses_def.h
-lib_clearok.o: term.h
-lib_clearok.o: unctrl.h
-lib_clearok.po: curses.h
-lib_clearok.po: ncurses_def.h
-lib_clearok.po: term.h
-lib_clearok.po: unctrl.h
-lib_clrbot.So: curses.h
-lib_clrbot.So: ncurses_def.h
-lib_clrbot.So: term.h
-lib_clrbot.So: unctrl.h
-lib_clrbot.o: curses.h
-lib_clrbot.o: ncurses_def.h
-lib_clrbot.o: term.h
-lib_clrbot.o: unctrl.h
-lib_clrbot.po: curses.h
-lib_clrbot.po: ncurses_def.h
-lib_clrbot.po: term.h
-lib_clrbot.po: unctrl.h
-lib_clreol.So: curses.h
-lib_clreol.So: ncurses_def.h
-lib_clreol.So: term.h
-lib_clreol.So: unctrl.h
-lib_clreol.o: curses.h
-lib_clreol.o: ncurses_def.h
-lib_clreol.o: term.h
-lib_clreol.o: unctrl.h
-lib_clreol.po: curses.h
-lib_clreol.po: ncurses_def.h
-lib_clreol.po: term.h
-lib_clreol.po: unctrl.h
-lib_color.So: curses.h
-lib_color.So: ncurses_def.h
-lib_color.So: term.h
-lib_color.So: unctrl.h
-lib_color.o: curses.h
-lib_color.o: ncurses_def.h
-lib_color.o: term.h
-lib_color.o: unctrl.h
-lib_color.po: curses.h
-lib_color.po: ncurses_def.h
-lib_color.po: term.h
-lib_color.po: unctrl.h
-lib_colorset.So: curses.h
-lib_colorset.So: ncurses_def.h
-lib_colorset.So: term.h
-lib_colorset.So: unctrl.h
-lib_colorset.o: curses.h
-lib_colorset.o: ncurses_def.h
-lib_colorset.o: term.h
-lib_colorset.o: unctrl.h
-lib_colorset.po: curses.h
-lib_colorset.po: ncurses_def.h
-lib_colorset.po: term.h
-lib_colorset.po: unctrl.h
-lib_cur_term.So: curses.h
-lib_cur_term.So: ncurses_def.h
-lib_cur_term.So: term.h
-lib_cur_term.So: termcap.h
-lib_cur_term.So: unctrl.h
-lib_cur_term.o: curses.h
-lib_cur_term.o: ncurses_def.h
-lib_cur_term.o: term.h
-lib_cur_term.o: termcap.h
-lib_cur_term.o: unctrl.h
-lib_cur_term.po: curses.h
-lib_cur_term.po: ncurses_def.h
-lib_cur_term.po: term.h
-lib_cur_term.po: termcap.h
-lib_cur_term.po: unctrl.h
-lib_data.So: curses.h
-lib_data.So: ncurses_def.h
-lib_data.So: term.h
-lib_data.So: unctrl.h
-lib_data.o: curses.h
-lib_data.o: ncurses_def.h
-lib_data.o: term.h
-lib_data.o: unctrl.h
-lib_data.po: curses.h
-lib_data.po: ncurses_def.h
-lib_data.po: term.h
-lib_data.po: unctrl.h
-lib_delch.So: curses.h
-lib_delch.So: ncurses_def.h
-lib_delch.So: term.h
-lib_delch.So: unctrl.h
-lib_delch.o: curses.h
-lib_delch.o: ncurses_def.h
-lib_delch.o: term.h
-lib_delch.o: unctrl.h
-lib_delch.po: curses.h
-lib_delch.po: ncurses_def.h
-lib_delch.po: term.h
-lib_delch.po: unctrl.h
-lib_delwin.So: curses.h
-lib_delwin.So: ncurses_def.h
-lib_delwin.So: term.h
-lib_delwin.So: unctrl.h
-lib_delwin.o: curses.h
-lib_delwin.o: ncurses_def.h
-lib_delwin.o: term.h
-lib_delwin.o: unctrl.h
-lib_delwin.po: curses.h
-lib_delwin.po: ncurses_def.h
-lib_delwin.po: term.h
-lib_delwin.po: unctrl.h
-lib_dft_fgbg.So: curses.h
-lib_dft_fgbg.So: ncurses_def.h
-lib_dft_fgbg.So: term.h
-lib_dft_fgbg.So: unctrl.h
-lib_dft_fgbg.o: curses.h
-lib_dft_fgbg.o: ncurses_def.h
-lib_dft_fgbg.o: term.h
-lib_dft_fgbg.o: unctrl.h
-lib_dft_fgbg.po: curses.h
-lib_dft_fgbg.po: ncurses_def.h
-lib_dft_fgbg.po: term.h
-lib_dft_fgbg.po: unctrl.h
-lib_echo.So: curses.h
-lib_echo.So: ncurses_def.h
-lib_echo.So: term.h
-lib_echo.So: unctrl.h
-lib_echo.o: curses.h
-lib_echo.o: ncurses_def.h
-lib_echo.o: term.h
-lib_echo.o: unctrl.h
-lib_echo.po: curses.h
-lib_echo.po: ncurses_def.h
-lib_echo.po: term.h
-lib_echo.po: unctrl.h
-lib_endwin.So: curses.h
-lib_endwin.So: ncurses_def.h
-lib_endwin.So: term.h
-lib_endwin.So: unctrl.h
-lib_endwin.o: curses.h
-lib_endwin.o: ncurses_def.h
-lib_endwin.o: term.h
-lib_endwin.o: unctrl.h
-lib_endwin.po: curses.h
-lib_endwin.po: ncurses_def.h
-lib_endwin.po: term.h
-lib_endwin.po: unctrl.h
-lib_erase.So: curses.h
-lib_erase.So: ncurses_def.h
-lib_erase.So: term.h
-lib_erase.So: unctrl.h
-lib_erase.o: curses.h
-lib_erase.o: ncurses_def.h
-lib_erase.o: term.h
-lib_erase.o: unctrl.h
-lib_erase.po: curses.h
-lib_erase.po: ncurses_def.h
-lib_erase.po: term.h
-lib_erase.po: unctrl.h
-lib_flash.So: curses.h
-lib_flash.So: ncurses_def.h
-lib_flash.So: term.h
-lib_flash.So: unctrl.h
-lib_flash.o: curses.h
-lib_flash.o: ncurses_def.h
-lib_flash.o: term.h
-lib_flash.o: unctrl.h
-lib_flash.po: curses.h
-lib_flash.po: ncurses_def.h
-lib_flash.po: term.h
-lib_flash.po: unctrl.h
-lib_freeall.So: curses.h
-lib_freeall.So: ncurses_def.h
-lib_freeall.So: term.h
-lib_freeall.So: unctrl.h
-lib_freeall.o: curses.h
-lib_freeall.o: ncurses_def.h
-lib_freeall.o: term.h
-lib_freeall.o: unctrl.h
-lib_freeall.po: curses.h
-lib_freeall.po: ncurses_def.h
-lib_freeall.po: term.h
-lib_freeall.po: unctrl.h
-lib_gen.So: curses.h
-lib_gen.So: lib_gen.c
-lib_gen.So: ncurses_def.h
-lib_gen.So: term.h
-lib_gen.So: unctrl.h
-lib_gen.o: curses.h
-lib_gen.o: lib_gen.c
-lib_gen.o: ncurses_def.h
-lib_gen.o: term.h
-lib_gen.o: unctrl.h
-lib_gen.po: curses.h
-lib_gen.po: lib_gen.c
-lib_gen.po: ncurses_def.h
-lib_gen.po: term.h
-lib_gen.po: unctrl.h
-lib_getch.So: curses.h
-lib_getch.So: ncurses_def.h
-lib_getch.So: term.h
-lib_getch.So: unctrl.h
-lib_getch.o: curses.h
-lib_getch.o: ncurses_def.h
-lib_getch.o: term.h
-lib_getch.o: unctrl.h
-lib_getch.po: curses.h
-lib_getch.po: ncurses_def.h
-lib_getch.po: term.h
-lib_getch.po: unctrl.h
-lib_getstr.So: curses.h
-lib_getstr.So: ncurses_def.h
-lib_getstr.So: term.h
-lib_getstr.So: unctrl.h
-lib_getstr.o: curses.h
-lib_getstr.o: ncurses_def.h
-lib_getstr.o: term.h
-lib_getstr.o: unctrl.h
-lib_getstr.po: curses.h
-lib_getstr.po: ncurses_def.h
-lib_getstr.po: term.h
-lib_getstr.po: unctrl.h
-lib_has_cap.So: curses.h
-lib_has_cap.So: ncurses_def.h
-lib_has_cap.So: term.h
-lib_has_cap.So: unctrl.h
-lib_has_cap.o: curses.h
-lib_has_cap.o: ncurses_def.h
-lib_has_cap.o: term.h
-lib_has_cap.o: unctrl.h
-lib_has_cap.po: curses.h
-lib_has_cap.po: ncurses_def.h
-lib_has_cap.po: term.h
-lib_has_cap.po: unctrl.h
-lib_hline.So: curses.h
-lib_hline.So: ncurses_def.h
-lib_hline.So: term.h
-lib_hline.So: unctrl.h
-lib_hline.o: curses.h
-lib_hline.o: ncurses_def.h
-lib_hline.o: term.h
-lib_hline.o: unctrl.h
-lib_hline.po: curses.h
-lib_hline.po: ncurses_def.h
-lib_hline.po: term.h
-lib_hline.po: unctrl.h
-lib_immedok.So: curses.h
-lib_immedok.So: ncurses_def.h
-lib_immedok.So: term.h
-lib_immedok.So: unctrl.h
-lib_immedok.o: curses.h
-lib_immedok.o: ncurses_def.h
-lib_immedok.o: term.h
-lib_immedok.o: unctrl.h
-lib_immedok.po: curses.h
-lib_immedok.po: ncurses_def.h
-lib_immedok.po: term.h
-lib_immedok.po: unctrl.h
-lib_inchstr.So: curses.h
-lib_inchstr.So: ncurses_def.h
-lib_inchstr.So: term.h
-lib_inchstr.So: unctrl.h
-lib_inchstr.o: curses.h
-lib_inchstr.o: ncurses_def.h
-lib_inchstr.o: term.h
-lib_inchstr.o: unctrl.h
-lib_inchstr.po: curses.h
-lib_inchstr.po: ncurses_def.h
-lib_inchstr.po: term.h
-lib_inchstr.po: unctrl.h
-lib_initscr.So: curses.h
-lib_initscr.So: ncurses_def.h
-lib_initscr.So: term.h
-lib_initscr.So: unctrl.h
-lib_initscr.o: curses.h
-lib_initscr.o: ncurses_def.h
-lib_initscr.o: term.h
-lib_initscr.o: unctrl.h
-lib_initscr.po: curses.h
-lib_initscr.po: ncurses_def.h
-lib_initscr.po: term.h
-lib_initscr.po: unctrl.h
-lib_insch.So: curses.h
-lib_insch.So: ncurses_def.h
-lib_insch.So: term.h
-lib_insch.So: unctrl.h
-lib_insch.o: curses.h
-lib_insch.o: ncurses_def.h
-lib_insch.o: term.h
-lib_insch.o: unctrl.h
-lib_insch.po: curses.h
-lib_insch.po: ncurses_def.h
-lib_insch.po: term.h
-lib_insch.po: unctrl.h
-lib_insdel.So: curses.h
-lib_insdel.So: ncurses_def.h
-lib_insdel.So: term.h
-lib_insdel.So: unctrl.h
-lib_insdel.o: curses.h
-lib_insdel.o: ncurses_def.h
-lib_insdel.o: term.h
-lib_insdel.o: unctrl.h
-lib_insdel.po: curses.h
-lib_insdel.po: ncurses_def.h
-lib_insdel.po: term.h
-lib_insdel.po: unctrl.h
-lib_insnstr.So: curses.h
-lib_insnstr.So: ncurses_def.h
-lib_insnstr.So: term.h
-lib_insnstr.So: unctrl.h
-lib_insnstr.o: curses.h
-lib_insnstr.o: ncurses_def.h
-lib_insnstr.o: term.h
-lib_insnstr.o: unctrl.h
-lib_insnstr.po: curses.h
-lib_insnstr.po: ncurses_def.h
-lib_insnstr.po: term.h
-lib_insnstr.po: unctrl.h
-lib_instr.So: curses.h
-lib_instr.So: ncurses_def.h
-lib_instr.So: term.h
-lib_instr.So: unctrl.h
-lib_instr.o: curses.h
-lib_instr.o: ncurses_def.h
-lib_instr.o: term.h
-lib_instr.o: unctrl.h
-lib_instr.po: curses.h
-lib_instr.po: ncurses_def.h
-lib_instr.po: term.h
-lib_instr.po: unctrl.h
-lib_isendwin.So: curses.h
-lib_isendwin.So: ncurses_def.h
-lib_isendwin.So: term.h
-lib_isendwin.So: unctrl.h
-lib_isendwin.o: curses.h
-lib_isendwin.o: ncurses_def.h
-lib_isendwin.o: term.h
-lib_isendwin.o: unctrl.h
-lib_isendwin.po: curses.h
-lib_isendwin.po: ncurses_def.h
-lib_isendwin.po: term.h
-lib_isendwin.po: unctrl.h
-lib_kernel.So: curses.h
-lib_kernel.So: ncurses_def.h
-lib_kernel.So: term.h
-lib_kernel.So: unctrl.h
-lib_kernel.o: curses.h
-lib_kernel.o: ncurses_def.h
-lib_kernel.o: term.h
-lib_kernel.o: unctrl.h
-lib_kernel.po: curses.h
-lib_kernel.po: ncurses_def.h
-lib_kernel.po: term.h
-lib_kernel.po: unctrl.h
-lib_keyname.So: curses.h
-lib_keyname.So: lib_keyname.c
-lib_keyname.So: ncurses_def.h
-lib_keyname.So: term.h
-lib_keyname.So: unctrl.h
-lib_keyname.o: curses.h
-lib_keyname.o: lib_keyname.c
-lib_keyname.o: ncurses_def.h
-lib_keyname.o: term.h
-lib_keyname.o: unctrl.h
-lib_keyname.po: curses.h
-lib_keyname.po: lib_keyname.c
-lib_keyname.po: ncurses_def.h
-lib_keyname.po: term.h
-lib_keyname.po: unctrl.h
-lib_leaveok.So: curses.h
-lib_leaveok.So: ncurses_def.h
-lib_leaveok.So: term.h
-lib_leaveok.So: unctrl.h
-lib_leaveok.o: curses.h
-lib_leaveok.o: ncurses_def.h
-lib_leaveok.o: term.h
-lib_leaveok.o: unctrl.h
-lib_leaveok.po: curses.h
-lib_leaveok.po: ncurses_def.h
-lib_leaveok.po: term.h
-lib_leaveok.po: unctrl.h
-lib_longname.So: curses.h
-lib_longname.So: ncurses_def.h
-lib_longname.So: term.h
-lib_longname.So: unctrl.h
-lib_longname.o: curses.h
-lib_longname.o: ncurses_def.h
-lib_longname.o: term.h
-lib_longname.o: unctrl.h
-lib_longname.po: curses.h
-lib_longname.po: ncurses_def.h
-lib_longname.po: term.h
-lib_longname.po: unctrl.h
-lib_mouse.So: curses.h
-lib_mouse.So: ncurses_def.h
-lib_mouse.So: term.h
-lib_mouse.So: unctrl.h
-lib_mouse.o: curses.h
-lib_mouse.o: ncurses_def.h
-lib_mouse.o: term.h
-lib_mouse.o: unctrl.h
-lib_mouse.po: curses.h
-lib_mouse.po: ncurses_def.h
-lib_mouse.po: term.h
-lib_mouse.po: unctrl.h
-lib_move.So: curses.h
-lib_move.So: ncurses_def.h
-lib_move.So: term.h
-lib_move.So: unctrl.h
-lib_move.o: curses.h
-lib_move.o: ncurses_def.h
-lib_move.o: term.h
-lib_move.o: unctrl.h
-lib_move.po: curses.h
-lib_move.po: ncurses_def.h
-lib_move.po: term.h
-lib_move.po: unctrl.h
-lib_mvcur.So: curses.h
-lib_mvcur.So: ncurses_def.h
-lib_mvcur.So: term.h
-lib_mvcur.So: unctrl.h
-lib_mvcur.o: curses.h
-lib_mvcur.o: ncurses_def.h
-lib_mvcur.o: term.h
-lib_mvcur.o: unctrl.h
-lib_mvcur.po: curses.h
-lib_mvcur.po: ncurses_def.h
-lib_mvcur.po: term.h
-lib_mvcur.po: unctrl.h
-lib_mvwin.So: curses.h
-lib_mvwin.So: ncurses_def.h
-lib_mvwin.So: term.h
-lib_mvwin.So: unctrl.h
-lib_mvwin.o: curses.h
-lib_mvwin.o: ncurses_def.h
-lib_mvwin.o: term.h
-lib_mvwin.o: unctrl.h
-lib_mvwin.po: curses.h
-lib_mvwin.po: ncurses_def.h
-lib_mvwin.po: term.h
-lib_mvwin.po: unctrl.h
-lib_napms.So: curses.h
-lib_napms.So: ncurses_def.h
-lib_napms.So: term.h
-lib_napms.So: unctrl.h
-lib_napms.o: curses.h
-lib_napms.o: ncurses_def.h
-lib_napms.o: term.h
-lib_napms.o: unctrl.h
-lib_napms.po: curses.h
-lib_napms.po: ncurses_def.h
-lib_napms.po: term.h
-lib_napms.po: unctrl.h
-lib_newterm.So: curses.h
-lib_newterm.So: ncurses_def.h
-lib_newterm.So: term.h
-lib_newterm.So: unctrl.h
-lib_newterm.o: curses.h
-lib_newterm.o: ncurses_def.h
-lib_newterm.o: term.h
-lib_newterm.o: unctrl.h
-lib_newterm.po: curses.h
-lib_newterm.po: ncurses_def.h
-lib_newterm.po: term.h
-lib_newterm.po: unctrl.h
-lib_newwin.So: curses.h
-lib_newwin.So: ncurses_def.h
-lib_newwin.So: term.h
-lib_newwin.So: unctrl.h
-lib_newwin.o: curses.h
-lib_newwin.o: ncurses_def.h
-lib_newwin.o: term.h
-lib_newwin.o: unctrl.h
-lib_newwin.po: curses.h
-lib_newwin.po: ncurses_def.h
-lib_newwin.po: term.h
-lib_newwin.po: unctrl.h
-lib_nl.So: curses.h
-lib_nl.So: ncurses_def.h
-lib_nl.So: term.h
-lib_nl.So: unctrl.h
-lib_nl.o: curses.h
-lib_nl.o: ncurses_def.h
-lib_nl.o: term.h
-lib_nl.o: unctrl.h
-lib_nl.po: curses.h
-lib_nl.po: ncurses_def.h
-lib_nl.po: term.h
-lib_nl.po: unctrl.h
-lib_options.So: curses.h
-lib_options.So: ncurses_def.h
-lib_options.So: term.h
-lib_options.So: unctrl.h
-lib_options.o: curses.h
-lib_options.o: ncurses_def.h
-lib_options.o: term.h
-lib_options.o: unctrl.h
-lib_options.po: curses.h
-lib_options.po: ncurses_def.h
-lib_options.po: term.h
-lib_options.po: unctrl.h
-lib_overlay.So: curses.h
-lib_overlay.So: ncurses_def.h
-lib_overlay.So: term.h
-lib_overlay.So: unctrl.h
-lib_overlay.o: curses.h
-lib_overlay.o: ncurses_def.h
-lib_overlay.o: term.h
-lib_overlay.o: unctrl.h
-lib_overlay.po: curses.h
-lib_overlay.po: ncurses_def.h
-lib_overlay.po: term.h
-lib_overlay.po: unctrl.h
-lib_pad.So: curses.h
-lib_pad.So: ncurses_def.h
-lib_pad.So: term.h
-lib_pad.So: unctrl.h
-lib_pad.o: curses.h
-lib_pad.o: ncurses_def.h
-lib_pad.o: term.h
-lib_pad.o: unctrl.h
-lib_pad.po: curses.h
-lib_pad.po: ncurses_def.h
-lib_pad.po: term.h
-lib_pad.po: unctrl.h
-lib_print.So: curses.h
-lib_print.So: ncurses_def.h
-lib_print.So: term.h
-lib_print.So: unctrl.h
-lib_print.o: curses.h
-lib_print.o: ncurses_def.h
-lib_print.o: term.h
-lib_print.o: unctrl.h
-lib_print.po: curses.h
-lib_print.po: ncurses_def.h
-lib_print.po: term.h
-lib_print.po: unctrl.h
-lib_printw.So: curses.h
-lib_printw.So: ncurses_def.h
-lib_printw.So: term.h
-lib_printw.So: unctrl.h
-lib_printw.o: curses.h
-lib_printw.o: ncurses_def.h
-lib_printw.o: term.h
-lib_printw.o: unctrl.h
-lib_printw.po: curses.h
-lib_printw.po: ncurses_def.h
-lib_printw.po: term.h
-lib_printw.po: unctrl.h
-lib_raw.So: curses.h
-lib_raw.So: ncurses_def.h
-lib_raw.So: term.h
-lib_raw.So: unctrl.h
-lib_raw.o: curses.h
-lib_raw.o: ncurses_def.h
-lib_raw.o: term.h
-lib_raw.o: unctrl.h
-lib_raw.po: curses.h
-lib_raw.po: ncurses_def.h
-lib_raw.po: term.h
-lib_raw.po: unctrl.h
-lib_redrawln.So: curses.h
-lib_redrawln.So: ncurses_def.h
-lib_redrawln.So: term.h
-lib_redrawln.So: unctrl.h
-lib_redrawln.o: curses.h
-lib_redrawln.o: ncurses_def.h
-lib_redrawln.o: term.h
-lib_redrawln.o: unctrl.h
-lib_redrawln.po: curses.h
-lib_redrawln.po: ncurses_def.h
-lib_redrawln.po: term.h
-lib_redrawln.po: unctrl.h
-lib_refresh.So: curses.h
-lib_refresh.So: ncurses_def.h
-lib_refresh.So: term.h
-lib_refresh.So: unctrl.h
-lib_refresh.o: curses.h
-lib_refresh.o: ncurses_def.h
-lib_refresh.o: term.h
-lib_refresh.o: unctrl.h
-lib_refresh.po: curses.h
-lib_refresh.po: ncurses_def.h
-lib_refresh.po: term.h
-lib_refresh.po: unctrl.h
-lib_restart.So: curses.h
-lib_restart.So: ncurses_def.h
-lib_restart.So: term.h
-lib_restart.So: unctrl.h
-lib_restart.o: curses.h
-lib_restart.o: ncurses_def.h
-lib_restart.o: term.h
-lib_restart.o: unctrl.h
-lib_restart.po: curses.h
-lib_restart.po: ncurses_def.h
-lib_restart.po: term.h
-lib_restart.po: unctrl.h
-lib_scanw.So: curses.h
-lib_scanw.So: ncurses_def.h
-lib_scanw.So: term.h
-lib_scanw.So: unctrl.h
-lib_scanw.o: curses.h
-lib_scanw.o: ncurses_def.h
-lib_scanw.o: term.h
-lib_scanw.o: unctrl.h
-lib_scanw.po: curses.h
-lib_scanw.po: ncurses_def.h
-lib_scanw.po: term.h
-lib_scanw.po: unctrl.h
-lib_screen.So: curses.h
-lib_screen.So: ncurses_def.h
-lib_screen.So: term.h
-lib_screen.So: unctrl.h
-lib_screen.o: curses.h
-lib_screen.o: ncurses_def.h
-lib_screen.o: term.h
-lib_screen.o: unctrl.h
-lib_screen.po: curses.h
-lib_screen.po: ncurses_def.h
-lib_screen.po: term.h
-lib_screen.po: unctrl.h
-lib_scroll.So: curses.h
-lib_scroll.So: ncurses_def.h
-lib_scroll.So: term.h
-lib_scroll.So: unctrl.h
-lib_scroll.o: curses.h
-lib_scroll.o: ncurses_def.h
-lib_scroll.o: term.h
-lib_scroll.o: unctrl.h
-lib_scroll.po: curses.h
-lib_scroll.po: ncurses_def.h
-lib_scroll.po: term.h
-lib_scroll.po: unctrl.h
-lib_scrollok.So: curses.h
-lib_scrollok.So: ncurses_def.h
-lib_scrollok.So: term.h
-lib_scrollok.So: unctrl.h
-lib_scrollok.o: curses.h
-lib_scrollok.o: ncurses_def.h
-lib_scrollok.o: term.h
-lib_scrollok.o: unctrl.h
-lib_scrollok.po: curses.h
-lib_scrollok.po: ncurses_def.h
-lib_scrollok.po: term.h
-lib_scrollok.po: unctrl.h
-lib_scrreg.So: curses.h
-lib_scrreg.So: ncurses_def.h
-lib_scrreg.So: term.h
-lib_scrreg.So: unctrl.h
-lib_scrreg.o: curses.h
-lib_scrreg.o: ncurses_def.h
-lib_scrreg.o: term.h
-lib_scrreg.o: unctrl.h
-lib_scrreg.po: curses.h
-lib_scrreg.po: ncurses_def.h
-lib_scrreg.po: term.h
-lib_scrreg.po: unctrl.h
-lib_set_term.So: curses.h
-lib_set_term.So: ncurses_def.h
-lib_set_term.So: term.h
-lib_set_term.So: unctrl.h
-lib_set_term.o: curses.h
-lib_set_term.o: ncurses_def.h
-lib_set_term.o: term.h
-lib_set_term.o: unctrl.h
-lib_set_term.po: curses.h
-lib_set_term.po: ncurses_def.h
-lib_set_term.po: term.h
-lib_set_term.po: unctrl.h
-lib_setup.So: curses.h
-lib_setup.So: ncurses_def.h
-lib_setup.So: term.h
-lib_setup.So: unctrl.h
-lib_setup.o: curses.h
-lib_setup.o: ncurses_def.h
-lib_setup.o: term.h
-lib_setup.o: unctrl.h
-lib_setup.po: curses.h
-lib_setup.po: ncurses_def.h
-lib_setup.po: term.h
-lib_setup.po: unctrl.h
-lib_slk.So: curses.h
-lib_slk.So: ncurses_def.h
-lib_slk.So: term.h
-lib_slk.So: unctrl.h
-lib_slk.o: curses.h
-lib_slk.o: ncurses_def.h
-lib_slk.o: term.h
-lib_slk.o: unctrl.h
-lib_slk.po: curses.h
-lib_slk.po: ncurses_def.h
-lib_slk.po: term.h
-lib_slk.po: unctrl.h
-lib_slkatr_set.So: curses.h
-lib_slkatr_set.So: ncurses_def.h
-lib_slkatr_set.So: term.h
-lib_slkatr_set.So: unctrl.h
-lib_slkatr_set.o: curses.h
-lib_slkatr_set.o: ncurses_def.h
-lib_slkatr_set.o: term.h
-lib_slkatr_set.o: unctrl.h
-lib_slkatr_set.po: curses.h
-lib_slkatr_set.po: ncurses_def.h
-lib_slkatr_set.po: term.h
-lib_slkatr_set.po: unctrl.h
-lib_slkatrof.So: curses.h
-lib_slkatrof.So: ncurses_def.h
-lib_slkatrof.So: term.h
-lib_slkatrof.So: unctrl.h
-lib_slkatrof.o: curses.h
-lib_slkatrof.o: ncurses_def.h
-lib_slkatrof.o: term.h
-lib_slkatrof.o: unctrl.h
-lib_slkatrof.po: curses.h
-lib_slkatrof.po: ncurses_def.h
-lib_slkatrof.po: term.h
-lib_slkatrof.po: unctrl.h
-lib_slkatron.So: curses.h
-lib_slkatron.So: ncurses_def.h
-lib_slkatron.So: term.h
-lib_slkatron.So: unctrl.h
-lib_slkatron.o: curses.h
-lib_slkatron.o: ncurses_def.h
-lib_slkatron.o: term.h
-lib_slkatron.o: unctrl.h
-lib_slkatron.po: curses.h
-lib_slkatron.po: ncurses_def.h
-lib_slkatron.po: term.h
-lib_slkatron.po: unctrl.h
-lib_slkatrset.So: curses.h
-lib_slkatrset.So: ncurses_def.h
-lib_slkatrset.So: term.h
-lib_slkatrset.So: unctrl.h
-lib_slkatrset.o: curses.h
-lib_slkatrset.o: ncurses_def.h
-lib_slkatrset.o: term.h
-lib_slkatrset.o: unctrl.h
-lib_slkatrset.po: curses.h
-lib_slkatrset.po: ncurses_def.h
-lib_slkatrset.po: term.h
-lib_slkatrset.po: unctrl.h
-lib_slkattr.So: curses.h
-lib_slkattr.So: ncurses_def.h
-lib_slkattr.So: term.h
-lib_slkattr.So: unctrl.h
-lib_slkattr.o: curses.h
-lib_slkattr.o: ncurses_def.h
-lib_slkattr.o: term.h
-lib_slkattr.o: unctrl.h
-lib_slkattr.po: curses.h
-lib_slkattr.po: ncurses_def.h
-lib_slkattr.po: term.h
-lib_slkattr.po: unctrl.h
-lib_slkclear.So: curses.h
-lib_slkclear.So: ncurses_def.h
-lib_slkclear.So: term.h
-lib_slkclear.So: unctrl.h
-lib_slkclear.o: curses.h
-lib_slkclear.o: ncurses_def.h
-lib_slkclear.o: term.h
-lib_slkclear.o: unctrl.h
-lib_slkclear.po: curses.h
-lib_slkclear.po: ncurses_def.h
-lib_slkclear.po: term.h
-lib_slkclear.po: unctrl.h
-lib_slkcolor.So: curses.h
-lib_slkcolor.So: ncurses_def.h
-lib_slkcolor.So: term.h
-lib_slkcolor.So: unctrl.h
-lib_slkcolor.o: curses.h
-lib_slkcolor.o: ncurses_def.h
-lib_slkcolor.o: term.h
-lib_slkcolor.o: unctrl.h
-lib_slkcolor.po: curses.h
-lib_slkcolor.po: ncurses_def.h
-lib_slkcolor.po: term.h
-lib_slkcolor.po: unctrl.h
-lib_slkinit.So: curses.h
-lib_slkinit.So: ncurses_def.h
-lib_slkinit.So: term.h
-lib_slkinit.So: unctrl.h
-lib_slkinit.o: curses.h
-lib_slkinit.o: ncurses_def.h
-lib_slkinit.o: term.h
-lib_slkinit.o: unctrl.h
-lib_slkinit.po: curses.h
-lib_slkinit.po: ncurses_def.h
-lib_slkinit.po: term.h
-lib_slkinit.po: unctrl.h
-lib_slklab.So: curses.h
-lib_slklab.So: ncurses_def.h
-lib_slklab.So: term.h
-lib_slklab.So: unctrl.h
-lib_slklab.o: curses.h
-lib_slklab.o: ncurses_def.h
-lib_slklab.o: term.h
-lib_slklab.o: unctrl.h
-lib_slklab.po: curses.h
-lib_slklab.po: ncurses_def.h
-lib_slklab.po: term.h
-lib_slklab.po: unctrl.h
-lib_slkrefr.So: curses.h
-lib_slkrefr.So: ncurses_def.h
-lib_slkrefr.So: term.h
-lib_slkrefr.So: unctrl.h
-lib_slkrefr.o: curses.h
-lib_slkrefr.o: ncurses_def.h
-lib_slkrefr.o: term.h
-lib_slkrefr.o: unctrl.h
-lib_slkrefr.po: curses.h
-lib_slkrefr.po: ncurses_def.h
-lib_slkrefr.po: term.h
-lib_slkrefr.po: unctrl.h
-lib_slkset.So: curses.h
-lib_slkset.So: ncurses_def.h
-lib_slkset.So: term.h
-lib_slkset.So: unctrl.h
-lib_slkset.o: curses.h
-lib_slkset.o: ncurses_def.h
-lib_slkset.o: term.h
-lib_slkset.o: unctrl.h
-lib_slkset.po: curses.h
-lib_slkset.po: ncurses_def.h
-lib_slkset.po: term.h
-lib_slkset.po: unctrl.h
-lib_slktouch.So: curses.h
-lib_slktouch.So: ncurses_def.h
-lib_slktouch.So: term.h
-lib_slktouch.So: unctrl.h
-lib_slktouch.o: curses.h
-lib_slktouch.o: ncurses_def.h
-lib_slktouch.o: term.h
-lib_slktouch.o: unctrl.h
-lib_slktouch.po: curses.h
-lib_slktouch.po: ncurses_def.h
-lib_slktouch.po: term.h
-lib_slktouch.po: unctrl.h
-lib_termcap.So: curses.h
-lib_termcap.So: ncurses_def.h
-lib_termcap.So: term.h
-lib_termcap.So: termcap.h
-lib_termcap.So: unctrl.h
-lib_termcap.o: curses.h
-lib_termcap.o: ncurses_def.h
-lib_termcap.o: term.h
-lib_termcap.o: termcap.h
-lib_termcap.o: unctrl.h
-lib_termcap.po: curses.h
-lib_termcap.po: ncurses_def.h
-lib_termcap.po: term.h
-lib_termcap.po: termcap.h
-lib_termcap.po: unctrl.h
-lib_termname.So: curses.h
-lib_termname.So: ncurses_def.h
-lib_termname.So: term.h
-lib_termname.So: unctrl.h
-lib_termname.o: curses.h
-lib_termname.o: ncurses_def.h
-lib_termname.o: term.h
-lib_termname.o: unctrl.h
-lib_termname.po: curses.h
-lib_termname.po: ncurses_def.h
-lib_termname.po: term.h
-lib_termname.po: unctrl.h
-lib_tgoto.So: curses.h
-lib_tgoto.So: ncurses_def.h
-lib_tgoto.So: term.h
-lib_tgoto.So: termcap.h
-lib_tgoto.So: unctrl.h
-lib_tgoto.o: curses.h
-lib_tgoto.o: ncurses_def.h
-lib_tgoto.o: term.h
-lib_tgoto.o: termcap.h
-lib_tgoto.o: unctrl.h
-lib_tgoto.po: curses.h
-lib_tgoto.po: ncurses_def.h
-lib_tgoto.po: term.h
-lib_tgoto.po: termcap.h
-lib_tgoto.po: unctrl.h
-lib_ti.So: curses.h
-lib_ti.So: ncurses_def.h
-lib_ti.So: term.h
-lib_ti.So: unctrl.h
-lib_ti.o: curses.h
-lib_ti.o: ncurses_def.h
-lib_ti.o: term.h
-lib_ti.o: unctrl.h
-lib_ti.po: curses.h
-lib_ti.po: ncurses_def.h
-lib_ti.po: term.h
-lib_ti.po: unctrl.h
-lib_touch.So: curses.h
-lib_touch.So: ncurses_def.h
-lib_touch.So: term.h
-lib_touch.So: unctrl.h
-lib_touch.o: curses.h
-lib_touch.o: ncurses_def.h
-lib_touch.o: term.h
-lib_touch.o: unctrl.h
-lib_touch.po: curses.h
-lib_touch.po: ncurses_def.h
-lib_touch.po: term.h
-lib_touch.po: unctrl.h
-lib_tparm.So: curses.h
-lib_tparm.So: ncurses_def.h
-lib_tparm.So: term.h
-lib_tparm.So: unctrl.h
-lib_tparm.o: curses.h
-lib_tparm.o: ncurses_def.h
-lib_tparm.o: term.h
-lib_tparm.o: unctrl.h
-lib_tparm.po: curses.h
-lib_tparm.po: ncurses_def.h
-lib_tparm.po: term.h
-lib_tparm.po: unctrl.h
-lib_tputs.So: curses.h
-lib_tputs.So: ncurses_def.h
-lib_tputs.So: term.h
-lib_tputs.So: termcap.h
-lib_tputs.So: unctrl.h
-lib_tputs.o: curses.h
-lib_tputs.o: ncurses_def.h
-lib_tputs.o: term.h
-lib_tputs.o: termcap.h
-lib_tputs.o: unctrl.h
-lib_tputs.po: curses.h
-lib_tputs.po: ncurses_def.h
-lib_tputs.po: term.h
-lib_tputs.po: termcap.h
-lib_tputs.po: unctrl.h
-lib_trace.So: curses.h
-lib_trace.So: ncurses_def.h
-lib_trace.So: term.h
-lib_trace.So: unctrl.h
-lib_trace.o: curses.h
-lib_trace.o: ncurses_def.h
-lib_trace.o: term.h
-lib_trace.o: unctrl.h
-lib_trace.po: curses.h
-lib_trace.po: ncurses_def.h
-lib_trace.po: term.h
-lib_trace.po: unctrl.h
-lib_tstp.So: curses.h
-lib_tstp.So: ncurses_def.h
-lib_tstp.So: term.h
-lib_tstp.So: unctrl.h
-lib_tstp.o: curses.h
-lib_tstp.o: ncurses_def.h
-lib_tstp.o: term.h
-lib_tstp.o: unctrl.h
-lib_tstp.po: curses.h
-lib_tstp.po: ncurses_def.h
-lib_tstp.po: term.h
-lib_tstp.po: unctrl.h
-lib_ttyflags.So: curses.h
-lib_ttyflags.So: ncurses_def.h
-lib_ttyflags.So: term.h
-lib_ttyflags.So: unctrl.h
-lib_ttyflags.o: curses.h
-lib_ttyflags.o: ncurses_def.h
-lib_ttyflags.o: term.h
-lib_ttyflags.o: unctrl.h
-lib_ttyflags.po: curses.h
-lib_ttyflags.po: ncurses_def.h
-lib_ttyflags.po: term.h
-lib_ttyflags.po: unctrl.h
-lib_twait.So: curses.h
-lib_twait.So: ncurses_def.h
-lib_twait.So: term.h
-lib_twait.So: unctrl.h
-lib_twait.o: curses.h
-lib_twait.o: ncurses_def.h
-lib_twait.o: term.h
-lib_twait.o: unctrl.h
-lib_twait.po: curses.h
-lib_twait.po: ncurses_def.h
-lib_twait.po: term.h
-lib_twait.po: unctrl.h
-lib_ungetch.So: curses.h
-lib_ungetch.So: ncurses_def.h
-lib_ungetch.So: term.h
-lib_ungetch.So: unctrl.h
-lib_ungetch.o: curses.h
-lib_ungetch.o: ncurses_def.h
-lib_ungetch.o: term.h
-lib_ungetch.o: unctrl.h
-lib_ungetch.po: curses.h
-lib_ungetch.po: ncurses_def.h
-lib_ungetch.po: term.h
-lib_ungetch.po: unctrl.h
-lib_vidattr.So: curses.h
-lib_vidattr.So: ncurses_def.h
-lib_vidattr.So: term.h
-lib_vidattr.So: unctrl.h
-lib_vidattr.o: curses.h
-lib_vidattr.o: ncurses_def.h
-lib_vidattr.o: term.h
-lib_vidattr.o: unctrl.h
-lib_vidattr.po: curses.h
-lib_vidattr.po: ncurses_def.h
-lib_vidattr.po: term.h
-lib_vidattr.po: unctrl.h
-lib_vline.So: curses.h
-lib_vline.So: ncurses_def.h
-lib_vline.So: term.h
-lib_vline.So: unctrl.h
-lib_vline.o: curses.h
-lib_vline.o: ncurses_def.h
-lib_vline.o: term.h
-lib_vline.o: unctrl.h
-lib_vline.po: curses.h
-lib_vline.po: ncurses_def.h
-lib_vline.po: term.h
-lib_vline.po: unctrl.h
-lib_wattroff.So: curses.h
-lib_wattroff.So: ncurses_def.h
-lib_wattroff.So: term.h
-lib_wattroff.So: unctrl.h
-lib_wattroff.o: curses.h
-lib_wattroff.o: ncurses_def.h
-lib_wattroff.o: term.h
-lib_wattroff.o: unctrl.h
-lib_wattroff.po: curses.h
-lib_wattroff.po: ncurses_def.h
-lib_wattroff.po: term.h
-lib_wattroff.po: unctrl.h
-lib_wattron.So: curses.h
-lib_wattron.So: ncurses_def.h
-lib_wattron.So: term.h
-lib_wattron.So: unctrl.h
-lib_wattron.o: curses.h
-lib_wattron.o: ncurses_def.h
-lib_wattron.o: term.h
-lib_wattron.o: unctrl.h
-lib_wattron.po: curses.h
-lib_wattron.po: ncurses_def.h
-lib_wattron.po: term.h
-lib_wattron.po: unctrl.h
-lib_winch.So: curses.h
-lib_winch.So: ncurses_def.h
-lib_winch.So: term.h
-lib_winch.So: unctrl.h
-lib_winch.o: curses.h
-lib_winch.o: ncurses_def.h
-lib_winch.o: term.h
-lib_winch.o: unctrl.h
-lib_winch.po: curses.h
-lib_winch.po: ncurses_def.h
-lib_winch.po: term.h
-lib_winch.po: unctrl.h
-lib_window.So: curses.h
-lib_window.So: ncurses_def.h
-lib_window.So: term.h
-lib_window.So: unctrl.h
-lib_window.o: curses.h
-lib_window.o: ncurses_def.h
-lib_window.o: term.h
-lib_window.o: unctrl.h
-lib_window.po: curses.h
-lib_window.po: ncurses_def.h
-lib_window.po: term.h
-lib_window.po: unctrl.h
-name_match.So: curses.h
-name_match.So: ncurses_def.h
-name_match.So: term.h
-name_match.So: unctrl.h
-name_match.o: curses.h
-name_match.o: ncurses_def.h
-name_match.o: term.h
-name_match.o: unctrl.h
-name_match.po: curses.h
-name_match.po: ncurses_def.h
-name_match.po: term.h
-name_match.po: unctrl.h
-names.So: curses.h
-names.So: names.c
-names.So: ncurses_def.h
-names.So: term.h
-names.So: unctrl.h
-names.o: curses.h
-names.o: names.c
-names.o: ncurses_def.h
-names.o: term.h
-names.o: unctrl.h
-names.po: curses.h
-names.po: names.c
-names.po: ncurses_def.h
-names.po: term.h
-names.po: unctrl.h
-nc_panel.So: curses.h
-nc_panel.So: ncurses_def.h
-nc_panel.So: term.h
-nc_panel.So: unctrl.h
-nc_panel.o: curses.h
-nc_panel.o: ncurses_def.h
-nc_panel.o: term.h
-nc_panel.o: unctrl.h
-nc_panel.po: curses.h
-nc_panel.po: ncurses_def.h
-nc_panel.po: term.h
-nc_panel.po: unctrl.h
-obsolete.So: curses.h
-obsolete.So: ncurses_def.h
-obsolete.So: term.h
-obsolete.So: unctrl.h
-obsolete.o: curses.h
-obsolete.o: ncurses_def.h
-obsolete.o: term.h
-obsolete.o: unctrl.h
-obsolete.po: curses.h
-obsolete.po: ncurses_def.h
-obsolete.po: term.h
-obsolete.po: unctrl.h
-parse_entry.So: curses.h
-parse_entry.So: ncurses_def.h
-parse_entry.So: parametrized.h
-parse_entry.So: term.h
-parse_entry.So: unctrl.h
-parse_entry.o: curses.h
-parse_entry.o: ncurses_def.h
-parse_entry.o: parametrized.h
-parse_entry.o: term.h
-parse_entry.o: unctrl.h
-parse_entry.po: curses.h
-parse_entry.po: ncurses_def.h
-parse_entry.po: parametrized.h
-parse_entry.po: term.h
-parse_entry.po: unctrl.h
-read_entry.So: curses.h
-read_entry.So: ncurses_def.h
-read_entry.So: term.h
-read_entry.So: unctrl.h
-read_entry.o: curses.h
-read_entry.o: ncurses_def.h
-read_entry.o: term.h
-read_entry.o: unctrl.h
-read_entry.po: curses.h
-read_entry.po: ncurses_def.h
-read_entry.po: term.h
-read_entry.po: unctrl.h
-resizeterm.So: curses.h
-resizeterm.So: ncurses_def.h
-resizeterm.So: term.h
-resizeterm.So: unctrl.h
-resizeterm.o: curses.h
-resizeterm.o: ncurses_def.h
-resizeterm.o: term.h
-resizeterm.o: unctrl.h
-resizeterm.po: curses.h
-resizeterm.po: ncurses_def.h
-resizeterm.po: term.h
-resizeterm.po: unctrl.h
-safe_sprintf.So: curses.h
-safe_sprintf.So: ncurses_def.h
-safe_sprintf.So: term.h
-safe_sprintf.So: unctrl.h
-safe_sprintf.o: curses.h
-safe_sprintf.o: ncurses_def.h
-safe_sprintf.o: term.h
-safe_sprintf.o: unctrl.h
-safe_sprintf.po: curses.h
-safe_sprintf.po: ncurses_def.h
-safe_sprintf.po: term.h
-safe_sprintf.po: unctrl.h
-strings.So: curses.h
-strings.So: ncurses_def.h
-strings.So: term.h
-strings.So: unctrl.h
-strings.o: curses.h
-strings.o: ncurses_def.h
-strings.o: term.h
-strings.o: unctrl.h
-strings.po: curses.h
-strings.po: ncurses_def.h
-strings.po: term.h
-strings.po: unctrl.h
-termcap.So: curses.h
-termcap.So: ncurses_def.h
-termcap.So: term.h
-termcap.So: unctrl.h
-termcap.o: curses.h
-termcap.o: ncurses_def.h
-termcap.o: term.h
-termcap.o: unctrl.h
-termcap.po: curses.h
-termcap.po: ncurses_def.h
-termcap.po: term.h
-termcap.po: unctrl.h
-tries.So: curses.h
-tries.So: ncurses_def.h
-tries.So: term.h
-tries.So: unctrl.h
-tries.o: curses.h
-tries.o: ncurses_def.h
-tries.o: term.h
-tries.o: unctrl.h
-tries.po: curses.h
-tries.po: ncurses_def.h
-tries.po: term.h
-tries.po: unctrl.h
-trim_sgr0.So: curses.h
-trim_sgr0.So: ncurses_def.h
-trim_sgr0.So: term.h
-trim_sgr0.So: unctrl.h
-trim_sgr0.o: curses.h
-trim_sgr0.o: ncurses_def.h
-trim_sgr0.o: term.h
-trim_sgr0.o: unctrl.h
-trim_sgr0.po: curses.h
-trim_sgr0.po: ncurses_def.h
-trim_sgr0.po: term.h
-trim_sgr0.po: unctrl.h
-tty_update.So: curses.h
-tty_update.So: ncurses_def.h
-tty_update.So: term.h
-tty_update.So: unctrl.h
-tty_update.o: curses.h
-tty_update.o: ncurses_def.h
-tty_update.o: term.h
-tty_update.o: unctrl.h
-tty_update.po: curses.h
-tty_update.po: ncurses_def.h
-tty_update.po: term.h
-tty_update.po: unctrl.h
-unctrl.So: curses.h
-unctrl.So: ncurses_def.h
-unctrl.So: term.h
-unctrl.So: unctrl.c
-unctrl.So: unctrl.h
-unctrl.o: curses.h
-unctrl.o: ncurses_def.h
-unctrl.o: term.h
-unctrl.o: unctrl.c
-unctrl.o: unctrl.h
-unctrl.po: curses.h
-unctrl.po: ncurses_def.h
-unctrl.po: term.h
-unctrl.po: unctrl.c
-unctrl.po: unctrl.h
-version.So: curses.h
-version.So: ncurses_def.h
-version.So: term.h
-version.So: unctrl.h
-version.o: curses.h
-version.o: ncurses_def.h
-version.o: term.h
-version.o: unctrl.h
-version.po: curses.h
-version.po: ncurses_def.h
-version.po: term.h
-version.po: unctrl.h
-visbuf.So: curses.h
-visbuf.So: ncurses_def.h
-visbuf.So: term.h
-visbuf.So: unctrl.h
-visbuf.o: curses.h
-visbuf.o: ncurses_def.h
-visbuf.o: term.h
-visbuf.o: unctrl.h
-visbuf.po: curses.h
-visbuf.po: ncurses_def.h
-visbuf.po: term.h
-visbuf.po: unctrl.h
-vsscanf.So: curses.h
-vsscanf.So: ncurses_def.h
-vsscanf.So: term.h
-vsscanf.So: unctrl.h
-vsscanf.o: curses.h
-vsscanf.o: ncurses_def.h
-vsscanf.o: term.h
-vsscanf.o: unctrl.h
-vsscanf.po: curses.h
-vsscanf.po: ncurses_def.h
-vsscanf.po: term.h
-vsscanf.po: unctrl.h
-wresize.So: curses.h
-wresize.So: ncurses_def.h
-wresize.So: term.h
-wresize.So: unctrl.h
-wresize.o: curses.h
-wresize.o: ncurses_def.h
-wresize.o: term.h
-wresize.o: unctrl.h
-wresize.po: curses.h
-wresize.po: ncurses_def.h
-wresize.po: term.h
-wresize.po: unctrl.h
-write_entry.So: curses.h
-write_entry.So: ncurses_def.h
-write_entry.So: term.h
-write_entry.So: unctrl.h
-write_entry.o: curses.h
-write_entry.o: ncurses_def.h
-write_entry.o: term.h
-write_entry.o: unctrl.h
-write_entry.po: curses.h
-write_entry.po: ncurses_def.h
-write_entry.po: term.h
-write_entry.po: unctrl.h
.endif
diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend
index b6ffa95..3646e2e 100644
--- a/lib/ncurses/ncursesw/Makefile.depend
+++ b/lib/ncurses/ncursesw/Makefile.depend
@@ -15,2515 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-access.So: curses.h
-access.So: ncurses_def.h
-access.So: ncurses_dll.h
-access.So: term.h
-access.So: unctrl.h
-access.o: curses.h
-access.o: ncurses_def.h
-access.o: ncurses_dll.h
-access.o: term.h
-access.o: unctrl.h
-access.po: curses.h
-access.po: ncurses_def.h
-access.po: ncurses_dll.h
-access.po: term.h
-access.po: unctrl.h
-add_tries.So: curses.h
-add_tries.So: ncurses_def.h
-add_tries.So: ncurses_dll.h
-add_tries.So: term.h
-add_tries.So: unctrl.h
-add_tries.o: curses.h
-add_tries.o: ncurses_def.h
-add_tries.o: ncurses_dll.h
-add_tries.o: term.h
-add_tries.o: unctrl.h
-add_tries.po: curses.h
-add_tries.po: ncurses_def.h
-add_tries.po: ncurses_dll.h
-add_tries.po: term.h
-add_tries.po: unctrl.h
-alloc_entry.So: curses.h
-alloc_entry.So: ncurses_def.h
-alloc_entry.So: ncurses_dll.h
-alloc_entry.So: term.h
-alloc_entry.So: unctrl.h
-alloc_entry.o: curses.h
-alloc_entry.o: ncurses_def.h
-alloc_entry.o: ncurses_dll.h
-alloc_entry.o: term.h
-alloc_entry.o: unctrl.h
-alloc_entry.po: curses.h
-alloc_entry.po: ncurses_def.h
-alloc_entry.po: ncurses_dll.h
-alloc_entry.po: term.h
-alloc_entry.po: unctrl.h
-alloc_ttype.So: curses.h
-alloc_ttype.So: ncurses_def.h
-alloc_ttype.So: ncurses_dll.h
-alloc_ttype.So: term.h
-alloc_ttype.So: unctrl.h
-alloc_ttype.o: curses.h
-alloc_ttype.o: ncurses_def.h
-alloc_ttype.o: ncurses_dll.h
-alloc_ttype.o: term.h
-alloc_ttype.o: unctrl.h
-alloc_ttype.po: curses.h
-alloc_ttype.po: ncurses_def.h
-alloc_ttype.po: ncurses_dll.h
-alloc_ttype.po: term.h
-alloc_ttype.po: unctrl.h
-captoinfo.So: curses.h
-captoinfo.So: ncurses_def.h
-captoinfo.So: ncurses_dll.h
-captoinfo.So: term.h
-captoinfo.So: unctrl.h
-captoinfo.o: curses.h
-captoinfo.o: ncurses_def.h
-captoinfo.o: ncurses_dll.h
-captoinfo.o: term.h
-captoinfo.o: unctrl.h
-captoinfo.po: curses.h
-captoinfo.po: ncurses_def.h
-captoinfo.po: ncurses_dll.h
-captoinfo.po: term.h
-captoinfo.po: unctrl.h
-charable.So: curses.h
-charable.So: ncurses_def.h
-charable.So: ncurses_dll.h
-charable.So: term.h
-charable.So: unctrl.h
-charable.o: curses.h
-charable.o: ncurses_def.h
-charable.o: ncurses_dll.h
-charable.o: term.h
-charable.o: unctrl.h
-charable.po: curses.h
-charable.po: ncurses_def.h
-charable.po: ncurses_dll.h
-charable.po: term.h
-charable.po: unctrl.h
-codes.So: codes.c
-codes.So: curses.h
-codes.So: ncurses_def.h
-codes.So: ncurses_dll.h
-codes.So: term.h
-codes.So: unctrl.h
-codes.o: codes.c
-codes.o: curses.h
-codes.o: ncurses_def.h
-codes.o: ncurses_dll.h
-codes.o: term.h
-codes.o: unctrl.h
-codes.po: codes.c
-codes.po: curses.h
-codes.po: ncurses_def.h
-codes.po: ncurses_dll.h
-codes.po: term.h
-codes.po: unctrl.h
-comp_captab.So: comp_captab.c
-comp_captab.So: curses.h
-comp_captab.So: hashsize.h
-comp_captab.So: ncurses_def.h
-comp_captab.So: ncurses_dll.h
-comp_captab.So: term.h
-comp_captab.So: unctrl.h
-comp_captab.o: comp_captab.c
-comp_captab.o: curses.h
-comp_captab.o: hashsize.h
-comp_captab.o: ncurses_def.h
-comp_captab.o: ncurses_dll.h
-comp_captab.o: term.h
-comp_captab.o: unctrl.h
-comp_captab.po: comp_captab.c
-comp_captab.po: curses.h
-comp_captab.po: hashsize.h
-comp_captab.po: ncurses_def.h
-comp_captab.po: ncurses_dll.h
-comp_captab.po: term.h
-comp_captab.po: unctrl.h
-comp_error.So: curses.h
-comp_error.So: ncurses_def.h
-comp_error.So: ncurses_dll.h
-comp_error.So: term.h
-comp_error.So: unctrl.h
-comp_error.o: curses.h
-comp_error.o: ncurses_def.h
-comp_error.o: ncurses_dll.h
-comp_error.o: term.h
-comp_error.o: unctrl.h
-comp_error.po: curses.h
-comp_error.po: ncurses_def.h
-comp_error.po: ncurses_dll.h
-comp_error.po: term.h
-comp_error.po: unctrl.h
-comp_expand.So: curses.h
-comp_expand.So: ncurses_def.h
-comp_expand.So: ncurses_dll.h
-comp_expand.So: term.h
-comp_expand.So: unctrl.h
-comp_expand.o: curses.h
-comp_expand.o: ncurses_def.h
-comp_expand.o: ncurses_dll.h
-comp_expand.o: term.h
-comp_expand.o: unctrl.h
-comp_expand.po: curses.h
-comp_expand.po: ncurses_def.h
-comp_expand.po: ncurses_dll.h
-comp_expand.po: term.h
-comp_expand.po: unctrl.h
-comp_hash.So: curses.h
-comp_hash.So: hashsize.h
-comp_hash.So: ncurses_def.h
-comp_hash.So: ncurses_dll.h
-comp_hash.So: term.h
-comp_hash.So: unctrl.h
-comp_hash.o: curses.h
-comp_hash.o: hashsize.h
-comp_hash.o: ncurses_def.h
-comp_hash.o: ncurses_dll.h
-comp_hash.o: term.h
-comp_hash.o: unctrl.h
-comp_hash.po: curses.h
-comp_hash.po: hashsize.h
-comp_hash.po: ncurses_def.h
-comp_hash.po: ncurses_dll.h
-comp_hash.po: term.h
-comp_hash.po: unctrl.h
-comp_parse.So: curses.h
-comp_parse.So: ncurses_def.h
-comp_parse.So: ncurses_dll.h
-comp_parse.So: term.h
-comp_parse.So: unctrl.h
-comp_parse.o: curses.h
-comp_parse.o: ncurses_def.h
-comp_parse.o: ncurses_dll.h
-comp_parse.o: term.h
-comp_parse.o: unctrl.h
-comp_parse.po: curses.h
-comp_parse.po: ncurses_def.h
-comp_parse.po: ncurses_dll.h
-comp_parse.po: term.h
-comp_parse.po: unctrl.h
-comp_scan.So: curses.h
-comp_scan.So: ncurses_def.h
-comp_scan.So: ncurses_dll.h
-comp_scan.So: term.h
-comp_scan.So: unctrl.h
-comp_scan.o: curses.h
-comp_scan.o: ncurses_def.h
-comp_scan.o: ncurses_dll.h
-comp_scan.o: term.h
-comp_scan.o: unctrl.h
-comp_scan.po: curses.h
-comp_scan.po: ncurses_def.h
-comp_scan.po: ncurses_dll.h
-comp_scan.po: term.h
-comp_scan.po: unctrl.h
-db_iterator.So: curses.h
-db_iterator.So: ncurses_def.h
-db_iterator.So: ncurses_dll.h
-db_iterator.So: term.h
-db_iterator.So: unctrl.h
-db_iterator.o: curses.h
-db_iterator.o: ncurses_def.h
-db_iterator.o: ncurses_dll.h
-db_iterator.o: term.h
-db_iterator.o: unctrl.h
-db_iterator.po: curses.h
-db_iterator.po: ncurses_def.h
-db_iterator.po: ncurses_dll.h
-db_iterator.po: term.h
-db_iterator.po: unctrl.h
-define_key.So: curses.h
-define_key.So: ncurses_def.h
-define_key.So: ncurses_dll.h
-define_key.So: term.h
-define_key.So: unctrl.h
-define_key.o: curses.h
-define_key.o: ncurses_def.h
-define_key.o: ncurses_dll.h
-define_key.o: term.h
-define_key.o: unctrl.h
-define_key.po: curses.h
-define_key.po: ncurses_def.h
-define_key.po: ncurses_dll.h
-define_key.po: term.h
-define_key.po: unctrl.h
-doalloc.So: curses.h
-doalloc.So: ncurses_def.h
-doalloc.So: ncurses_dll.h
-doalloc.So: term.h
-doalloc.So: unctrl.h
-doalloc.o: curses.h
-doalloc.o: ncurses_def.h
-doalloc.o: ncurses_dll.h
-doalloc.o: term.h
-doalloc.o: unctrl.h
-doalloc.po: curses.h
-doalloc.po: ncurses_def.h
-doalloc.po: ncurses_dll.h
-doalloc.po: term.h
-doalloc.po: unctrl.h
-entries.So: curses.h
-entries.So: ncurses_def.h
-entries.So: ncurses_dll.h
-entries.So: term.h
-entries.So: unctrl.h
-entries.o: curses.h
-entries.o: ncurses_def.h
-entries.o: ncurses_dll.h
-entries.o: term.h
-entries.o: unctrl.h
-entries.po: curses.h
-entries.po: ncurses_def.h
-entries.po: ncurses_dll.h
-entries.po: term.h
-entries.po: unctrl.h
-expanded.So: curses.h
-expanded.So: expanded.c
-expanded.So: ncurses_def.h
-expanded.So: ncurses_dll.h
-expanded.So: term.h
-expanded.So: unctrl.h
-expanded.o: curses.h
-expanded.o: expanded.c
-expanded.o: ncurses_def.h
-expanded.o: ncurses_dll.h
-expanded.o: term.h
-expanded.o: unctrl.h
-expanded.po: curses.h
-expanded.po: expanded.c
-expanded.po: ncurses_def.h
-expanded.po: ncurses_dll.h
-expanded.po: term.h
-expanded.po: unctrl.h
-fallback.So: curses.h
-fallback.So: fallback.c
-fallback.So: ncurses_def.h
-fallback.So: ncurses_dll.h
-fallback.So: term.h
-fallback.So: unctrl.h
-fallback.o: curses.h
-fallback.o: fallback.c
-fallback.o: ncurses_def.h
-fallback.o: ncurses_dll.h
-fallback.o: term.h
-fallback.o: unctrl.h
-fallback.po: curses.h
-fallback.po: fallback.c
-fallback.po: ncurses_def.h
-fallback.po: ncurses_dll.h
-fallback.po: term.h
-fallback.po: unctrl.h
-free_ttype.So: curses.h
-free_ttype.So: ncurses_def.h
-free_ttype.So: ncurses_dll.h
-free_ttype.So: term.h
-free_ttype.So: unctrl.h
-free_ttype.o: curses.h
-free_ttype.o: ncurses_def.h
-free_ttype.o: ncurses_dll.h
-free_ttype.o: term.h
-free_ttype.o: unctrl.h
-free_ttype.po: curses.h
-free_ttype.po: ncurses_def.h
-free_ttype.po: ncurses_dll.h
-free_ttype.po: term.h
-free_ttype.po: unctrl.h
-getenv_num.So: curses.h
-getenv_num.So: ncurses_def.h
-getenv_num.So: ncurses_dll.h
-getenv_num.So: term.h
-getenv_num.So: unctrl.h
-getenv_num.o: curses.h
-getenv_num.o: ncurses_def.h
-getenv_num.o: ncurses_dll.h
-getenv_num.o: term.h
-getenv_num.o: unctrl.h
-getenv_num.po: curses.h
-getenv_num.po: ncurses_def.h
-getenv_num.po: ncurses_dll.h
-getenv_num.po: term.h
-getenv_num.po: unctrl.h
-hardscroll.So: curses.h
-hardscroll.So: ncurses_def.h
-hardscroll.So: ncurses_dll.h
-hardscroll.So: term.h
-hardscroll.So: unctrl.h
-hardscroll.o: curses.h
-hardscroll.o: ncurses_def.h
-hardscroll.o: ncurses_dll.h
-hardscroll.o: term.h
-hardscroll.o: unctrl.h
-hardscroll.po: curses.h
-hardscroll.po: ncurses_def.h
-hardscroll.po: ncurses_dll.h
-hardscroll.po: term.h
-hardscroll.po: unctrl.h
-hashed_db.So: curses.h
-hashed_db.So: ncurses_def.h
-hashed_db.So: ncurses_dll.h
-hashed_db.So: term.h
-hashed_db.So: unctrl.h
-hashed_db.o: curses.h
-hashed_db.o: ncurses_def.h
-hashed_db.o: ncurses_dll.h
-hashed_db.o: term.h
-hashed_db.o: unctrl.h
-hashed_db.po: curses.h
-hashed_db.po: ncurses_def.h
-hashed_db.po: ncurses_dll.h
-hashed_db.po: term.h
-hashed_db.po: unctrl.h
-hashmap.So: curses.h
-hashmap.So: ncurses_def.h
-hashmap.So: ncurses_dll.h
-hashmap.So: term.h
-hashmap.So: unctrl.h
-hashmap.o: curses.h
-hashmap.o: ncurses_def.h
-hashmap.o: ncurses_dll.h
-hashmap.o: term.h
-hashmap.o: unctrl.h
-hashmap.po: curses.h
-hashmap.po: ncurses_def.h
-hashmap.po: ncurses_dll.h
-hashmap.po: term.h
-hashmap.po: unctrl.h
-home_terminfo.So: curses.h
-home_terminfo.So: ncurses_def.h
-home_terminfo.So: ncurses_dll.h
-home_terminfo.So: term.h
-home_terminfo.So: unctrl.h
-home_terminfo.o: curses.h
-home_terminfo.o: ncurses_def.h
-home_terminfo.o: ncurses_dll.h
-home_terminfo.o: term.h
-home_terminfo.o: unctrl.h
-home_terminfo.po: curses.h
-home_terminfo.po: ncurses_def.h
-home_terminfo.po: ncurses_dll.h
-home_terminfo.po: term.h
-home_terminfo.po: unctrl.h
-init_keytry.So: curses.h
-init_keytry.So: init_keytry.h
-init_keytry.So: ncurses_def.h
-init_keytry.So: ncurses_dll.h
-init_keytry.So: term.h
-init_keytry.So: unctrl.h
-init_keytry.o: curses.h
-init_keytry.o: init_keytry.h
-init_keytry.o: ncurses_def.h
-init_keytry.o: ncurses_dll.h
-init_keytry.o: term.h
-init_keytry.o: unctrl.h
-init_keytry.po: curses.h
-init_keytry.po: init_keytry.h
-init_keytry.po: ncurses_def.h
-init_keytry.po: ncurses_dll.h
-init_keytry.po: term.h
-init_keytry.po: unctrl.h
-key_defined.So: curses.h
-key_defined.So: ncurses_def.h
-key_defined.So: ncurses_dll.h
-key_defined.So: term.h
-key_defined.So: unctrl.h
-key_defined.o: curses.h
-key_defined.o: ncurses_def.h
-key_defined.o: ncurses_dll.h
-key_defined.o: term.h
-key_defined.o: unctrl.h
-key_defined.po: curses.h
-key_defined.po: ncurses_def.h
-key_defined.po: ncurses_dll.h
-key_defined.po: term.h
-key_defined.po: unctrl.h
-keybound.So: curses.h
-keybound.So: ncurses_def.h
-keybound.So: ncurses_dll.h
-keybound.So: term.h
-keybound.So: unctrl.h
-keybound.o: curses.h
-keybound.o: ncurses_def.h
-keybound.o: ncurses_dll.h
-keybound.o: term.h
-keybound.o: unctrl.h
-keybound.po: curses.h
-keybound.po: ncurses_def.h
-keybound.po: ncurses_dll.h
-keybound.po: term.h
-keybound.po: unctrl.h
-keyok.So: curses.h
-keyok.So: ncurses_def.h
-keyok.So: ncurses_dll.h
-keyok.So: term.h
-keyok.So: unctrl.h
-keyok.o: curses.h
-keyok.o: ncurses_def.h
-keyok.o: ncurses_dll.h
-keyok.o: term.h
-keyok.o: unctrl.h
-keyok.po: curses.h
-keyok.po: ncurses_def.h
-keyok.po: ncurses_dll.h
-keyok.po: term.h
-keyok.po: unctrl.h
-legacy_coding.So: curses.h
-legacy_coding.So: ncurses_def.h
-legacy_coding.So: ncurses_dll.h
-legacy_coding.So: term.h
-legacy_coding.So: unctrl.h
-legacy_coding.o: curses.h
-legacy_coding.o: ncurses_def.h
-legacy_coding.o: ncurses_dll.h
-legacy_coding.o: term.h
-legacy_coding.o: unctrl.h
-legacy_coding.po: curses.h
-legacy_coding.po: ncurses_def.h
-legacy_coding.po: ncurses_dll.h
-legacy_coding.po: term.h
-legacy_coding.po: unctrl.h
-lib_acs.So: curses.h
-lib_acs.So: ncurses_def.h
-lib_acs.So: ncurses_dll.h
-lib_acs.So: term.h
-lib_acs.So: unctrl.h
-lib_acs.o: curses.h
-lib_acs.o: ncurses_def.h
-lib_acs.o: ncurses_dll.h
-lib_acs.o: term.h
-lib_acs.o: unctrl.h
-lib_acs.po: curses.h
-lib_acs.po: ncurses_def.h
-lib_acs.po: ncurses_dll.h
-lib_acs.po: term.h
-lib_acs.po: unctrl.h
-lib_add_wch.So: curses.h
-lib_add_wch.So: ncurses_def.h
-lib_add_wch.So: ncurses_dll.h
-lib_add_wch.So: term.h
-lib_add_wch.So: unctrl.h
-lib_add_wch.o: curses.h
-lib_add_wch.o: ncurses_def.h
-lib_add_wch.o: ncurses_dll.h
-lib_add_wch.o: term.h
-lib_add_wch.o: unctrl.h
-lib_add_wch.po: curses.h
-lib_add_wch.po: ncurses_def.h
-lib_add_wch.po: ncurses_dll.h
-lib_add_wch.po: term.h
-lib_add_wch.po: unctrl.h
-lib_addch.So: curses.h
-lib_addch.So: ncurses_def.h
-lib_addch.So: ncurses_dll.h
-lib_addch.So: term.h
-lib_addch.So: unctrl.h
-lib_addch.o: curses.h
-lib_addch.o: ncurses_def.h
-lib_addch.o: ncurses_dll.h
-lib_addch.o: term.h
-lib_addch.o: unctrl.h
-lib_addch.po: curses.h
-lib_addch.po: ncurses_def.h
-lib_addch.po: ncurses_dll.h
-lib_addch.po: term.h
-lib_addch.po: unctrl.h
-lib_addstr.So: curses.h
-lib_addstr.So: ncurses_def.h
-lib_addstr.So: ncurses_dll.h
-lib_addstr.So: term.h
-lib_addstr.So: unctrl.h
-lib_addstr.o: curses.h
-lib_addstr.o: ncurses_def.h
-lib_addstr.o: ncurses_dll.h
-lib_addstr.o: term.h
-lib_addstr.o: unctrl.h
-lib_addstr.po: curses.h
-lib_addstr.po: ncurses_def.h
-lib_addstr.po: ncurses_dll.h
-lib_addstr.po: term.h
-lib_addstr.po: unctrl.h
-lib_baudrate.So: curses.h
-lib_baudrate.So: ncurses_def.h
-lib_baudrate.So: ncurses_dll.h
-lib_baudrate.So: term.h
-lib_baudrate.So: termcap.h
-lib_baudrate.So: unctrl.h
-lib_baudrate.o: curses.h
-lib_baudrate.o: ncurses_def.h
-lib_baudrate.o: ncurses_dll.h
-lib_baudrate.o: term.h
-lib_baudrate.o: termcap.h
-lib_baudrate.o: unctrl.h
-lib_baudrate.po: curses.h
-lib_baudrate.po: ncurses_def.h
-lib_baudrate.po: ncurses_dll.h
-lib_baudrate.po: term.h
-lib_baudrate.po: termcap.h
-lib_baudrate.po: unctrl.h
-lib_beep.So: curses.h
-lib_beep.So: ncurses_def.h
-lib_beep.So: ncurses_dll.h
-lib_beep.So: term.h
-lib_beep.So: unctrl.h
-lib_beep.o: curses.h
-lib_beep.o: ncurses_def.h
-lib_beep.o: ncurses_dll.h
-lib_beep.o: term.h
-lib_beep.o: unctrl.h
-lib_beep.po: curses.h
-lib_beep.po: ncurses_def.h
-lib_beep.po: ncurses_dll.h
-lib_beep.po: term.h
-lib_beep.po: unctrl.h
-lib_bkgd.So: curses.h
-lib_bkgd.So: ncurses_def.h
-lib_bkgd.So: ncurses_dll.h
-lib_bkgd.So: term.h
-lib_bkgd.So: unctrl.h
-lib_bkgd.o: curses.h
-lib_bkgd.o: ncurses_def.h
-lib_bkgd.o: ncurses_dll.h
-lib_bkgd.o: term.h
-lib_bkgd.o: unctrl.h
-lib_bkgd.po: curses.h
-lib_bkgd.po: ncurses_def.h
-lib_bkgd.po: ncurses_dll.h
-lib_bkgd.po: term.h
-lib_bkgd.po: unctrl.h
-lib_box.So: curses.h
-lib_box.So: ncurses_def.h
-lib_box.So: ncurses_dll.h
-lib_box.So: term.h
-lib_box.So: unctrl.h
-lib_box.o: curses.h
-lib_box.o: ncurses_def.h
-lib_box.o: ncurses_dll.h
-lib_box.o: term.h
-lib_box.o: unctrl.h
-lib_box.po: curses.h
-lib_box.po: ncurses_def.h
-lib_box.po: ncurses_dll.h
-lib_box.po: term.h
-lib_box.po: unctrl.h
-lib_box_set.So: curses.h
-lib_box_set.So: ncurses_def.h
-lib_box_set.So: ncurses_dll.h
-lib_box_set.So: term.h
-lib_box_set.So: unctrl.h
-lib_box_set.o: curses.h
-lib_box_set.o: ncurses_def.h
-lib_box_set.o: ncurses_dll.h
-lib_box_set.o: term.h
-lib_box_set.o: unctrl.h
-lib_box_set.po: curses.h
-lib_box_set.po: ncurses_def.h
-lib_box_set.po: ncurses_dll.h
-lib_box_set.po: term.h
-lib_box_set.po: unctrl.h
-lib_cchar.So: curses.h
-lib_cchar.So: ncurses_def.h
-lib_cchar.So: ncurses_dll.h
-lib_cchar.So: term.h
-lib_cchar.So: unctrl.h
-lib_cchar.o: curses.h
-lib_cchar.o: ncurses_def.h
-lib_cchar.o: ncurses_dll.h
-lib_cchar.o: term.h
-lib_cchar.o: unctrl.h
-lib_cchar.po: curses.h
-lib_cchar.po: ncurses_def.h
-lib_cchar.po: ncurses_dll.h
-lib_cchar.po: term.h
-lib_cchar.po: unctrl.h
-lib_chgat.So: curses.h
-lib_chgat.So: ncurses_def.h
-lib_chgat.So: ncurses_dll.h
-lib_chgat.So: term.h
-lib_chgat.So: unctrl.h
-lib_chgat.o: curses.h
-lib_chgat.o: ncurses_def.h
-lib_chgat.o: ncurses_dll.h
-lib_chgat.o: term.h
-lib_chgat.o: unctrl.h
-lib_chgat.po: curses.h
-lib_chgat.po: ncurses_def.h
-lib_chgat.po: ncurses_dll.h
-lib_chgat.po: term.h
-lib_chgat.po: unctrl.h
-lib_clear.So: curses.h
-lib_clear.So: ncurses_def.h
-lib_clear.So: ncurses_dll.h
-lib_clear.So: term.h
-lib_clear.So: unctrl.h
-lib_clear.o: curses.h
-lib_clear.o: ncurses_def.h
-lib_clear.o: ncurses_dll.h
-lib_clear.o: term.h
-lib_clear.o: unctrl.h
-lib_clear.po: curses.h
-lib_clear.po: ncurses_def.h
-lib_clear.po: ncurses_dll.h
-lib_clear.po: term.h
-lib_clear.po: unctrl.h
-lib_clearok.So: curses.h
-lib_clearok.So: ncurses_def.h
-lib_clearok.So: ncurses_dll.h
-lib_clearok.So: term.h
-lib_clearok.So: unctrl.h
-lib_clearok.o: curses.h
-lib_clearok.o: ncurses_def.h
-lib_clearok.o: ncurses_dll.h
-lib_clearok.o: term.h
-lib_clearok.o: unctrl.h
-lib_clearok.po: curses.h
-lib_clearok.po: ncurses_def.h
-lib_clearok.po: ncurses_dll.h
-lib_clearok.po: term.h
-lib_clearok.po: unctrl.h
-lib_clrbot.So: curses.h
-lib_clrbot.So: ncurses_def.h
-lib_clrbot.So: ncurses_dll.h
-lib_clrbot.So: term.h
-lib_clrbot.So: unctrl.h
-lib_clrbot.o: curses.h
-lib_clrbot.o: ncurses_def.h
-lib_clrbot.o: ncurses_dll.h
-lib_clrbot.o: term.h
-lib_clrbot.o: unctrl.h
-lib_clrbot.po: curses.h
-lib_clrbot.po: ncurses_def.h
-lib_clrbot.po: ncurses_dll.h
-lib_clrbot.po: term.h
-lib_clrbot.po: unctrl.h
-lib_clreol.So: curses.h
-lib_clreol.So: ncurses_def.h
-lib_clreol.So: ncurses_dll.h
-lib_clreol.So: term.h
-lib_clreol.So: unctrl.h
-lib_clreol.o: curses.h
-lib_clreol.o: ncurses_def.h
-lib_clreol.o: ncurses_dll.h
-lib_clreol.o: term.h
-lib_clreol.o: unctrl.h
-lib_clreol.po: curses.h
-lib_clreol.po: ncurses_def.h
-lib_clreol.po: ncurses_dll.h
-lib_clreol.po: term.h
-lib_clreol.po: unctrl.h
-lib_color.So: curses.h
-lib_color.So: ncurses_def.h
-lib_color.So: ncurses_dll.h
-lib_color.So: term.h
-lib_color.So: unctrl.h
-lib_color.o: curses.h
-lib_color.o: ncurses_def.h
-lib_color.o: ncurses_dll.h
-lib_color.o: term.h
-lib_color.o: unctrl.h
-lib_color.po: curses.h
-lib_color.po: ncurses_def.h
-lib_color.po: ncurses_dll.h
-lib_color.po: term.h
-lib_color.po: unctrl.h
-lib_colorset.So: curses.h
-lib_colorset.So: ncurses_def.h
-lib_colorset.So: ncurses_dll.h
-lib_colorset.So: term.h
-lib_colorset.So: unctrl.h
-lib_colorset.o: curses.h
-lib_colorset.o: ncurses_def.h
-lib_colorset.o: ncurses_dll.h
-lib_colorset.o: term.h
-lib_colorset.o: unctrl.h
-lib_colorset.po: curses.h
-lib_colorset.po: ncurses_def.h
-lib_colorset.po: ncurses_dll.h
-lib_colorset.po: term.h
-lib_colorset.po: unctrl.h
-lib_cur_term.So: curses.h
-lib_cur_term.So: ncurses_def.h
-lib_cur_term.So: ncurses_dll.h
-lib_cur_term.So: term.h
-lib_cur_term.So: termcap.h
-lib_cur_term.So: unctrl.h
-lib_cur_term.o: curses.h
-lib_cur_term.o: ncurses_def.h
-lib_cur_term.o: ncurses_dll.h
-lib_cur_term.o: term.h
-lib_cur_term.o: termcap.h
-lib_cur_term.o: unctrl.h
-lib_cur_term.po: curses.h
-lib_cur_term.po: ncurses_def.h
-lib_cur_term.po: ncurses_dll.h
-lib_cur_term.po: term.h
-lib_cur_term.po: termcap.h
-lib_cur_term.po: unctrl.h
-lib_data.So: curses.h
-lib_data.So: ncurses_def.h
-lib_data.So: ncurses_dll.h
-lib_data.So: term.h
-lib_data.So: unctrl.h
-lib_data.o: curses.h
-lib_data.o: ncurses_def.h
-lib_data.o: ncurses_dll.h
-lib_data.o: term.h
-lib_data.o: unctrl.h
-lib_data.po: curses.h
-lib_data.po: ncurses_def.h
-lib_data.po: ncurses_dll.h
-lib_data.po: term.h
-lib_data.po: unctrl.h
-lib_delch.So: curses.h
-lib_delch.So: ncurses_def.h
-lib_delch.So: ncurses_dll.h
-lib_delch.So: term.h
-lib_delch.So: unctrl.h
-lib_delch.o: curses.h
-lib_delch.o: ncurses_def.h
-lib_delch.o: ncurses_dll.h
-lib_delch.o: term.h
-lib_delch.o: unctrl.h
-lib_delch.po: curses.h
-lib_delch.po: ncurses_def.h
-lib_delch.po: ncurses_dll.h
-lib_delch.po: term.h
-lib_delch.po: unctrl.h
-lib_delwin.So: curses.h
-lib_delwin.So: ncurses_def.h
-lib_delwin.So: ncurses_dll.h
-lib_delwin.So: term.h
-lib_delwin.So: unctrl.h
-lib_delwin.o: curses.h
-lib_delwin.o: ncurses_def.h
-lib_delwin.o: ncurses_dll.h
-lib_delwin.o: term.h
-lib_delwin.o: unctrl.h
-lib_delwin.po: curses.h
-lib_delwin.po: ncurses_def.h
-lib_delwin.po: ncurses_dll.h
-lib_delwin.po: term.h
-lib_delwin.po: unctrl.h
-lib_dft_fgbg.So: curses.h
-lib_dft_fgbg.So: ncurses_def.h
-lib_dft_fgbg.So: ncurses_dll.h
-lib_dft_fgbg.So: term.h
-lib_dft_fgbg.So: unctrl.h
-lib_dft_fgbg.o: curses.h
-lib_dft_fgbg.o: ncurses_def.h
-lib_dft_fgbg.o: ncurses_dll.h
-lib_dft_fgbg.o: term.h
-lib_dft_fgbg.o: unctrl.h
-lib_dft_fgbg.po: curses.h
-lib_dft_fgbg.po: ncurses_def.h
-lib_dft_fgbg.po: ncurses_dll.h
-lib_dft_fgbg.po: term.h
-lib_dft_fgbg.po: unctrl.h
-lib_echo.So: curses.h
-lib_echo.So: ncurses_def.h
-lib_echo.So: ncurses_dll.h
-lib_echo.So: term.h
-lib_echo.So: unctrl.h
-lib_echo.o: curses.h
-lib_echo.o: ncurses_def.h
-lib_echo.o: ncurses_dll.h
-lib_echo.o: term.h
-lib_echo.o: unctrl.h
-lib_echo.po: curses.h
-lib_echo.po: ncurses_def.h
-lib_echo.po: ncurses_dll.h
-lib_echo.po: term.h
-lib_echo.po: unctrl.h
-lib_endwin.So: curses.h
-lib_endwin.So: ncurses_def.h
-lib_endwin.So: ncurses_dll.h
-lib_endwin.So: term.h
-lib_endwin.So: unctrl.h
-lib_endwin.o: curses.h
-lib_endwin.o: ncurses_def.h
-lib_endwin.o: ncurses_dll.h
-lib_endwin.o: term.h
-lib_endwin.o: unctrl.h
-lib_endwin.po: curses.h
-lib_endwin.po: ncurses_def.h
-lib_endwin.po: ncurses_dll.h
-lib_endwin.po: term.h
-lib_endwin.po: unctrl.h
-lib_erase.So: curses.h
-lib_erase.So: ncurses_def.h
-lib_erase.So: ncurses_dll.h
-lib_erase.So: term.h
-lib_erase.So: unctrl.h
-lib_erase.o: curses.h
-lib_erase.o: ncurses_def.h
-lib_erase.o: ncurses_dll.h
-lib_erase.o: term.h
-lib_erase.o: unctrl.h
-lib_erase.po: curses.h
-lib_erase.po: ncurses_def.h
-lib_erase.po: ncurses_dll.h
-lib_erase.po: term.h
-lib_erase.po: unctrl.h
-lib_erasewchar.So: curses.h
-lib_erasewchar.So: ncurses_def.h
-lib_erasewchar.So: ncurses_dll.h
-lib_erasewchar.So: term.h
-lib_erasewchar.So: unctrl.h
-lib_erasewchar.o: curses.h
-lib_erasewchar.o: ncurses_def.h
-lib_erasewchar.o: ncurses_dll.h
-lib_erasewchar.o: term.h
-lib_erasewchar.o: unctrl.h
-lib_erasewchar.po: curses.h
-lib_erasewchar.po: ncurses_def.h
-lib_erasewchar.po: ncurses_dll.h
-lib_erasewchar.po: term.h
-lib_erasewchar.po: unctrl.h
-lib_flash.So: curses.h
-lib_flash.So: ncurses_def.h
-lib_flash.So: ncurses_dll.h
-lib_flash.So: term.h
-lib_flash.So: unctrl.h
-lib_flash.o: curses.h
-lib_flash.o: ncurses_def.h
-lib_flash.o: ncurses_dll.h
-lib_flash.o: term.h
-lib_flash.o: unctrl.h
-lib_flash.po: curses.h
-lib_flash.po: ncurses_def.h
-lib_flash.po: ncurses_dll.h
-lib_flash.po: term.h
-lib_flash.po: unctrl.h
-lib_freeall.So: curses.h
-lib_freeall.So: ncurses_def.h
-lib_freeall.So: ncurses_dll.h
-lib_freeall.So: term.h
-lib_freeall.So: unctrl.h
-lib_freeall.o: curses.h
-lib_freeall.o: ncurses_def.h
-lib_freeall.o: ncurses_dll.h
-lib_freeall.o: term.h
-lib_freeall.o: unctrl.h
-lib_freeall.po: curses.h
-lib_freeall.po: ncurses_def.h
-lib_freeall.po: ncurses_dll.h
-lib_freeall.po: term.h
-lib_freeall.po: unctrl.h
-lib_gen.So: curses.h
-lib_gen.So: lib_gen.c
-lib_gen.So: ncurses_def.h
-lib_gen.So: ncurses_dll.h
-lib_gen.So: term.h
-lib_gen.So: unctrl.h
-lib_gen.o: curses.h
-lib_gen.o: lib_gen.c
-lib_gen.o: ncurses_def.h
-lib_gen.o: ncurses_dll.h
-lib_gen.o: term.h
-lib_gen.o: unctrl.h
-lib_gen.po: curses.h
-lib_gen.po: lib_gen.c
-lib_gen.po: ncurses_def.h
-lib_gen.po: ncurses_dll.h
-lib_gen.po: term.h
-lib_gen.po: unctrl.h
-lib_get_wch.So: curses.h
-lib_get_wch.So: ncurses_def.h
-lib_get_wch.So: ncurses_dll.h
-lib_get_wch.So: term.h
-lib_get_wch.So: unctrl.h
-lib_get_wch.o: curses.h
-lib_get_wch.o: ncurses_def.h
-lib_get_wch.o: ncurses_dll.h
-lib_get_wch.o: term.h
-lib_get_wch.o: unctrl.h
-lib_get_wch.po: curses.h
-lib_get_wch.po: ncurses_def.h
-lib_get_wch.po: ncurses_dll.h
-lib_get_wch.po: term.h
-lib_get_wch.po: unctrl.h
-lib_get_wstr.So: curses.h
-lib_get_wstr.So: ncurses_def.h
-lib_get_wstr.So: ncurses_dll.h
-lib_get_wstr.So: term.h
-lib_get_wstr.So: unctrl.h
-lib_get_wstr.o: curses.h
-lib_get_wstr.o: ncurses_def.h
-lib_get_wstr.o: ncurses_dll.h
-lib_get_wstr.o: term.h
-lib_get_wstr.o: unctrl.h
-lib_get_wstr.po: curses.h
-lib_get_wstr.po: ncurses_def.h
-lib_get_wstr.po: ncurses_dll.h
-lib_get_wstr.po: term.h
-lib_get_wstr.po: unctrl.h
-lib_getch.So: curses.h
-lib_getch.So: ncurses_def.h
-lib_getch.So: ncurses_dll.h
-lib_getch.So: term.h
-lib_getch.So: unctrl.h
-lib_getch.o: curses.h
-lib_getch.o: ncurses_def.h
-lib_getch.o: ncurses_dll.h
-lib_getch.o: term.h
-lib_getch.o: unctrl.h
-lib_getch.po: curses.h
-lib_getch.po: ncurses_def.h
-lib_getch.po: ncurses_dll.h
-lib_getch.po: term.h
-lib_getch.po: unctrl.h
-lib_getstr.So: curses.h
-lib_getstr.So: ncurses_def.h
-lib_getstr.So: ncurses_dll.h
-lib_getstr.So: term.h
-lib_getstr.So: unctrl.h
-lib_getstr.o: curses.h
-lib_getstr.o: ncurses_def.h
-lib_getstr.o: ncurses_dll.h
-lib_getstr.o: term.h
-lib_getstr.o: unctrl.h
-lib_getstr.po: curses.h
-lib_getstr.po: ncurses_def.h
-lib_getstr.po: ncurses_dll.h
-lib_getstr.po: term.h
-lib_getstr.po: unctrl.h
-lib_has_cap.So: curses.h
-lib_has_cap.So: ncurses_def.h
-lib_has_cap.So: ncurses_dll.h
-lib_has_cap.So: term.h
-lib_has_cap.So: unctrl.h
-lib_has_cap.o: curses.h
-lib_has_cap.o: ncurses_def.h
-lib_has_cap.o: ncurses_dll.h
-lib_has_cap.o: term.h
-lib_has_cap.o: unctrl.h
-lib_has_cap.po: curses.h
-lib_has_cap.po: ncurses_def.h
-lib_has_cap.po: ncurses_dll.h
-lib_has_cap.po: term.h
-lib_has_cap.po: unctrl.h
-lib_hline.So: curses.h
-lib_hline.So: ncurses_def.h
-lib_hline.So: ncurses_dll.h
-lib_hline.So: term.h
-lib_hline.So: unctrl.h
-lib_hline.o: curses.h
-lib_hline.o: ncurses_def.h
-lib_hline.o: ncurses_dll.h
-lib_hline.o: term.h
-lib_hline.o: unctrl.h
-lib_hline.po: curses.h
-lib_hline.po: ncurses_def.h
-lib_hline.po: ncurses_dll.h
-lib_hline.po: term.h
-lib_hline.po: unctrl.h
-lib_hline_set.So: curses.h
-lib_hline_set.So: ncurses_def.h
-lib_hline_set.So: ncurses_dll.h
-lib_hline_set.So: term.h
-lib_hline_set.So: unctrl.h
-lib_hline_set.o: curses.h
-lib_hline_set.o: ncurses_def.h
-lib_hline_set.o: ncurses_dll.h
-lib_hline_set.o: term.h
-lib_hline_set.o: unctrl.h
-lib_hline_set.po: curses.h
-lib_hline_set.po: ncurses_def.h
-lib_hline_set.po: ncurses_dll.h
-lib_hline_set.po: term.h
-lib_hline_set.po: unctrl.h
-lib_immedok.So: curses.h
-lib_immedok.So: ncurses_def.h
-lib_immedok.So: ncurses_dll.h
-lib_immedok.So: term.h
-lib_immedok.So: unctrl.h
-lib_immedok.o: curses.h
-lib_immedok.o: ncurses_def.h
-lib_immedok.o: ncurses_dll.h
-lib_immedok.o: term.h
-lib_immedok.o: unctrl.h
-lib_immedok.po: curses.h
-lib_immedok.po: ncurses_def.h
-lib_immedok.po: ncurses_dll.h
-lib_immedok.po: term.h
-lib_immedok.po: unctrl.h
-lib_in_wch.So: curses.h
-lib_in_wch.So: ncurses_def.h
-lib_in_wch.So: ncurses_dll.h
-lib_in_wch.So: term.h
-lib_in_wch.So: unctrl.h
-lib_in_wch.o: curses.h
-lib_in_wch.o: ncurses_def.h
-lib_in_wch.o: ncurses_dll.h
-lib_in_wch.o: term.h
-lib_in_wch.o: unctrl.h
-lib_in_wch.po: curses.h
-lib_in_wch.po: ncurses_def.h
-lib_in_wch.po: ncurses_dll.h
-lib_in_wch.po: term.h
-lib_in_wch.po: unctrl.h
-lib_in_wchnstr.So: curses.h
-lib_in_wchnstr.So: ncurses_def.h
-lib_in_wchnstr.So: ncurses_dll.h
-lib_in_wchnstr.So: term.h
-lib_in_wchnstr.So: unctrl.h
-lib_in_wchnstr.o: curses.h
-lib_in_wchnstr.o: ncurses_def.h
-lib_in_wchnstr.o: ncurses_dll.h
-lib_in_wchnstr.o: term.h
-lib_in_wchnstr.o: unctrl.h
-lib_in_wchnstr.po: curses.h
-lib_in_wchnstr.po: ncurses_def.h
-lib_in_wchnstr.po: ncurses_dll.h
-lib_in_wchnstr.po: term.h
-lib_in_wchnstr.po: unctrl.h
-lib_inchstr.So: curses.h
-lib_inchstr.So: ncurses_def.h
-lib_inchstr.So: ncurses_dll.h
-lib_inchstr.So: term.h
-lib_inchstr.So: unctrl.h
-lib_inchstr.o: curses.h
-lib_inchstr.o: ncurses_def.h
-lib_inchstr.o: ncurses_dll.h
-lib_inchstr.o: term.h
-lib_inchstr.o: unctrl.h
-lib_inchstr.po: curses.h
-lib_inchstr.po: ncurses_def.h
-lib_inchstr.po: ncurses_dll.h
-lib_inchstr.po: term.h
-lib_inchstr.po: unctrl.h
-lib_initscr.So: curses.h
-lib_initscr.So: ncurses_def.h
-lib_initscr.So: ncurses_dll.h
-lib_initscr.So: term.h
-lib_initscr.So: unctrl.h
-lib_initscr.o: curses.h
-lib_initscr.o: ncurses_def.h
-lib_initscr.o: ncurses_dll.h
-lib_initscr.o: term.h
-lib_initscr.o: unctrl.h
-lib_initscr.po: curses.h
-lib_initscr.po: ncurses_def.h
-lib_initscr.po: ncurses_dll.h
-lib_initscr.po: term.h
-lib_initscr.po: unctrl.h
-lib_ins_wch.So: curses.h
-lib_ins_wch.So: ncurses_def.h
-lib_ins_wch.So: ncurses_dll.h
-lib_ins_wch.So: term.h
-lib_ins_wch.So: unctrl.h
-lib_ins_wch.o: curses.h
-lib_ins_wch.o: ncurses_def.h
-lib_ins_wch.o: ncurses_dll.h
-lib_ins_wch.o: term.h
-lib_ins_wch.o: unctrl.h
-lib_ins_wch.po: curses.h
-lib_ins_wch.po: ncurses_def.h
-lib_ins_wch.po: ncurses_dll.h
-lib_ins_wch.po: term.h
-lib_ins_wch.po: unctrl.h
-lib_insch.So: curses.h
-lib_insch.So: ncurses_def.h
-lib_insch.So: ncurses_dll.h
-lib_insch.So: term.h
-lib_insch.So: unctrl.h
-lib_insch.o: curses.h
-lib_insch.o: ncurses_def.h
-lib_insch.o: ncurses_dll.h
-lib_insch.o: term.h
-lib_insch.o: unctrl.h
-lib_insch.po: curses.h
-lib_insch.po: ncurses_def.h
-lib_insch.po: ncurses_dll.h
-lib_insch.po: term.h
-lib_insch.po: unctrl.h
-lib_insdel.So: curses.h
-lib_insdel.So: ncurses_def.h
-lib_insdel.So: ncurses_dll.h
-lib_insdel.So: term.h
-lib_insdel.So: unctrl.h
-lib_insdel.o: curses.h
-lib_insdel.o: ncurses_def.h
-lib_insdel.o: ncurses_dll.h
-lib_insdel.o: term.h
-lib_insdel.o: unctrl.h
-lib_insdel.po: curses.h
-lib_insdel.po: ncurses_def.h
-lib_insdel.po: ncurses_dll.h
-lib_insdel.po: term.h
-lib_insdel.po: unctrl.h
-lib_insnstr.So: curses.h
-lib_insnstr.So: ncurses_def.h
-lib_insnstr.So: ncurses_dll.h
-lib_insnstr.So: term.h
-lib_insnstr.So: unctrl.h
-lib_insnstr.o: curses.h
-lib_insnstr.o: ncurses_def.h
-lib_insnstr.o: ncurses_dll.h
-lib_insnstr.o: term.h
-lib_insnstr.o: unctrl.h
-lib_insnstr.po: curses.h
-lib_insnstr.po: ncurses_def.h
-lib_insnstr.po: ncurses_dll.h
-lib_insnstr.po: term.h
-lib_insnstr.po: unctrl.h
-lib_instr.So: curses.h
-lib_instr.So: ncurses_def.h
-lib_instr.So: ncurses_dll.h
-lib_instr.So: term.h
-lib_instr.So: unctrl.h
-lib_instr.o: curses.h
-lib_instr.o: ncurses_def.h
-lib_instr.o: ncurses_dll.h
-lib_instr.o: term.h
-lib_instr.o: unctrl.h
-lib_instr.po: curses.h
-lib_instr.po: ncurses_def.h
-lib_instr.po: ncurses_dll.h
-lib_instr.po: term.h
-lib_instr.po: unctrl.h
-lib_inwstr.So: curses.h
-lib_inwstr.So: ncurses_def.h
-lib_inwstr.So: ncurses_dll.h
-lib_inwstr.So: term.h
-lib_inwstr.So: unctrl.h
-lib_inwstr.o: curses.h
-lib_inwstr.o: ncurses_def.h
-lib_inwstr.o: ncurses_dll.h
-lib_inwstr.o: term.h
-lib_inwstr.o: unctrl.h
-lib_inwstr.po: curses.h
-lib_inwstr.po: ncurses_def.h
-lib_inwstr.po: ncurses_dll.h
-lib_inwstr.po: term.h
-lib_inwstr.po: unctrl.h
-lib_isendwin.So: curses.h
-lib_isendwin.So: ncurses_def.h
-lib_isendwin.So: ncurses_dll.h
-lib_isendwin.So: term.h
-lib_isendwin.So: unctrl.h
-lib_isendwin.o: curses.h
-lib_isendwin.o: ncurses_def.h
-lib_isendwin.o: ncurses_dll.h
-lib_isendwin.o: term.h
-lib_isendwin.o: unctrl.h
-lib_isendwin.po: curses.h
-lib_isendwin.po: ncurses_def.h
-lib_isendwin.po: ncurses_dll.h
-lib_isendwin.po: term.h
-lib_isendwin.po: unctrl.h
-lib_kernel.So: curses.h
-lib_kernel.So: ncurses_def.h
-lib_kernel.So: ncurses_dll.h
-lib_kernel.So: term.h
-lib_kernel.So: unctrl.h
-lib_kernel.o: curses.h
-lib_kernel.o: ncurses_def.h
-lib_kernel.o: ncurses_dll.h
-lib_kernel.o: term.h
-lib_kernel.o: unctrl.h
-lib_kernel.po: curses.h
-lib_kernel.po: ncurses_def.h
-lib_kernel.po: ncurses_dll.h
-lib_kernel.po: term.h
-lib_kernel.po: unctrl.h
-lib_key_name.So: curses.h
-lib_key_name.So: ncurses_def.h
-lib_key_name.So: ncurses_dll.h
-lib_key_name.So: term.h
-lib_key_name.So: unctrl.h
-lib_key_name.o: curses.h
-lib_key_name.o: ncurses_def.h
-lib_key_name.o: ncurses_dll.h
-lib_key_name.o: term.h
-lib_key_name.o: unctrl.h
-lib_key_name.po: curses.h
-lib_key_name.po: ncurses_def.h
-lib_key_name.po: ncurses_dll.h
-lib_key_name.po: term.h
-lib_key_name.po: unctrl.h
-lib_keyname.So: curses.h
-lib_keyname.So: lib_keyname.c
-lib_keyname.So: ncurses_def.h
-lib_keyname.So: ncurses_dll.h
-lib_keyname.So: term.h
-lib_keyname.So: unctrl.h
-lib_keyname.o: curses.h
-lib_keyname.o: lib_keyname.c
-lib_keyname.o: ncurses_def.h
-lib_keyname.o: ncurses_dll.h
-lib_keyname.o: term.h
-lib_keyname.o: unctrl.h
-lib_keyname.po: curses.h
-lib_keyname.po: lib_keyname.c
-lib_keyname.po: ncurses_def.h
-lib_keyname.po: ncurses_dll.h
-lib_keyname.po: term.h
-lib_keyname.po: unctrl.h
-lib_leaveok.So: curses.h
-lib_leaveok.So: ncurses_def.h
-lib_leaveok.So: ncurses_dll.h
-lib_leaveok.So: term.h
-lib_leaveok.So: unctrl.h
-lib_leaveok.o: curses.h
-lib_leaveok.o: ncurses_def.h
-lib_leaveok.o: ncurses_dll.h
-lib_leaveok.o: term.h
-lib_leaveok.o: unctrl.h
-lib_leaveok.po: curses.h
-lib_leaveok.po: ncurses_def.h
-lib_leaveok.po: ncurses_dll.h
-lib_leaveok.po: term.h
-lib_leaveok.po: unctrl.h
-lib_longname.So: curses.h
-lib_longname.So: ncurses_def.h
-lib_longname.So: ncurses_dll.h
-lib_longname.So: term.h
-lib_longname.So: unctrl.h
-lib_longname.o: curses.h
-lib_longname.o: ncurses_def.h
-lib_longname.o: ncurses_dll.h
-lib_longname.o: term.h
-lib_longname.o: unctrl.h
-lib_longname.po: curses.h
-lib_longname.po: ncurses_def.h
-lib_longname.po: ncurses_dll.h
-lib_longname.po: term.h
-lib_longname.po: unctrl.h
-lib_mouse.So: curses.h
-lib_mouse.So: ncurses_def.h
-lib_mouse.So: ncurses_dll.h
-lib_mouse.So: term.h
-lib_mouse.So: unctrl.h
-lib_mouse.o: curses.h
-lib_mouse.o: ncurses_def.h
-lib_mouse.o: ncurses_dll.h
-lib_mouse.o: term.h
-lib_mouse.o: unctrl.h
-lib_mouse.po: curses.h
-lib_mouse.po: ncurses_def.h
-lib_mouse.po: ncurses_dll.h
-lib_mouse.po: term.h
-lib_mouse.po: unctrl.h
-lib_move.So: curses.h
-lib_move.So: ncurses_def.h
-lib_move.So: ncurses_dll.h
-lib_move.So: term.h
-lib_move.So: unctrl.h
-lib_move.o: curses.h
-lib_move.o: ncurses_def.h
-lib_move.o: ncurses_dll.h
-lib_move.o: term.h
-lib_move.o: unctrl.h
-lib_move.po: curses.h
-lib_move.po: ncurses_def.h
-lib_move.po: ncurses_dll.h
-lib_move.po: term.h
-lib_move.po: unctrl.h
-lib_mvcur.So: curses.h
-lib_mvcur.So: ncurses_def.h
-lib_mvcur.So: ncurses_dll.h
-lib_mvcur.So: term.h
-lib_mvcur.So: unctrl.h
-lib_mvcur.o: curses.h
-lib_mvcur.o: ncurses_def.h
-lib_mvcur.o: ncurses_dll.h
-lib_mvcur.o: term.h
-lib_mvcur.o: unctrl.h
-lib_mvcur.po: curses.h
-lib_mvcur.po: ncurses_def.h
-lib_mvcur.po: ncurses_dll.h
-lib_mvcur.po: term.h
-lib_mvcur.po: unctrl.h
-lib_mvwin.So: curses.h
-lib_mvwin.So: ncurses_def.h
-lib_mvwin.So: ncurses_dll.h
-lib_mvwin.So: term.h
-lib_mvwin.So: unctrl.h
-lib_mvwin.o: curses.h
-lib_mvwin.o: ncurses_def.h
-lib_mvwin.o: ncurses_dll.h
-lib_mvwin.o: term.h
-lib_mvwin.o: unctrl.h
-lib_mvwin.po: curses.h
-lib_mvwin.po: ncurses_def.h
-lib_mvwin.po: ncurses_dll.h
-lib_mvwin.po: term.h
-lib_mvwin.po: unctrl.h
-lib_napms.So: curses.h
-lib_napms.So: ncurses_def.h
-lib_napms.So: ncurses_dll.h
-lib_napms.So: term.h
-lib_napms.So: unctrl.h
-lib_napms.o: curses.h
-lib_napms.o: ncurses_def.h
-lib_napms.o: ncurses_dll.h
-lib_napms.o: term.h
-lib_napms.o: unctrl.h
-lib_napms.po: curses.h
-lib_napms.po: ncurses_def.h
-lib_napms.po: ncurses_dll.h
-lib_napms.po: term.h
-lib_napms.po: unctrl.h
-lib_newterm.So: curses.h
-lib_newterm.So: ncurses_def.h
-lib_newterm.So: ncurses_dll.h
-lib_newterm.So: term.h
-lib_newterm.So: unctrl.h
-lib_newterm.o: curses.h
-lib_newterm.o: ncurses_def.h
-lib_newterm.o: ncurses_dll.h
-lib_newterm.o: term.h
-lib_newterm.o: unctrl.h
-lib_newterm.po: curses.h
-lib_newterm.po: ncurses_def.h
-lib_newterm.po: ncurses_dll.h
-lib_newterm.po: term.h
-lib_newterm.po: unctrl.h
-lib_newwin.So: curses.h
-lib_newwin.So: ncurses_def.h
-lib_newwin.So: ncurses_dll.h
-lib_newwin.So: term.h
-lib_newwin.So: unctrl.h
-lib_newwin.o: curses.h
-lib_newwin.o: ncurses_def.h
-lib_newwin.o: ncurses_dll.h
-lib_newwin.o: term.h
-lib_newwin.o: unctrl.h
-lib_newwin.po: curses.h
-lib_newwin.po: ncurses_def.h
-lib_newwin.po: ncurses_dll.h
-lib_newwin.po: term.h
-lib_newwin.po: unctrl.h
-lib_nl.So: curses.h
-lib_nl.So: ncurses_def.h
-lib_nl.So: ncurses_dll.h
-lib_nl.So: term.h
-lib_nl.So: unctrl.h
-lib_nl.o: curses.h
-lib_nl.o: ncurses_def.h
-lib_nl.o: ncurses_dll.h
-lib_nl.o: term.h
-lib_nl.o: unctrl.h
-lib_nl.po: curses.h
-lib_nl.po: ncurses_def.h
-lib_nl.po: ncurses_dll.h
-lib_nl.po: term.h
-lib_nl.po: unctrl.h
-lib_options.So: curses.h
-lib_options.So: ncurses_def.h
-lib_options.So: ncurses_dll.h
-lib_options.So: term.h
-lib_options.So: unctrl.h
-lib_options.o: curses.h
-lib_options.o: ncurses_def.h
-lib_options.o: ncurses_dll.h
-lib_options.o: term.h
-lib_options.o: unctrl.h
-lib_options.po: curses.h
-lib_options.po: ncurses_def.h
-lib_options.po: ncurses_dll.h
-lib_options.po: term.h
-lib_options.po: unctrl.h
-lib_overlay.So: curses.h
-lib_overlay.So: ncurses_def.h
-lib_overlay.So: ncurses_dll.h
-lib_overlay.So: term.h
-lib_overlay.So: unctrl.h
-lib_overlay.o: curses.h
-lib_overlay.o: ncurses_def.h
-lib_overlay.o: ncurses_dll.h
-lib_overlay.o: term.h
-lib_overlay.o: unctrl.h
-lib_overlay.po: curses.h
-lib_overlay.po: ncurses_def.h
-lib_overlay.po: ncurses_dll.h
-lib_overlay.po: term.h
-lib_overlay.po: unctrl.h
-lib_pad.So: curses.h
-lib_pad.So: ncurses_def.h
-lib_pad.So: ncurses_dll.h
-lib_pad.So: term.h
-lib_pad.So: unctrl.h
-lib_pad.o: curses.h
-lib_pad.o: ncurses_def.h
-lib_pad.o: ncurses_dll.h
-lib_pad.o: term.h
-lib_pad.o: unctrl.h
-lib_pad.po: curses.h
-lib_pad.po: ncurses_def.h
-lib_pad.po: ncurses_dll.h
-lib_pad.po: term.h
-lib_pad.po: unctrl.h
-lib_pecho_wchar.So: curses.h
-lib_pecho_wchar.So: ncurses_def.h
-lib_pecho_wchar.So: ncurses_dll.h
-lib_pecho_wchar.So: term.h
-lib_pecho_wchar.So: unctrl.h
-lib_pecho_wchar.o: curses.h
-lib_pecho_wchar.o: ncurses_def.h
-lib_pecho_wchar.o: ncurses_dll.h
-lib_pecho_wchar.o: term.h
-lib_pecho_wchar.o: unctrl.h
-lib_pecho_wchar.po: curses.h
-lib_pecho_wchar.po: ncurses_def.h
-lib_pecho_wchar.po: ncurses_dll.h
-lib_pecho_wchar.po: term.h
-lib_pecho_wchar.po: unctrl.h
-lib_print.So: curses.h
-lib_print.So: ncurses_def.h
-lib_print.So: ncurses_dll.h
-lib_print.So: term.h
-lib_print.So: unctrl.h
-lib_print.o: curses.h
-lib_print.o: ncurses_def.h
-lib_print.o: ncurses_dll.h
-lib_print.o: term.h
-lib_print.o: unctrl.h
-lib_print.po: curses.h
-lib_print.po: ncurses_def.h
-lib_print.po: ncurses_dll.h
-lib_print.po: term.h
-lib_print.po: unctrl.h
-lib_printw.So: curses.h
-lib_printw.So: ncurses_def.h
-lib_printw.So: ncurses_dll.h
-lib_printw.So: term.h
-lib_printw.So: unctrl.h
-lib_printw.o: curses.h
-lib_printw.o: ncurses_def.h
-lib_printw.o: ncurses_dll.h
-lib_printw.o: term.h
-lib_printw.o: unctrl.h
-lib_printw.po: curses.h
-lib_printw.po: ncurses_def.h
-lib_printw.po: ncurses_dll.h
-lib_printw.po: term.h
-lib_printw.po: unctrl.h
-lib_raw.So: curses.h
-lib_raw.So: ncurses_def.h
-lib_raw.So: ncurses_dll.h
-lib_raw.So: term.h
-lib_raw.So: unctrl.h
-lib_raw.o: curses.h
-lib_raw.o: ncurses_def.h
-lib_raw.o: ncurses_dll.h
-lib_raw.o: term.h
-lib_raw.o: unctrl.h
-lib_raw.po: curses.h
-lib_raw.po: ncurses_def.h
-lib_raw.po: ncurses_dll.h
-lib_raw.po: term.h
-lib_raw.po: unctrl.h
-lib_redrawln.So: curses.h
-lib_redrawln.So: ncurses_def.h
-lib_redrawln.So: ncurses_dll.h
-lib_redrawln.So: term.h
-lib_redrawln.So: unctrl.h
-lib_redrawln.o: curses.h
-lib_redrawln.o: ncurses_def.h
-lib_redrawln.o: ncurses_dll.h
-lib_redrawln.o: term.h
-lib_redrawln.o: unctrl.h
-lib_redrawln.po: curses.h
-lib_redrawln.po: ncurses_def.h
-lib_redrawln.po: ncurses_dll.h
-lib_redrawln.po: term.h
-lib_redrawln.po: unctrl.h
-lib_refresh.So: curses.h
-lib_refresh.So: ncurses_def.h
-lib_refresh.So: ncurses_dll.h
-lib_refresh.So: term.h
-lib_refresh.So: unctrl.h
-lib_refresh.o: curses.h
-lib_refresh.o: ncurses_def.h
-lib_refresh.o: ncurses_dll.h
-lib_refresh.o: term.h
-lib_refresh.o: unctrl.h
-lib_refresh.po: curses.h
-lib_refresh.po: ncurses_def.h
-lib_refresh.po: ncurses_dll.h
-lib_refresh.po: term.h
-lib_refresh.po: unctrl.h
-lib_restart.So: curses.h
-lib_restart.So: ncurses_def.h
-lib_restart.So: ncurses_dll.h
-lib_restart.So: term.h
-lib_restart.So: unctrl.h
-lib_restart.o: curses.h
-lib_restart.o: ncurses_def.h
-lib_restart.o: ncurses_dll.h
-lib_restart.o: term.h
-lib_restart.o: unctrl.h
-lib_restart.po: curses.h
-lib_restart.po: ncurses_def.h
-lib_restart.po: ncurses_dll.h
-lib_restart.po: term.h
-lib_restart.po: unctrl.h
-lib_scanw.So: curses.h
-lib_scanw.So: ncurses_def.h
-lib_scanw.So: ncurses_dll.h
-lib_scanw.So: term.h
-lib_scanw.So: unctrl.h
-lib_scanw.o: curses.h
-lib_scanw.o: ncurses_def.h
-lib_scanw.o: ncurses_dll.h
-lib_scanw.o: term.h
-lib_scanw.o: unctrl.h
-lib_scanw.po: curses.h
-lib_scanw.po: ncurses_def.h
-lib_scanw.po: ncurses_dll.h
-lib_scanw.po: term.h
-lib_scanw.po: unctrl.h
-lib_screen.So: curses.h
-lib_screen.So: ncurses_def.h
-lib_screen.So: ncurses_dll.h
-lib_screen.So: term.h
-lib_screen.So: unctrl.h
-lib_screen.o: curses.h
-lib_screen.o: ncurses_def.h
-lib_screen.o: ncurses_dll.h
-lib_screen.o: term.h
-lib_screen.o: unctrl.h
-lib_screen.po: curses.h
-lib_screen.po: ncurses_def.h
-lib_screen.po: ncurses_dll.h
-lib_screen.po: term.h
-lib_screen.po: unctrl.h
-lib_scroll.So: curses.h
-lib_scroll.So: ncurses_def.h
-lib_scroll.So: ncurses_dll.h
-lib_scroll.So: term.h
-lib_scroll.So: unctrl.h
-lib_scroll.o: curses.h
-lib_scroll.o: ncurses_def.h
-lib_scroll.o: ncurses_dll.h
-lib_scroll.o: term.h
-lib_scroll.o: unctrl.h
-lib_scroll.po: curses.h
-lib_scroll.po: ncurses_def.h
-lib_scroll.po: ncurses_dll.h
-lib_scroll.po: term.h
-lib_scroll.po: unctrl.h
-lib_scrollok.So: curses.h
-lib_scrollok.So: ncurses_def.h
-lib_scrollok.So: ncurses_dll.h
-lib_scrollok.So: term.h
-lib_scrollok.So: unctrl.h
-lib_scrollok.o: curses.h
-lib_scrollok.o: ncurses_def.h
-lib_scrollok.o: ncurses_dll.h
-lib_scrollok.o: term.h
-lib_scrollok.o: unctrl.h
-lib_scrollok.po: curses.h
-lib_scrollok.po: ncurses_def.h
-lib_scrollok.po: ncurses_dll.h
-lib_scrollok.po: term.h
-lib_scrollok.po: unctrl.h
-lib_scrreg.So: curses.h
-lib_scrreg.So: ncurses_def.h
-lib_scrreg.So: ncurses_dll.h
-lib_scrreg.So: term.h
-lib_scrreg.So: unctrl.h
-lib_scrreg.o: curses.h
-lib_scrreg.o: ncurses_def.h
-lib_scrreg.o: ncurses_dll.h
-lib_scrreg.o: term.h
-lib_scrreg.o: unctrl.h
-lib_scrreg.po: curses.h
-lib_scrreg.po: ncurses_def.h
-lib_scrreg.po: ncurses_dll.h
-lib_scrreg.po: term.h
-lib_scrreg.po: unctrl.h
-lib_set_term.So: curses.h
-lib_set_term.So: ncurses_def.h
-lib_set_term.So: ncurses_dll.h
-lib_set_term.So: term.h
-lib_set_term.So: unctrl.h
-lib_set_term.o: curses.h
-lib_set_term.o: ncurses_def.h
-lib_set_term.o: ncurses_dll.h
-lib_set_term.o: term.h
-lib_set_term.o: unctrl.h
-lib_set_term.po: curses.h
-lib_set_term.po: ncurses_def.h
-lib_set_term.po: ncurses_dll.h
-lib_set_term.po: term.h
-lib_set_term.po: unctrl.h
-lib_setup.So: curses.h
-lib_setup.So: ncurses_def.h
-lib_setup.So: ncurses_dll.h
-lib_setup.So: term.h
-lib_setup.So: unctrl.h
-lib_setup.o: curses.h
-lib_setup.o: ncurses_def.h
-lib_setup.o: ncurses_dll.h
-lib_setup.o: term.h
-lib_setup.o: unctrl.h
-lib_setup.po: curses.h
-lib_setup.po: ncurses_def.h
-lib_setup.po: ncurses_dll.h
-lib_setup.po: term.h
-lib_setup.po: unctrl.h
-lib_slk.So: curses.h
-lib_slk.So: ncurses_def.h
-lib_slk.So: ncurses_dll.h
-lib_slk.So: term.h
-lib_slk.So: unctrl.h
-lib_slk.o: curses.h
-lib_slk.o: ncurses_def.h
-lib_slk.o: ncurses_dll.h
-lib_slk.o: term.h
-lib_slk.o: unctrl.h
-lib_slk.po: curses.h
-lib_slk.po: ncurses_def.h
-lib_slk.po: ncurses_dll.h
-lib_slk.po: term.h
-lib_slk.po: unctrl.h
-lib_slk_wset.So: curses.h
-lib_slk_wset.So: ncurses_def.h
-lib_slk_wset.So: ncurses_dll.h
-lib_slk_wset.So: term.h
-lib_slk_wset.So: unctrl.h
-lib_slk_wset.o: curses.h
-lib_slk_wset.o: ncurses_def.h
-lib_slk_wset.o: ncurses_dll.h
-lib_slk_wset.o: term.h
-lib_slk_wset.o: unctrl.h
-lib_slk_wset.po: curses.h
-lib_slk_wset.po: ncurses_def.h
-lib_slk_wset.po: ncurses_dll.h
-lib_slk_wset.po: term.h
-lib_slk_wset.po: unctrl.h
-lib_slkatr_set.So: curses.h
-lib_slkatr_set.So: ncurses_def.h
-lib_slkatr_set.So: ncurses_dll.h
-lib_slkatr_set.So: term.h
-lib_slkatr_set.So: unctrl.h
-lib_slkatr_set.o: curses.h
-lib_slkatr_set.o: ncurses_def.h
-lib_slkatr_set.o: ncurses_dll.h
-lib_slkatr_set.o: term.h
-lib_slkatr_set.o: unctrl.h
-lib_slkatr_set.po: curses.h
-lib_slkatr_set.po: ncurses_def.h
-lib_slkatr_set.po: ncurses_dll.h
-lib_slkatr_set.po: term.h
-lib_slkatr_set.po: unctrl.h
-lib_slkatrof.So: curses.h
-lib_slkatrof.So: ncurses_def.h
-lib_slkatrof.So: ncurses_dll.h
-lib_slkatrof.So: term.h
-lib_slkatrof.So: unctrl.h
-lib_slkatrof.o: curses.h
-lib_slkatrof.o: ncurses_def.h
-lib_slkatrof.o: ncurses_dll.h
-lib_slkatrof.o: term.h
-lib_slkatrof.o: unctrl.h
-lib_slkatrof.po: curses.h
-lib_slkatrof.po: ncurses_def.h
-lib_slkatrof.po: ncurses_dll.h
-lib_slkatrof.po: term.h
-lib_slkatrof.po: unctrl.h
-lib_slkatron.So: curses.h
-lib_slkatron.So: ncurses_def.h
-lib_slkatron.So: ncurses_dll.h
-lib_slkatron.So: term.h
-lib_slkatron.So: unctrl.h
-lib_slkatron.o: curses.h
-lib_slkatron.o: ncurses_def.h
-lib_slkatron.o: ncurses_dll.h
-lib_slkatron.o: term.h
-lib_slkatron.o: unctrl.h
-lib_slkatron.po: curses.h
-lib_slkatron.po: ncurses_def.h
-lib_slkatron.po: ncurses_dll.h
-lib_slkatron.po: term.h
-lib_slkatron.po: unctrl.h
-lib_slkatrset.So: curses.h
-lib_slkatrset.So: ncurses_def.h
-lib_slkatrset.So: ncurses_dll.h
-lib_slkatrset.So: term.h
-lib_slkatrset.So: unctrl.h
-lib_slkatrset.o: curses.h
-lib_slkatrset.o: ncurses_def.h
-lib_slkatrset.o: ncurses_dll.h
-lib_slkatrset.o: term.h
-lib_slkatrset.o: unctrl.h
-lib_slkatrset.po: curses.h
-lib_slkatrset.po: ncurses_def.h
-lib_slkatrset.po: ncurses_dll.h
-lib_slkatrset.po: term.h
-lib_slkatrset.po: unctrl.h
-lib_slkattr.So: curses.h
-lib_slkattr.So: ncurses_def.h
-lib_slkattr.So: ncurses_dll.h
-lib_slkattr.So: term.h
-lib_slkattr.So: unctrl.h
-lib_slkattr.o: curses.h
-lib_slkattr.o: ncurses_def.h
-lib_slkattr.o: ncurses_dll.h
-lib_slkattr.o: term.h
-lib_slkattr.o: unctrl.h
-lib_slkattr.po: curses.h
-lib_slkattr.po: ncurses_def.h
-lib_slkattr.po: ncurses_dll.h
-lib_slkattr.po: term.h
-lib_slkattr.po: unctrl.h
-lib_slkclear.So: curses.h
-lib_slkclear.So: ncurses_def.h
-lib_slkclear.So: ncurses_dll.h
-lib_slkclear.So: term.h
-lib_slkclear.So: unctrl.h
-lib_slkclear.o: curses.h
-lib_slkclear.o: ncurses_def.h
-lib_slkclear.o: ncurses_dll.h
-lib_slkclear.o: term.h
-lib_slkclear.o: unctrl.h
-lib_slkclear.po: curses.h
-lib_slkclear.po: ncurses_def.h
-lib_slkclear.po: ncurses_dll.h
-lib_slkclear.po: term.h
-lib_slkclear.po: unctrl.h
-lib_slkcolor.So: curses.h
-lib_slkcolor.So: ncurses_def.h
-lib_slkcolor.So: ncurses_dll.h
-lib_slkcolor.So: term.h
-lib_slkcolor.So: unctrl.h
-lib_slkcolor.o: curses.h
-lib_slkcolor.o: ncurses_def.h
-lib_slkcolor.o: ncurses_dll.h
-lib_slkcolor.o: term.h
-lib_slkcolor.o: unctrl.h
-lib_slkcolor.po: curses.h
-lib_slkcolor.po: ncurses_def.h
-lib_slkcolor.po: ncurses_dll.h
-lib_slkcolor.po: term.h
-lib_slkcolor.po: unctrl.h
-lib_slkinit.So: curses.h
-lib_slkinit.So: ncurses_def.h
-lib_slkinit.So: ncurses_dll.h
-lib_slkinit.So: term.h
-lib_slkinit.So: unctrl.h
-lib_slkinit.o: curses.h
-lib_slkinit.o: ncurses_def.h
-lib_slkinit.o: ncurses_dll.h
-lib_slkinit.o: term.h
-lib_slkinit.o: unctrl.h
-lib_slkinit.po: curses.h
-lib_slkinit.po: ncurses_def.h
-lib_slkinit.po: ncurses_dll.h
-lib_slkinit.po: term.h
-lib_slkinit.po: unctrl.h
-lib_slklab.So: curses.h
-lib_slklab.So: ncurses_def.h
-lib_slklab.So: ncurses_dll.h
-lib_slklab.So: term.h
-lib_slklab.So: unctrl.h
-lib_slklab.o: curses.h
-lib_slklab.o: ncurses_def.h
-lib_slklab.o: ncurses_dll.h
-lib_slklab.o: term.h
-lib_slklab.o: unctrl.h
-lib_slklab.po: curses.h
-lib_slklab.po: ncurses_def.h
-lib_slklab.po: ncurses_dll.h
-lib_slklab.po: term.h
-lib_slklab.po: unctrl.h
-lib_slkrefr.So: curses.h
-lib_slkrefr.So: ncurses_def.h
-lib_slkrefr.So: ncurses_dll.h
-lib_slkrefr.So: term.h
-lib_slkrefr.So: unctrl.h
-lib_slkrefr.o: curses.h
-lib_slkrefr.o: ncurses_def.h
-lib_slkrefr.o: ncurses_dll.h
-lib_slkrefr.o: term.h
-lib_slkrefr.o: unctrl.h
-lib_slkrefr.po: curses.h
-lib_slkrefr.po: ncurses_def.h
-lib_slkrefr.po: ncurses_dll.h
-lib_slkrefr.po: term.h
-lib_slkrefr.po: unctrl.h
-lib_slkset.So: curses.h
-lib_slkset.So: ncurses_def.h
-lib_slkset.So: ncurses_dll.h
-lib_slkset.So: term.h
-lib_slkset.So: unctrl.h
-lib_slkset.o: curses.h
-lib_slkset.o: ncurses_def.h
-lib_slkset.o: ncurses_dll.h
-lib_slkset.o: term.h
-lib_slkset.o: unctrl.h
-lib_slkset.po: curses.h
-lib_slkset.po: ncurses_def.h
-lib_slkset.po: ncurses_dll.h
-lib_slkset.po: term.h
-lib_slkset.po: unctrl.h
-lib_slktouch.So: curses.h
-lib_slktouch.So: ncurses_def.h
-lib_slktouch.So: ncurses_dll.h
-lib_slktouch.So: term.h
-lib_slktouch.So: unctrl.h
-lib_slktouch.o: curses.h
-lib_slktouch.o: ncurses_def.h
-lib_slktouch.o: ncurses_dll.h
-lib_slktouch.o: term.h
-lib_slktouch.o: unctrl.h
-lib_slktouch.po: curses.h
-lib_slktouch.po: ncurses_def.h
-lib_slktouch.po: ncurses_dll.h
-lib_slktouch.po: term.h
-lib_slktouch.po: unctrl.h
-lib_termcap.So: curses.h
-lib_termcap.So: ncurses_def.h
-lib_termcap.So: ncurses_dll.h
-lib_termcap.So: term.h
-lib_termcap.So: termcap.h
-lib_termcap.So: unctrl.h
-lib_termcap.o: curses.h
-lib_termcap.o: ncurses_def.h
-lib_termcap.o: ncurses_dll.h
-lib_termcap.o: term.h
-lib_termcap.o: termcap.h
-lib_termcap.o: unctrl.h
-lib_termcap.po: curses.h
-lib_termcap.po: ncurses_def.h
-lib_termcap.po: ncurses_dll.h
-lib_termcap.po: term.h
-lib_termcap.po: termcap.h
-lib_termcap.po: unctrl.h
-lib_termname.So: curses.h
-lib_termname.So: ncurses_def.h
-lib_termname.So: ncurses_dll.h
-lib_termname.So: term.h
-lib_termname.So: unctrl.h
-lib_termname.o: curses.h
-lib_termname.o: ncurses_def.h
-lib_termname.o: ncurses_dll.h
-lib_termname.o: term.h
-lib_termname.o: unctrl.h
-lib_termname.po: curses.h
-lib_termname.po: ncurses_def.h
-lib_termname.po: ncurses_dll.h
-lib_termname.po: term.h
-lib_termname.po: unctrl.h
-lib_tgoto.So: curses.h
-lib_tgoto.So: ncurses_def.h
-lib_tgoto.So: ncurses_dll.h
-lib_tgoto.So: term.h
-lib_tgoto.So: termcap.h
-lib_tgoto.So: unctrl.h
-lib_tgoto.o: curses.h
-lib_tgoto.o: ncurses_def.h
-lib_tgoto.o: ncurses_dll.h
-lib_tgoto.o: term.h
-lib_tgoto.o: termcap.h
-lib_tgoto.o: unctrl.h
-lib_tgoto.po: curses.h
-lib_tgoto.po: ncurses_def.h
-lib_tgoto.po: ncurses_dll.h
-lib_tgoto.po: term.h
-lib_tgoto.po: termcap.h
-lib_tgoto.po: unctrl.h
-lib_ti.So: curses.h
-lib_ti.So: ncurses_def.h
-lib_ti.So: ncurses_dll.h
-lib_ti.So: term.h
-lib_ti.So: unctrl.h
-lib_ti.o: curses.h
-lib_ti.o: ncurses_def.h
-lib_ti.o: ncurses_dll.h
-lib_ti.o: term.h
-lib_ti.o: unctrl.h
-lib_ti.po: curses.h
-lib_ti.po: ncurses_def.h
-lib_ti.po: ncurses_dll.h
-lib_ti.po: term.h
-lib_ti.po: unctrl.h
-lib_touch.So: curses.h
-lib_touch.So: ncurses_def.h
-lib_touch.So: ncurses_dll.h
-lib_touch.So: term.h
-lib_touch.So: unctrl.h
-lib_touch.o: curses.h
-lib_touch.o: ncurses_def.h
-lib_touch.o: ncurses_dll.h
-lib_touch.o: term.h
-lib_touch.o: unctrl.h
-lib_touch.po: curses.h
-lib_touch.po: ncurses_def.h
-lib_touch.po: ncurses_dll.h
-lib_touch.po: term.h
-lib_touch.po: unctrl.h
-lib_tparm.So: curses.h
-lib_tparm.So: ncurses_def.h
-lib_tparm.So: ncurses_dll.h
-lib_tparm.So: term.h
-lib_tparm.So: unctrl.h
-lib_tparm.o: curses.h
-lib_tparm.o: ncurses_def.h
-lib_tparm.o: ncurses_dll.h
-lib_tparm.o: term.h
-lib_tparm.o: unctrl.h
-lib_tparm.po: curses.h
-lib_tparm.po: ncurses_def.h
-lib_tparm.po: ncurses_dll.h
-lib_tparm.po: term.h
-lib_tparm.po: unctrl.h
-lib_tputs.So: curses.h
-lib_tputs.So: ncurses_def.h
-lib_tputs.So: ncurses_dll.h
-lib_tputs.So: term.h
-lib_tputs.So: termcap.h
-lib_tputs.So: unctrl.h
-lib_tputs.o: curses.h
-lib_tputs.o: ncurses_def.h
-lib_tputs.o: ncurses_dll.h
-lib_tputs.o: term.h
-lib_tputs.o: termcap.h
-lib_tputs.o: unctrl.h
-lib_tputs.po: curses.h
-lib_tputs.po: ncurses_def.h
-lib_tputs.po: ncurses_dll.h
-lib_tputs.po: term.h
-lib_tputs.po: termcap.h
-lib_tputs.po: unctrl.h
-lib_trace.So: curses.h
-lib_trace.So: ncurses_def.h
-lib_trace.So: ncurses_dll.h
-lib_trace.So: term.h
-lib_trace.So: unctrl.h
-lib_trace.o: curses.h
-lib_trace.o: ncurses_def.h
-lib_trace.o: ncurses_dll.h
-lib_trace.o: term.h
-lib_trace.o: unctrl.h
-lib_trace.po: curses.h
-lib_trace.po: ncurses_def.h
-lib_trace.po: ncurses_dll.h
-lib_trace.po: term.h
-lib_trace.po: unctrl.h
-lib_tstp.So: curses.h
-lib_tstp.So: ncurses_def.h
-lib_tstp.So: ncurses_dll.h
-lib_tstp.So: term.h
-lib_tstp.So: unctrl.h
-lib_tstp.o: curses.h
-lib_tstp.o: ncurses_def.h
-lib_tstp.o: ncurses_dll.h
-lib_tstp.o: term.h
-lib_tstp.o: unctrl.h
-lib_tstp.po: curses.h
-lib_tstp.po: ncurses_def.h
-lib_tstp.po: ncurses_dll.h
-lib_tstp.po: term.h
-lib_tstp.po: unctrl.h
-lib_ttyflags.So: curses.h
-lib_ttyflags.So: ncurses_def.h
-lib_ttyflags.So: ncurses_dll.h
-lib_ttyflags.So: term.h
-lib_ttyflags.So: unctrl.h
-lib_ttyflags.o: curses.h
-lib_ttyflags.o: ncurses_def.h
-lib_ttyflags.o: ncurses_dll.h
-lib_ttyflags.o: term.h
-lib_ttyflags.o: unctrl.h
-lib_ttyflags.po: curses.h
-lib_ttyflags.po: ncurses_def.h
-lib_ttyflags.po: ncurses_dll.h
-lib_ttyflags.po: term.h
-lib_ttyflags.po: unctrl.h
-lib_twait.So: curses.h
-lib_twait.So: ncurses_def.h
-lib_twait.So: ncurses_dll.h
-lib_twait.So: term.h
-lib_twait.So: unctrl.h
-lib_twait.o: curses.h
-lib_twait.o: ncurses_def.h
-lib_twait.o: ncurses_dll.h
-lib_twait.o: term.h
-lib_twait.o: unctrl.h
-lib_twait.po: curses.h
-lib_twait.po: ncurses_def.h
-lib_twait.po: ncurses_dll.h
-lib_twait.po: term.h
-lib_twait.po: unctrl.h
-lib_unget_wch.So: curses.h
-lib_unget_wch.So: ncurses_def.h
-lib_unget_wch.So: ncurses_dll.h
-lib_unget_wch.So: term.h
-lib_unget_wch.So: unctrl.h
-lib_unget_wch.o: curses.h
-lib_unget_wch.o: ncurses_def.h
-lib_unget_wch.o: ncurses_dll.h
-lib_unget_wch.o: term.h
-lib_unget_wch.o: unctrl.h
-lib_unget_wch.po: curses.h
-lib_unget_wch.po: ncurses_def.h
-lib_unget_wch.po: ncurses_dll.h
-lib_unget_wch.po: term.h
-lib_unget_wch.po: unctrl.h
-lib_ungetch.So: curses.h
-lib_ungetch.So: ncurses_def.h
-lib_ungetch.So: ncurses_dll.h
-lib_ungetch.So: term.h
-lib_ungetch.So: unctrl.h
-lib_ungetch.o: curses.h
-lib_ungetch.o: ncurses_def.h
-lib_ungetch.o: ncurses_dll.h
-lib_ungetch.o: term.h
-lib_ungetch.o: unctrl.h
-lib_ungetch.po: curses.h
-lib_ungetch.po: ncurses_def.h
-lib_ungetch.po: ncurses_dll.h
-lib_ungetch.po: term.h
-lib_ungetch.po: unctrl.h
-lib_vid_attr.So: curses.h
-lib_vid_attr.So: ncurses_def.h
-lib_vid_attr.So: ncurses_dll.h
-lib_vid_attr.So: term.h
-lib_vid_attr.So: unctrl.h
-lib_vid_attr.o: curses.h
-lib_vid_attr.o: ncurses_def.h
-lib_vid_attr.o: ncurses_dll.h
-lib_vid_attr.o: term.h
-lib_vid_attr.o: unctrl.h
-lib_vid_attr.po: curses.h
-lib_vid_attr.po: ncurses_def.h
-lib_vid_attr.po: ncurses_dll.h
-lib_vid_attr.po: term.h
-lib_vid_attr.po: unctrl.h
-lib_vidattr.So: curses.h
-lib_vidattr.So: ncurses_def.h
-lib_vidattr.So: ncurses_dll.h
-lib_vidattr.So: term.h
-lib_vidattr.So: unctrl.h
-lib_vidattr.o: curses.h
-lib_vidattr.o: ncurses_def.h
-lib_vidattr.o: ncurses_dll.h
-lib_vidattr.o: term.h
-lib_vidattr.o: unctrl.h
-lib_vidattr.po: curses.h
-lib_vidattr.po: ncurses_def.h
-lib_vidattr.po: ncurses_dll.h
-lib_vidattr.po: term.h
-lib_vidattr.po: unctrl.h
-lib_vline.So: curses.h
-lib_vline.So: ncurses_def.h
-lib_vline.So: ncurses_dll.h
-lib_vline.So: term.h
-lib_vline.So: unctrl.h
-lib_vline.o: curses.h
-lib_vline.o: ncurses_def.h
-lib_vline.o: ncurses_dll.h
-lib_vline.o: term.h
-lib_vline.o: unctrl.h
-lib_vline.po: curses.h
-lib_vline.po: ncurses_def.h
-lib_vline.po: ncurses_dll.h
-lib_vline.po: term.h
-lib_vline.po: unctrl.h
-lib_vline_set.So: curses.h
-lib_vline_set.So: ncurses_def.h
-lib_vline_set.So: ncurses_dll.h
-lib_vline_set.So: term.h
-lib_vline_set.So: unctrl.h
-lib_vline_set.o: curses.h
-lib_vline_set.o: ncurses_def.h
-lib_vline_set.o: ncurses_dll.h
-lib_vline_set.o: term.h
-lib_vline_set.o: unctrl.h
-lib_vline_set.po: curses.h
-lib_vline_set.po: ncurses_def.h
-lib_vline_set.po: ncurses_dll.h
-lib_vline_set.po: term.h
-lib_vline_set.po: unctrl.h
-lib_wacs.So: curses.h
-lib_wacs.So: ncurses_def.h
-lib_wacs.So: ncurses_dll.h
-lib_wacs.So: term.h
-lib_wacs.So: unctrl.h
-lib_wacs.o: curses.h
-lib_wacs.o: ncurses_def.h
-lib_wacs.o: ncurses_dll.h
-lib_wacs.o: term.h
-lib_wacs.o: unctrl.h
-lib_wacs.po: curses.h
-lib_wacs.po: ncurses_def.h
-lib_wacs.po: ncurses_dll.h
-lib_wacs.po: term.h
-lib_wacs.po: unctrl.h
-lib_wattroff.So: curses.h
-lib_wattroff.So: ncurses_def.h
-lib_wattroff.So: ncurses_dll.h
-lib_wattroff.So: term.h
-lib_wattroff.So: unctrl.h
-lib_wattroff.o: curses.h
-lib_wattroff.o: ncurses_def.h
-lib_wattroff.o: ncurses_dll.h
-lib_wattroff.o: term.h
-lib_wattroff.o: unctrl.h
-lib_wattroff.po: curses.h
-lib_wattroff.po: ncurses_def.h
-lib_wattroff.po: ncurses_dll.h
-lib_wattroff.po: term.h
-lib_wattroff.po: unctrl.h
-lib_wattron.So: curses.h
-lib_wattron.So: ncurses_def.h
-lib_wattron.So: ncurses_dll.h
-lib_wattron.So: term.h
-lib_wattron.So: unctrl.h
-lib_wattron.o: curses.h
-lib_wattron.o: ncurses_def.h
-lib_wattron.o: ncurses_dll.h
-lib_wattron.o: term.h
-lib_wattron.o: unctrl.h
-lib_wattron.po: curses.h
-lib_wattron.po: ncurses_def.h
-lib_wattron.po: ncurses_dll.h
-lib_wattron.po: term.h
-lib_wattron.po: unctrl.h
-lib_winch.So: curses.h
-lib_winch.So: ncurses_def.h
-lib_winch.So: ncurses_dll.h
-lib_winch.So: term.h
-lib_winch.So: unctrl.h
-lib_winch.o: curses.h
-lib_winch.o: ncurses_def.h
-lib_winch.o: ncurses_dll.h
-lib_winch.o: term.h
-lib_winch.o: unctrl.h
-lib_winch.po: curses.h
-lib_winch.po: ncurses_def.h
-lib_winch.po: ncurses_dll.h
-lib_winch.po: term.h
-lib_winch.po: unctrl.h
-lib_window.So: curses.h
-lib_window.So: ncurses_def.h
-lib_window.So: ncurses_dll.h
-lib_window.So: term.h
-lib_window.So: unctrl.h
-lib_window.o: curses.h
-lib_window.o: ncurses_def.h
-lib_window.o: ncurses_dll.h
-lib_window.o: term.h
-lib_window.o: unctrl.h
-lib_window.po: curses.h
-lib_window.po: ncurses_def.h
-lib_window.po: ncurses_dll.h
-lib_window.po: term.h
-lib_window.po: unctrl.h
-lib_wunctrl.So: curses.h
-lib_wunctrl.So: ncurses_def.h
-lib_wunctrl.So: ncurses_dll.h
-lib_wunctrl.So: term.h
-lib_wunctrl.So: unctrl.h
-lib_wunctrl.o: curses.h
-lib_wunctrl.o: ncurses_def.h
-lib_wunctrl.o: ncurses_dll.h
-lib_wunctrl.o: term.h
-lib_wunctrl.o: unctrl.h
-lib_wunctrl.po: curses.h
-lib_wunctrl.po: ncurses_def.h
-lib_wunctrl.po: ncurses_dll.h
-lib_wunctrl.po: term.h
-lib_wunctrl.po: unctrl.h
-name_match.So: curses.h
-name_match.So: ncurses_def.h
-name_match.So: ncurses_dll.h
-name_match.So: term.h
-name_match.So: unctrl.h
-name_match.o: curses.h
-name_match.o: ncurses_def.h
-name_match.o: ncurses_dll.h
-name_match.o: term.h
-name_match.o: unctrl.h
-name_match.po: curses.h
-name_match.po: ncurses_def.h
-name_match.po: ncurses_dll.h
-name_match.po: term.h
-name_match.po: unctrl.h
-names.So: curses.h
-names.So: names.c
-names.So: ncurses_def.h
-names.So: ncurses_dll.h
-names.So: term.h
-names.So: unctrl.h
-names.o: curses.h
-names.o: names.c
-names.o: ncurses_def.h
-names.o: ncurses_dll.h
-names.o: term.h
-names.o: unctrl.h
-names.po: curses.h
-names.po: names.c
-names.po: ncurses_def.h
-names.po: ncurses_dll.h
-names.po: term.h
-names.po: unctrl.h
-nc_panel.So: curses.h
-nc_panel.So: ncurses_def.h
-nc_panel.So: ncurses_dll.h
-nc_panel.So: term.h
-nc_panel.So: unctrl.h
-nc_panel.o: curses.h
-nc_panel.o: ncurses_def.h
-nc_panel.o: ncurses_dll.h
-nc_panel.o: term.h
-nc_panel.o: unctrl.h
-nc_panel.po: curses.h
-nc_panel.po: ncurses_def.h
-nc_panel.po: ncurses_dll.h
-nc_panel.po: term.h
-nc_panel.po: unctrl.h
-obsolete.So: curses.h
-obsolete.So: ncurses_def.h
-obsolete.So: ncurses_dll.h
-obsolete.So: term.h
-obsolete.So: unctrl.h
-obsolete.o: curses.h
-obsolete.o: ncurses_def.h
-obsolete.o: ncurses_dll.h
-obsolete.o: term.h
-obsolete.o: unctrl.h
-obsolete.po: curses.h
-obsolete.po: ncurses_def.h
-obsolete.po: ncurses_dll.h
-obsolete.po: term.h
-obsolete.po: unctrl.h
-parse_entry.So: curses.h
-parse_entry.So: ncurses_def.h
-parse_entry.So: ncurses_dll.h
-parse_entry.So: parametrized.h
-parse_entry.So: term.h
-parse_entry.So: unctrl.h
-parse_entry.o: curses.h
-parse_entry.o: ncurses_def.h
-parse_entry.o: ncurses_dll.h
-parse_entry.o: parametrized.h
-parse_entry.o: term.h
-parse_entry.o: unctrl.h
-parse_entry.po: curses.h
-parse_entry.po: ncurses_def.h
-parse_entry.po: ncurses_dll.h
-parse_entry.po: parametrized.h
-parse_entry.po: term.h
-parse_entry.po: unctrl.h
-read_entry.So: curses.h
-read_entry.So: ncurses_def.h
-read_entry.So: ncurses_dll.h
-read_entry.So: term.h
-read_entry.So: unctrl.h
-read_entry.o: curses.h
-read_entry.o: ncurses_def.h
-read_entry.o: ncurses_dll.h
-read_entry.o: term.h
-read_entry.o: unctrl.h
-read_entry.po: curses.h
-read_entry.po: ncurses_def.h
-read_entry.po: ncurses_dll.h
-read_entry.po: term.h
-read_entry.po: unctrl.h
-resizeterm.So: curses.h
-resizeterm.So: ncurses_def.h
-resizeterm.So: ncurses_dll.h
-resizeterm.So: term.h
-resizeterm.So: unctrl.h
-resizeterm.o: curses.h
-resizeterm.o: ncurses_def.h
-resizeterm.o: ncurses_dll.h
-resizeterm.o: term.h
-resizeterm.o: unctrl.h
-resizeterm.po: curses.h
-resizeterm.po: ncurses_def.h
-resizeterm.po: ncurses_dll.h
-resizeterm.po: term.h
-resizeterm.po: unctrl.h
-safe_sprintf.So: curses.h
-safe_sprintf.So: ncurses_def.h
-safe_sprintf.So: ncurses_dll.h
-safe_sprintf.So: term.h
-safe_sprintf.So: unctrl.h
-safe_sprintf.o: curses.h
-safe_sprintf.o: ncurses_def.h
-safe_sprintf.o: ncurses_dll.h
-safe_sprintf.o: term.h
-safe_sprintf.o: unctrl.h
-safe_sprintf.po: curses.h
-safe_sprintf.po: ncurses_def.h
-safe_sprintf.po: ncurses_dll.h
-safe_sprintf.po: term.h
-safe_sprintf.po: unctrl.h
-strings.So: curses.h
-strings.So: ncurses_def.h
-strings.So: ncurses_dll.h
-strings.So: term.h
-strings.So: unctrl.h
-strings.o: curses.h
-strings.o: ncurses_def.h
-strings.o: ncurses_dll.h
-strings.o: term.h
-strings.o: unctrl.h
-strings.po: curses.h
-strings.po: ncurses_def.h
-strings.po: ncurses_dll.h
-strings.po: term.h
-strings.po: unctrl.h
-termcap.So: curses.h
-termcap.So: ncurses_def.h
-termcap.So: ncurses_dll.h
-termcap.So: term.h
-termcap.So: unctrl.h
-termcap.o: curses.h
-termcap.o: ncurses_def.h
-termcap.o: ncurses_dll.h
-termcap.o: term.h
-termcap.o: unctrl.h
-termcap.po: curses.h
-termcap.po: ncurses_def.h
-termcap.po: ncurses_dll.h
-termcap.po: term.h
-termcap.po: unctrl.h
-tries.So: curses.h
-tries.So: ncurses_def.h
-tries.So: ncurses_dll.h
-tries.So: term.h
-tries.So: unctrl.h
-tries.o: curses.h
-tries.o: ncurses_def.h
-tries.o: ncurses_dll.h
-tries.o: term.h
-tries.o: unctrl.h
-tries.po: curses.h
-tries.po: ncurses_def.h
-tries.po: ncurses_dll.h
-tries.po: term.h
-tries.po: unctrl.h
-trim_sgr0.So: curses.h
-trim_sgr0.So: ncurses_def.h
-trim_sgr0.So: ncurses_dll.h
-trim_sgr0.So: term.h
-trim_sgr0.So: unctrl.h
-trim_sgr0.o: curses.h
-trim_sgr0.o: ncurses_def.h
-trim_sgr0.o: ncurses_dll.h
-trim_sgr0.o: term.h
-trim_sgr0.o: unctrl.h
-trim_sgr0.po: curses.h
-trim_sgr0.po: ncurses_def.h
-trim_sgr0.po: ncurses_dll.h
-trim_sgr0.po: term.h
-trim_sgr0.po: unctrl.h
-tty_update.So: curses.h
-tty_update.So: ncurses_def.h
-tty_update.So: ncurses_dll.h
-tty_update.So: term.h
-tty_update.So: unctrl.h
-tty_update.o: curses.h
-tty_update.o: ncurses_def.h
-tty_update.o: ncurses_dll.h
-tty_update.o: term.h
-tty_update.o: unctrl.h
-tty_update.po: curses.h
-tty_update.po: ncurses_def.h
-tty_update.po: ncurses_dll.h
-tty_update.po: term.h
-tty_update.po: unctrl.h
-unctrl.So: curses.h
-unctrl.So: ncurses_def.h
-unctrl.So: ncurses_dll.h
-unctrl.So: term.h
-unctrl.So: unctrl.c
-unctrl.So: unctrl.h
-unctrl.o: curses.h
-unctrl.o: ncurses_def.h
-unctrl.o: ncurses_dll.h
-unctrl.o: term.h
-unctrl.o: unctrl.c
-unctrl.o: unctrl.h
-unctrl.po: curses.h
-unctrl.po: ncurses_def.h
-unctrl.po: ncurses_dll.h
-unctrl.po: term.h
-unctrl.po: unctrl.c
-unctrl.po: unctrl.h
-version.So: curses.h
-version.So: ncurses_def.h
-version.So: ncurses_dll.h
-version.So: term.h
-version.So: unctrl.h
-version.o: curses.h
-version.o: ncurses_def.h
-version.o: ncurses_dll.h
-version.o: term.h
-version.o: unctrl.h
-version.po: curses.h
-version.po: ncurses_def.h
-version.po: ncurses_dll.h
-version.po: term.h
-version.po: unctrl.h
-visbuf.So: curses.h
-visbuf.So: ncurses_def.h
-visbuf.So: ncurses_dll.h
-visbuf.So: term.h
-visbuf.So: unctrl.h
-visbuf.o: curses.h
-visbuf.o: ncurses_def.h
-visbuf.o: ncurses_dll.h
-visbuf.o: term.h
-visbuf.o: unctrl.h
-visbuf.po: curses.h
-visbuf.po: ncurses_def.h
-visbuf.po: ncurses_dll.h
-visbuf.po: term.h
-visbuf.po: unctrl.h
-vsscanf.So: curses.h
-vsscanf.So: ncurses_def.h
-vsscanf.So: ncurses_dll.h
-vsscanf.So: term.h
-vsscanf.So: unctrl.h
-vsscanf.o: curses.h
-vsscanf.o: ncurses_def.h
-vsscanf.o: ncurses_dll.h
-vsscanf.o: term.h
-vsscanf.o: unctrl.h
-vsscanf.po: curses.h
-vsscanf.po: ncurses_def.h
-vsscanf.po: ncurses_dll.h
-vsscanf.po: term.h
-vsscanf.po: unctrl.h
-wresize.So: curses.h
-wresize.So: ncurses_def.h
-wresize.So: ncurses_dll.h
-wresize.So: term.h
-wresize.So: unctrl.h
-wresize.o: curses.h
-wresize.o: ncurses_def.h
-wresize.o: ncurses_dll.h
-wresize.o: term.h
-wresize.o: unctrl.h
-wresize.po: curses.h
-wresize.po: ncurses_def.h
-wresize.po: ncurses_dll.h
-wresize.po: term.h
-wresize.po: unctrl.h
-write_entry.So: curses.h
-write_entry.So: ncurses_def.h
-write_entry.So: ncurses_dll.h
-write_entry.So: term.h
-write_entry.So: unctrl.h
-write_entry.o: curses.h
-write_entry.o: ncurses_def.h
-write_entry.o: ncurses_dll.h
-write_entry.o: term.h
-write_entry.o: unctrl.h
-write_entry.po: curses.h
-write_entry.po: ncurses_def.h
-write_entry.po: ncurses_dll.h
-write_entry.po: term.h
-write_entry.po: unctrl.h
.endif
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index 7ed28bc..8ba6d1d 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -17,49 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-p_above.So: ncurses_def.h
-p_above.o: ncurses_def.h
-p_above.po: ncurses_def.h
-p_below.So: ncurses_def.h
-p_below.o: ncurses_def.h
-p_below.po: ncurses_def.h
-p_bottom.So: ncurses_def.h
-p_bottom.o: ncurses_def.h
-p_bottom.po: ncurses_def.h
-p_delete.So: ncurses_def.h
-p_delete.o: ncurses_def.h
-p_delete.po: ncurses_def.h
-p_hidden.So: ncurses_def.h
-p_hidden.o: ncurses_def.h
-p_hidden.po: ncurses_def.h
-p_hide.So: ncurses_def.h
-p_hide.o: ncurses_def.h
-p_hide.po: ncurses_def.h
-p_move.So: ncurses_def.h
-p_move.o: ncurses_def.h
-p_move.po: ncurses_def.h
-p_new.So: ncurses_def.h
-p_new.o: ncurses_def.h
-p_new.po: ncurses_def.h
-p_replace.So: ncurses_def.h
-p_replace.o: ncurses_def.h
-p_replace.po: ncurses_def.h
-p_show.So: ncurses_def.h
-p_show.o: ncurses_def.h
-p_show.po: ncurses_def.h
-p_top.So: ncurses_def.h
-p_top.o: ncurses_def.h
-p_top.po: ncurses_def.h
-p_update.So: ncurses_def.h
-p_update.o: ncurses_def.h
-p_update.po: ncurses_def.h
-p_user.So: ncurses_def.h
-p_user.o: ncurses_def.h
-p_user.po: ncurses_def.h
-p_win.So: ncurses_def.h
-p_win.o: ncurses_def.h
-p_win.po: ncurses_def.h
-panel.So: ncurses_def.h
-panel.o: ncurses_def.h
-panel.po: ncurses_def.h
.endif
diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend
index 0bb0107..59bc828 100644
--- a/lib/ncurses/panelw/Makefile.depend
+++ b/lib/ncurses/panelw/Makefile.depend
@@ -16,49 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-p_above.So: ncurses_def.h
-p_above.o: ncurses_def.h
-p_above.po: ncurses_def.h
-p_below.So: ncurses_def.h
-p_below.o: ncurses_def.h
-p_below.po: ncurses_def.h
-p_bottom.So: ncurses_def.h
-p_bottom.o: ncurses_def.h
-p_bottom.po: ncurses_def.h
-p_delete.So: ncurses_def.h
-p_delete.o: ncurses_def.h
-p_delete.po: ncurses_def.h
-p_hidden.So: ncurses_def.h
-p_hidden.o: ncurses_def.h
-p_hidden.po: ncurses_def.h
-p_hide.So: ncurses_def.h
-p_hide.o: ncurses_def.h
-p_hide.po: ncurses_def.h
-p_move.So: ncurses_def.h
-p_move.o: ncurses_def.h
-p_move.po: ncurses_def.h
-p_new.So: ncurses_def.h
-p_new.o: ncurses_def.h
-p_new.po: ncurses_def.h
-p_replace.So: ncurses_def.h
-p_replace.o: ncurses_def.h
-p_replace.po: ncurses_def.h
-p_show.So: ncurses_def.h
-p_show.o: ncurses_def.h
-p_show.po: ncurses_def.h
-p_top.So: ncurses_def.h
-p_top.o: ncurses_def.h
-p_top.po: ncurses_def.h
-p_update.So: ncurses_def.h
-p_update.o: ncurses_def.h
-p_update.po: ncurses_def.h
-p_user.So: ncurses_def.h
-p_user.o: ncurses_def.h
-p_user.po: ncurses_def.h
-p_win.So: ncurses_def.h
-p_win.o: ncurses_def.h
-p_win.po: ncurses_def.h
-panel.So: ncurses_def.h
-panel.o: ncurses_def.h
-panel.po: ncurses_def.h
.endif
diff --git a/libexec/dma/dmagent/Makefile.depend b/libexec/dma/dmagent/Makefile.depend
index 226aa40..46c0054 100644
--- a/libexec/dma/dmagent/Makefile.depend
+++ b/libexec/dma/dmagent/Makefile.depend
@@ -19,12 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-aliases_parse.o: aliases_parse.c
-aliases_parse.o: aliases_parse.h
-aliases_parse.po: aliases_parse.c
-aliases_parse.po: aliases_parse.h
-aliases_scan.o: aliases_parse.h
-aliases_scan.o: aliases_scan.c
-aliases_scan.po: aliases_parse.h
-aliases_scan.po: aliases_scan.c
.endif
diff --git a/libexec/ftpd/Makefile.depend b/libexec/ftpd/Makefile.depend
index 0c70593..5480d1d 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -24,6 +24,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ftpcmd.o: ftpcmd.c
-ftpcmd.po: ftpcmd.c
.endif
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index 9e38097..33b2f79 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -17,6 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-mail.local.o: sm_os.h
-mail.local.po: sm_os.h
.endif
diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend
index 518da5b..0cb1420 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-smrsh.o: sm_os.h
-smrsh.po: sm_os.h
.endif
diff --git a/libexec/ypxfr/Makefile.depend b/libexec/ypxfr/Makefile.depend
index 6a84a3f..bdd7bc2 100644
--- a/libexec/ypxfr/Makefile.depend
+++ b/libexec/ypxfr/Makefile.depend
@@ -19,12 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-yp_clnt.o: yp.h
-yp_clnt.o: yp_clnt.c
-yp_clnt.po: yp.h
-yp_clnt.po: yp_clnt.c
-ypxfr_clnt.o: yp.h
-ypxfr_clnt.o: ypxfr_clnt.c
-ypxfr_clnt.po: yp.h
-ypxfr_clnt.po: ypxfr_clnt.c
.endif
diff --git a/sbin/atm/atmconfig/Makefile.depend b/sbin/atm/atmconfig/Makefile.depend
index c790621..6c9b396 100644
--- a/sbin/atm/atmconfig/Makefile.depend
+++ b/sbin/atm/atmconfig/Makefile.depend
@@ -19,6 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-atmconfig_device.o: oid.h
-atmconfig_device.po: oid.h
.endif
diff --git a/sbin/devd/Makefile.depend b/sbin/devd/Makefile.depend
index 2611200..2e12316 100644
--- a/sbin/devd/Makefile.depend
+++ b/sbin/devd/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/sbin/gbde/Makefile.depend b/sbin/gbde/Makefile.depend
index 1d64ddb..f2694f4 100644
--- a/sbin/gbde/Makefile.depend
+++ b/sbin/gbde/Makefile.depend
@@ -20,6 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-template.o: template.c
-template.po: template.c
.endif
diff --git a/sbin/hastctl/Makefile.depend b/sbin/hastctl/Makefile.depend
index fa326bb..ae4bdce 100644
--- a/sbin/hastctl/Makefile.depend
+++ b/sbin/hastctl/Makefile.depend
@@ -19,10 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/sbin/hastd/Makefile.depend b/sbin/hastd/Makefile.depend
index 546ac40..ed7392f 100644
--- a/sbin/hastd/Makefile.depend
+++ b/sbin/hastd/Makefile.depend
@@ -23,10 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/sbin/ipf/ipf/Makefile.depend b/sbin/ipf/ipf/Makefile.depend
index 36b066e..fc64f41 100644
--- a/sbin/ipf/ipf/Makefile.depend
+++ b/sbin/ipf/ipf/Makefile.depend
@@ -21,14 +21,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipf_l.o: ipf_l.c
-ipf_l.o: ipf_l.h
-ipf_l.o: ipf_y.h
-ipf_l.po: ipf_l.c
-ipf_l.po: ipf_l.h
-ipf_l.po: ipf_y.h
-ipf_y.o: ipf_l.h
-ipf_y.o: ipf_y.c
-ipf_y.po: ipf_l.h
-ipf_y.po: ipf_y.c
.endif
diff --git a/sbin/ipf/ipftest/Makefile.depend b/sbin/ipf/ipftest/Makefile.depend
index 73f6c41..6fbd594 100644
--- a/sbin/ipf/ipftest/Makefile.depend
+++ b/sbin/ipf/ipftest/Makefile.depend
@@ -20,40 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipf_l.o: ipf_l.c
-ipf_l.o: ipf_l.h
-ipf_l.o: ipf_y.h
-ipf_l.po: ipf_l.c
-ipf_l.po: ipf_l.h
-ipf_l.po: ipf_y.h
-ipf_y.o: ipf.tab.c
-ipf_y.o: ipf_l.h
-ipf_y.o: ipf_y.c
-ipf_y.po: ipf.tab.c
-ipf_y.po: ipf_l.h
-ipf_y.po: ipf_y.c
-ipnat_l.o: ipnat_l.c
-ipnat_l.o: ipnat_l.h
-ipnat_l.o: ipnat_y.h
-ipnat_l.po: ipnat_l.c
-ipnat_l.po: ipnat_l.h
-ipnat_l.po: ipnat_y.h
-ipnat_y.o: ipnat.tab.c
-ipnat_y.o: ipnat_l.h
-ipnat_y.o: ipnat_y.c
-ipnat_y.po: ipnat.tab.c
-ipnat_y.po: ipnat_l.h
-ipnat_y.po: ipnat_y.c
-ippool_l.o: ippool_l.c
-ippool_l.o: ippool_l.h
-ippool_l.o: ippool_y.h
-ippool_l.po: ippool_l.c
-ippool_l.po: ippool_l.h
-ippool_l.po: ippool_y.h
-ippool_y.o: ippool.tab.c
-ippool_y.o: ippool_l.h
-ippool_y.o: ippool_y.c
-ippool_y.po: ippool.tab.c
-ippool_y.po: ippool_l.h
-ippool_y.po: ippool_y.c
.endif
diff --git a/sbin/ipf/ipmon/Makefile.depend b/sbin/ipf/ipmon/Makefile.depend
index c33fe27..6fbd594 100644
--- a/sbin/ipf/ipmon/Makefile.depend
+++ b/sbin/ipf/ipmon/Makefile.depend
@@ -20,14 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipmon_l.o: ipmon_l.c
-ipmon_l.o: ipmon_l.h
-ipmon_l.o: ipmon_y.h
-ipmon_l.po: ipmon_l.c
-ipmon_l.po: ipmon_l.h
-ipmon_l.po: ipmon_y.h
-ipmon_y.o: ipmon_l.h
-ipmon_y.o: ipmon_y.c
-ipmon_y.po: ipmon_l.h
-ipmon_y.po: ipmon_y.c
.endif
diff --git a/sbin/ipf/ipnat/Makefile.depend b/sbin/ipf/ipnat/Makefile.depend
index ea17231..6fbd594 100644
--- a/sbin/ipf/ipnat/Makefile.depend
+++ b/sbin/ipf/ipnat/Makefile.depend
@@ -20,14 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ipnat_l.o: ipnat_l.c
-ipnat_l.o: ipnat_l.h
-ipnat_l.o: ipnat_y.h
-ipnat_l.po: ipnat_l.c
-ipnat_l.po: ipnat_l.h
-ipnat_l.po: ipnat_y.h
-ipnat_y.o: ipnat_l.h
-ipnat_y.o: ipnat_y.c
-ipnat_y.po: ipnat_l.h
-ipnat_y.po: ipnat_y.c
.endif
diff --git a/sbin/ipf/ippool/Makefile.depend b/sbin/ipf/ippool/Makefile.depend
index bc6ba75..6fbd594 100644
--- a/sbin/ipf/ippool/Makefile.depend
+++ b/sbin/ipf/ippool/Makefile.depend
@@ -20,14 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ippool_l.o: ippool_l.c
-ippool_l.o: ippool_l.h
-ippool_l.o: ippool_y.h
-ippool_l.po: ippool_l.c
-ippool_l.po: ippool_l.h
-ippool_l.po: ippool_y.h
-ippool_y.o: ippool_l.h
-ippool_y.o: ippool_y.c
-ippool_y.po: ippool_l.h
-ippool_y.po: ippool_y.c
.endif
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 366f77f..f6a9692 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -1029,7 +1029,7 @@ fill_dscp(ipfw_insn *cmd, char *av, int cblen)
errx(EX_DATAERR, "Invalid DSCP value");
}
- if (code > 32)
+ if (code >= 32)
*high |= 1 << (code - 32);
else
*low |= 1 << code;
diff --git a/sbin/pfctl/Makefile.depend b/sbin/pfctl/Makefile.depend
index 0113da6..6a75a18 100644
--- a/sbin/pfctl/Makefile.depend
+++ b/sbin/pfctl/Makefile.depend
@@ -19,6 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
.endif
diff --git a/sbin/route/Makefile.depend b/sbin/route/Makefile.depend
index a6497f2..54c1f6f 100644
--- a/sbin/route/Makefile.depend
+++ b/sbin/route/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-route.o: keywords.h
-route.po: keywords.h
.endif
diff --git a/sbin/setkey/Makefile.depend b/sbin/setkey/Makefile.depend
index 9764245..88d8ceb 100644
--- a/sbin/setkey/Makefile.depend
+++ b/sbin/setkey/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/secure/lib/libcrypto/Makefile.depend b/secure/lib/libcrypto/Makefile.depend
index 0742ab2..9f2467a 100644
--- a/secure/lib/libcrypto/Makefile.depend
+++ b/secure/lib/libcrypto/Makefile.depend
@@ -17,7 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cversion.So: buildinf.h
-cversion.o: buildinf.h
-cversion.po: buildinf.h
.endif
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2c04dd3..2508da0 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -165,7 +165,6 @@ MAN= aac.4 \
geom_fox.4 \
geom_linux_lvm.4 \
geom_map.4 \
- geom_uncompress.4 \
geom_uzip.4 \
gif.4 \
gpio.4 \
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 05d4839..e03b65b 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -73,7 +73,6 @@
.Cd options GEOM_SHSEC
.Cd options GEOM_STRIPE
.Cd options GEOM_SUNLABEL
-.Cd options GEOM_UNCOMPRESS
.Cd options GEOM_UZIP
.Cd options GEOM_VIRSTOR
.Cd options GEOM_VOL
diff --git a/share/man/man4/geom_map.4 b/share/man/man4/geom_map.4
index 47b2aa8..b84f90a 100644
--- a/share/man/man4/geom_map.4
+++ b/share/man/man4/geom_map.4
@@ -78,7 +78,7 @@ or by using
0 DISK cfid0 8388608 4 hd 0 sc 0
1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
-2 UNCOMPRESS map/rootfs.uncompress 18677760 512
+2 UZIP map/rootfs.uzip 18677760 512
1 MAP map/kernel 1114112 4 i 3 o 262144 entry 0 dsize 1114112
1 MAP map/upgrade 7995392 4 i 2 o 262144 entry 0 dsize 7995392
1 MAP map/factory 65536 4 i 1 o 196608 entry 0 dsize 65536
diff --git a/share/man/man4/geom_uncompress.4 b/share/man/man4/geom_uncompress.4
deleted file mode 100644
index af12d27..0000000
--- a/share/man/man4/geom_uncompress.4
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" Copyright (c) 2006, Ceri Davies <ceri@FreeBSD.org>
-.\" Copyright (c) 2014, Luiz Otavio O Souza <loos@FreeBSD.org>
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd January 9, 2014
-.Dt GEOM_UNCOMPRESS 4
-.Os
-.Sh NAME
-.Nm geom_uncompress
-.Nd "GEOM based compressed disk images"
-.Sh SYNOPSIS
-To compile this driver into the kernel, place the following line in your
-kernel configuration file:
-.Bd -ragged -offset indent
-.Cd "options GEOM_UNCOMPRESS"
-.Ed
-.Pp
-Alternatively, to load the driver as a module at boot time, place the
-following line in
-.Xr loader.conf 5 :
-.Bd -literal -offset indent
-geom_uncompress_load="YES"
-.Ed
-.Sh DESCRIPTION
-The
-.Nm
-framework provides support for compressed read-only disk images.
-This allows significant storage savings at the expense of a little CPU
-time on each read.
-Data written in the GEOM label area allows
-.Nm
-to detect compressed images which have been created with
-.Xr mkulzma 8
-or
-.Xr mkuzip 8
-and presented to the kernel as a logical disk device via
-.Xr md 4 .
-.Nm
-creates a unique
-.Pa md#.uncompress
-device for each image.
-.Pp
-The
-.Nm
-device is subsequently used by the
-.Fx
-kernel to access the disk images.
-The
-.Nm
-driver does not allow write operations to the underlying disk image.
-To check which
-.Xr md 4
-devices match a given
-.Nm
-device:
-.Bd -literal -offset indent
-# geom uncompress list
-Geom name: md0.uncompress
-Providers:
-1. Name: md0.uncompress
- Mediasize: 52428800 (50M)
- Sectorsize: 512
- Mode: r1w0e0
-Consumers:
-1. Name: md0
- Mediasize: 20864000 (20M)
- Sectorsize: 512
- Mode: r1w0e0
-.Ed
-.Sh SEE ALSO
-.Xr GEOM 4 ,
-.Xr md 4 ,
-.Xr geom 8 ,
-.Xr mkulzma 8 ,
-.Xr mkuzip 8
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Max Khon Aq Mt fjoe@FreeBSD.org
-as
-.Xr geom_uzip 4 .
-.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org
-copied it over as
-.Nm
-and added LZMA functionality .
-This manual page was written by
-.An Ceri Davies Aq Mt ceri@FreeBSD.org
-for the
-.Xr geom_uzip 4 ,
-and modified by
-.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org
-to match
-.Nm .
diff --git a/share/man/man4/geom_uzip.4 b/share/man/man4/geom_uzip.4
index 0d36322..4dbab52 100644
--- a/share/man/man4/geom_uzip.4
+++ b/share/man/man4/geom_uzip.4
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm geom_uzip
-.Nd "GEOM based compressed disk images"
+.Nd "GEOM based compressed disk images and partitions"
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following line in your
@@ -51,7 +51,7 @@ The
framework provides support for compressed read-only
disk images.
This allows significant storage savings at the expense of
-a little CPU time on each read.
+a some CPU time on each read.
Data written in the GEOM label area allows
.Nm
to detect compressed images which have been created with
@@ -63,17 +63,53 @@ creates a unique
.Pa md#.uzip
device for each image.
.Pp
+.Nm
+is not limited to supporting only
+.Xr md 4
+images.
+The image can also reside on a block device.
+.Pq For example, a disk, USB flash drive, DVD-ROM, etc.
+The appropriate device node will appear with the
+.Pa .uzip
+suffix.
+.Bd -literal -offset indent
+# gpart show da0
+=> 0 7833600 da0 BSD (3.7G)
+ 0 2097152 1 freebsd-ufs (1.0G)
+ 2097152 5736448 - free - (2.7G)
+# gpart add -t freebsd-ufs -s 1G da0
+da0b added
+# dd if=/tmp/20160217_dcomp_zcomp.uzip bs=256k of=/dev/da0b
+3190+1 records in
+3190+1 records out
+836331008 bytes transferred in 111.021489 secs (7533055 bytes/sec)
+# fsck -t ffs /dev/da0b.uzip
+** /dev/da0b.uzip (NO WRITE)
+** Last Mounted on /mnt
+** Phase 1 - Check Blocks and Sizes
+** Phase 2 - Check Pathnames
+** Phase 3 - Check Connectivity
+** Phase 4 - Check Reference Counts
+** Phase 5 - Check Cyl groups
+97455 files, 604242 used, 184741 free (2349 frags, 22799 blocks,
+ 0.3% fragmentation)
+# mount -o ro /dev/da0b.uzip /mnt
+# df /dev/da0b.uzip
+Filesystem 1K-blocks Used Avail Capacity Mounted on
+/dev/da0b.uzip 3155932 2416968 738964 77% /mnt
+.Ed
+.Pp
The
.Nm
-device is subsequently used by the
+device is subsequently used by
.Fx
-kernel to access the disk images.
+kernel to access the uncompressed data.
The
.Nm
driver does not allow write operations to the underlying disk image.
To check which
-.Xr md 4
-devices match a given
+.Dq providers
+match a given
.Nm
device:
.Bd -literal -offset indent
@@ -83,13 +119,44 @@ Providers:
1. Name: md1.uzip
Mediasize: 22003712 (21M)
Sectorsize: 512
- Mode: r1w0e1
Consumers:
1. Name: md1
Mediasize: 9563648 (9.1M)
Sectorsize: 512
- Mode: r1w0e1
+
+Geom name: da0b.uzip
+Providers:
+1. Name: da0b.uzip
+ Mediasize: 3355443200 (3.1G)
+ Sectorsize: 512
+Consumers:
+1. Name: da0b
+ Mediasize: 1073741824 (1.0G)
+ Sectorsize: 512
.Ed
+.Pp
+.Nm
+allows mounting the root file system from a compressed disk partition by
+setting the
+.Dv vfs.root.mountfrom
+tunable.
+See
+.Xr loader.conf 5
+for details.
+.Sh DIAGNOSTICS
+Several flags are provided for tracing
+.Nm
+I/O operations and TOC parsing via the following sysctls.
+.Bl -tag -width indent
+.It Va kern.geom.uzip.debug
+Log level.
+Zero disables logging.
+Higher values enable more verbose debug logging for
+.Nm .
+Supported levels are from 0 (no logging) to 4 (maximum amount of logging).
+.It Va kern.geom.uzip.debug_block
+Log operations involving compressed cluster number.
+.El
.Sh SEE ALSO
.Xr GEOM 4 ,
.Xr md 4 ,
@@ -101,5 +168,12 @@ The
.Nm
driver was written by
.An Max Khon Aq Mt fjoe@FreeBSD.org .
+The block de-duplication code as well as some
+.Nm
+driver optimizations have been contributed by
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org .
+The LZMA decompression support and CLOOP 3.0 support have been added by
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
+.Pp
This manual page was written by
.An Ceri Davies Aq Mt ceri@FreeBSD.org .
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index dd53992..d1fc461 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 12, 2015
+.Dd February 24, 2016
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -141,16 +141,6 @@ Optimization levels other than
and
.Fl O2
are not supported.
-.Va BDECFLAGS
-is provided as a set of
-.Xr cc 1
-settings suggested by
-.An Bruce Evans Aq Mt bde@FreeBSD.org
-for developing and testing changes.
-They can be used, if set, by:
-.Bd -literal -offset indent
-CFLAGS+=${BDECFLAGS}
-.Ed
.It Va CPUTYPE
.Pq Vt str
Controls which processor should be targeted for generated
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 60bf53a..38f3f28 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 292283 2015-12-15 18:42:30Z bdrewery
.\" $FreeBSD$
-.Dd January 9, 2016
+.Dd February 24, 2016
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -165,10 +165,16 @@ The resulting system cannot build programs from source.
.Pp
It is a default setting on
arm64/aarch64.
+.It Va WITH_BINUTILS
+.\" from FreeBSD: head/tools/build/options/WITH_BINUTILS 295491 2016-02-11 00:14:00Z emaste
+Set to build and install binutils (as, ld, objcopy, and objdump) as part
+of the normal system build.
+.Pp
+It is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
.It Va WITHOUT_BINUTILS_BOOTSTRAP
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
-Set to not build binutils (as, c++-filt, gconv,
-ld, nm, objcopy, objdump, readelf, size and strip)
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 295490 2016-02-10 23:57:09Z emaste
+Set to not build binutils (as, ld, objcopy and objdump)
as part of the bootstrap process.
.Bf -symbolic
The option does not work for build targets unless some alternative
@@ -177,6 +183,13 @@ toolchain is provided.
.Pp
It is a default setting on
arm64/aarch64.
+.It Va WITH_BINUTILS_BOOTSTRAP
+.\" from FreeBSD: head/tools/build/options/WITH_BINUTILS_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste
+Set build binutils (as, ld, objcopy and objdump)
+as part of the bootstrap process.
+.Pp
+It is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
.It Va WITHOUT_BLUETOOTH
.\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru
Set to not build Bluetooth related kernel modules, programs and libraries.
@@ -504,6 +517,8 @@ When set, it also enforces the following options:
.Pp
.Bl -item -compact
.It
+.Va WITH_FAST_DEPEND
+.It
.Va WITH_INSTALL_AS_USER
.El
.Pp
@@ -601,6 +616,14 @@ instead of the one from GNU Binutils.
.Pp
It is a default setting on
arm64/aarch64.
+.It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP 295491 2016-02-11 00:14:00Z emaste
+Set to not build ELF Tool Chain tools
+(addr2line, nm, size, strings and strip)
+as part of the bootstrap process.
+.Bf -symbolic
+An alternate bootstrap tool chain must be provided.
+.Ef
.It Va WITHOUT_EXAMPLES
.\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
Set to avoid installing examples to
@@ -702,6 +725,13 @@ Set to not build
.Pp
It is a default setting on
arm64/aarch64.
+.It Va WITH_GDB
+.\" from FreeBSD: head/tools/build/options/WITH_GDB 295493 2016-02-11 00:30:51Z emaste
+Set to build
+.Xr gdb 1 .
+.Pp
+It is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv6hf, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
.It Va WITHOUT_GNU
.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU 174550 2007-12-12 16:43:17Z ru
Set to not build contributed GNU software as a part of the base system.
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 47457ea..47959f3 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 12, 2014
+.Dd February 4, 2016
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -604,6 +604,16 @@ as.
Only supported after
.Pa /usr
is mounted.
+.It Va ${name}_oomprotect
+.Xr protect 1
+.Va command
+from being killed when swap space is exhausted.
+If
+.Em YES
+is used, no child processes are protected.
+If
+.Em ALL ,
+protect all child processes.
.It Va ${name}_program
Full path to the command.
Overrides
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index d29ca5b..1eae442 100644
--- a/share/man/man9/vrele.9
+++ b/share/man/man9/vrele.9
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 20, 2010
+.Dd February 24, 2016
.Dt VRELE 9
.Os
.Sh NAME
@@ -81,9 +81,11 @@ If the
.Va v_usecount
field of the non-doomed vnode reaches zero, then it will be inactivated
and placed on the free list.
-Since the functions might need to call VOPs for the vnode, the
-.Va Giant
-mutex should be conditionally locked around the call.
+.Pp
+The
+.Fn vrele
+function may lock the vnode.
+All three functions may sleep.
.Pp
The hold count for the vnode is always greater or equal to the usecount.
Non-forced unmount fails when mount point owns a vnode that has non-zero
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 6f27d7e..3330ae0 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -94,19 +94,21 @@ _SKIP_READ_DEPEND= 1
.if defined(SRCS)
CLEANFILES?=
-.if ${MK_FAST_DEPEND} == "yes" || !exists(${.OBJDIR}/${DEPENDFILE})
.for _S in ${SRCS:N*.[dhly]}
-${_S:R}.o: ${_S}
-.endfor
+OBJS_DEPEND_GUESS.${_S:R}.o= ${_S}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${_S:R}.o: ${OBJS_DEPEND_GUESS.${_S:R}.o}
.endif
+.endfor
# Lexical analyzers
.for _LSRC in ${SRCS:M*.l:N*/*}
.for _LC in ${_LSRC:R}.c
${_LC}: ${_LSRC}
${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC}
-.if ${MK_FAST_DEPEND} == "yes" || !exists(${.OBJDIR}/${DEPENDFILE})
-${_LC:R}.o: ${_LC}
+OBJS_DEPEND_GUESS.${_LC:R}.o= ${_LC}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${_LC:R}.o: ${OBJS_DEPEND_GUESS.${_LC:R}.o}
.endif
SRCS:= ${SRCS:S/${_LSRC}/${_LC}/}
CLEANFILES+= ${_LC}
@@ -136,8 +138,9 @@ CLEANFILES+= ${_YH}
${_YC}: ${_YSRC}
${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
.endif
-.if ${MK_FAST_DEPEND} == "yes" || !exists(${.OBJDIR}/${DEPENDFILE})
-${_YC:R}.o: ${_YC}
+OBJS_DEPEND_GUESS.${_YC:R}.o= ${_YC}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${_YC:R}.o: ${OBJS_DEPEND_GUESS.${_YC:R}.o}
.endif
.endfor
.endfor
@@ -170,14 +173,24 @@ ${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//}
.endfor
-.if ${MK_FAST_DEPEND} == "yes" && \
- (${.MAKE.MODE:Mmeta} == "" || ${.MAKE.MODE:Mnofilemon} != "")
+.if !empty(.MAKE.MODE:Mmeta) && empty(.MAKE.MODE:Mnofilemon)
+_meta_filemon= 1
+.endif
+.if ${MK_FAST_DEPEND} == "yes"
DEPEND_MP?= -MP
# Handle OBJS=../somefile.o hacks. Just replace '/' rather than use :T to
# avoid collisions.
DEPEND_FILTER= C,/,_,g
+DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
+.if !empty(DEPENDSRCS)
+DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,}
+.endif
+DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./}
DEPEND_CFLAGS+= -MD ${DEPEND_MP} -MF${DEPENDFILE}.${.TARGET:${DEPEND_FILTER}}
DEPEND_CFLAGS+= -MT${.TARGET}
+# Skip generating or including .depend.* files if in meta+filemon mode since
+# it will track dependencies itself. OBJS_DEPEND_GUESS is still used though.
+.if !defined(_meta_filemon)
.if defined(.PARSEDIR)
# Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS
# as those are the only ones we will include.
@@ -186,27 +199,48 @@ CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:}
.else
CFLAGS+= ${DEPEND_CFLAGS}
.endif
-DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
-.if !empty(DEPENDSRCS)
-DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,}
-.endif
-DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./}
.if !defined(_SKIP_READ_DEPEND)
.for __depend_obj in ${DEPENDFILES_OBJS}
.sinclude "${__depend_obj}"
.endfor
-.endif
+.endif # !defined(_SKIP_READ_DEPEND)
+.endif # !defined(_meta_filemon)
.endif # ${MK_FAST_DEPEND} == "yes"
.endif # defined(SRCS)
.if ${MK_DIRDEPS_BUILD} == "yes"
+# Prevent meta.autodep.mk from tracking "local dependencies".
+.depend:
.include <meta.autodep.mk>
+# If using filemon then _EXTRADEPEND is skipped since it is not needed.
+.if empty(.MAKE.MODE:Mnofilemon)
# this depend: bypasses that below
# the dependency helps when bootstrapping
depend: beforedepend ${DPSRCS} ${SRCS} afterdepend
beforedepend:
afterdepend: beforedepend
.endif
+.endif
+
+# Guess some dependencies for when no ${DEPENDFILE}.OBJ is generated yet.
+# For meta+filemon the .meta file is checked for since it is the dependency
+# file used.
+.if ${MK_FAST_DEPEND} == "yes"
+.for __obj in ${DEPENDOBJS:O:u}
+.if (defined(_meta_filemon) && !exists(${.OBJDIR}/${__obj}.meta)) || \
+ (!defined(_meta_filemon) && !exists(${.OBJDIR}/${DEPENDFILE}.${__obj}))
+${__obj}: ${OBJS_DEPEND_GUESS}
+${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
+.endif
+.endfor
+
+# Always run 'make depend' to generate dependencies early and to avoid the
+# need for manually running it. The dirdeps build should only do this in
+# sub-makes though since MAKELEVEL0 is for dirdeps calculations.
+.if ${MK_DIRDEPS_BUILD} == "no" || ${.MAKE.LEVEL} > 0
+beforebuild: depend
+.endif
+.endif # ${MK_FAST_DEPEND} == "yes"
.if !target(depend)
.if defined(SRCS)
@@ -231,9 +265,13 @@ MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \
.endif # ${MK_FAST_DEPEND} == "no"
DPSRCS+= ${SRCS}
+# FAST_DEPEND will only generate a .depend if _EXTRADEPEND is used but
+# the target is created to allow 'make depend' to generate files.
${DEPENDFILE}: ${DPSRCS}
-.if ${MK_FAST_DEPEND} == "no"
+.if exists(${.OBJDIR}/${DEPENDFILE})
rm -f ${DEPENDFILE}
+.endif
+.if ${MK_FAST_DEPEND} == "no"
.if !empty(DPSRCS:M*.[cS])
${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
${MKDEP_CFLAGS} ${.ALLSRC:M*.[cS]}
@@ -245,8 +283,6 @@ ${DEPENDFILE}: ${DPSRCS}
${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx}
.else
.endif
-.else
- : > ${.TARGET}
.endif # ${MK_FAST_DEPEND} == "no"
.if target(_EXTRADEPEND)
_EXTRADEPEND: .USE
@@ -268,6 +304,7 @@ afterdepend:
.endif
.endif
+.if defined(SRCS)
.if ${CTAGS:T} == "gtags"
CLEANDEPENDFILES+= GPATH GRTAGS GSYMS GTAGS
.if defined(HTML)
@@ -276,15 +313,16 @@ CLEANDEPENDDIRS+= HTML
.else
CLEANDEPENDFILES+= tags
.endif
+.endif
.if !target(cleandepend)
cleandepend:
-.if defined(SRCS)
+.if !empty(CLEANDEPENDFILES)
rm -f ${CLEANDEPENDFILES}
+.endif
.if !empty(CLEANDEPENDDIRS)
rm -rf ${CLEANDEPENDDIRS}
.endif
.endif
-.endif
.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD))
_LDADD_FROM_DPADD= ${DPADD:R:T:C;^lib(.*)$;-l\1;g}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index dc81c1c..036d3d1 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -415,28 +415,31 @@ lint: ${SRCS:M*.c}
.include <bsd.man.mk>
.endif
-.include <bsd.dep.mk>
-
-.if ${MK_FAST_DEPEND} == "yes" || !exists(${.OBJDIR}/${DEPENDFILE})
.if defined(LIB) && !empty(LIB)
-.if !exists(${.OBJDIR}/${DEPENDFILE})
-${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h}
+OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${OBJS} ${STATICOBJS} ${POBJS}: ${OBJS_DEPEND_GUESS}
.endif
.for _S in ${SRCS:N*.[hly]}
-${_S:R}.po: ${_S}
+OBJS_DEPEND_GUESS.${_S:R}.po= ${_S}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${_S:R}.po: ${OBJS_DEPEND_GUESS.${_S:R}.po}
+.endif
.endfor
.endif
.if defined(SHLIB_NAME) || \
defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
-.if !exists(${.OBJDIR}/${DEPENDFILE})
-${SOBJS}: ${SRCS:M*.h}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${SOBJS}: ${OBJS_DEPEND_GUESS}
.endif
.for _S in ${SRCS:N*.[hly]}
-${_S:R}.So: ${_S}
-.endfor
+OBJS_DEPEND_GUESS.${_S:R}.So= ${_S}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${_S:R}.So: ${OBJS_DEPEND_GUESS.${_S:R}.So}
.endif
+.endfor
.endif
+.include <bsd.dep.mk>
.include <bsd.obj.mk>
-
.include <bsd.sys.mk>
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index e2c56ac..390909e 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -77,7 +77,14 @@ __DEFAULT_NO_OPTIONS = \
__DEFAULT_DEPENDENT_OPTIONS = \
STAGING_MAN/STAGING \
STAGING_PROG/STAGING \
-
+
+
+# Enable FAST_DEPEND by default for the meta build.
+.if !empty(.MAKE.MODE:Mmeta)
+__DEFAULT_YES_OPTIONS+= FAST_DEPEND
+__DEFAULT_NO_OPTIONS:= ${__DEFAULT_NO_OPTIONS:NFAST_DEPEND}
+.endif
+
.include <bsd.mkopt.mk>
#
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 612eb8e..ec5dec9 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -275,12 +275,13 @@ lint: ${SRCS:M*.c}
.include <bsd.man.mk>
.endif
-.include <bsd.dep.mk>
-
-.if defined(PROG) && !exists(${.OBJDIR}/${DEPENDFILE})
-${OBJS}: ${SRCS:M*.h}
+.if defined(PROG)
+OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${OBJS}: ${OBJS_DEPEND_GUESS}
+.endif
.endif
+.include <bsd.dep.mk>
.include <bsd.obj.mk>
-
.include <bsd.sys.mk>
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index cba0b59..8d0fe8e 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -27,18 +27,6 @@ UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
.export UPDATE_DEPENDFILE_PROG
.endif
-.ifndef PROG
-# They may have asked us to build just one
-.for t in ${PROGS}
-.if make($t)
-.if ${PROGS_CXX:U:M${t}}
-PROG_CXX ?= $t
-.endif
-PROG ?= $t
-.endif
-.endfor
-.endif
-
.if defined(PROG)
# just one of many
PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
@@ -74,7 +62,8 @@ UPDATE_DEPENDFILE = NO
# These are handled by the main make process.
.ifdef _RECURSING_PROGS
-_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS CONFGROUPS
+_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS CONFGROUPS FILESGROUPS INCSGROUPS \
+ SCRIPTS
.for v in ${_PROGS_GLOBAL_VARS}
$v =
.endfor
@@ -134,6 +123,8 @@ $p.$t: .PHONY .MAKE
# Depend main pseudo targets on all PROG.pseudo targets too.
.for t in ${PROGS_TARGETS:O:u}
+.if make(${t})
$t: ${PROGS:%=%.$t}
+.endif
.endfor
.endif # !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index d490845..2b79f2b 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -138,14 +138,14 @@ __subdir_targets=
.if ${__dir} == .WAIT
__subdir_targets+= .WAIT
.else
-__subdir_targets+= ${__target}_subdir_${__dir}
+__subdir_targets+= ${__target}_subdir_${DIRPRFX}${__dir}
__deps=
.if ${_is_standalone_target} == 0
.for __dep in ${SUBDIR_DEPEND_${__dir}}
-__deps+= ${__target}_subdir_${__dep}
+__deps+= ${__target}_subdir_${DIRPRFX}${__dep}
.endfor
.endif
-${__target}_subdir_${__dir}: .PHONY .MAKE ${__deps}
+${__target}_subdir_${DIRPRFX}${__dir}: .PHONY .MAKE ${__deps}
.if !defined(NO_SUBDIR)
@${_+_}target=${__target:realinstall=install}; \
dir=${__dir}; \
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 8d0b34b..bf4fcbc 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -6,6 +6,7 @@
# we need this until there is an alternative
MK_INSTALL_AS_USER= yes
+MK_FAST_DEPEND= yes
_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},}
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index aea25da..dc94891 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -151,6 +151,7 @@ END(bcopy)
*/
ENTRY(memcpy)
PUSH_FRAME_POINTER
+ movq %rdi,%rax
movq %rdx,%rcx
shrq $3,%rcx /* copy by 64-bit words */
cld /* copy forwards */
diff --git a/sys/arm/arm/cpu_asm-v6.S b/sys/arm/arm/cpu_asm-v6.S
index e3dce4c..7ab02cf 100644
--- a/sys/arm/arm/cpu_asm-v6.S
+++ b/sys/arm/arm/cpu_asm-v6.S
@@ -34,16 +34,9 @@
#include <machine/armreg.h>
#include <machine/sysreg.h>
-#if __ARM_ARCH >= 6
#define GET_PCB(tmp) \
- mrc CP15_TPIDRPRW(tmp); \
- add tmp, tmp, #(TD_PCB)
-#else
-.Lcurpcb:
- .word _C_LABEL(__pcpu) + PC_CURPCB
-#define GET_PCB(tmp) \
- ldr tmp, .Lcurpcb
-#endif
+ mrc CP15_TPIDRPRW(tmp); \
+ add tmp, tmp, #(TD_PCB)
/*
* Define cache functions used by startup code, which counts on the fact that
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index 1abbd6c..061355d 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -94,6 +94,74 @@ fdt_pic_decode_t fdt_pic_table[] = {
};
#endif
+/*
+ * Fix FDT data related to interrupts.
+ *
+ * Driven by the needs of linux and its drivers (as always), the published FDT
+ * data for imx6 now sets the interrupt parent for most devices to the GPC
+ * interrupt controller, which is for use when the chip is in deep-sleep mode.
+ * We don't support deep sleep or have a GPC-PIC driver; we need all interrupts
+ * to be handled by the GIC.
+ *
+ * Luckily, the change to the FDT data was to assign the GPC as the interrupt
+ * parent for the soc node and letting that get inherited by all other devices
+ * (except a few that directly name GIC as their interrupt parent). So we can
+ * set the world right by just changing the interrupt-parent property of the soc
+ * node to refer to GIC instead of GPC. This will get us by until we write our
+ * own GPC driver (or until linux changes its mind and the FDT data again).
+ *
+ * We validate that we have data that looks like we expect before changing it:
+ * - SOC node exists and has GPC as its interrupt parent.
+ * - GPC node exists and has GIC as its interrupt parent.
+ * - GIC node exists and is its own interrupt parent.
+ *
+ * This applies to all models of imx6. Luckily all of them have the devices
+ * involved at the same addresses on the same busses, so we don't need any
+ * per-soc logic. We handle this at platform attach time rather than via the
+ * fdt_fixup_table, because the latter requires matching on the FDT "model"
+ * property, and this applies to all boards including those not yet invented.
+ */
+static void
+fix_fdt_interrupt_data(void)
+{
+ phandle_t gicipar, gicnode, gicxref;
+ phandle_t gpcipar, gpcnode, gpcxref;
+ phandle_t socipar, socnode;
+ int result;
+
+ socnode = OF_finddevice("/soc");
+ if (socnode == -1)
+ return;
+ result = OF_getencprop(socnode, "interrupt-parent", &socipar,
+ sizeof(socipar));
+ if (result <= 0)
+ return;
+
+ gicnode = OF_finddevice("/soc/interrupt-controller@00a01000");
+ if (gicnode == -1)
+ return;
+ result = OF_getencprop(gicnode, "interrupt-parent", &gicipar,
+ sizeof(gicipar));
+ if (result <= 0)
+ return;
+ gicxref = OF_xref_from_node(gicnode);
+
+ gpcnode = OF_finddevice("/soc/aips-bus@02000000/gpc@020dc000");
+ if (gpcnode == -1)
+ return;
+ result = OF_getencprop(gpcnode, "interrupt-parent", &gpcipar,
+ sizeof(gpcipar));
+ if (result <= 0)
+ return;
+ gpcxref = OF_xref_from_node(gpcnode);
+
+ if (socipar != gpcxref || gpcipar != gicxref || gicipar != gicxref)
+ return;
+
+ gicxref = cpu_to_fdt32(gicxref);
+ OF_setprop(socnode, "interrupt-parent", &gicxref, sizeof(gicxref));
+}
+
static vm_offset_t
imx6_lastaddr(platform_t plat)
{
@@ -104,6 +172,10 @@ imx6_lastaddr(platform_t plat)
static int
imx6_attach(platform_t plat)
{
+
+ /* Fix soc interrupt-parent property. */
+ fix_fdt_interrupt_data();
+
/* Inform the MPCore timer driver that its clock is variable. */
arm_tmr_change_frequency(ARM_TMR_FREQUENCY_VARIES);
diff --git a/sys/arm/include/cpu-v6.h b/sys/arm/include/cpu-v6.h
index e537c10..2597139 100644
--- a/sys/arm/include/cpu-v6.h
+++ b/sys/arm/include/cpu-v6.h
@@ -177,15 +177,12 @@ _RF0(cp15_dfar_get, CP15_DFAR(%0))
_RF0(cp15_ifar_get, CP15_IFAR(%0))
_RF0(cp15_l2ctlr_get, CP15_L2CTLR(%0))
#endif
-/* ARMv6+ and XScale */
_RF0(cp15_actlr_get, CP15_ACTLR(%0))
_WF1(cp15_actlr_set, CP15_ACTLR(%0))
-#if __ARM_ARCH >= 6
_WF1(cp15_ats1cpr_set, CP15_ATS1CPR(%0))
_WF1(cp15_ats1cpw_set, CP15_ATS1CPW(%0))
_RF0(cp15_par_get, CP15_PAR(%0))
_RF0(cp15_sctlr_get, CP15_SCTLR(%0))
-#endif
/*CPU id registers */
_RF0(cp15_midr_get, CP15_MIDR(%0))
diff --git a/sys/arm64/cavium/thunder_pcie.c b/sys/arm64/cavium/thunder_pcie.c
deleted file mode 100644
index b4ac43c..0000000
--- a/sys/arm64/cavium/thunder_pcie.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * Copyright (c) 2015 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Semihalf under
- * the sponsorship of the FreeBSD Foundation.
- *
- * 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.
- */
-
-/* PCIe root complex driver for Cavium Thunder SOC */
-#include "opt_platform.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/kernel.h>
-#include <sys/rman.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/endian.h>
-#include <sys/cpuset.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcib_private.h>
-#include <dev/pci/pci_private.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include "thunder_pcie_common.h"
-
-#include "pcib_if.h"
-
-/* Assembling ECAM Configuration Address */
-#define PCIE_BUS_SHIFT 20
-#define PCIE_SLOT_SHIFT 15
-#define PCIE_FUNC_SHIFT 12
-#define PCIE_BUS_MASK 0xFF
-#define PCIE_SLOT_MASK 0x1F
-#define PCIE_FUNC_MASK 0x07
-#define PCIE_REG_MASK 0xFFF
-
-#define PCIE_ADDR_OFFSET(bus, slot, func, reg) \
- ((((bus) & PCIE_BUS_MASK) << PCIE_BUS_SHIFT) | \
- (((slot) & PCIE_SLOT_MASK) << PCIE_SLOT_SHIFT) | \
- (((func) & PCIE_FUNC_MASK) << PCIE_FUNC_SHIFT) | \
- ((reg) & PCIE_REG_MASK))
-
-#define THUNDER_ECAM0_CFG_BASE 0x848000000000UL
-#define THUNDER_ECAM1_CFG_BASE 0x849000000000UL
-#define THUNDER_ECAM2_CFG_BASE 0x84a000000000UL
-#define THUNDER_ECAM3_CFG_BASE 0x84b000000000UL
-#define THUNDER_ECAM4_CFG_BASE 0x948000000000UL
-#define THUNDER_ECAM5_CFG_BASE 0x949000000000UL
-#define THUNDER_ECAM6_CFG_BASE 0x94a000000000UL
-#define THUNDER_ECAM7_CFG_BASE 0x94b000000000UL
-
-/*
- * ThunderX supports up to 4 ethernet interfaces, so it's good
- * value to use as default for numbers of VFs, since each eth
- * interface represents separate virtual function.
- */
-static int thunder_pcie_max_vfs = 4;
-SYSCTL_INT(_hw, OID_AUTO, thunder_pcie_max_vfs, CTLFLAG_RWTUN,
- &thunder_pcie_max_vfs, 0, "Max VFs supported by ThunderX internal PCIe");
-
-/* Forward prototypes */
-static int thunder_pcie_identify_pcib(device_t);
-static int thunder_pcie_maxslots(device_t);
-static uint32_t thunder_pcie_read_config(device_t, u_int, u_int, u_int, u_int,
- int);
-static int thunder_pcie_read_ivar(device_t, device_t, int, uintptr_t *);
-static void thunder_pcie_write_config(device_t, u_int, u_int,
- u_int, u_int, uint32_t, int);
-static int thunder_pcie_write_ivar(device_t, device_t, int, uintptr_t);
-
-int
-thunder_pcie_attach(device_t dev)
-{
- int rid;
- struct thunder_pcie_softc *sc;
- int error;
- int tuple;
- uint64_t base, size;
-
- sc = device_get_softc(dev);
- sc->dev = dev;
-
- /* Identify pcib domain */
- if (thunder_pcie_identify_pcib(dev))
- return (ENXIO);
-
- rid = 0;
- sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
- if (sc->res == NULL) {
- device_printf(dev, "could not map memory.\n");
- return (ENXIO);
- }
-
- sc->mem_rman.rm_type = RMAN_ARRAY;
- sc->mem_rman.rm_descr = "PCIe Memory";
-
- /* Initialize rman and allocate memory regions */
- error = rman_init(&sc->mem_rman);
- if (error) {
- device_printf(dev, "rman_init() failed. error = %d\n", error);
- return (error);
- }
-
- for (tuple = 0; tuple < RANGES_TUPLES_MAX; tuple++) {
- base = sc->ranges[tuple].phys_base;
- size = sc->ranges[tuple].size;
- if ((base == 0) || (size == 0))
- continue; /* empty range element */
-
- error = rman_manage_region(&sc->mem_rman, base, base + size - 1);
- if (error) {
- device_printf(dev, "rman_manage_region() failed. error = %d\n", error);
- rman_fini(&sc->mem_rman);
- return (error);
- }
- }
- device_add_child(dev, "pci", -1);
-
- return (bus_generic_attach(dev));
-}
-
-static uint32_t
-thunder_pcie_read_config(device_t dev, u_int bus, u_int slot,
- u_int func, u_int reg, int bytes)
-{
- uint64_t offset;
- uint32_t data;
- struct thunder_pcie_softc *sc;
- bus_space_tag_t t;
- bus_space_handle_t h;
-
- if ((bus > PCI_BUSMAX) || (slot > PCI_SLOTMAX) ||
- (func > PCI_FUNCMAX) || (reg > PCIE_REGMAX))
- return (~0U);
-
- sc = device_get_softc(dev);
-
- offset = PCIE_ADDR_OFFSET(bus, slot, func, reg);
- t = rman_get_bustag(sc->res);
- h = rman_get_bushandle(sc->res);
-
- switch (bytes) {
- case 1:
- data = bus_space_read_1(t, h, offset);
- break;
- case 2:
- data = le16toh(bus_space_read_2(t, h, offset));
- break;
- case 4:
- data = le32toh(bus_space_read_4(t, h, offset));
- break;
- default:
- return (~0U);
- }
-
- return (data);
-}
-
-static void
-thunder_pcie_write_config(device_t dev, u_int bus, u_int slot,
- u_int func, u_int reg, uint32_t val, int bytes)
-{
- uint64_t offset;
- struct thunder_pcie_softc *sc;
- bus_space_tag_t t;
- bus_space_handle_t h;
-
- if ((bus > PCI_BUSMAX) || (slot > PCI_SLOTMAX) ||
- (func > PCI_FUNCMAX) || (reg > PCIE_REGMAX))
- return ;
-
- sc = device_get_softc(dev);
-
- offset = PCIE_ADDR_OFFSET(bus, slot, func, reg);
- t = rman_get_bustag(sc->res);
- h = rman_get_bushandle(sc->res);
-
- switch (bytes) {
- case 1:
- bus_space_write_1(t, h, offset, val);
- break;
- case 2:
- bus_space_write_2(t, h, offset, htole16(val));
- break;
- case 4:
- bus_space_write_4(t, h, offset, htole32(val));
- break;
- default:
- return;
- }
-
-}
-
-static int
-thunder_pcie_maxslots(device_t dev)
-{
-
- /* max slots per bus acc. to standard */
- return (PCI_SLOTMAX);
-}
-
-static int
-thunder_pcie_read_ivar(device_t dev, device_t child, int index,
- uintptr_t *result)
-{
- struct thunder_pcie_softc *sc;
-
- sc = device_get_softc(dev);
-
- if (index == PCIB_IVAR_BUS) {
- /* this pcib is always on bus 0 */
- *result = 0;
- return (0);
- }
- if (index == PCIB_IVAR_DOMAIN) {
- *result = sc->ecam;
- return (0);
- }
-
- return (ENOENT);
-}
-
-static int
-thunder_pcie_write_ivar(device_t dev, device_t child, int index,
- uintptr_t value)
-{
-
- return (ENOENT);
-}
-
-int
-thunder_pcie_release_resource(device_t dev, device_t child, int type, int rid,
- struct resource *res)
-{
-
- if (type != SYS_RES_MEMORY)
- return (bus_generic_release_resource(dev, child,
- type, rid, res));
-
- return (rman_release_resource(res));
-}
-
-struct resource *
-thunder_pcie_alloc_resource(device_t dev, device_t child, int type, int *rid,
- rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
-{
- struct thunder_pcie_softc *sc = device_get_softc(dev);
- struct rman *rm = NULL;
- struct resource *res;
- pci_addr_t map, testval;
-
- switch (type) {
- case SYS_RES_IOPORT:
- goto fail;
- break;
- case SYS_RES_MEMORY:
- rm = &sc->mem_rman;
- break;
- default:
- return (bus_generic_alloc_resource(dev, child,
- type, rid, start, end, count, flags));
- };
-
- if (RMAN_IS_DEFAULT_RANGE(start, end)) {
-
- /* Read BAR manually to get resource address and size */
- pci_read_bar(child, *rid, &map, &testval, NULL);
-
- /* Mask the information bits */
- if (PCI_BAR_MEM(map))
- map &= PCIM_BAR_MEM_BASE;
- else
- map &= PCIM_BAR_IO_BASE;
-
- if (PCI_BAR_MEM(testval))
- testval &= PCIM_BAR_MEM_BASE;
- else
- testval &= PCIM_BAR_IO_BASE;
-
- start = map;
- count = (~testval) + 1;
- /*
- * Internal ThunderX devices supports up to 3 64-bit BARs.
- * If we're allocating anything above, that means upper layer
- * wants us to allocate VF-BAR. In that case reserve bigger
- * slice to make a room for other VFs adjacent to this one.
- */
- if (*rid > PCIR_BAR(5))
- count = count * thunder_pcie_max_vfs;
- end = start + count - 1;
- }
-
- /* Convert input BUS address to required PHYS */
- if (range_addr_is_pci(sc->ranges, start, count) == 0)
- goto fail;
- start = range_addr_pci_to_phys(sc->ranges, start);
- end = start + count - 1;
-
- if (bootverbose) {
- device_printf(dev,
- "rman_reserve_resource: start=%#lx, end=%#lx, count=%#lx\n",
- start, end, count);
- }
-
- res = rman_reserve_resource(rm, start, end, count, flags, child);
- if (res == NULL)
- goto fail;
-
- rman_set_rid(res, *rid);
-
- if ((flags & RF_ACTIVE) != 0)
- if (bus_activate_resource(child, type, *rid, res)) {
- rman_release_resource(res);
- goto fail;
- }
-
- return (res);
-
-fail:
- if (bootverbose) {
- device_printf(dev, "%s FAIL: type=%d, rid=%d, "
- "start=%016lx, end=%016lx, count=%016lx, flags=%x\n",
- __func__, type, *rid, start, end, count, flags);
- }
-
- return (NULL);
-}
-
-static int
-thunder_pcie_identify_pcib(device_t dev)
-{
- struct thunder_pcie_softc *sc;
- rman_res_t start;
-
- sc = device_get_softc(dev);
- start = bus_get_resource_start(dev, SYS_RES_MEMORY, 0);
-
- switch(start) {
- case THUNDER_ECAM0_CFG_BASE:
- sc->ecam = 0;
- break;
- case THUNDER_ECAM1_CFG_BASE:
- sc->ecam = 1;
- break;
- case THUNDER_ECAM2_CFG_BASE:
- sc->ecam = 2;
- break;
- case THUNDER_ECAM3_CFG_BASE:
- sc->ecam = 3;
- break;
- case THUNDER_ECAM4_CFG_BASE:
- sc->ecam = 4;
- break;
- case THUNDER_ECAM5_CFG_BASE:
- sc->ecam = 5;
- break;
- case THUNDER_ECAM6_CFG_BASE:
- sc->ecam = 6;
- break;
- case THUNDER_ECAM7_CFG_BASE:
- sc->ecam = 7;
- break;
- default:
- device_printf(dev,
- "error: incorrect resource address=%#lx.\n", start);
- return (ENXIO);
- }
- return (0);
-}
-
-static device_method_t thunder_pcie_methods[] = {
- DEVMETHOD(pcib_maxslots, thunder_pcie_maxslots),
- DEVMETHOD(pcib_read_config, thunder_pcie_read_config),
- DEVMETHOD(pcib_write_config, thunder_pcie_write_config),
- DEVMETHOD(bus_read_ivar, thunder_pcie_read_ivar),
- DEVMETHOD(bus_write_ivar, thunder_pcie_write_ivar),
- DEVMETHOD(bus_alloc_resource, thunder_pcie_alloc_resource),
- DEVMETHOD(bus_release_resource, thunder_pcie_release_resource),
- DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
- DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
-
- DEVMETHOD(pcib_map_msi, arm_map_msi),
- DEVMETHOD(pcib_alloc_msix, arm_alloc_msix),
- DEVMETHOD(pcib_release_msix, arm_release_msix),
- DEVMETHOD(pcib_alloc_msi, arm_alloc_msi),
- DEVMETHOD(pcib_release_msi, arm_release_msi),
-
- DEVMETHOD_END
-};
-
-DEFINE_CLASS_0(pcib, thunder_pcie_driver, thunder_pcie_methods,
- sizeof(struct thunder_pcie_softc));
diff --git a/sys/arm64/cavium/thunder_pcie_common.c b/sys/arm64/cavium/thunder_pcie_common.c
index 58239f1..bb0e922 100644
--- a/sys/arm64/cavium/thunder_pcie_common.c
+++ b/sys/arm64/cavium/thunder_pcie_common.c
@@ -32,6 +32,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_platform.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -43,17 +45,31 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <machine/intr.h>
+#ifdef FDT
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/ofw_pci.h>
+#endif
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcib_private.h>
+#include <dev/pci/pci_host_generic.h>
+
#include "thunder_pcie_common.h"
MALLOC_DEFINE(M_THUNDER_PCIE, "Thunder PCIe driver", "Thunder PCIe driver memory");
+#define THUNDER_CFG_BASE_TO_ECAM(x) ((((x) >> 36UL) & 0x3) | (((x) >> 42UL) & 0x4))
+
uint32_t
range_addr_is_pci(struct pcie_range *ranges, uint64_t addr, uint64_t size)
{
struct pcie_range *r;
int tuple;
- for (tuple = 0; tuple < RANGES_TUPLES_MAX; tuple++) {
+ for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) {
r = &ranges[tuple];
if (addr >= r->pci_base &&
addr < (r->pci_base + r->size) &&
@@ -73,7 +89,7 @@ range_addr_is_phys(struct pcie_range *ranges, uint64_t addr, uint64_t size)
struct pcie_range *r;
int tuple;
- for (tuple = 0; tuple < RANGES_TUPLES_MAX; tuple++) {
+ for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) {
r = &ranges[tuple];
if (addr >= r->phys_base &&
addr < (r->phys_base + r->size) &&
@@ -95,7 +111,7 @@ range_addr_pci_to_phys(struct pcie_range *ranges, uint64_t pci_addr)
int tuple;
/* Find physical address corresponding to given bus address */
- for (tuple = 0; tuple < RANGES_TUPLES_MAX; tuple++) {
+ for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) {
r = &ranges[tuple];
if (pci_addr >= r->pci_base &&
pci_addr < (r->pci_base + r->size)) {
@@ -109,3 +125,20 @@ range_addr_pci_to_phys(struct pcie_range *ranges, uint64_t pci_addr)
return (0);
}
+int
+thunder_pcie_identify_ecam(device_t dev, int *ecam)
+{
+ rman_res_t start;
+
+ /* Check if we're running on Cavium ThunderX */
+ if (!CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK,
+ CPU_IMPL_CAVIUM, CPU_PART_THUNDER, 0, 0))
+ return (EINVAL);
+
+ start = bus_get_resource_start(dev, SYS_RES_MEMORY, 0);
+ *ecam = THUNDER_CFG_BASE_TO_ECAM(start);
+
+ device_printf(dev, "ThunderX quirk, setting ECAM to %d\n", *ecam);
+
+ return (0);
+}
diff --git a/sys/arm64/cavium/thunder_pcie_common.h b/sys/arm64/cavium/thunder_pcie_common.h
index c9119bb..fc8fa13 100644
--- a/sys/arm64/cavium/thunder_pcie_common.h
+++ b/sys/arm64/cavium/thunder_pcie_common.h
@@ -29,43 +29,15 @@
#ifndef _CAVIUM_THUNDER_PCIE_COMMON_H_
#define _CAVIUM_THUNDER_PCIE_COMMON_H_
-#define RANGES_TUPLES_MAX 6
-#define RANGES_TUPLES_INVALID (RANGES_TUPLES_MAX + 1)
-
DECLARE_CLASS(thunder_pcie_driver);
DECLARE_CLASS(thunder_pem_driver);
MALLOC_DECLARE(M_THUNDER_PCIE);
-struct pcie_range {
- uint64_t pci_base;
- uint64_t phys_base;
- uint64_t size;
- uint64_t flags;
-};
-
-struct thunder_pcie_softc {
- struct pcie_range ranges[RANGES_TUPLES_MAX];
- struct rman mem_rman;
- struct resource *res;
- int ecam;
- device_t dev;
-};
-
uint32_t range_addr_is_pci(struct pcie_range *, uint64_t, uint64_t);
uint32_t range_addr_is_phys(struct pcie_range *, uint64_t, uint64_t);
uint64_t range_addr_pci_to_phys(struct pcie_range *, uint64_t);
-int thunder_common_alloc_msi(device_t, device_t, int, int, int *);
-int thunder_common_alloc_msix(device_t, device_t, int *);
-int thunder_common_map_msi(device_t, device_t, int, uint64_t *, uint32_t *);
-int thunder_common_release_msi(device_t, device_t, int, int *);
-int thunder_common_release_msix(device_t, device_t, int);
-
-struct resource *thunder_pcie_alloc_resource(device_t,
- device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
-int thunder_pcie_release_resource(device_t, device_t, int, int,
- struct resource *);
-int thunder_pcie_attach(device_t);
+int thunder_pcie_identify_ecam(device_t, int *);
#endif /* _CAVIUM_THUNDER_PCIE_COMMON_H_ */
diff --git a/sys/arm64/cavium/thunder_pcie_fdt.c b/sys/arm64/cavium/thunder_pcie_fdt.c
index 09b5660..f0cad72 100644
--- a/sys/arm64/cavium/thunder_pcie_fdt.c
+++ b/sys/arm64/cavium/thunder_pcie_fdt.c
@@ -45,53 +45,24 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/pci/pci_host_generic.h>
#include "thunder_pcie_common.h"
-#define OFW_CELL_TO_UINT64(cell) \
- (((uint64_t)(*(cell)) << 32) | (uint64_t)(*((cell) + 1)))
-
-#define SPACE_CODE_SHIFT 24
-#define SPACE_CODE_MASK 0x3
-#define SPACE_CODE_IO_SPACE 0x1
-#define PROPS_CELL_SIZE 1
-#define PCI_ADDR_CELL_SIZE 2
-
-static int thunder_pcie_fdt_probe(device_t);
static int thunder_pcie_fdt_attach(device_t);
-
-static struct resource * thunder_pcie_ofw_bus_alloc_res(device_t, device_t,
- int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
-static int thunder_pcie_ofw_bus_rel_res(device_t, device_t, int, int,
- struct resource *);
-
-static const struct ofw_bus_devinfo *thunder_pcie_ofw_get_devinfo(device_t,
- device_t);
+static int thunder_pcie_fdt_probe(device_t);
static device_method_t thunder_pcie_fdt_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, thunder_pcie_fdt_probe),
DEVMETHOD(device_attach, thunder_pcie_fdt_attach),
- /* Bus interface */
- DEVMETHOD(bus_alloc_resource, thunder_pcie_ofw_bus_alloc_res),
- DEVMETHOD(bus_release_resource, thunder_pcie_ofw_bus_rel_res),
- DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-
- /* ofw_bus interface */
- DEVMETHOD(ofw_bus_get_devinfo, thunder_pcie_ofw_get_devinfo),
- DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
- DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
- DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
- DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
- DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
-
/* End */
DEVMETHOD_END
};
DEFINE_CLASS_1(pcib, thunder_pcie_fdt_driver, thunder_pcie_fdt_methods,
- sizeof(struct thunder_pcie_softc), thunder_pcie_driver);
+ sizeof(struct generic_pcie_softc), generic_pcie_driver);
static devclass_t thunder_pcie_fdt_devclass;
@@ -100,17 +71,21 @@ DRIVER_MODULE(thunder_pcib, simplebus, thunder_pcie_fdt_driver,
DRIVER_MODULE(thunder_pcib, ofwbus, thunder_pcie_fdt_driver,
thunder_pcie_fdt_devclass, 0, 0);
-static int thunder_pcie_fdt_ranges(device_t);
-static int thunder_pcie_ofw_bus_attach(device_t);
static int
thunder_pcie_fdt_probe(device_t dev)
{
+ /* Check if we're running on Cavium ThunderX */
+ if (!CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK,
+ CPU_IMPL_CAVIUM, CPU_PART_THUNDER, 0, 0))
+ return (ENXIO);
+
if (!ofw_bus_status_okay(dev))
return (ENXIO);
- if (ofw_bus_is_compatible(dev, "cavium,thunder-pcie") ||
+ if (ofw_bus_is_compatible(dev, "pci-host-ecam-generic") ||
+ ofw_bus_is_compatible(dev, "cavium,thunder-pcie") ||
ofw_bus_is_compatible(dev, "cavium,pci-host-thunder-ecam")) {
device_set_desc(dev, "Cavium Integrated PCI/PCI-E Controller");
return (BUS_PROBE_DEFAULT);
@@ -122,261 +97,11 @@ thunder_pcie_fdt_probe(device_t dev)
static int
thunder_pcie_fdt_attach(device_t dev)
{
- int err;
-
- /* Retrieve 'ranges' property from FDT */
- if (thunder_pcie_fdt_ranges(dev) != 0)
- return (ENXIO);
-
- err = thunder_pcie_ofw_bus_attach(dev);
- if (err != 0)
- return (err);
-
- return (thunder_pcie_attach(dev));
-}
-
-static __inline void
-get_addr_size_cells(phandle_t node, pcell_t *addr_cells, pcell_t *size_cells)
-{
-
- *addr_cells = 2;
- /* Find address cells if present */
- OF_getencprop(node, "#address-cells", addr_cells, sizeof(*addr_cells));
-
- *size_cells = 2;
- /* Find size cells if present */
- OF_getencprop(node, "#size-cells", size_cells, sizeof(*size_cells));
-}
-
-static int
-thunder_pcie_fdt_ranges(device_t dev)
-{
- struct thunder_pcie_softc *sc;
- phandle_t node;
- pcell_t pci_addr_cells, parent_addr_cells, size_cells;
- pcell_t attributes;
- pcell_t *ranges_buf, *cell_ptr;
- int cells_count, tuples_count;
- int tuple;
- int rv;
+ struct generic_pcie_softc *sc;
sc = device_get_softc(dev);
- node = ofw_bus_get_node(dev);
-
- get_addr_size_cells(node, &pci_addr_cells, &size_cells);
-
- /* Find parent address cells if present */
- if (OF_getencprop(OF_parent(node), "#address-cells",
- &parent_addr_cells, sizeof(parent_addr_cells)) < sizeof(parent_addr_cells))
- parent_addr_cells = 2;
-
- /* Check if FDT format matches driver requirements */
- if ((parent_addr_cells != 2) || (pci_addr_cells != 3) ||
- (size_cells != 2)) {
- device_printf(dev,
- "Unexpected number of address or size cells in FDT "
- " %d:%d:%d\n",
- parent_addr_cells, pci_addr_cells, size_cells);
- return (ENXIO);
- }
-
- cells_count = OF_getencprop_alloc(node, "ranges",
- sizeof(pcell_t), (void **)&ranges_buf);
- if (cells_count == -1) {
- device_printf(dev, "Error parsing FDT 'ranges' property\n");
- return (ENXIO);
- }
-
- tuples_count = cells_count /
- (pci_addr_cells + parent_addr_cells + size_cells);
- if (tuples_count > RANGES_TUPLES_MAX) {
- device_printf(dev,
- "Unexpected number of 'ranges' tuples in FDT\n");
- rv = ENXIO;
- goto out;
- }
-
- cell_ptr = ranges_buf;
-
- for (tuple = 0; tuple < tuples_count; tuple++) {
- /*
- * TUPLE FORMAT:
- * attributes - 32-bit attributes field
- * PCI address - bus address combined of two cells in
- * a following format:
- * <ADDR MSB> <ADDR LSB>
- * PA address - physical address combined of two cells in
- * a following format:
- * <ADDR MSB> <ADDR LSB>
- * size - range size combined of two cells in
- * a following format:
- * <ADDR MSB> <ADDR LSB>
- */
- attributes = *cell_ptr;
- attributes = (attributes >> SPACE_CODE_SHIFT) & SPACE_CODE_MASK;
- if (attributes == SPACE_CODE_IO_SPACE) {
- /* Internal PCIe does not support IO space, ignore. */
- sc->ranges[tuple].phys_base = 0;
- sc->ranges[tuple].size = 0;
- cell_ptr +=
- (pci_addr_cells + parent_addr_cells + size_cells);
- continue;
- }
- cell_ptr += PROPS_CELL_SIZE;
- sc->ranges[tuple].pci_base = OFW_CELL_TO_UINT64(cell_ptr);
- cell_ptr += PCI_ADDR_CELL_SIZE;
- sc->ranges[tuple].phys_base = OFW_CELL_TO_UINT64(cell_ptr);
- cell_ptr += parent_addr_cells;
- sc->ranges[tuple].size = OFW_CELL_TO_UINT64(cell_ptr);
- cell_ptr += size_cells;
-
- if (bootverbose) {
- device_printf(dev,
- "\tPCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx\n",
- sc->ranges[tuple].pci_base,
- sc->ranges[tuple].phys_base,
- sc->ranges[tuple].size);
- }
-
- }
- for (; tuple < RANGES_TUPLES_MAX; tuple++) {
- /* zero-fill remaining tuples to mark empty elements in array */
- sc->ranges[tuple].phys_base = 0;
- sc->ranges[tuple].size = 0;
- }
-
- rv = 0;
-out:
- free(ranges_buf, M_OFWPROP);
- return (rv);
-}
-
-/* OFW bus interface */
-struct thunder_pcie_ofw_devinfo {
- struct ofw_bus_devinfo di_dinfo;
- struct resource_list di_rl;
-};
-
-static const struct ofw_bus_devinfo *
-thunder_pcie_ofw_get_devinfo(device_t bus __unused, device_t child)
-{
- struct thunder_pcie_ofw_devinfo *di;
-
- di = device_get_ivars(child);
- return (&di->di_dinfo);
-}
-
-static struct resource *
-thunder_pcie_ofw_bus_alloc_res(device_t bus, device_t child, int type, int *rid,
- rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
-{
- struct thunder_pcie_softc *sc;
- struct thunder_pcie_ofw_devinfo *di;
- struct resource_list_entry *rle;
- int i;
-
- /* For PCIe devices that do not have FDT nodes, use PCIB method */
- if ((int)ofw_bus_get_node(child) <= 0) {
- return (thunder_pcie_alloc_resource(bus, child, type, rid,
- start, end, count, flags));
- }
-
- sc = device_get_softc(bus);
-
- if (RMAN_IS_DEFAULT_RANGE(start, end)) {
- if ((di = device_get_ivars(child)) == NULL)
- return (NULL);
- if (type == SYS_RES_IOPORT)
- type = SYS_RES_MEMORY;
-
- /* Find defaults for this rid */
- rle = resource_list_find(&di->di_rl, type, *rid);
- if (rle == NULL)
- return (NULL);
-
- start = rle->start;
- end = rle->end;
- count = rle->count;
- }
-
- if (type == SYS_RES_MEMORY) {
- /* Remap through ranges property */
- for (i = 0; i < RANGES_TUPLES_MAX; i++) {
- if (start >= sc->ranges[i].phys_base && end <
- sc->ranges[i].pci_base + sc->ranges[i].size) {
- start -= sc->ranges[i].phys_base;
- start += sc->ranges[i].pci_base;
- end -= sc->ranges[i].phys_base;
- end += sc->ranges[i].pci_base;
- break;
- }
- }
+ thunder_pcie_identify_ecam(dev, &sc->ecam);
- if (i == RANGES_TUPLES_MAX) {
- device_printf(bus, "Could not map resource "
- "%#lx-%#lx\n", start, end);
- return (NULL);
- }
- }
-
- return (bus_generic_alloc_resource(bus, child, type, rid, start, end,
- count, flags));
-}
-
-static int
-thunder_pcie_ofw_bus_rel_res(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
-
- /* For PCIe devices that do not have FDT nodes, use PCIB method */
- if ((int)ofw_bus_get_node(child) <= 0) {
- return (thunder_pcie_release_resource(bus,
- child, type, rid, res));
- }
-
- return (bus_generic_release_resource(bus, child, type, rid, res));
+ return (pci_host_generic_attach(dev));
}
-/* Helper functions */
-
-static int
-thunder_pcie_ofw_bus_attach(device_t dev)
-{
- struct thunder_pcie_ofw_devinfo *di;
- device_t child;
- phandle_t parent, node;
- pcell_t addr_cells, size_cells;
-
- parent = ofw_bus_get_node(dev);
- if (parent > 0) {
- get_addr_size_cells(parent, &addr_cells, &size_cells);
- /* Iterate through all bus subordinates */
- for (node = OF_child(parent); node > 0; node = OF_peer(node)) {
- /* Allocate and populate devinfo. */
- di = malloc(sizeof(*di), M_THUNDER_PCIE, M_WAITOK | M_ZERO);
- if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node) != 0) {
- free(di, M_THUNDER_PCIE);
- continue;
- }
-
- /* Initialize and populate resource list. */
- resource_list_init(&di->di_rl);
- ofw_bus_reg_to_rl(dev, node, addr_cells, size_cells,
- &di->di_rl);
- ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
-
- /* Add newbus device for this FDT node */
- child = device_add_child(dev, NULL, -1);
- if (child == NULL) {
- resource_list_free(&di->di_rl);
- ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
- free(di, M_THUNDER_PCIE);
- continue;
- }
-
- device_set_ivars(child, di);
- }
- }
-
- return (0);
-}
diff --git a/sys/arm64/cavium/thunder_pcie_pem.c b/sys/arm64/cavium/thunder_pcie_pem.c
index 0f1e6a3..02eb41c 100644
--- a/sys/arm64/cavium/thunder_pcie_pem.c
+++ b/sys/arm64/cavium/thunder_pcie_pem.c
@@ -32,6 +32,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_platform.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -41,8 +43,16 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <sys/endian.h>
+#ifdef FDT
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/ofw_pci.h>
+#endif
+
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
+#include <dev/pci/pci_host_generic.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/arm64/cavium/thunder_pcie_pem.h b/sys/arm64/cavium/thunder_pcie_pem.h
index 8b45cb1..755dc8d 100644
--- a/sys/arm64/cavium/thunder_pcie_pem.h
+++ b/sys/arm64/cavium/thunder_pcie_pem.h
@@ -39,7 +39,7 @@ struct thunder_pem_softc {
struct resource *reg;
bus_space_tag_t reg_bst;
bus_space_handle_t reg_bsh;
- struct pcie_range ranges[RANGES_TUPLES_MAX];
+ struct pcie_range ranges[MAX_RANGES_TUPLES];
struct rman mem_rman;
struct rman io_rman;
bus_space_handle_t pem_sli_base;
diff --git a/sys/arm64/cavium/thunder_pcie_pem_fdt.c b/sys/arm64/cavium/thunder_pcie_pem_fdt.c
index b423753..39fed31 100644
--- a/sys/arm64/cavium/thunder_pcie_pem_fdt.c
+++ b/sys/arm64/cavium/thunder_pcie_pem_fdt.c
@@ -28,6 +28,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_platform.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -44,6 +46,11 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcib_private.h>
+#include <dev/pci/pci_host_generic.h>
+
#include "thunder_pcie_common.h"
#include "thunder_pcie_pem.h"
diff --git a/sys/boot/efi/loader/Makefile.depend b/sys/boot/efi/loader/Makefile.depend
index 3129986..cca8fc0 100644
--- a/sys/boot/efi/loader/Makefile.depend
+++ b/sys/boot/efi/loader/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vers.o: vers.c
-vers.po: vers.c
.endif
diff --git a/sys/boot/fdt/dts/riscv/qemu.dts b/sys/boot/fdt/dts/riscv/qemu.dts
index b9590a9..067e18f 100644
--- a/sys/boot/fdt/dts/riscv/qemu.dts
+++ b/sys/boot/fdt/dts/riscv/qemu.dts
@@ -49,7 +49,7 @@
memory {
device_type = "memory";
- reg = <0x0 0x8000000>; /* 128MB at 0x0 */
+ reg = <0x0 0x40000000>; /* 1GB at 0x0 */
};
soc {
diff --git a/sys/boot/fdt/dts/riscv/spike.dts b/sys/boot/fdt/dts/riscv/spike.dts
index c501334..dc67114 100644
--- a/sys/boot/fdt/dts/riscv/spike.dts
+++ b/sys/boot/fdt/dts/riscv/spike.dts
@@ -43,13 +43,30 @@
#size-cells = <1>;
#interrupt-cells = <1>;
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "riscv,rv64i";
+ reg = <0x40002000>;
+ };
+
+ cpu@1 {
+ device_type = "cpu";
+ compatible = "riscv,rv64i";
+ reg = <0x4000a000>;
+ };
+ };
+
aliases {
console0 = &console0;
};
memory {
device_type = "memory";
- reg = <0x0 0x8000000>; /* 128MB at 0x0 */
+ reg = <0x0 0x40000000>; /* 1GB at 0x0 */
};
soc {
diff --git a/sys/boot/ficl/Makefile.depend b/sys/boot/ficl/Makefile.depend
index 729ef23..c04b7c3 100644
--- a/sys/boot/ficl/Makefile.depend
+++ b/sys/boot/ficl/Makefile.depend
@@ -12,6 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-softcore.o: softcore.c
-softcore.po: softcore.c
.endif
diff --git a/sys/boot/ficl32/Makefile.depend b/sys/boot/ficl32/Makefile.depend
index 729ef23..c04b7c3 100644
--- a/sys/boot/ficl32/Makefile.depend
+++ b/sys/boot/ficl32/Makefile.depend
@@ -12,6 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-softcore.o: softcore.c
-softcore.po: softcore.c
.endif
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index c13e90e..9162055 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -238,7 +238,6 @@ geom_nop_load="NO" # Transparent disk driver (see gnop(8))
geom_raid3_load="NO" # RAID3 disk driver (see graid3(8))
geom_shsec_load="NO" # Shared secret disk driver (see gshsec(8))
geom_stripe_load="NO" # RAID0 disk driver (see gstripe(8))
-geom_uncompress_load="NO" # Compressed disk images driver (see mkulzma(8))
geom_uzip_load="NO" # Compressed disk images driver (see mkuzip(8))
geom_vinum_load="NO" # Concatenated/mirror/raid driver (see vinum(4))
diff --git a/sys/boot/i386/loader/Makefile.depend b/sys/boot/i386/loader/Makefile.depend
index ece1e95..9650fc0 100644
--- a/sys/boot/i386/loader/Makefile.depend
+++ b/sys/boot/i386/loader/Makefile.depend
@@ -17,6 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vers.o: vers.c
-vers.po: vers.c
.endif
diff --git a/sys/boot/i386/zfsloader/Makefile.depend b/sys/boot/i386/zfsloader/Makefile.depend
index 840a6c3..b3810a2 100644
--- a/sys/boot/i386/zfsloader/Makefile.depend
+++ b/sys/boot/i386/zfsloader/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vers.o: vers.c
-vers.po: vers.c
.endif
diff --git a/sys/boot/libstand32/Makefile.depend b/sys/boot/libstand32/Makefile.depend
index 57cd80c..1d86fce 100644
--- a/sys/boot/libstand32/Makefile.depend
+++ b/sys/boot/libstand32/Makefile.depend
@@ -12,46 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-_bzlib.o: _bzlib.c
-_bzlib.o: libstand_bzlib_private.h
-_bzlib.po: _bzlib.c
-_bzlib.po: libstand_bzlib_private.h
-_crctable.o: _crctable.c
-_crctable.o: libstand_bzlib_private.h
-_crctable.po: _crctable.c
-_crctable.po: libstand_bzlib_private.h
-_decompress.o: _decompress.c
-_decompress.o: libstand_bzlib_private.h
-_decompress.po: _decompress.c
-_decompress.po: libstand_bzlib_private.h
-_huffman.o: _huffman.c
-_huffman.o: libstand_bzlib_private.h
-_huffman.po: _huffman.c
-_huffman.po: libstand_bzlib_private.h
-_infback.o: _infback.c
-_infback.o: libstand_zutil.h
-_infback.po: _infback.c
-_infback.po: libstand_zutil.h
-_inffast.o: _inffast.c
-_inffast.o: libstand_zutil.h
-_inffast.po: _inffast.c
-_inffast.po: libstand_zutil.h
-_inflate.o: _inflate.c
-_inflate.o: libstand_zutil.h
-_inflate.po: _inflate.c
-_inflate.po: libstand_zutil.h
-_inftrees.o: _inftrees.c
-_inftrees.o: libstand_zutil.h
-_inftrees.po: _inftrees.c
-_inftrees.po: libstand_zutil.h
-_randtable.o: _randtable.c
-_randtable.o: libstand_bzlib_private.h
-_randtable.po: _randtable.c
-_randtable.po: libstand_bzlib_private.h
-_zutil.o: _zutil.c
-_zutil.o: libstand_gzguts.h
-_zutil.o: libstand_zutil.h
-_zutil.po: _zutil.c
-_zutil.po: libstand_gzguts.h
-_zutil.po: libstand_zutil.h
.endif
diff --git a/sys/boot/userboot/ficl/Makefile.depend b/sys/boot/userboot/ficl/Makefile.depend
index 729ef23..c04b7c3 100644
--- a/sys/boot/userboot/ficl/Makefile.depend
+++ b/sys/boot/userboot/ficl/Makefile.depend
@@ -12,6 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-softcore.o: softcore.c
-softcore.po: softcore.c
.endif
diff --git a/sys/boot/userboot/libstand/Makefile.depend b/sys/boot/userboot/libstand/Makefile.depend
index 57cd80c..1d86fce 100644
--- a/sys/boot/userboot/libstand/Makefile.depend
+++ b/sys/boot/userboot/libstand/Makefile.depend
@@ -12,46 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-_bzlib.o: _bzlib.c
-_bzlib.o: libstand_bzlib_private.h
-_bzlib.po: _bzlib.c
-_bzlib.po: libstand_bzlib_private.h
-_crctable.o: _crctable.c
-_crctable.o: libstand_bzlib_private.h
-_crctable.po: _crctable.c
-_crctable.po: libstand_bzlib_private.h
-_decompress.o: _decompress.c
-_decompress.o: libstand_bzlib_private.h
-_decompress.po: _decompress.c
-_decompress.po: libstand_bzlib_private.h
-_huffman.o: _huffman.c
-_huffman.o: libstand_bzlib_private.h
-_huffman.po: _huffman.c
-_huffman.po: libstand_bzlib_private.h
-_infback.o: _infback.c
-_infback.o: libstand_zutil.h
-_infback.po: _infback.c
-_infback.po: libstand_zutil.h
-_inffast.o: _inffast.c
-_inffast.o: libstand_zutil.h
-_inffast.po: _inffast.c
-_inffast.po: libstand_zutil.h
-_inflate.o: _inflate.c
-_inflate.o: libstand_zutil.h
-_inflate.po: _inflate.c
-_inflate.po: libstand_zutil.h
-_inftrees.o: _inftrees.c
-_inftrees.o: libstand_zutil.h
-_inftrees.po: _inftrees.c
-_inftrees.po: libstand_zutil.h
-_randtable.o: _randtable.c
-_randtable.o: libstand_bzlib_private.h
-_randtable.po: _randtable.c
-_randtable.po: libstand_bzlib_private.h
-_zutil.o: _zutil.c
-_zutil.o: libstand_gzguts.h
-_zutil.o: libstand_zutil.h
-_zutil.po: _zutil.c
-_zutil.po: libstand_gzguts.h
-_zutil.po: libstand_zutil.h
.endif
diff --git a/sys/boot/userboot/userboot/Makefile.depend b/sys/boot/userboot/userboot/Makefile.depend
index a011827..871417f 100644
--- a/sys/boot/userboot/userboot/Makefile.depend
+++ b/sys/boot/userboot/userboot/Makefile.depend
@@ -13,6 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vers.So: vers.c
-vers.po: vers.c
.endif
diff --git a/sys/compat/cloudabi/cloudabi_mem.c b/sys/compat/cloudabi/cloudabi_mem.c
index 5bc5a19..9d82673 100644
--- a/sys/compat/cloudabi/cloudabi_mem.c
+++ b/sys/compat/cloudabi/cloudabi_mem.c
@@ -35,18 +35,26 @@ __FBSDID("$FreeBSD$");
/* Converts CloudABI's memory protection flags to FreeBSD's. */
static int
-convert_mprot(cloudabi_mprot_t in)
+convert_mprot(cloudabi_mprot_t in, int *out)
{
- int out;
- out = 0;
+ /* Unknown protection flags. */
+ if ((in & ~(CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE |
+ CLOUDABI_PROT_READ)) != 0)
+ return (ENOTSUP);
+ /* W^X: Write and exec cannot be enabled at the same time. */
+ if ((in & (CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE)) ==
+ (CLOUDABI_PROT_EXEC | CLOUDABI_PROT_WRITE))
+ return (ENOTSUP);
+
+ *out = 0;
if (in & CLOUDABI_PROT_EXEC)
- out |= PROT_EXEC;
+ *out |= PROT_EXEC;
if (in & CLOUDABI_PROT_WRITE)
- out |= PROT_WRITE;
+ *out |= PROT_WRITE;
if (in & CLOUDABI_PROT_READ)
- out |= PROT_READ;
- return (out);
+ *out |= PROT_READ;
+ return (0);
}
int
@@ -98,10 +106,10 @@ cloudabi_sys_mem_map(struct thread *td, struct cloudabi_sys_mem_map_args *uap)
struct mmap_args mmap_args = {
.addr = uap->addr,
.len = uap->len,
- .prot = convert_mprot(uap->prot),
.fd = uap->fd,
.pos = uap->off
};
+ int error;
/* Translate flags. */
if (uap->flags & CLOUDABI_MAP_ANON)
@@ -113,6 +121,11 @@ cloudabi_sys_mem_map(struct thread *td, struct cloudabi_sys_mem_map_args *uap)
if (uap->flags & CLOUDABI_MAP_SHARED)
mmap_args.flags |= MAP_SHARED;
+ /* Translate protection. */
+ error = convert_mprot(uap->prot, &mmap_args.prot);
+ if (error != 0)
+ return (error);
+
return (sys_mmap(td, &mmap_args));
}
@@ -123,8 +136,13 @@ cloudabi_sys_mem_protect(struct thread *td,
struct mprotect_args mprotect_args = {
.addr = uap->addr,
.len = uap->len,
- .prot = convert_mprot(uap->prot),
};
+ int error;
+
+ /* Translate protection. */
+ error = convert_mprot(uap->prot, &mprotect_args.prot);
+ if (error != 0)
+ return (error);
return (sys_mprotect(td, &mprotect_args));
}
diff --git a/sys/compat/cloudabi/cloudabi_sock.c b/sys/compat/cloudabi/cloudabi_sock.c
index 3aefab1..cdccdff 100644
--- a/sys/compat/cloudabi/cloudabi_sock.c
+++ b/sys/compat/cloudabi/cloudabi_sock.c
@@ -208,7 +208,7 @@ cloudabi_sys_sock_stat_get(struct thread *td,
int error;
error = getsock_cap(td, uap->fd, cap_rights_init(&rights,
- CAP_GETSOCKOPT | CAP_GETPEERNAME | CAP_GETSOCKNAME), &fp, NULL);
+ CAP_GETSOCKOPT, CAP_GETPEERNAME, CAP_GETSOCKNAME), &fp, NULL);
if (error != 0)
return (error);
so = fp->f_data;
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 67a1bb4..efef9e4 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -177,7 +177,6 @@ options GEOM_RAID3 # RAID3 functionality.
options GEOM_SHSEC # Shared secret.
options GEOM_STRIPE # Disk striping.
options GEOM_SUNLABEL # Sun/Solaris partitioning
-options GEOM_UNCOMPRESS # Read-only compressed disks (lzma, zip)
options GEOM_UZIP # Read-only compressed disks
options GEOM_VINUM # Vinum logical volume manager
options GEOM_VIRSTOR # Virtual storage.
diff --git a/sys/conf/files b/sys/conf/files
index bbf9713..ba5e04bc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3081,23 +3081,25 @@ geom/raid3/g_raid3.c optional geom_raid3
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
-geom/uncompress/g_uncompress.c optional geom_uncompress
contrib/xz-embedded/freebsd/xz_malloc.c \
- optional xz_embedded | geom_uncompress \
+ optional xz_embedded | geom_uzip \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
- optional xz_embedded | geom_uncompress \
+ optional xz_embedded | geom_uzip \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
- optional xz_embedded | geom_uncompress \
+ optional xz_embedded | geom_uzip \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
- optional xz_embedded | geom_uncompress \
+ optional xz_embedded | geom_uzip \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
- optional xz_embedded | geom_uncompress \
+ optional xz_embedded | geom_uzip \
compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
geom/uzip/g_uzip.c optional geom_uzip
+geom/uzip/g_uzip_lzma.c optional geom_uzip
+geom/uzip/g_uzip_wrkthr.c optional geom_uzip
+geom/uzip/g_uzip_zlib.c optional geom_uzip
geom/vinum/geom_vinum.c optional geom_vinum
geom/vinum/geom_vinum_create.c optional geom_vinum
geom/vinum/geom_vinum_drive.c optional geom_vinum
@@ -3455,7 +3457,7 @@ libkern/strvalid.c standard
libkern/timingsafe_bcmp.c standard
libkern/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
- ddb_ctf | gzio | geom_uncompress
+ ddb_ctf | gzio
net/altq/altq_cbq.c optional altq
net/altq/altq_cdnr.c optional altq
net/altq/altq_codel.c optional altq
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index a6ab7d9..97f2e37 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -266,7 +266,10 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
+dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
+dev/hyperv/utilities/hv_shutdown.c optional hyperv
+dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hv_channel.c optional hyperv
dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 02a8bf8..8f5f10a 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -52,7 +52,6 @@ arm64/arm64/uma_machdep.c standard
arm64/arm64/unwind.c optional ddb | kdtrace_hooks | stack
arm64/arm64/vfp.c standard
arm64/arm64/vm_machdep.c standard
-arm64/cavium/thunder_pcie.c optional soc_cavm_thunderx pci
arm64/cavium/thunder_pcie_fdt.c optional soc_cavm_thunderx pci fdt
arm64/cavium/thunder_pcie_pem.c optional soc_cavm_thunderx pci
arm64/cavium/thunder_pcie_pem_fdt.c optional soc_cavm_thunderx pci fdt
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 172897b..b065165 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -240,7 +240,10 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
+dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
+dev/hyperv/utilities/hv_shutdown.c optional hyperv
+dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hv_channel.c optional hyperv
dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv
diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv
index d687d3e..cfce99b 100644
--- a/sys/conf/files.riscv
+++ b/sys/conf/files.riscv
@@ -1,6 +1,7 @@
# $FreeBSD$
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
+dev/ofw/ofw_cpu.c optional fdt
kern/kern_clocksource.c standard
kern/subr_dummy_vdso_tc.c standard
libkern/bcmp.c standard
@@ -29,12 +30,13 @@ riscv/riscv/intr_machdep.c standard
riscv/riscv/in_cksum.c optional inet | inet6
riscv/riscv/identcpu.c standard
riscv/riscv/locore.S standard no-obj
-riscv/riscv/minidump_machdep.c standard
riscv/riscv/machdep.c standard
+riscv/riscv/minidump_machdep.c standard
+riscv/riscv/mp_machdep.c optional smp
riscv/riscv/mem.c standard
riscv/riscv/nexus.c standard
riscv/riscv/pmap.c standard
-riscv/riscv/stack_machdep.c standard
+riscv/riscv/stack_machdep.c optional ddb | stack
riscv/riscv/support.S standard
riscv/riscv/swtch.S standard
riscv/riscv/sys_machdep.c standard
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 1a3a1fd..a1906cf 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -49,6 +49,12 @@ __DEFAULT_NO_OPTIONS = \
NAND \
OFED
+# Enable FAST_DEPEND by default for the meta build.
+.if !empty(.MAKE.MODE:Unormal:Mmeta)
+__DEFAULT_YES_OPTIONS+= FAST_DEPEND
+__DEFAULT_NO_OPTIONS:= ${__DEFAULT_NO_OPTIONS:NFAST_DEPEND}
+.endif
+
# Some options are totally broken on some architectures. We disable
# them. If you need to enable them on an experimental basis, you
# must change this code.
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index d3b398e..3e75911 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -86,7 +86,8 @@ ports-${__target}:
.ORDER: kernel-install modules-install
-kernel-all: ${KERNEL_KO} ${KERNEL_EXTRA}
+beforebuild: .PHONY
+kernel-all: beforebuild .WAIT ${KERNEL_KO} ${KERNEL_EXTRA}
kernel-cleandir: kernel-clean kernel-cleandepend
@@ -142,8 +143,10 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
.endif
${SYSTEM_LD_TAIL}
-.if !exists(${.OBJDIR}/.depend)
-${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
+OBJS_DEPEND_GUESS+= assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} \
+ ${MFILES:T:S/.m$/.h/}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/.depend)
+${SYSTEM_OBJS}: ${OBJS_DEPEND_GUESS}
.endif
LNFILES= ${CFILES:T:S/.c$/.ln/}
@@ -178,9 +181,6 @@ hack.So: Makefile
${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So
rm -f hack.c
-# This rule stops ./assym.s in .depend from causing problems.
-./assym.s: assym.s
-
assym.s: $S/kern/genassym.sh genassym.o
NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET}
@@ -223,10 +223,17 @@ SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
${MFILES:T:S/.m$/.h/}
DEPENDFILES= .depend .depend.*
-.if ${MK_FAST_DEPEND} == "yes" && \
- (${.MAKE.MODE:Unormal:Mmeta} == "" || ${.MAKE.MODE:Unormal:Mnofilemon} != "")
+# Skip generating or including .depend.* files if in meta+filemon mode since
+# it will track dependencies itself. OBJS_DEPEND_GUESS is still used though.
+.if !empty(.MAKE.MODE:Unormal:Mmeta) && empty(.MAKE.MODE:Unormal:Mnofilemon)
+_meta_filemon= 1
+.endif
+.if ${MK_FAST_DEPEND} == "yes"
+DEPENDOBJS+= ${SYSTEM_OBJS} genassym.o
+DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:C/^/.depend./}
DEPEND_CFLAGS+= -MD -MP -MF.depend.${.TARGET}
DEPEND_CFLAGS+= -MT${.TARGET}
+.if !defined(_meta_filemon)
.if defined(.PARSEDIR)
# Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS
# as those are the only ones we will include.
@@ -235,15 +242,35 @@ CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:}
.else
CFLAGS+= ${DEPEND_CFLAGS}
.endif
-DEPENDOBJS+= ${SYSTEM_OBJS} genassym.o
-DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:C/^/.depend./}
.if !defined(_SKIP_READ_DEPEND)
.for __depend_obj in ${DEPENDFILES_OBJS}
.sinclude "${__depend_obj}"
.endfor
-.endif
+.endif # !defined(_SKIP_READ_DEPEND)
+.endif # !defined(_meta_filemon)
+
+# Always run 'make depend' to generate dependencies early and to avoid the
+# need for manually running it. For the kernel this is mostly a NOP since
+# all dependencies are correctly added or accounted for. This is mostly to
+# ensure downstream uses of kernel-depend are handled.
+beforebuild: kernel-depend
.endif # ${MK_FAST_DEPEND} == "yes"
+# Guess some dependencies for when no ${DEPENDFILE}.OBJ is generated yet.
+# For meta+filemon the .meta file is checked for since it is the dependency
+# file used.
+.if ${MK_FAST_DEPEND} == "yes"
+.for __obj in ${DEPENDOBJS:O:u}
+.if (defined(_meta_filemon) && !exists(${.OBJDIR}/${__obj}.meta)) || \
+ (!defined(_meta_filemon) && !exists(${.OBJDIR}/.depend.${__obj}))
+.if ${SYSTEM_OBJS:M${__obj}}
+${__obj}: ${OBJS_DEPEND_GUESS}
+.endif
+${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
+.endif
+.endfor
+.endif
+
.NOPATH: .depend ${DEPENDFILES_OBJS}
.depend: .PRECIOUS ${SRCS}
@@ -267,8 +294,6 @@ DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:C/^/.depend./}
${MAKE} -V SFILES_CDDL | \
CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
mv ${.TARGET}.tmp ${.TARGET}
-.else
- : > ${.TARGET}
.endif
_ILINKS= machine
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index b5fa131..237db8f 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -454,16 +454,16 @@ lint: ${SRCS}
${OBJS}: opt_global.h
.endif
-.include <bsd.dep.mk>
-
-cleandepend: cleanilinks
+CLEANDEPENDFILES+= ${_ILINKS}
# .depend needs include links so we remove them only together.
cleanilinks:
rm -f ${_ILINKS}
-.if !exists(${.OBJDIR}/${DEPENDFILE})
-${OBJS}: ${SRCS:M*.h}
+OBJS_DEPEND_GUESS+= ${SRCS:M*.h}
+.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+${OBJS}: ${OBJS_DEPEND_GUESS}
.endif
+.include <bsd.dep.mk>
.include <bsd.obj.mk>
.include "kern.mk"
diff --git a/sys/conf/options b/sys/conf/options
index f7c48c2..0bc9225 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -132,9 +132,8 @@ GEOM_RAID3 opt_geom.h
GEOM_SHSEC opt_geom.h
GEOM_STRIPE opt_geom.h
GEOM_SUNLABEL opt_geom.h
-GEOM_UNCOMPRESS opt_geom.h
-GEOM_UNCOMPRESS_DEBUG opt_geom.h
GEOM_UZIP opt_geom.h
+GEOM_UZIP_DEBUG opt_geom.h
GEOM_VINUM opt_geom.h
GEOM_VIRSTOR opt_geom.h
GEOM_VOL opt_geom.h
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index 8a8cb6e..6482b3f 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -434,9 +434,7 @@ out:
params->gpe_bit, (params->glk) ? ", GLK" : "",
ecdt ? ", ECDT" : "");
device_set_desc_copy(dev, desc);
- }
-
- if (ret > 0 && params)
+ } else
free(params, M_TEMP);
if (buf.Pointer)
AcpiOsFree(buf.Pointer);
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index 5b9e526..6360071 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -597,23 +597,28 @@ acpi_video_vo_bind(struct acpi_video_output *vo, ACPI_HANDLE handle)
{
ACPI_SERIAL_BEGIN(video_output);
- if (vo->vo_levels != NULL)
+ if (vo->vo_levels != NULL) {
+ AcpiRemoveNotifyHandler(vo->handle, ACPI_DEVICE_NOTIFY,
+ acpi_video_vo_notify_handler);
AcpiOsFree(vo->vo_levels);
+ vo->vo_levels = NULL;
+ }
vo->handle = handle;
vo->vo_numlevels = vo_get_brightness_levels(handle, &vo->vo_levels);
if (vo->vo_numlevels >= 2) {
- if (vo->vo_fullpower == -1
- || acpi_video_vo_check_level(vo, vo->vo_fullpower) != 0)
+ if (vo->vo_fullpower == -1 ||
+ acpi_video_vo_check_level(vo, vo->vo_fullpower) != 0) {
/* XXX - can't deal with rebinding... */
vo->vo_fullpower = vo->vo_levels[BCL_FULLPOWER];
- if (vo->vo_economy == -1
- || acpi_video_vo_check_level(vo, vo->vo_economy) != 0)
+ }
+ if (vo->vo_economy == -1 ||
+ acpi_video_vo_check_level(vo, vo->vo_economy) != 0) {
/* XXX - see above. */
vo->vo_economy = vo->vo_levels[BCL_ECONOMY];
- }
- if (vo->vo_levels != NULL)
+ }
AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY,
acpi_video_vo_notify_handler, vo);
+ }
ACPI_SERIAL_END(video_output);
}
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 1f6746c..6f7458c 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -3193,9 +3193,11 @@ em_setup_interface(device_t dev, struct adapter *adapter)
if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
if_setioctlfn(ifp, em_ioctl);
if_setgetcounterfn(ifp, em_get_counter);
+
/* TSO parameters */
ifp->if_hw_tsomax = IP_MAXPACKET;
- ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER;
+ /* Take m_pullup(9)'s in em_xmit() w/ TSO into acount. */
+ ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER - 5;
ifp->if_hw_tsomaxsegsize = EM_TSO_SEG_SIZE;
#ifdef EM_MULTIQUEUE
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index 3b280b3..c8c98cd 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -269,7 +269,7 @@
#define HW_DEBUGOUT1(S, A) if (DEBUG_HW) printf(S "\n", A)
#define HW_DEBUGOUT2(S, A, B) if (DEBUG_HW) printf(S "\n", A, B)
-#define EM_MAX_SCATTER 64
+#define EM_MAX_SCATTER 40
#define EM_VFTA_SIZE 128
#define EM_TSO_SIZE (65535 + sizeof(struct ether_vlan_header))
#define EM_TSO_SEG_SIZE 4096 /* Max dma segment size */
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index c84dfc2..b1b2c4a 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -3139,6 +3139,12 @@ igb_setup_interface(device_t dev, struct adapter *adapter)
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = igb_ioctl;
ifp->if_get_counter = igb_get_counter;
+
+ /* TSO parameters */
+ ifp->if_hw_tsomax = IP_MAXPACKET;
+ ifp->if_hw_tsomaxsegcount = IGB_MAX_SCATTER;
+ ifp->if_hw_tsomaxsegsize = IGB_TSO_SEG_SIZE;
+
#ifndef IGB_LEGACY_TX
ifp->if_transmit = igb_mq_start;
ifp->if_qflush = igb_qflush;
diff --git a/sys/dev/e1000/if_igb.h b/sys/dev/e1000/if_igb.h
index af42b56..98df1ec 100644
--- a/sys/dev/e1000/if_igb.h
+++ b/sys/dev/e1000/if_igb.h
@@ -278,7 +278,7 @@
#define HW_DEBUGOUT1(S, A) if (DEBUG_HW) printf(S "\n", A)
#define HW_DEBUGOUT2(S, A, B) if (DEBUG_HW) printf(S "\n", A, B)
-#define IGB_MAX_SCATTER 64
+#define IGB_MAX_SCATTER 40
#define IGB_VFTA_SIZE 128
#define IGB_BR_SIZE 4096 /* ring buf size */
#define IGB_TSO_SIZE (65535 + sizeof(struct ether_vlan_header))
diff --git a/sys/dev/e1000/if_lem.h b/sys/dev/e1000/if_lem.h
index 0dde26e..2bdc21a 100644
--- a/sys/dev/e1000/if_lem.h
+++ b/sys/dev/e1000/if_lem.h
@@ -236,10 +236,8 @@
#define HW_DEBUGOUT1(S, A) if (DEBUG_HW) printf(S "\n", A)
#define HW_DEBUGOUT2(S, A, B) if (DEBUG_HW) printf(S "\n", A, B)
-#define EM_MAX_SCATTER 64
+#define EM_MAX_SCATTER 40
#define EM_VFTA_SIZE 128
-#define EM_TSO_SIZE (65535 + sizeof(struct ether_vlan_header))
-#define EM_TSO_SEG_SIZE 4096 /* Max dma segment size */
#define EM_MSIX_MASK 0x01F00000 /* For 82574 use */
#define ETH_ZLEN 60
#define ETH_ADDR_LEN 6
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 8e2ca57..f45543b 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -919,40 +919,5 @@ hv_get_phys_addr(void *virt)
return (ret);
}
-
-/**
- * KVP related structures
- *
- */
-typedef struct hv_vmbus_service {
- hv_guid guid; /* Hyper-V GUID */
- char *name; /* name of service */
- boolean_t enabled; /* service enabled */
- void* context;
- struct task task;
- /*
- * function to initialize service
- */
- int (*init)(struct hv_vmbus_service *);
-
- /*
- * function to process Hyper-V messages
- */
- void (*callback)(void *);
-
- /*
- * function to uninitilize service
- */
- int (*uninit)(struct hv_vmbus_service *);
-} hv_vmbus_service;
-
-extern uint8_t* receive_buffer[];
-extern hv_vmbus_service service_table[];
extern uint32_t hv_vmbus_protocal_version;
-
-void hv_kvp_callback(void *context);
-int hv_kvp_init(hv_vmbus_service *serv);
-void hv_kvp_deinit(void);
-
#endif /* __HYPERV_H__ */
-
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index b692ecb..9520c88 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -905,6 +905,68 @@ done:
}
/*
+ * NOTE:
+ * If this function fails, then txd will be freed, but the mbuf
+ * associated w/ the txd will _not_ be freed.
+ */
+static int
+hn_send_pkt(struct ifnet *ifp, struct hv_device *device_ctx,
+ struct hn_tx_ring *txr, struct hn_txdesc *txd)
+{
+ int error, send_failed = 0;
+
+again:
+ /*
+ * Make sure that txd is not freed before ETHER_BPF_MTAP.
+ */
+ hn_txdesc_hold(txd);
+ error = hv_nv_on_send(device_ctx, &txd->netvsc_pkt);
+ if (!error) {
+ ETHER_BPF_MTAP(ifp, txd->m);
+ if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+ }
+ hn_txdesc_put(txr, txd);
+
+ if (__predict_false(error)) {
+ int freed;
+
+ /*
+ * This should "really rarely" happen.
+ *
+ * XXX Too many RX to be acked or too many sideband
+ * commands to run? Ask netvsc_channel_rollup()
+ * to kick start later.
+ */
+ txr->hn_has_txeof = 1;
+ if (!send_failed) {
+ txr->hn_send_failed++;
+ send_failed = 1;
+ /*
+ * Try sending again after set hn_has_txeof;
+ * in case that we missed the last
+ * netvsc_channel_rollup().
+ */
+ goto again;
+ }
+ if_printf(ifp, "send failed\n");
+
+ /*
+ * Caller will perform further processing on the
+ * associated mbuf, so don't free it in hn_txdesc_put();
+ * only unload it from the DMA map in hn_txdesc_put(),
+ * if it was loaded.
+ */
+ txd->m = NULL;
+ freed = hn_txdesc_put(txr, txd);
+ KASSERT(freed != 0,
+ ("fail to free txd upon send error"));
+
+ txr->hn_send_failed++;
+ }
+ return error;
+}
+
+/*
* Start a transmit of one or more packets
*/
static int
@@ -922,9 +984,9 @@ hn_start_locked(struct hn_tx_ring *txr, int len)
return 0;
while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
- int error, send_failed = 0;
struct hn_txdesc *txd;
struct mbuf *m_head;
+ int error;
IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
if (m_head == NULL)
@@ -936,14 +998,14 @@ hn_start_locked(struct hn_tx_ring *txr, int len)
* dispatch this packet sending (and sending of any
* following up packets) to tx taskqueue.
*/
- IF_PREPEND(&ifp->if_snd, m_head);
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
return 1;
}
txd = hn_txdesc_get(txr);
if (txd == NULL) {
txr->hn_no_txdescs++;
- IF_PREPEND(&ifp->if_snd, m_head);
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
atomic_set_int(&ifp->if_drv_flags, IFF_DRV_OACTIVE);
break;
}
@@ -953,53 +1015,11 @@ hn_start_locked(struct hn_tx_ring *txr, int len)
/* Both txd and m_head are freed */
continue;
}
-again:
- /*
- * Make sure that txd is not freed before ETHER_BPF_MTAP.
- */
- hn_txdesc_hold(txd);
- error = hv_nv_on_send(device_ctx, &txd->netvsc_pkt);
- if (!error) {
- ETHER_BPF_MTAP(ifp, m_head);
- if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
- }
- hn_txdesc_put(txr, txd);
+ error = hn_send_pkt(ifp, device_ctx, txr, txd);
if (__predict_false(error)) {
- int freed;
-
- /*
- * This should "really rarely" happen.
- *
- * XXX Too many RX to be acked or too many sideband
- * commands to run? Ask netvsc_channel_rollup()
- * to kick start later.
- */
- txr->hn_has_txeof = 1;
- if (!send_failed) {
- txr->hn_send_failed++;
- send_failed = 1;
- /*
- * Try sending again after set hn_has_txeof;
- * in case that we missed the last
- * netvsc_channel_rollup().
- */
- goto again;
- }
- if_printf(ifp, "send failed\n");
-
- /*
- * This mbuf will be prepended, don't free it
- * in hn_txdesc_put(); only unload it from the
- * DMA map in hn_txdesc_put(), if it was loaded.
- */
- txd->m = NULL;
- freed = hn_txdesc_put(txr, txd);
- KASSERT(freed != 0,
- ("fail to free txd upon send error"));
-
- txr->hn_send_failed++;
- IF_PREPEND(&ifp->if_snd, m_head);
+ /* txd is freed, but m_head is not */
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
atomic_set_int(&ifp->if_drv_flags, IFF_DRV_OACTIVE);
break;
}
diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index 9683ad8..bdf3d60 100644
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -810,8 +810,8 @@ hv_storvsc_rescan_target(struct storvsc_softc *sc)
if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid, targetid,
CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
- printf("unable to create path for rescan, pathid: %d,"
- "targetid: %d\n", pathid, targetid);
+ printf("unable to create path for rescan, pathid: %u,"
+ "targetid: %u\n", pathid, targetid);
xpt_free_ccb(ccb);
return;
}
diff --git a/sys/dev/hyperv/utilities/hv_heartbeat.c b/sys/dev/hyperv/utilities/hv_heartbeat.c
new file mode 100644
index 0000000..c1b6da5
--- /dev/null
+++ b/sys/dev/hyperv/utilities/hv_heartbeat.c
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2014 Microsoft Corp.
+ * 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 unmodified, 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 ``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 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/timetc.h>
+#include <sys/syscallsubr.h>
+
+#include <dev/hyperv/include/hyperv.h>
+#include "hv_util.h"
+
+/* Heartbeat Service */
+static hv_guid service_guid = { .data =
+ {0x39, 0x4f, 0x16, 0x57, 0x15, 0x91, 0x78, 0x4e,
+ 0xab, 0x55, 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d} };
+
+/**
+ * Process heartbeat message
+ */
+static void
+hv_heartbeat_cb(void *context)
+{
+ uint8_t* buf;
+ hv_vmbus_channel* channel;
+ uint32_t recvlen;
+ uint64_t requestid;
+ int ret;
+
+ struct hv_vmbus_heartbeat_msg_data* heartbeat_msg;
+ struct hv_vmbus_icmsg_hdr* icmsghdrp;
+ hv_util_sc *softc;
+
+ softc = (hv_util_sc*)context;
+ buf = softc->receive_buffer;;
+ channel = softc->hv_dev->channel;
+
+ ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE, &recvlen,
+ &requestid);
+
+ if ((ret == 0) && recvlen > 0) {
+
+ icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
+ &buf[sizeof(struct hv_vmbus_pipe_hdr)];
+
+ if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
+ hv_negotiate_version(icmsghdrp, NULL, buf);
+
+ } else {
+ heartbeat_msg =
+ (struct hv_vmbus_heartbeat_msg_data *)
+ &buf[sizeof(struct hv_vmbus_pipe_hdr) +
+ sizeof(struct hv_vmbus_icmsg_hdr)];
+
+ heartbeat_msg->seq_num += 1;
+ }
+
+ icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION |
+ HV_ICMSGHDRFLAG_RESPONSE;
+
+ hv_vmbus_channel_send_packet(channel, buf, recvlen, requestid,
+ HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
+ }
+}
+
+static int
+hv_heartbeat_probe(device_t dev)
+{
+ const char *p = vmbus_get_type(dev);
+ if (!memcmp(p, &service_guid, sizeof(hv_guid))) {
+ device_set_desc(dev, "Hyper-V Heartbeat Service");
+ return BUS_PROBE_DEFAULT;
+ }
+
+ return ENXIO;
+}
+
+static int
+hv_heartbeat_attach(device_t dev)
+{
+ hv_util_sc *softc = (hv_util_sc*)device_get_softc(dev);
+
+ softc->callback = hv_heartbeat_cb;
+
+ return hv_util_attach(dev);
+}
+
+static device_method_t heartbeat_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, hv_heartbeat_probe),
+ DEVMETHOD(device_attach, hv_heartbeat_attach),
+ DEVMETHOD(device_detach, hv_util_detach),
+ { 0, 0 }
+};
+
+static driver_t heartbeat_driver = { "hvheartbeat", heartbeat_methods, sizeof(hv_util_sc)};
+
+static devclass_t heartbeat_devclass;
+
+DRIVER_MODULE(hv_heartbeat, vmbus, heartbeat_driver, heartbeat_devclass, NULL, NULL);
+MODULE_VERSION(hv_heartbeat, 1);
+MODULE_DEPEND(hv_heartbeat, vmbus, 1, 1, 1);
diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c
index 86e037a..8517918 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.c
+++ b/sys/dev/hyperv/utilities/hv_kvp.c
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/netvsc/hv_net_vsc.h>
+#include "hv_util.h"
#include "unicode.h"
#include "hv_kvp.h"
@@ -74,8 +75,6 @@ __FBSDID("$FreeBSD$");
/* hv_kvp debug control */
static int hv_kvp_log = 0;
-SYSCTL_INT(_dev, OID_AUTO, hv_kvp_log, CTLFLAG_RW, &hv_kvp_log, 0,
- "hv_kvp log");
#define hv_kvp_log_error(...) do { \
if (hv_kvp_log > 0) \
@@ -87,6 +86,10 @@ SYSCTL_INT(_dev, OID_AUTO, hv_kvp_log, CTLFLAG_RW, &hv_kvp_log, 0,
log(LOG_INFO, "hv_kvp: " __VA_ARGS__); \
} while (0)
+static hv_guid service_guid = { .data =
+ {0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d,
+ 0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3, 0xe6} };
+
/* character device prototypes */
static d_open_t hv_kvp_dev_open;
static d_close_t hv_kvp_dev_close;
@@ -94,12 +97,6 @@ static d_read_t hv_kvp_dev_daemon_read;
static d_write_t hv_kvp_dev_daemon_write;
static d_poll_t hv_kvp_dev_daemon_poll;
-/* hv_kvp prototypes */
-static int hv_kvp_req_in_progress(void);
-static void hv_kvp_transaction_init(uint32_t, hv_vmbus_channel *, uint64_t, uint8_t *);
-static void hv_kvp_send_msg_to_daemon(void);
-static void hv_kvp_process_request(void *context, int pending);
-
/* hv_kvp character device structure */
static struct cdevsw hv_kvp_cdevsw =
{
@@ -111,67 +108,67 @@ static struct cdevsw hv_kvp_cdevsw =
.d_poll = hv_kvp_dev_daemon_poll,
.d_name = "hv_kvp_dev",
};
-static struct cdev *hv_kvp_dev;
-static struct hv_kvp_msg *hv_kvp_dev_buf;
-struct proc *daemon_task;
-static struct selinfo hv_kvp_selinfo;
/*
* Global state to track and synchronize multiple
* KVP transaction requests from the host.
*/
-static struct {
+typedef struct hv_kvp_sc {
+ struct hv_util_sc util_sc;
- /* Unless specified the pending mutex should be
+ /* Unless specified the pending mutex should be
* used to alter the values of the following paramters:
* 1. req_in_progress
* 2. req_timed_out
- * 3. pending_reqs.
*/
- struct mtx pending_mutex;
-
+ struct mtx pending_mutex;
+
+ struct task task;
+
/* To track if transaction is active or not */
- boolean_t req_in_progress;
+ boolean_t req_in_progress;
/* Tracks if daemon did not reply back in time */
- boolean_t req_timed_out;
+ boolean_t req_timed_out;
/* Tracks if daemon is serving a request currently */
boolean_t daemon_busy;
- /* Count of KVP requests from Hyper-V. */
- uint64_t pending_reqs;
-
-
- /* Length of host message */
- uint32_t host_msg_len;
- /* Pointer to channel */
- hv_vmbus_channel *channelp;
+ /* Length of host message */
+ uint32_t host_msg_len;
/* Host message id */
- uint64_t host_msg_id;
-
+ uint64_t host_msg_id;
+
/* Current kvp message from the host */
- struct hv_kvp_msg *host_kvp_msg;
-
+ struct hv_kvp_msg *host_kvp_msg;
+
/* Current kvp message for daemon */
- struct hv_kvp_msg daemon_kvp_msg;
-
+ struct hv_kvp_msg daemon_kvp_msg;
+
/* Rcv buffer for communicating with the host*/
- uint8_t *rcv_buf;
-
+ uint8_t *rcv_buf;
+
/* Device semaphore to control communication */
- struct sema dev_sema;
-
+ struct sema dev_sema;
+
/* Indicates if daemon registered with driver */
- boolean_t register_done;
-
+ boolean_t register_done;
+
/* Character device status */
- boolean_t dev_accessed;
-} kvp_globals;
+ boolean_t dev_accessed;
+
+ struct cdev *hv_kvp_dev;
+
+ struct proc *daemon_task;
-/* global vars */
-MALLOC_DECLARE(M_HV_KVP_DEV_BUF);
-MALLOC_DEFINE(M_HV_KVP_DEV_BUF, "hv_kvp_dev buffer", "buffer for hv_kvp_dev module");
+ struct selinfo hv_kvp_selinfo;
+} hv_kvp_sc;
+
+/* hv_kvp prototypes */
+static int hv_kvp_req_in_progress(hv_kvp_sc *sc);
+static void hv_kvp_transaction_init(hv_kvp_sc *sc, uint32_t, uint64_t, uint8_t *);
+static void hv_kvp_send_msg_to_daemon(hv_kvp_sc *sc);
+static void hv_kvp_process_request(void *context, int pending);
/*
* hv_kvp low level functions
@@ -181,10 +178,10 @@ MALLOC_DEFINE(M_HV_KVP_DEV_BUF, "hv_kvp_dev buffer", "buffer for hv_kvp_dev modu
* Check if kvp transaction is in progres
*/
static int
-hv_kvp_req_in_progress(void)
+hv_kvp_req_in_progress(hv_kvp_sc *sc)
{
- return (kvp_globals.req_in_progress);
+ return (sc->req_in_progress);
}
@@ -192,18 +189,17 @@ hv_kvp_req_in_progress(void)
* This routine is called whenever a message is received from the host
*/
static void
-hv_kvp_transaction_init(uint32_t rcv_len, hv_vmbus_channel *rcv_channel,
+hv_kvp_transaction_init(hv_kvp_sc *sc, uint32_t rcv_len,
uint64_t request_id, uint8_t *rcv_buf)
{
-
+
/* Store all the relevant message details in the global structure */
/* Do not need to use mutex for req_in_progress here */
- kvp_globals.req_in_progress = true;
- kvp_globals.host_msg_len = rcv_len;
- kvp_globals.channelp = rcv_channel;
- kvp_globals.host_msg_id = request_id;
- kvp_globals.rcv_buf = rcv_buf;
- kvp_globals.host_kvp_msg = (struct hv_kvp_msg *)&rcv_buf[
+ sc->req_in_progress = true;
+ sc->host_msg_len = rcv_len;
+ sc->host_msg_id = request_id;
+ sc->rcv_buf = rcv_buf;
+ sc->host_kvp_msg = (struct hv_kvp_msg *)&rcv_buf[
sizeof(struct hv_vmbus_pipe_hdr) +
sizeof(struct hv_vmbus_icmsg_hdr)];
}
@@ -255,12 +251,12 @@ hv_kvp_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp,
* Convert ip related info in umsg from utf8 to utf16 and store in hmsg
*/
static int
-hv_kvp_convert_utf8_ipinfo_to_utf16(struct hv_kvp_msg *umsg,
+hv_kvp_convert_utf8_ipinfo_to_utf16(struct hv_kvp_msg *umsg,
struct hv_kvp_ip_msg *host_ip_msg)
{
int err_ip, err_subnet, err_gway, err_dns, err_adap;
int UNUSED_FLAG = 1;
-
+
utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.ip_addr,
MAX_IP_ADDR_SIZE,
(char *)umsg->body.kvp_ip_val.ip_addr,
@@ -291,7 +287,7 @@ hv_kvp_convert_utf8_ipinfo_to_utf16(struct hv_kvp_msg *umsg,
strlen((char *)umsg->body.kvp_ip_val.adapter_id),
UNUSED_FLAG,
&err_adap);
-
+
host_ip_msg->kvp_ip_val.dhcp_enabled = umsg->body.kvp_ip_val.dhcp_enabled;
host_ip_msg->kvp_ip_val.addr_family = umsg->body.kvp_ip_val.addr_family;
@@ -386,7 +382,7 @@ hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_msg *host_ip_msg,
MAX_IP_ADDR_SIZE,
UNUSED_FLAG,
&err_subnet);
-
+
utf16_to_utf8((char *)umsg->body.kvp_ip_val.gate_way, MAX_GATEWAY_SIZE,
(uint16_t *)host_ip_msg->kvp_ip_val.gate_way,
MAX_GATEWAY_SIZE,
@@ -408,16 +404,13 @@ hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_msg *host_ip_msg,
* Ensure utf16_utf8 takes care of the additional string terminating char!!
*/
static void
-hv_kvp_convert_hostmsg_to_usermsg(void)
+hv_kvp_convert_hostmsg_to_usermsg(struct hv_kvp_msg *hmsg, struct hv_kvp_msg *umsg)
{
int utf_err = 0;
uint32_t value_type;
- struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)
- kvp_globals.host_kvp_msg;
-
- struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
- struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
+ struct hv_kvp_ip_msg *host_ip_msg;
+ host_ip_msg = (struct hv_kvp_ip_msg*)hmsg;
memset(umsg, 0, sizeof(struct hv_kvp_msg));
umsg->kvp_hdr.operation = hmsg->kvp_hdr.operation;
@@ -522,14 +515,12 @@ hv_kvp_convert_hostmsg_to_usermsg(void)
* Prepare a host kvp msg based on user kvp msg (utf8 to utf16)
*/
static int
-hv_kvp_convert_usermsg_to_hostmsg(void)
+hv_kvp_convert_usermsg_to_hostmsg(struct hv_kvp_msg *umsg, struct hv_kvp_msg *hmsg)
{
int hkey_len = 0, hvalue_len = 0, utf_err = 0;
struct hv_kvp_exchg_msg_value *host_exchg_data;
char *key_name, *value;
- struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
- struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)hmsg;
switch (hmsg->kvp_hdr.operation) {
@@ -561,7 +552,7 @@ hv_kvp_convert_usermsg_to_hostmsg(void)
if ((hkey_len < 0) || (hvalue_len < 0))
return (HV_KVP_E_FAIL);
-
+
return (KVP_SUCCESS);
case HV_KVP_OP_GET:
@@ -577,9 +568,9 @@ hv_kvp_convert_usermsg_to_hostmsg(void)
/* Use values by string */
host_exchg_data->value_type = HV_REG_SZ;
- if ((hkey_len < 0) || (hvalue_len < 0))
+ if ((hkey_len < 0) || (hvalue_len < 0))
return (HV_KVP_E_FAIL);
-
+
return (KVP_SUCCESS);
default:
@@ -592,22 +583,22 @@ hv_kvp_convert_usermsg_to_hostmsg(void)
* Send the response back to the host.
*/
static void
-hv_kvp_respond_host(int error)
+hv_kvp_respond_host(hv_kvp_sc *sc, int error)
{
struct hv_vmbus_icmsg_hdr *hv_icmsg_hdrp;
hv_icmsg_hdrp = (struct hv_vmbus_icmsg_hdr *)
- &kvp_globals.rcv_buf[sizeof(struct hv_vmbus_pipe_hdr)];
+ &sc->rcv_buf[sizeof(struct hv_vmbus_pipe_hdr)];
if (error)
error = HV_KVP_E_FAIL;
hv_icmsg_hdrp->status = error;
hv_icmsg_hdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION | HV_ICMSGHDRFLAG_RESPONSE;
-
- error = hv_vmbus_channel_send_packet(kvp_globals.channelp,
- kvp_globals.rcv_buf,
- kvp_globals.host_msg_len, kvp_globals.host_msg_id,
+
+ error = hv_vmbus_channel_send_packet(sc->util_sc.hv_dev->channel,
+ sc->rcv_buf,
+ sc->host_msg_len, sc->host_msg_id,
HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
if (error)
@@ -621,16 +612,19 @@ hv_kvp_respond_host(int error)
* and the host
*/
static void
-hv_kvp_send_msg_to_daemon(void)
+hv_kvp_send_msg_to_daemon(hv_kvp_sc *sc)
{
+ struct hv_kvp_msg *hmsg = sc->host_kvp_msg;
+ struct hv_kvp_msg *umsg = &sc->daemon_kvp_msg;
+
/* Prepare kvp_msg to be sent to user */
- hv_kvp_convert_hostmsg_to_usermsg();
+ hv_kvp_convert_hostmsg_to_usermsg(hmsg, umsg);
/* Send the msg to user via function deamon_read - setting sema */
- sema_post(&kvp_globals.dev_sema);
+ sema_post(&sc->dev_sema);
/* We should wake up the daemon, in case it's doing poll() */
- selwakeup(&hv_kvp_selinfo);
+ selwakeup(&sc->hv_kvp_selinfo);
}
@@ -642,95 +636,80 @@ static void
hv_kvp_process_request(void *context, int pending)
{
uint8_t *kvp_buf;
- hv_vmbus_channel *channel = context;
+ hv_vmbus_channel *channel;
uint32_t recvlen = 0;
uint64_t requestid;
struct hv_vmbus_icmsg_hdr *icmsghdrp;
int ret = 0;
- uint64_t pending_cnt = 1;
-
+ hv_kvp_sc *sc;
+
hv_kvp_log_info("%s: entering hv_kvp_process_request\n", __func__);
- kvp_buf = receive_buffer[HV_KVP];
+
+ sc = (hv_kvp_sc*)context;
+ kvp_buf = sc->util_sc.receive_buffer;;
+ channel = sc->util_sc.hv_dev->channel;
+
ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
&recvlen, &requestid);
- /*
- * We start counting only after the daemon registers
- * and therefore there could be requests pending in
- * the VMBus that are not reflected in pending_cnt.
- * Therefore we continue reading as long as either of
- * the below conditions is true.
- */
+ while ((ret == 0) && (recvlen > 0)) {
+
+ icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
+ &kvp_buf[sizeof(struct hv_vmbus_pipe_hdr)];
+
+ hv_kvp_transaction_init(sc, recvlen, requestid, kvp_buf);
+ if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
+ hv_kvp_negotiate_version(icmsghdrp, NULL, kvp_buf);
+ hv_kvp_respond_host(sc, ret);
+
+ /*
+ * It is ok to not acquire the mutex before setting
+ * req_in_progress here because negotiation is the
+ * first thing that happens and hence there is no
+ * chance of a race condition.
+ */
+
+ sc->req_in_progress = false;
+ hv_kvp_log_info("%s :version negotiated\n", __func__);
+
+ } else {
+ if (!sc->daemon_busy) {
+
+ hv_kvp_log_info("%s: issuing qury to daemon\n", __func__);
+ mtx_lock(&sc->pending_mutex);
+ sc->req_timed_out = false;
+ sc->daemon_busy = true;
+ mtx_unlock(&sc->pending_mutex);
- while ((pending_cnt>0) || ((ret == 0) && (recvlen > 0))) {
-
- if ((ret == 0) && (recvlen>0)) {
-
- icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
- &kvp_buf[sizeof(struct hv_vmbus_pipe_hdr)];
-
- hv_kvp_transaction_init(recvlen, channel, requestid, kvp_buf);
- if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_kvp_negotiate_version(icmsghdrp, NULL, kvp_buf);
- hv_kvp_respond_host(ret);
-
- /*
- * It is ok to not acquire the mutex before setting
- * req_in_progress here because negotiation is the
- * first thing that happens and hence there is no
- * chance of a race condition.
- */
-
- kvp_globals.req_in_progress = false;
- hv_kvp_log_info("%s :version negotiated\n", __func__);
-
- } else {
- if (!kvp_globals.daemon_busy) {
-
- hv_kvp_log_info("%s: issuing qury to daemon\n", __func__);
- mtx_lock(&kvp_globals.pending_mutex);
- kvp_globals.req_timed_out = false;
- kvp_globals.daemon_busy = true;
- mtx_unlock(&kvp_globals.pending_mutex);
-
- hv_kvp_send_msg_to_daemon();
- hv_kvp_log_info("%s: waiting for daemon\n", __func__);
- }
-
- /* Wait 5 seconds for daemon to respond back */
- tsleep(&kvp_globals, 0, "kvpworkitem", 5 * hz);
- hv_kvp_log_info("%s: came out of wait\n", __func__);
+ hv_kvp_send_msg_to_daemon(sc);
+ hv_kvp_log_info("%s: waiting for daemon\n", __func__);
}
+
+ /* Wait 5 seconds for daemon to respond back */
+ tsleep(sc, 0, "kvpworkitem", 5 * hz);
+ hv_kvp_log_info("%s: came out of wait\n", __func__);
}
- mtx_lock(&kvp_globals.pending_mutex);
-
+ mtx_lock(&sc->pending_mutex);
+
/* Notice that once req_timed_out is set to true
* it will remain true until the next request is
* sent to the daemon. The response from daemon
- * is forwarded to host only when this flag is
- * false.
+ * is forwarded to host only when this flag is
+ * false.
*/
- kvp_globals.req_timed_out = true;
+ sc->req_timed_out = true;
/*
* Cancel request if so need be.
*/
- if (hv_kvp_req_in_progress()) {
+ if (hv_kvp_req_in_progress(sc)) {
hv_kvp_log_info("%s: request was still active after wait so failing\n", __func__);
- hv_kvp_respond_host(HV_KVP_E_FAIL);
- kvp_globals.req_in_progress = false;
- }
-
- /*
- * Decrement pending request count and
- */
- if (kvp_globals.pending_reqs>0) {
- kvp_globals.pending_reqs = kvp_globals.pending_reqs - 1;
+ hv_kvp_respond_host(sc, HV_KVP_E_FAIL);
+ sc->req_in_progress = false;
}
- pending_cnt = kvp_globals.pending_reqs;
-
- mtx_unlock(&kvp_globals.pending_mutex);
+
+ mtx_unlock(&sc->pending_mutex);
/*
* Try reading next buffer
@@ -738,104 +717,43 @@ hv_kvp_process_request(void *context, int pending)
recvlen = 0;
ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
&recvlen, &requestid);
- hv_kvp_log_info("%s: read: context %p, pending_cnt %llu ret =%d, recvlen=%d\n",
- __func__, context, (unsigned long long)pending_cnt, ret, recvlen);
- }
+ hv_kvp_log_info("%s: read: context %p, ret =%d, recvlen=%d\n",
+ __func__, context, ret, recvlen);
+ }
}
/*
* Callback routine that gets called whenever there is a message from host
*/
-void
+static void
hv_kvp_callback(void *context)
{
- uint64_t pending_cnt = 0;
-
- if (kvp_globals.register_done == false) {
- kvp_globals.channelp = context;
- TASK_INIT(&service_table[HV_KVP].task, 0, hv_kvp_process_request, context);
- } else {
- mtx_lock(&kvp_globals.pending_mutex);
- kvp_globals.pending_reqs = kvp_globals.pending_reqs + 1;
- pending_cnt = kvp_globals.pending_reqs;
- mtx_unlock(&kvp_globals.pending_mutex);
- if (pending_cnt == 1) {
- hv_kvp_log_info("%s: Queuing work item\n", __func__);
- taskqueue_enqueue(taskqueue_thread, &service_table[HV_KVP].task);
- }
- }
-}
-
-
-/*
- * This function is called by the hv_kvp_init -
- * creates character device hv_kvp_dev
- * allocates memory to hv_kvp_dev_buf
- *
- */
-static int
-hv_kvp_dev_init(void)
-{
- int error = 0;
-
- /* initialize semaphore */
- sema_init(&kvp_globals.dev_sema, 0, "hv_kvp device semaphore");
- /* create character device */
- error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK,
- &hv_kvp_dev,
- &hv_kvp_cdevsw,
- 0,
- UID_ROOT,
- GID_WHEEL,
- 0640,
- "hv_kvp_dev");
-
- if (error != 0)
- return (error);
-
+ hv_kvp_sc *sc = (hv_kvp_sc*)context;
/*
- * Malloc with M_WAITOK flag will never fail.
- */
- hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf), M_HV_KVP_DEV_BUF, M_WAITOK |
- M_ZERO);
-
- return (0);
-}
-
-
-/*
- * This function is called by the hv_kvp_deinit -
- * destroy character device
- */
-static void
-hv_kvp_dev_destroy(void)
-{
-
- if (daemon_task != NULL) {
- PROC_LOCK(daemon_task);
- kern_psignal(daemon_task, SIGKILL);
- PROC_UNLOCK(daemon_task);
+ The first request from host will not be handled until daemon is registered.
+ when callback is triggered without a registered daemon, callback just return.
+ When a new daemon gets regsitered, this callbcak is trigged from _write op.
+ */
+ if (sc->register_done) {
+ hv_kvp_log_info("%s: Queuing work item\n", __func__);
+ taskqueue_enqueue(taskqueue_thread, &sc->task);
}
-
- destroy_dev(hv_kvp_dev);
- free(hv_kvp_dev_buf, M_HV_KVP_DEV_BUF);
- return;
}
-
static int
hv_kvp_dev_open(struct cdev *dev, int oflags, int devtype,
struct thread *td)
{
-
+ hv_kvp_sc *sc = (hv_kvp_sc*)dev->si_drv1;
+
hv_kvp_log_info("%s: Opened device \"hv_kvp_device\" successfully.\n", __func__);
- if (kvp_globals.dev_accessed)
+ if (sc->dev_accessed)
return (-EBUSY);
-
- daemon_task = curproc;
- kvp_globals.dev_accessed = true;
- kvp_globals.daemon_busy = false;
+
+ sc->daemon_task = curproc;
+ sc->dev_accessed = true;
+ sc->daemon_busy = false;
return (0);
}
@@ -844,10 +762,11 @@ static int
hv_kvp_dev_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused,
struct thread *td __unused)
{
+ hv_kvp_sc *sc = (hv_kvp_sc*)dev->si_drv1;
hv_kvp_log_info("%s: Closing device \"hv_kvp_device\".\n", __func__);
- kvp_globals.dev_accessed = false;
- kvp_globals.register_done = false;
+ sc->dev_accessed = false;
+ sc->register_done = false;
return (0);
}
@@ -857,18 +776,21 @@ hv_kvp_dev_close(struct cdev *dev __unused, int fflag __unused, int devtype __un
* acts as a send to daemon
*/
static int
-hv_kvp_dev_daemon_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
+hv_kvp_dev_daemon_read(struct cdev *dev, struct uio *uio, int ioflag __unused)
{
size_t amt;
int error = 0;
+ struct hv_kvp_msg *hv_kvp_dev_buf;
+ hv_kvp_sc *sc = (hv_kvp_sc*)dev->si_drv1;
/* Check hv_kvp daemon registration status*/
- if (!kvp_globals.register_done)
+ if (!sc->register_done)
return (KVP_ERROR);
- sema_wait(&kvp_globals.dev_sema);
+ sema_wait(&sc->dev_sema);
- memcpy(hv_kvp_dev_buf, &kvp_globals.daemon_kvp_msg, sizeof(struct hv_kvp_msg));
+ hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf), M_TEMP, M_WAITOK);
+ memcpy(hv_kvp_dev_buf, &sc->daemon_kvp_msg, sizeof(struct hv_kvp_msg));
amt = MIN(uio->uio_resid, uio->uio_offset >= BUFFERSIZE + 1 ? 0 :
BUFFERSIZE + 1 - uio->uio_offset);
@@ -876,6 +798,7 @@ hv_kvp_dev_daemon_read(struct cdev *dev __unused, struct uio *uio, int ioflag __
if ((error = uiomove(hv_kvp_dev_buf, amt, uio)) != 0)
hv_kvp_log_info("%s: hv_kvp uiomove read failed!\n", __func__);
+ free(hv_kvp_dev_buf, M_TEMP);
return (error);
}
@@ -885,29 +808,30 @@ hv_kvp_dev_daemon_read(struct cdev *dev __unused, struct uio *uio, int ioflag __
* acts as a recieve from daemon
*/
static int
-hv_kvp_dev_daemon_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
+hv_kvp_dev_daemon_write(struct cdev *dev, struct uio *uio, int ioflag __unused)
{
size_t amt;
int error = 0;
+ struct hv_kvp_msg *hv_kvp_dev_buf;
+ hv_kvp_sc *sc = (hv_kvp_sc*)dev->si_drv1;
uio->uio_offset = 0;
+ hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf), M_TEMP, M_WAITOK);
amt = MIN(uio->uio_resid, BUFFERSIZE);
error = uiomove(hv_kvp_dev_buf, amt, uio);
- if (error != 0)
+ if (error != 0) {
+ free(hv_kvp_dev_buf, M_TEMP);
return (error);
+ }
+ memcpy(&sc->daemon_kvp_msg, hv_kvp_dev_buf, sizeof(struct hv_kvp_msg));
- memcpy(&kvp_globals.daemon_kvp_msg, hv_kvp_dev_buf, sizeof(struct hv_kvp_msg));
-
- if (kvp_globals.register_done == false) {
- if (kvp_globals.daemon_kvp_msg.kvp_hdr.operation == HV_KVP_OP_REGISTER) {
-
- kvp_globals.register_done = true;
- if (kvp_globals.channelp) {
-
- hv_kvp_callback(kvp_globals.channelp);
- }
+ free(hv_kvp_dev_buf, M_TEMP);
+ if (sc->register_done == false) {
+ if (sc->daemon_kvp_msg.kvp_hdr.operation == HV_KVP_OP_REGISTER) {
+ sc->register_done = true;
+ hv_kvp_callback(dev->si_drv1);
}
else {
hv_kvp_log_info("%s, KVP Registration Failed\n", __func__);
@@ -915,18 +839,20 @@ hv_kvp_dev_daemon_write(struct cdev *dev __unused, struct uio *uio, int ioflag _
}
} else {
- mtx_lock(&kvp_globals.pending_mutex);
+ mtx_lock(&sc->pending_mutex);
- if(!kvp_globals.req_timed_out) {
+ if(!sc->req_timed_out) {
+ struct hv_kvp_msg *hmsg = sc->host_kvp_msg;
+ struct hv_kvp_msg *umsg = &sc->daemon_kvp_msg;
- hv_kvp_convert_usermsg_to_hostmsg();
- hv_kvp_respond_host(KVP_SUCCESS);
- wakeup(&kvp_globals);
- kvp_globals.req_in_progress = false;
+ hv_kvp_convert_usermsg_to_hostmsg(umsg, hmsg);
+ hv_kvp_respond_host(sc, KVP_SUCCESS);
+ wakeup(sc);
+ sc->req_in_progress = false;
}
- kvp_globals.daemon_busy = false;
- mtx_unlock(&kvp_globals.pending_mutex);
+ sc->daemon_busy = false;
+ mtx_unlock(&sc->pending_mutex);
}
return (error);
@@ -938,53 +864,106 @@ hv_kvp_dev_daemon_write(struct cdev *dev __unused, struct uio *uio, int ioflag _
* for daemon to read.
*/
static int
-hv_kvp_dev_daemon_poll(struct cdev *dev __unused, int events, struct thread *td)
+hv_kvp_dev_daemon_poll(struct cdev *dev, int events, struct thread *td)
{
int revents = 0;
+ hv_kvp_sc *sc = (hv_kvp_sc*)dev->si_drv1;
- mtx_lock(&kvp_globals.pending_mutex);
+ mtx_lock(&sc->pending_mutex);
/*
* We check global flag daemon_busy for the data availiability for
* userland to read. Deamon_busy is set to true before driver has data
* for daemon to read. It is set to false after daemon sends
* then response back to driver.
*/
- if (kvp_globals.daemon_busy == true)
+ if (sc->daemon_busy == true)
revents = POLLIN;
else
- selrecord(td, &hv_kvp_selinfo);
+ selrecord(td, &sc->hv_kvp_selinfo);
- mtx_unlock(&kvp_globals.pending_mutex);
+ mtx_unlock(&sc->pending_mutex);
return (revents);
}
+static int
+hv_kvp_probe(device_t dev)
+{
+ const char *p = vmbus_get_type(dev);
+ if (!memcmp(p, &service_guid, sizeof(hv_guid))) {
+ device_set_desc(dev, "Hyper-V KVP Service");
+ return BUS_PROBE_DEFAULT;
+ }
+
+ return ENXIO;
+}
-/*
- * hv_kvp initialization function
- * called from hv_util service.
- *
- */
-int
-hv_kvp_init(hv_vmbus_service *srv)
+static int
+hv_kvp_attach(device_t dev)
{
- int error = 0;
+ int error;
+ struct sysctl_oid_list *child;
+ struct sysctl_ctx_list *ctx;
- memset(&kvp_globals, 0, sizeof(kvp_globals));
+ hv_kvp_sc *sc = (hv_kvp_sc*)device_get_softc(dev);
- error = hv_kvp_dev_init();
- mtx_init(&kvp_globals.pending_mutex, "hv-kvp pending mutex",
+ sc->util_sc.callback = hv_kvp_callback;
+ sema_init(&sc->dev_sema, 0, "hv_kvp device semaphore");
+ mtx_init(&sc->pending_mutex, "hv-kvp pending mutex",
NULL, MTX_DEF);
- return (error);
-}
+ ctx = device_get_sysctl_ctx(dev);
+ child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev));
+ SYSCTL_ADD_INT(ctx, child, OID_AUTO, "hv_kvp_log",
+ CTLFLAG_RW, &hv_kvp_log, 0, "Hyperv KVP service log level");
-void
-hv_kvp_deinit(void)
+ TASK_INIT(&sc->task, 0, hv_kvp_process_request, sc);
+
+ /* create character device */
+ error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK,
+ &sc->hv_kvp_dev,
+ &hv_kvp_cdevsw,
+ 0,
+ UID_ROOT,
+ GID_WHEEL,
+ 0640,
+ "hv_kvp_dev");
+
+ if (error != 0)
+ return (error);
+ sc->hv_kvp_dev->si_drv1 = sc;
+
+ return hv_util_attach(dev);
+}
+
+static int
+hv_kvp_detach(device_t dev)
{
- hv_kvp_dev_destroy();
- mtx_destroy(&kvp_globals.pending_mutex);
+ hv_kvp_sc *sc = (hv_kvp_sc*)device_get_softc(dev);
- return;
+ if (sc->daemon_task != NULL) {
+ PROC_LOCK(sc->daemon_task);
+ kern_psignal(sc->daemon_task, SIGKILL);
+ PROC_UNLOCK(sc->daemon_task);
+ }
+
+ destroy_dev(sc->hv_kvp_dev);
+ return hv_util_detach(dev);
}
+
+static device_method_t kvp_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, hv_kvp_probe),
+ DEVMETHOD(device_attach, hv_kvp_attach),
+ DEVMETHOD(device_detach, hv_kvp_detach),
+ { 0, 0 }
+};
+
+static driver_t kvp_driver = { "hvkvp", kvp_methods, sizeof(hv_kvp_sc)};
+
+static devclass_t kvp_devclass;
+
+DRIVER_MODULE(hv_kvp, vmbus, kvp_driver, kvp_devclass, NULL, NULL);
+MODULE_VERSION(hv_kvp, 1);
+MODULE_DEPEND(hv_kvp, vmbus, 1, 1, 1);
diff --git a/sys/dev/hyperv/utilities/hv_kvp.h b/sys/dev/hyperv/utilities/hv_kvp.h
index b67373fa..b62149e 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.h
+++ b/sys/dev/hyperv/utilities/hv_kvp.h
@@ -238,17 +238,4 @@ struct hv_kvp_ip_msg {
struct hv_kvp_ipaddr_value kvp_ip_val;
} __attribute__((packed));
-
-#define HV_SHUT_DOWN 0
-#define HV_TIME_SYNCH 1
-#define HV_HEART_BEAT 2
-#define HV_KVP 3
-#define HV_MAX_UTIL_SERVICES 4
-
-#define HV_WLTIMEDELTA 116444736000000000L /* in 100ns unit */
-#define HV_ICTIMESYNCFLAG_PROBE 0
-#define HV_ICTIMESYNCFLAG_SYNC 1
-#define HV_ICTIMESYNCFLAG_SAMPLE 2
-#define HV_NANO_SEC_PER_SEC 1000000000
-
#endif /* _KVP_H */
diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/hv_shutdown.c
new file mode 100644
index 0000000..20bc65e
--- /dev/null
+++ b/sys/dev/hyperv/utilities/hv_shutdown.c
@@ -0,0 +1,151 @@
+/*-
+ * Copyright (c) 2014 Microsoft Corp.
+ * 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 unmodified, 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 ``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 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * A common driver for all hyper-V util services.
+ */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/reboot.h>
+#include <sys/timetc.h>
+#include <sys/syscallsubr.h>
+
+#include <dev/hyperv/include/hyperv.h>
+#include "hv_util.h"
+
+static hv_guid service_guid = { .data =
+ {0x31, 0x60, 0x0B, 0X0E, 0x13, 0x52, 0x34, 0x49,
+ 0x81, 0x8B, 0x38, 0XD9, 0x0C, 0xED, 0x39, 0xDB} };
+
+/**
+ * Shutdown
+ */
+static void
+hv_shutdown_cb(void *context)
+{
+ uint8_t* buf;
+ hv_vmbus_channel* channel;
+ uint8_t execute_shutdown = 0;
+ hv_vmbus_icmsg_hdr* icmsghdrp;
+ uint32_t recv_len;
+ uint64_t request_id;
+ int ret;
+ hv_vmbus_shutdown_msg_data* shutdown_msg;
+ hv_util_sc *softc;
+
+ softc = (hv_util_sc*)context;
+ buf = softc->receive_buffer;;
+ channel = softc->hv_dev->channel;
+ ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE,
+ &recv_len, &request_id);
+
+ if ((ret == 0) && recv_len > 0) {
+
+ icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
+ &buf[sizeof(struct hv_vmbus_pipe_hdr)];
+
+ if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
+ hv_negotiate_version(icmsghdrp, NULL, buf);
+
+ } else {
+ shutdown_msg =
+ (struct hv_vmbus_shutdown_msg_data *)
+ &buf[sizeof(struct hv_vmbus_pipe_hdr) +
+ sizeof(struct hv_vmbus_icmsg_hdr)];
+
+ switch (shutdown_msg->flags) {
+ case 0:
+ case 1:
+ icmsghdrp->status = HV_S_OK;
+ execute_shutdown = 1;
+ if(bootverbose)
+ printf("Shutdown request received -"
+ " graceful shutdown initiated\n");
+ break;
+ default:
+ icmsghdrp->status = HV_E_FAIL;
+ execute_shutdown = 0;
+ printf("Shutdown request received -"
+ " Invalid request\n");
+ break;
+ }
+ }
+
+ icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION |
+ HV_ICMSGHDRFLAG_RESPONSE;
+
+ hv_vmbus_channel_send_packet(channel, buf,
+ recv_len, request_id,
+ HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
+ }
+
+ if (execute_shutdown)
+ shutdown_nice(RB_POWEROFF);
+}
+
+static int
+hv_shutdown_probe(device_t dev)
+{
+ const char *p = vmbus_get_type(dev);
+ if (!memcmp(p, &service_guid, sizeof(hv_guid))) {
+ device_set_desc(dev, "Hyper-V Shutdown Service");
+ return BUS_PROBE_DEFAULT;
+ }
+
+ return ENXIO;
+}
+
+static int
+hv_shutdown_attach(device_t dev)
+{
+ hv_util_sc *softc = (hv_util_sc*)device_get_softc(dev);
+
+ softc->callback = hv_shutdown_cb;
+
+ return hv_util_attach(dev);
+}
+
+static device_method_t shutdown_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, hv_shutdown_probe),
+ DEVMETHOD(device_attach, hv_shutdown_attach),
+ DEVMETHOD(device_detach, hv_util_detach),
+ { 0, 0 }
+};
+
+static driver_t shutdown_driver = { "hvshutdown", shutdown_methods, sizeof(hv_util_sc)};
+
+static devclass_t shutdown_devclass;
+
+DRIVER_MODULE(hv_shutdown, vmbus, shutdown_driver, shutdown_devclass, NULL, NULL);
+MODULE_VERSION(hv_shutdown, 1);
+MODULE_DEPEND(hv_shutdown, vmbus, 1, 1, 1);
diff --git a/sys/dev/hyperv/utilities/hv_timesync.c b/sys/dev/hyperv/utilities/hv_timesync.c
new file mode 100644
index 0000000..d1ea904
--- /dev/null
+++ b/sys/dev/hyperv/utilities/hv_timesync.c
@@ -0,0 +1,216 @@
+/*-
+ * Copyright (c) 2014 Microsoft Corp.
+ * 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 unmodified, 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 ``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 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.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * A common driver for all hyper-V util services.
+ */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/reboot.h>
+#include <sys/timetc.h>
+#include <sys/syscallsubr.h>
+
+#include <dev/hyperv/include/hyperv.h>
+#include "hv_util.h"
+
+#define HV_WLTIMEDELTA 116444736000000000L /* in 100ns unit */
+#define HV_ICTIMESYNCFLAG_PROBE 0
+#define HV_ICTIMESYNCFLAG_SYNC 1
+#define HV_ICTIMESYNCFLAG_SAMPLE 2
+#define HV_NANO_SEC_PER_SEC 1000000000
+
+/* Time Sync data */
+typedef struct {
+ uint64_t data;
+} time_sync_data;
+
+ /* Time Synch Service */
+static hv_guid service_guid = {.data =
+ {0x30, 0xe6, 0x27, 0x95, 0xae, 0xd0, 0x7b, 0x49,
+ 0xad, 0xce, 0xe8, 0x0a, 0xb0, 0x17, 0x5c, 0xaf } };
+
+struct hv_ictimesync_data {
+ uint64_t parenttime;
+ uint64_t childtime;
+ uint64_t roundtriptime;
+ uint8_t flags;
+} __packed;
+
+typedef struct hv_timesync_sc {
+ hv_util_sc util_sc;
+ struct task task;
+ time_sync_data time_msg;
+} hv_timesync_sc;
+
+/**
+ * Set host time based on time sync message from host
+ */
+static void
+hv_set_host_time(void *context, int pending)
+{
+ hv_timesync_sc *softc = (hv_timesync_sc*)context;
+ uint64_t hosttime = softc->time_msg.data;
+ struct timespec guest_ts, host_ts;
+ uint64_t host_tns;
+ int64_t diff;
+ int error;
+
+ host_tns = (hosttime - HV_WLTIMEDELTA) * 100;
+ host_ts.tv_sec = (time_t)(host_tns/HV_NANO_SEC_PER_SEC);
+ host_ts.tv_nsec = (long)(host_tns%HV_NANO_SEC_PER_SEC);
+
+ nanotime(&guest_ts);
+
+ diff = (int64_t)host_ts.tv_sec - (int64_t)guest_ts.tv_sec;
+
+ /*
+ * If host differs by 5 seconds then make the guest catch up
+ */
+ if (diff > 5 || diff < -5) {
+ error = kern_clock_settime(curthread, CLOCK_REALTIME,
+ &host_ts);
+ }
+}
+
+/**
+ * @brief Synchronize time with host after reboot, restore, etc.
+ *
+ * ICTIMESYNCFLAG_SYNC flag bit indicates reboot, restore events of the VM.
+ * After reboot the flag ICTIMESYNCFLAG_SYNC is included in the first time
+ * message after the timesync channel is opened. Since the hv_utils module is
+ * loaded after hv_vmbus, the first message is usually missed. The other
+ * thing is, systime is automatically set to emulated hardware clock which may
+ * not be UTC time or in the same time zone. So, to override these effects, we
+ * use the first 50 time samples for initial system time setting.
+ */
+static inline
+void hv_adj_guesttime(hv_timesync_sc *sc, uint64_t hosttime, uint8_t flags)
+{
+ sc->time_msg.data = hosttime;
+
+ if (((flags & HV_ICTIMESYNCFLAG_SYNC) != 0) ||
+ ((flags & HV_ICTIMESYNCFLAG_SAMPLE) != 0)) {
+ taskqueue_enqueue(taskqueue_thread, &sc->task);
+ }
+}
+
+/**
+ * Time Sync Channel message handler
+ */
+static void
+hv_timesync_cb(void *context)
+{
+ hv_vmbus_channel* channel;
+ hv_vmbus_icmsg_hdr* icmsghdrp;
+ uint32_t recvlen;
+ uint64_t requestId;
+ int ret;
+ uint8_t* time_buf;
+ struct hv_ictimesync_data* timedatap;
+ hv_timesync_sc *softc;
+
+ softc = (hv_timesync_sc*)context;
+ channel = softc->util_sc.hv_dev->channel;
+ time_buf = softc->util_sc.receive_buffer;
+
+ ret = hv_vmbus_channel_recv_packet(channel, time_buf,
+ PAGE_SIZE, &recvlen, &requestId);
+
+ if ((ret == 0) && recvlen > 0) {
+ icmsghdrp = (struct hv_vmbus_icmsg_hdr *) &time_buf[
+ sizeof(struct hv_vmbus_pipe_hdr)];
+
+ if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
+ hv_negotiate_version(icmsghdrp, NULL, time_buf);
+ } else {
+ timedatap = (struct hv_ictimesync_data *) &time_buf[
+ sizeof(struct hv_vmbus_pipe_hdr) +
+ sizeof(struct hv_vmbus_icmsg_hdr)];
+ hv_adj_guesttime(softc, timedatap->parenttime, timedatap->flags);
+ }
+
+ icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION
+ | HV_ICMSGHDRFLAG_RESPONSE;
+
+ hv_vmbus_channel_send_packet(channel, time_buf,
+ recvlen, requestId,
+ HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
+ }
+}
+
+static int
+hv_timesync_probe(device_t dev)
+{
+ const char *p = vmbus_get_type(dev);
+ if (!memcmp(p, &service_guid, sizeof(hv_guid))) {
+ device_set_desc(dev, "Hyper-V Time Synch Service");
+ return BUS_PROBE_DEFAULT;
+ }
+
+ return ENXIO;
+}
+
+static int
+hv_timesync_attach(device_t dev)
+{
+ hv_timesync_sc *softc = device_get_softc(dev);
+
+ softc->util_sc.callback = hv_timesync_cb;
+ TASK_INIT(&softc->task, 1, hv_set_host_time, softc);
+
+ return hv_util_attach(dev);
+}
+
+static int
+hv_timesync_detach(device_t dev)
+{
+ hv_timesync_sc *softc = device_get_softc(dev);
+ taskqueue_drain(taskqueue_thread, &softc->task);
+
+ return hv_util_detach(dev);
+}
+
+static device_method_t timesync_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, hv_timesync_probe),
+ DEVMETHOD(device_attach, hv_timesync_attach),
+ DEVMETHOD(device_detach, hv_timesync_detach),
+ { 0, 0 }
+};
+
+static driver_t timesync_driver = { "hvtimesync", timesync_methods, sizeof(hv_timesync_sc)};
+
+static devclass_t timesync_devclass;
+
+DRIVER_MODULE(hv_timesync, vmbus, timesync_driver, timesync_devclass, NULL, NULL);
+MODULE_VERSION(hv_timesync, 1);
+MODULE_DEPEND(hv_timesync, vmbus, 1, 1, 1);
diff --git a/sys/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c
index 38054ca..7d19b3f 100644
--- a/sys/dev/hyperv/utilities/hv_util.c
+++ b/sys/dev/hyperv/utilities/hv_util.c
@@ -40,94 +40,9 @@
#include <sys/syscallsubr.h>
#include <dev/hyperv/include/hyperv.h>
-#include "hv_kvp.h"
+#include "hv_util.h"
-/* Time Sync data */
-typedef struct {
- uint64_t data;
-} time_sync_data;
-
-static void hv_shutdown_cb(void *context);
-static void hv_heartbeat_cb(void *context);
-static void hv_timesync_cb(void *context);
-
-static int hv_timesync_init(hv_vmbus_service *serv);
-static int hv_timesync_uninit(hv_vmbus_service *serv);
-static void hv_set_host_time(void *context, int pending);
-
-/*
- * Note: GUID codes below are predefined by the host hypervisor
- * (Hyper-V and Azure)interface and required for correct operation.
- */
-hv_vmbus_service service_table[] = {
- /* Shutdown Service */
- { .guid.data = {0x31, 0x60, 0x0B, 0X0E, 0x13, 0x52, 0x34, 0x49,
- 0x81, 0x8B, 0x38, 0XD9, 0x0C, 0xED, 0x39, 0xDB},
- .name = "Hyper-V Shutdown Service\n",
- .enabled = TRUE,
- .callback = hv_shutdown_cb,
- },
-
- /* Time Synch Service */
- { .guid.data = {0x30, 0xe6, 0x27, 0x95, 0xae, 0xd0, 0x7b, 0x49,
- 0xad, 0xce, 0xe8, 0x0a, 0xb0, 0x17, 0x5c, 0xaf},
- .name = "Hyper-V Time Synch Service\n",
- .enabled = TRUE,
- .init = hv_timesync_init,
- .callback = hv_timesync_cb,
- .uninit = hv_timesync_uninit,
- },
-
- /* Heartbeat Service */
- { .guid.data = {0x39, 0x4f, 0x16, 0x57, 0x15, 0x91, 0x78, 0x4e,
- 0xab, 0x55, 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d},
- .name = "Hyper-V Heartbeat Service\n",
- .enabled = TRUE,
- .callback = hv_heartbeat_cb,
- },
-
- /* KVP (Key Value Pair) Service */
- { .guid.data = {0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d,
- 0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3, 0xe6},
- .name = "Hyper-V KVP Service\n",
- .enabled = TRUE,
- .init = hv_kvp_init,
- .callback = hv_kvp_callback,
- },
-};
-
-/*
- * Receive buffer pointers. There is one buffer per utility service. The
- * buffer is allocated during attach().
- */
-uint8_t *receive_buffer[HV_MAX_UTIL_SERVICES];
-
-static boolean_t destroyed_kvp = FALSE;
-
-struct hv_ictimesync_data {
- uint64_t parenttime;
- uint64_t childtime;
- uint64_t roundtriptime;
- uint8_t flags;
-} __packed;
-
-static int
-hv_timesync_init(hv_vmbus_service *serv)
-{
- void *time_msg = malloc(sizeof(time_sync_data), M_DEVBUF, M_WAITOK);
- TASK_INIT(&serv->task, 1, hv_set_host_time, time_msg);
- return (0);
-}
-
-static int
-hv_timesync_uninit(hv_vmbus_service *serv)
-{
- taskqueue_drain(taskqueue_thread, &serv->task);
- free(serv->task.ta_context, M_DEVBUF);
- return (0);
-}
-
-static void
+void
hv_negotiate_version(
struct hv_vmbus_icmsg_hdr* icmsghdrp,
struct hv_vmbus_icmsg_negotiate* negop,
@@ -156,252 +71,19 @@ hv_negotiate_version(
negop->icmsg_vercnt = 1;
}
-
-/**
- * Set host time based on time sync message from host
- */
-static void
-hv_set_host_time(void *context, int pending)
-{
- time_sync_data* time_msg = (time_sync_data*) context;
- uint64_t hosttime = time_msg->data;
- struct timespec guest_ts, host_ts;
- uint64_t host_tns;
- int64_t diff;
- int error;
-
- host_tns = (hosttime - HV_WLTIMEDELTA) * 100;
- host_ts.tv_sec = (time_t)(host_tns/HV_NANO_SEC_PER_SEC);
- host_ts.tv_nsec = (long)(host_tns%HV_NANO_SEC_PER_SEC);
-
- nanotime(&guest_ts);
-
- diff = (int64_t)host_ts.tv_sec - (int64_t)guest_ts.tv_sec;
-
- /*
- * If host differs by 5 seconds then make the guest catch up
- */
- if (diff > 5 || diff < -5) {
- error = kern_clock_settime(curthread, CLOCK_REALTIME,
- &host_ts);
- }
-}
-
-/**
- * @brief Synchronize time with host after reboot, restore, etc.
- *
- * ICTIMESYNCFLAG_SYNC flag bit indicates reboot, restore events of the VM.
- * After reboot the flag ICTIMESYNCFLAG_SYNC is included in the first time
- * message after the timesync channel is opened. Since the hv_utils module is
- * loaded after hv_vmbus, the first message is usually missed. The other
- * thing is, systime is automatically set to emulated hardware clock which may
- * not be UTC time or in the same time zone. So, to override these effects, we
- * use the first 50 time samples for initial system time setting.
- */
-static inline
-void hv_adj_guesttime(uint64_t hosttime, uint8_t flags)
-{
- time_sync_data* time_msg = service_table[HV_TIME_SYNCH].task.ta_context;
-
- time_msg->data = hosttime;
-
- if (((flags & HV_ICTIMESYNCFLAG_SYNC) != 0) ||
- ((flags & HV_ICTIMESYNCFLAG_SAMPLE) != 0)) {
- taskqueue_enqueue(taskqueue_thread, &service_table[HV_TIME_SYNCH].task);
- }
-}
-
-/**
- * Time Sync Channel message handler
- */
-static void
-hv_timesync_cb(void *context)
-{
- hv_vmbus_channel* channel = context;
- hv_vmbus_icmsg_hdr* icmsghdrp;
- uint32_t recvlen;
- uint64_t requestId;
- int ret;
- uint8_t* time_buf;
- struct hv_ictimesync_data* timedatap;
-
- time_buf = receive_buffer[HV_TIME_SYNCH];
-
- ret = hv_vmbus_channel_recv_packet(channel, time_buf,
- PAGE_SIZE, &recvlen, &requestId);
-
- if ((ret == 0) && recvlen > 0) {
- icmsghdrp = (struct hv_vmbus_icmsg_hdr *) &time_buf[
- sizeof(struct hv_vmbus_pipe_hdr)];
-
- if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, time_buf);
- } else {
- timedatap = (struct hv_ictimesync_data *) &time_buf[
- sizeof(struct hv_vmbus_pipe_hdr) +
- sizeof(struct hv_vmbus_icmsg_hdr)];
- hv_adj_guesttime(timedatap->parenttime, timedatap->flags);
- }
-
- icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION
- | HV_ICMSGHDRFLAG_RESPONSE;
-
- hv_vmbus_channel_send_packet(channel, time_buf,
- recvlen, requestId,
- HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
- }
-}
-
-/**
- * Shutdown
- */
-static void
-hv_shutdown_cb(void *context)
-{
- uint8_t* buf;
- hv_vmbus_channel* channel = context;
- uint8_t execute_shutdown = 0;
- hv_vmbus_icmsg_hdr* icmsghdrp;
- uint32_t recv_len;
- uint64_t request_id;
- int ret;
- hv_vmbus_shutdown_msg_data* shutdown_msg;
-
- buf = receive_buffer[HV_SHUT_DOWN];
-
- ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE,
- &recv_len, &request_id);
-
- if ((ret == 0) && recv_len > 0) {
-
- icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
- &buf[sizeof(struct hv_vmbus_pipe_hdr)];
-
- if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, buf);
-
- } else {
- shutdown_msg =
- (struct hv_vmbus_shutdown_msg_data *)
- &buf[sizeof(struct hv_vmbus_pipe_hdr) +
- sizeof(struct hv_vmbus_icmsg_hdr)];
-
- switch (shutdown_msg->flags) {
- case 0:
- case 1:
- icmsghdrp->status = HV_S_OK;
- execute_shutdown = 1;
- if(bootverbose)
- printf("Shutdown request received -"
- " graceful shutdown initiated\n");
- break;
- default:
- icmsghdrp->status = HV_E_FAIL;
- execute_shutdown = 0;
- printf("Shutdown request received -"
- " Invalid request\n");
- break;
- }
- }
-
- icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION |
- HV_ICMSGHDRFLAG_RESPONSE;
-
- hv_vmbus_channel_send_packet(channel, buf,
- recv_len, request_id,
- HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
- }
-
- if (execute_shutdown)
- shutdown_nice(RB_POWEROFF);
-}
-
-/**
- * Process heartbeat message
- */
-static void
-hv_heartbeat_cb(void *context)
-{
- uint8_t* buf;
- hv_vmbus_channel* channel = context;
- uint32_t recvlen;
- uint64_t requestid;
- int ret;
-
- struct hv_vmbus_heartbeat_msg_data* heartbeat_msg;
- struct hv_vmbus_icmsg_hdr* icmsghdrp;
-
- buf = receive_buffer[HV_HEART_BEAT];
-
- ret = hv_vmbus_channel_recv_packet(channel, buf, PAGE_SIZE, &recvlen,
- &requestid);
-
- if ((ret == 0) && recvlen > 0) {
-
- icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
- &buf[sizeof(struct hv_vmbus_pipe_hdr)];
-
- if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_negotiate_version(icmsghdrp, NULL, buf);
-
- } else {
- heartbeat_msg =
- (struct hv_vmbus_heartbeat_msg_data *)
- &buf[sizeof(struct hv_vmbus_pipe_hdr) +
- sizeof(struct hv_vmbus_icmsg_hdr)];
-
- heartbeat_msg->seq_num += 1;
- }
-
- icmsghdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION |
- HV_ICMSGHDRFLAG_RESPONSE;
-
- hv_vmbus_channel_send_packet(channel, buf, recvlen, requestid,
- HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
- }
-}
-
-
-static int
-hv_util_probe(device_t dev)
-{
- int i;
- int rtn_value = ENXIO;
-
- for (i = 0; i < HV_MAX_UTIL_SERVICES; i++) {
- const char *p = vmbus_get_type(dev);
- if (service_table[i].enabled && !memcmp(p, &service_table[i].guid, sizeof(hv_guid))) {
- device_set_softc(dev, (void *) (&service_table[i]));
- rtn_value = BUS_PROBE_DEFAULT;
- }
- }
-
- return rtn_value;
-}
-
-static int
+int
hv_util_attach(device_t dev)
{
- struct hv_device* hv_dev;
- struct hv_vmbus_service* service;
- int ret;
- size_t receive_buffer_offset;
+ struct hv_device* hv_dev;
+ struct hv_util_sc* softc;
+ int ret;
hv_dev = vmbus_get_devctx(dev);
- service = device_get_softc(dev);
- receive_buffer_offset = service - &service_table[0];
- device_printf(dev, "Hyper-V Service attaching: %s\n", service->name);
- receive_buffer[receive_buffer_offset] =
+ softc = device_get_softc(dev);
+ softc->hv_dev = hv_dev;
+ softc->receive_buffer =
malloc(4 * PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO);
- if (service->init != NULL) {
- ret = service->init(service);
- if (ret) {
- ret = ENODEV;
- goto error0;
- }
- }
-
/*
* These services are not performance critical and do not need
* batched reading. Furthermore, some services such as KVP can
@@ -412,75 +94,30 @@ hv_util_attach(device_t dev)
hv_set_channel_read_state(hv_dev->channel, FALSE);
ret = hv_vmbus_channel_open(hv_dev->channel, 4 * PAGE_SIZE,
- 4 * PAGE_SIZE, NULL, 0,
- service->callback, hv_dev->channel);
+ 4 * PAGE_SIZE, NULL, 0,
+ softc->callback, softc);
if (ret)
- goto error0;
+ goto error0;
return (0);
- error0:
-
- free(receive_buffer[receive_buffer_offset], M_DEVBUF);
- receive_buffer[receive_buffer_offset] = NULL;
-
+error0:
+ free(softc->receive_buffer, M_DEVBUF);
return (ret);
}
-static int
+int
hv_util_detach(device_t dev)
{
- struct hv_device* hv_dev;
- struct hv_vmbus_service* service;
- size_t receive_buffer_offset;
-
- if (!destroyed_kvp) {
- hv_kvp_deinit();
- destroyed_kvp = TRUE;
- }
+ struct hv_device* hv_dev;
+ struct hv_util_sc* softc;
hv_dev = vmbus_get_devctx(dev);
hv_vmbus_channel_close(hv_dev->channel);
- service = device_get_softc(dev);
- receive_buffer_offset = service - &service_table[0];
-
- if (service->uninit != NULL)
- service->uninit(service);
+ softc = device_get_softc(dev);
- free(receive_buffer[receive_buffer_offset], M_DEVBUF);
- receive_buffer[receive_buffer_offset] = NULL;
+ free(softc->receive_buffer, M_DEVBUF);
return (0);
}
-
-static int
-hv_util_modevent(module_t mod, int event, void *arg)
-{
- switch (event) {
- case MOD_LOAD:
- break;
- case MOD_UNLOAD:
- break;
- default:
- break;
- }
- return (0);
-}
-
-static device_method_t util_methods[] = {
- /* Device interface */
- DEVMETHOD(device_probe, hv_util_probe),
- DEVMETHOD(device_attach, hv_util_attach),
- DEVMETHOD(device_detach, hv_util_detach),
- DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 } }
-;
-
-static driver_t util_driver = { "hyperv-utils", util_methods, 0 };
-
-static devclass_t util_devclass;
-
-DRIVER_MODULE(hv_utils, vmbus, util_driver, util_devclass, hv_util_modevent, 0);
-MODULE_VERSION(hv_utils, 1);
-MODULE_DEPEND(hv_utils, vmbus, 1, 1, 1);
diff --git a/sys/dev/hyperv/utilities/hv_util.h b/sys/dev/hyperv/utilities/hv_util.h
new file mode 100644
index 0000000..708dca8
--- /dev/null
+++ b/sys/dev/hyperv/utilities/hv_util.h
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2009-2012 Microsoft Corp.
+ * Copyright (c) 2012 NetApp Inc.
+ * Copyright (c) 2012 Citrix Inc.
+ * 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 unmodified, 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 ``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 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _HVUTIL_H_
+#define _HVUTIL_H_
+
+/**
+ * hv_util related structures
+ *
+ */
+typedef struct hv_util_sc {
+ /*
+ * function to process Hyper-V messages
+ */
+ void (*callback)(void *);
+
+ struct hv_device* hv_dev;
+ uint8_t *receive_buffer;
+} hv_util_sc;
+
+void hv_negotiate_version(
+ struct hv_vmbus_icmsg_hdr* icmsghdrp,
+ struct hv_vmbus_icmsg_negotiate* negop,
+ uint8_t* buf);
+
+int hv_util_attach(device_t dev);
+int hv_util_detach(device_t dev);
+#endif
diff --git a/sys/dev/hyperv/vmbus/hv_connection.c b/sys/dev/hyperv/vmbus/hv_connection.c
index e60c557..0ff45df 100644
--- a/sys/dev/hyperv/vmbus/hv_connection.c
+++ b/sys/dev/hyperv/vmbus/hv_connection.c
@@ -248,10 +248,7 @@ hv_vmbus_connect(void) {
mtx_destroy(&hv_vmbus_g_connection.channel_msg_lock);
if (hv_vmbus_g_connection.interrupt_page != NULL) {
- contigfree(
- hv_vmbus_g_connection.interrupt_page,
- PAGE_SIZE,
- M_DEVBUF);
+ free(hv_vmbus_g_connection.interrupt_page, M_DEVBUF);
hv_vmbus_g_connection.interrupt_page = NULL;
}
@@ -279,7 +276,7 @@ hv_vmbus_disconnect(void) {
ret = hv_vmbus_post_message(&msg, sizeof(hv_vmbus_channel_unload));
- contigfree(hv_vmbus_g_connection.interrupt_page, PAGE_SIZE, M_DEVBUF);
+ free(hv_vmbus_g_connection.interrupt_page, M_DEVBUF);
mtx_destroy(&hv_vmbus_g_connection.channel_msg_lock);
diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c
index f972c5f..3717cbf 100644
--- a/sys/dev/ixl/if_ixl.c
+++ b/sys/dev/ixl/if_ixl.c
@@ -115,6 +115,8 @@ static int ixl_init_msix(struct ixl_pf *);
static void ixl_configure_msix(struct ixl_pf *);
static void ixl_configure_itr(struct ixl_pf *);
static void ixl_configure_legacy(struct ixl_pf *);
+static void ixl_init_taskqueues(struct ixl_pf *);
+static void ixl_free_taskqueues(struct ixl_pf *);
static void ixl_free_pci_resources(struct ixl_pf *);
static void ixl_local_timer(void *);
static int ixl_setup_interface(device_t, struct ixl_vsi *);
@@ -642,7 +644,7 @@ ixl_attach(device_t dev)
else
error = ixl_assign_vsi_legacy(pf);
if (error)
- goto err_late;
+ goto err_mac_hmc;
if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||
(hw->aq.fw_maj_ver < 4)) {
@@ -667,7 +669,7 @@ ixl_attach(device_t dev)
error = ixl_switch_config(pf);
if (error) {
device_printf(dev, "Initial switch config failed: %d\n", error);
- goto err_mac_hmc;
+ goto err_late;
}
/* Limit phy interrupts to link and modules failure */
@@ -680,6 +682,9 @@ ixl_attach(device_t dev)
bus = ixl_get_bus_info(hw, dev);
i40e_set_pci_config_data(hw, bus);
+ /* Initialize taskqueues */
+ ixl_init_taskqueues(pf);
+
/* Initialize statistics */
ixl_pf_reset_stats(pf);
ixl_update_stats_counters(pf);
@@ -748,7 +753,6 @@ ixl_detach(device_t dev)
struct ixl_pf *pf = device_get_softc(dev);
struct i40e_hw *hw = &pf->hw;
struct ixl_vsi *vsi = &pf->vsi;
- struct ixl_queue *que = vsi->queues;
i40e_status status;
#ifdef PCI_IOV
int error;
@@ -777,13 +781,7 @@ ixl_detach(device_t dev)
IXL_PF_UNLOCK(pf);
}
- for (int i = 0; i < vsi->num_queues; i++, que++) {
- if (que->tq) {
- taskqueue_drain(que->tq, &que->task);
- taskqueue_drain(que->tq, &que->tx_task);
- taskqueue_free(que->tq);
- }
- }
+ ixl_free_taskqueues(pf);
/* Shutdown LAN HMC */
status = i40e_shutdown_lan_hmc(hw);
@@ -1990,6 +1988,58 @@ ixl_assign_vsi_legacy(struct ixl_pf *pf)
return (0);
}
+static void
+ixl_init_taskqueues(struct ixl_pf *pf)
+{
+ struct ixl_vsi *vsi = &pf->vsi;
+ struct ixl_queue *que = vsi->queues;
+ device_t dev = pf->dev;
+
+ /* Tasklet for Admin Queue */
+ TASK_INIT(&pf->adminq, 0, ixl_do_adminq, pf);
+#ifdef PCI_IOV
+ /* VFLR Tasklet */
+ TASK_INIT(&pf->vflr_task, 0, ixl_handle_vflr, pf);
+#endif
+
+ /* Create and start PF taskqueue */
+ pf->tq = taskqueue_create_fast("ixl_adm", M_NOWAIT,
+ taskqueue_thread_enqueue, &pf->tq);
+ taskqueue_start_threads(&pf->tq, 1, PI_NET, "%s adminq",
+ device_get_nameunit(dev));
+
+ /* Create queue tasks and start queue taskqueues */
+ for (int i = 0; i < vsi->num_queues; i++, que++) {
+ TASK_INIT(&que->tx_task, 0, ixl_deferred_mq_start, que);
+ TASK_INIT(&que->task, 0, ixl_handle_que, que);
+ que->tq = taskqueue_create_fast("ixl_que", M_NOWAIT,
+ taskqueue_thread_enqueue, &que->tq);
+#ifdef RSS
+ CPU_SETOF(cpu_id, &cpu_mask);
+ taskqueue_start_threads_cpuset(&que->tq, 1, PI_NET,
+ &cpu_mask, "%s (bucket %d)",
+ device_get_nameunit(dev), cpu_id);
+#else
+ taskqueue_start_threads(&que->tq, 1, PI_NET,
+ "%s (que %d)", device_get_nameunit(dev), que->me);
+#endif
+ }
+
+}
+
+static void
+ixl_free_taskqueues(struct ixl_pf *pf)
+{
+ struct ixl_vsi *vsi = &pf->vsi;
+ struct ixl_queue *que = vsi->queues;
+
+ if (pf->tq)
+ taskqueue_free(pf->tq);
+ for (int i = 0; i < vsi->num_queues; i++, que++) {
+ if (que->tq)
+ taskqueue_free(que->tq);
+ }
+}
/*********************************************************************
*
@@ -2028,17 +2078,6 @@ ixl_assign_vsi_msix(struct ixl_pf *pf)
}
bus_describe_intr(dev, pf->res, pf->tag, "aq");
pf->admvec = vector;
- /* Tasklet for Admin Queue */
- TASK_INIT(&pf->adminq, 0, ixl_do_adminq, pf);
-
-#ifdef PCI_IOV
- TASK_INIT(&pf->vflr_task, 0, ixl_handle_vflr, pf);
-#endif
-
- pf->tq = taskqueue_create_fast("ixl_adm", M_NOWAIT,
- taskqueue_thread_enqueue, &pf->tq);
- taskqueue_start_threads(&pf->tq, 1, PI_NET, "%s adminq",
- device_get_nameunit(pf->dev));
++vector;
/* Now set up the stations */
@@ -2069,19 +2108,6 @@ ixl_assign_vsi_msix(struct ixl_pf *pf)
#endif
bus_bind_intr(dev, que->res, cpu_id);
que->msix = vector;
- TASK_INIT(&que->tx_task, 0, ixl_deferred_mq_start, que);
- TASK_INIT(&que->task, 0, ixl_handle_que, que);
- que->tq = taskqueue_create_fast("ixl_que", M_NOWAIT,
- taskqueue_thread_enqueue, &que->tq);
-#ifdef RSS
- CPU_SETOF(cpu_id, &cpu_mask);
- taskqueue_start_threads_cpuset(&que->tq, 1, PI_NET,
- &cpu_mask, "%s (bucket %d)",
- device_get_nameunit(dev), cpu_id);
-#else
- taskqueue_start_threads(&que->tq, 1, PI_NET,
- "%s que", device_get_nameunit(dev));
-#endif
}
return (0);
@@ -2144,9 +2170,15 @@ ixl_init_msix(struct ixl_pf *pf)
/* Figure out a reasonable auto config value */
queues = (mp_ncpus > (available - 1)) ? (available - 1) : mp_ncpus;
- /* Override with hardcoded value if sane */
+ /* Override with hardcoded value if it's less than autoconfig count */
if ((ixl_max_queues != 0) && (ixl_max_queues <= queues))
queues = ixl_max_queues;
+ else if ((ixl_max_queues != 0) && (ixl_max_queues > queues))
+ device_printf(dev, "ixl_max_queues > # of cpus, using "
+ "autoconfig amount...\n");
+ /* Or limit maximum auto-configured queues to 8 */
+ else if ((ixl_max_queues == 0) && (queues > 8))
+ queues = 8;
#ifdef RSS
/* If we're doing RSS, clamp at the number of RSS buckets */
@@ -2880,7 +2912,6 @@ ixl_initialize_vsi(struct ixl_vsi *vsi)
device_printf(dev, "Fail in init_rx_ring %d\n", i);
break;
}
- wr32(vsi->hw, I40E_QRX_TAIL(que->me), 0);
#ifdef DEV_NETMAP
/* preserve queue */
if (vsi->ifp->if_capenable & IFCAP_NETMAP) {
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index e78af11..0ae7433 100644
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -390,7 +390,6 @@ ixl_xmit(struct ixl_queue *que, struct mbuf **m_headp)
++txr->total_packets;
wr32(hw, txr->tail, i);
- ixl_flush(hw);
/* Mark outstanding work */
if (que->busy == 0)
que->busy = 1;
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 2c8a564..00277f0 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -810,7 +810,7 @@ nvme_ctrlr_intx_handler(void *arg)
nvme_qpair_process_completions(&ctrlr->adminq);
- if (ctrlr->ioq[0].cpl)
+ if (ctrlr->ioq && ctrlr->ioq[0].cpl)
nvme_qpair_process_completions(&ctrlr->ioq[0]);
nvme_mmio_write_4(ctrlr, intmc, 1);
diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c
index d6d2125..3606385 100644
--- a/sys/dev/pci/pci_host_generic.c
+++ b/sys/dev/pci/pci_host_generic.c
@@ -33,6 +33,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_platform.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -51,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcib_private.h>
+#include <dev/pci/pci_host_generic.h>
#include <machine/cpu.h>
#include <machine/bus.h>
@@ -74,9 +77,6 @@ __FBSDID("$FreeBSD$");
(((func) & PCIE_FUNC_MASK) << PCIE_FUNC_SHIFT) | \
((reg) & PCIE_REG_MASK))
-#define MAX_RANGES_TUPLES 5
-#define MIN_RANGES_TUPLES 2
-
#define PCI_IO_WINDOW_OFFSET 0x1000
#define SPACE_CODE_SHIFT 24
@@ -85,34 +85,15 @@ __FBSDID("$FreeBSD$");
#define PROPS_CELL_SIZE 1
#define PCI_ADDR_CELL_SIZE 2
-struct pcie_range {
- uint64_t pci_base;
- uint64_t phys_base;
- uint64_t size;
- uint64_t flags;
-#define FLAG_IO (1 << 0)
-#define FLAG_MEM (1 << 1)
-};
-
-struct generic_pcie_softc {
- struct pcie_range ranges[MAX_RANGES_TUPLES];
- int nranges;
- struct rman mem_rman;
- struct rman io_rman;
- struct resource *res;
- struct resource *res1;
- int ecam;
- bus_space_tag_t bst;
- bus_space_handle_t bsh;
- device_t dev;
- bus_space_handle_t ioh;
- struct ofw_bus_iinfo pci_iinfo;
+/* OFW bus interface */
+struct generic_pcie_ofw_devinfo {
+ struct ofw_bus_devinfo di_dinfo;
+ struct resource_list di_rl;
};
/* Forward prototypes */
static int generic_pcie_probe(device_t dev);
-static int generic_pcie_attach(device_t dev);
static int parse_pci_mem_ranges(struct generic_pcie_softc *sc);
static uint32_t generic_pcie_read_config(device_t dev, u_int bus, u_int slot,
u_int func, u_int reg, int bytes);
@@ -126,8 +107,33 @@ static int generic_pcie_write_ivar(device_t dev, device_t child, int index,
static struct resource *generic_pcie_alloc_resource(device_t dev,
device_t child, int type, int *rid, rman_res_t start, rman_res_t end,
rman_res_t count, u_int flags);
+static struct resource *generic_pcie_alloc_resource_ofw(device_t, device_t,
+ int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
+static struct resource *generic_pcie_alloc_resource_pcie(device_t dev,
+ device_t child, int type, int *rid, rman_res_t start, rman_res_t end,
+ rman_res_t count, u_int flags);
static int generic_pcie_release_resource(device_t dev, device_t child,
int type, int rid, struct resource *res);
+static int generic_pcie_release_resource_ofw(device_t, device_t, int, int,
+ struct resource *);
+static int generic_pcie_release_resource_pcie(device_t, device_t, int, int,
+ struct resource *);
+static int generic_pcie_ofw_bus_attach(device_t);
+static const struct ofw_bus_devinfo *generic_pcie_ofw_get_devinfo(device_t,
+ device_t);
+
+static __inline void
+get_addr_size_cells(phandle_t node, pcell_t *addr_cells, pcell_t *size_cells)
+{
+
+ *addr_cells = 2;
+ /* Find address cells if present */
+ OF_getencprop(node, "#address-cells", addr_cells, sizeof(*addr_cells));
+
+ *size_cells = 2;
+ /* Find size cells if present */
+ OF_getencprop(node, "#size-cells", size_cells, sizeof(*size_cells));
+}
static int
generic_pcie_probe(device_t dev)
@@ -138,14 +144,14 @@ generic_pcie_probe(device_t dev)
if (ofw_bus_is_compatible(dev, "pci-host-ecam-generic")) {
device_set_desc(dev, "Generic PCI host controller");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_GENERIC);
}
return (ENXIO);
}
-static int
-generic_pcie_attach(device_t dev)
+int
+pci_host_generic_attach(device_t dev)
{
struct generic_pcie_softc *sc;
uint64_t phys_base;
@@ -158,6 +164,17 @@ generic_pcie_attach(device_t dev)
sc = device_get_softc(dev);
sc->dev = dev;
+ /* Retrieve 'ranges' property from FDT */
+ if (bootverbose)
+ device_printf(dev, "parsing FDT for ECAM%d:\n",
+ sc->ecam);
+ if (parse_pci_mem_ranges(sc))
+ return (ENXIO);
+
+ /* Attach OFW bus */
+ if (generic_pcie_ofw_bus_attach(dev) != 0)
+ return (ENXIO);
+
rid = 0;
sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (sc->res == NULL) {
@@ -173,13 +190,6 @@ generic_pcie_attach(device_t dev)
sc->io_rman.rm_type = RMAN_ARRAY;
sc->io_rman.rm_descr = "PCIe IO window";
- /* Retrieve 'ranges' property from FDT */
- if (bootverbose)
- device_printf(dev, "parsing FDT for ECAM%d:\n",
- sc->ecam);
- if (parse_pci_mem_ranges(sc))
- return (ENXIO);
-
/* Initialize rman and allocate memory regions */
error = rman_init(&sc->mem_rman);
if (error) {
@@ -220,7 +230,6 @@ generic_pcie_attach(device_t dev)
ofw_bus_setup_iinfo(ofw_bus_get_node(dev), &sc->pci_iinfo,
sizeof(cell_t));
-
device_add_child(dev, "pci", -1);
return (bus_generic_attach(dev));
}
@@ -314,7 +323,8 @@ generic_pcie_read_config(device_t dev, u_int bus, u_int slot,
uint64_t offset;
uint32_t data;
- if (bus > 255 || slot > 31 || func > 7 || reg > 4095)
+ if ((bus > PCI_BUSMAX) || (slot > PCI_SLOTMAX) ||
+ (func > PCI_FUNCMAX) || (reg > PCIE_REGMAX))
return (~0U);
sc = device_get_softc(dev);
@@ -349,7 +359,8 @@ generic_pcie_write_config(device_t dev, u_int bus, u_int slot,
bus_space_tag_t t;
uint64_t offset;
- if (bus > 255 || slot > 31 || func > 7 || reg > 4095)
+ if ((bus > PCI_BUSMAX) || (slot > PCI_SLOTMAX) ||
+ (func > PCI_FUNCMAX) || (reg > PCIE_REGMAX))
return;
sc = device_get_softc(dev);
@@ -434,7 +445,8 @@ generic_pcie_read_ivar(device_t dev, device_t child, int index,
return (0);
}
- device_printf(dev, "ERROR: Unknown index.\n");
+ if (bootverbose)
+ device_printf(dev, "ERROR: Unknown index %d.\n", index);
return (ENOENT);
}
@@ -463,7 +475,7 @@ generic_pcie_rman(struct generic_pcie_softc *sc, int type)
}
static int
-generic_pcie_release_resource(device_t dev, device_t child, int type,
+generic_pcie_release_resource_pcie(device_t dev, device_t child, int type,
int rid, struct resource *res)
{
struct generic_pcie_softc *sc;
@@ -480,10 +492,41 @@ generic_pcie_release_resource(device_t dev, device_t child, int type,
return (bus_generic_release_resource(dev, child, type, rid, res));
}
+static int
+generic_pcie_release_resource(device_t dev, device_t child, int type,
+ int rid, struct resource *res)
+{
+
+ /* For PCIe devices that do not have FDT nodes, use PCIB method */
+ if ((int)ofw_bus_get_node(child) <= 0) {
+ return (generic_pcie_release_resource_pcie(dev,
+ child, type, rid, res));
+ }
+
+ /* For other devices use OFW method */
+ return (generic_pcie_release_resource_ofw(dev,
+ child, type, rid, res));
+}
+
static struct resource *
generic_pcie_alloc_resource(device_t dev, device_t child, int type, int *rid,
rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
+
+ /* For PCIe devices that do not have FDT nodes, use PCIB method */
+ if ((int)ofw_bus_get_node(child) <= 0)
+ return (generic_pcie_alloc_resource_pcie(dev, child, type, rid,
+ start, end, count, flags));
+
+ /* For other devices use OFW method */
+ return (generic_pcie_alloc_resource_ofw(dev, child, type, rid,
+ start, end, count, flags));
+}
+
+static struct resource *
+generic_pcie_alloc_resource_pcie(device_t dev, device_t child, int type, int *rid,
+ rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
+{
struct generic_pcie_softc *sc;
struct resource *res;
struct rman *rm;
@@ -516,11 +559,9 @@ generic_pcie_alloc_resource(device_t dev, device_t child, int type, int *rid,
return (res);
fail:
- if (bootverbose) {
- device_printf(dev, "%s FAIL: type=%d, rid=%d, "
- "start=%016lx, end=%016lx, count=%016lx, flags=%x\n",
- __func__, type, *rid, start, end, count, flags);
- }
+ device_printf(dev, "%s FAIL: type=%d, rid=%d, "
+ "start=%016lx, end=%016lx, count=%016lx, flags=%x\n",
+ __func__, type, *rid, start, end, count, flags);
return (NULL);
}
@@ -617,7 +658,7 @@ generic_pcie_deactivate_resource(device_t dev, device_t child, int type, int rid
static device_method_t generic_pcie_methods[] = {
DEVMETHOD(device_probe, generic_pcie_probe),
- DEVMETHOD(device_attach, generic_pcie_attach),
+ DEVMETHOD(device_attach, pci_host_generic_attach),
DEVMETHOD(bus_read_ivar, generic_pcie_read_ivar),
DEVMETHOD(bus_write_ivar, generic_pcie_write_ivar),
DEVMETHOD(bus_alloc_resource, generic_pcie_alloc_resource),
@@ -641,18 +682,137 @@ static device_method_t generic_pcie_methods[] = {
DEVMETHOD(pcib_map_msi, arm_map_msi),
#endif
+ /* ofw_bus interface */
+ DEVMETHOD(ofw_bus_get_devinfo, generic_pcie_ofw_get_devinfo),
+ DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
+ DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
+ DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
+ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
+ DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
+
DEVMETHOD_END
};
-static driver_t generic_pcie_driver = {
- "pcib",
- generic_pcie_methods,
- sizeof(struct generic_pcie_softc),
-};
+static const struct ofw_bus_devinfo *
+generic_pcie_ofw_get_devinfo(device_t bus __unused, device_t child)
+{
+ struct generic_pcie_ofw_devinfo *di;
+
+ di = device_get_ivars(child);
+ return (&di->di_dinfo);
+}
+
+static struct resource *
+generic_pcie_alloc_resource_ofw(device_t bus, device_t child, int type, int *rid,
+ rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
+{
+ struct generic_pcie_softc *sc;
+ struct generic_pcie_ofw_devinfo *di;
+ struct resource_list_entry *rle;
+ int i;
+
+ sc = device_get_softc(bus);
+
+ if ((start == 0UL) && (end == ~0UL)) {
+ if ((di = device_get_ivars(child)) == NULL)
+ return (NULL);
+ if (type == SYS_RES_IOPORT)
+ type = SYS_RES_MEMORY;
+
+ /* Find defaults for this rid */
+ rle = resource_list_find(&di->di_rl, type, *rid);
+ if (rle == NULL)
+ return (NULL);
+
+ start = rle->start;
+ end = rle->end;
+ count = rle->count;
+ }
+
+ if (type == SYS_RES_MEMORY) {
+ /* Remap through ranges property */
+ for (i = 0; i < MAX_RANGES_TUPLES; i++) {
+ if (start >= sc->ranges[i].phys_base && end <
+ sc->ranges[i].pci_base + sc->ranges[i].size) {
+ start -= sc->ranges[i].phys_base;
+ start += sc->ranges[i].pci_base;
+ end -= sc->ranges[i].phys_base;
+ end += sc->ranges[i].pci_base;
+ break;
+ }
+ }
-static devclass_t generic_pcie_devclass;
+ if (i == MAX_RANGES_TUPLES) {
+ device_printf(bus, "Could not map resource "
+ "%#lx-%#lx\n", start, end);
+ return (NULL);
+ }
+ }
+
+ return (bus_generic_alloc_resource(bus, child, type, rid, start, end,
+ count, flags));
+}
+
+static int
+generic_pcie_release_resource_ofw(device_t bus, device_t child, int type, int rid,
+ struct resource *res)
+{
+
+ return (bus_generic_release_resource(bus, child, type, rid, res));
+}
+
+/* Helper functions */
+
+static int
+generic_pcie_ofw_bus_attach(device_t dev)
+{
+ struct generic_pcie_ofw_devinfo *di;
+ device_t child;
+ phandle_t parent, node;
+ pcell_t addr_cells, size_cells;
+
+ parent = ofw_bus_get_node(dev);
+ if (parent > 0) {
+ get_addr_size_cells(parent, &addr_cells, &size_cells);
+ /* Iterate through all bus subordinates */
+ for (node = OF_child(parent); node > 0; node = OF_peer(node)) {
+
+ /* Allocate and populate devinfo. */
+ di = malloc(sizeof(*di), M_DEVBUF, M_WAITOK | M_ZERO);
+ if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node) != 0) {
+ free(di, M_DEVBUF);
+ continue;
+ }
+
+ /* Initialize and populate resource list. */
+ resource_list_init(&di->di_rl);
+ ofw_bus_reg_to_rl(dev, node, addr_cells, size_cells,
+ &di->di_rl);
+ ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
+
+ /* Add newbus device for this FDT node */
+ child = device_add_child(dev, NULL, -1);
+ if (child == NULL) {
+ resource_list_free(&di->di_rl);
+ ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
+ free(di, M_DEVBUF);
+ continue;
+ }
+
+ device_set_ivars(child, di);
+ }
+ }
+
+ return (0);
+}
+
+DEFINE_CLASS_0(pcib, generic_pcie_driver,
+ generic_pcie_methods, sizeof(struct generic_pcie_softc));
+
+devclass_t generic_pcie_devclass;
DRIVER_MODULE(pcib, simplebus, generic_pcie_driver,
-generic_pcie_devclass, 0, 0);
+ generic_pcie_devclass, 0, 0);
DRIVER_MODULE(pcib, ofwbus, generic_pcie_driver,
-generic_pcie_devclass, 0, 0);
+ generic_pcie_devclass, 0, 0);
+
diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h
new file mode 100644
index 0000000..94d417a
--- /dev/null
+++ b/sys/dev/pci/pci_host_generic.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Semihalf.
+ *
+ * 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.
+ *
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef __PCI_HOST_GENERIC_H_
+#define __PCI_HOST_GENERIC_H_
+
+#define MAX_RANGES_TUPLES 16
+#define MIN_RANGES_TUPLES 2
+
+struct pcie_range {
+ uint64_t pci_base;
+ uint64_t phys_base;
+ uint64_t size;
+ uint64_t flags;
+#define FLAG_IO (1 << 0)
+#define FLAG_MEM (1 << 1)
+};
+
+struct generic_pcie_softc {
+ struct pcie_range ranges[MAX_RANGES_TUPLES];
+ int nranges;
+ struct rman mem_rman;
+ struct rman io_rman;
+ struct resource *res;
+ struct resource *res1;
+ int ecam;
+ bus_space_tag_t bst;
+ bus_space_handle_t bsh;
+ device_t dev;
+ bus_space_handle_t ioh;
+#ifdef FDT
+ struct ofw_bus_iinfo pci_iinfo;
+#endif
+};
+
+extern devclass_t generic_pcie_devclass;
+DECLARE_CLASS(generic_pcie_driver);
+
+int pci_host_generic_attach(device_t);
+
+#endif /* __PCI_HOST_GENERIC_H_ */
diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c
index 6eb40f0..7288827 100644
--- a/sys/dev/uart/uart_cpu_fdt.c
+++ b/sys/dev/uart/uart_cpu_fdt.c
@@ -54,10 +54,6 @@ __FBSDID("$FreeBSD$");
#include <dev/uart/uart_cpu.h>
#include <dev/uart/uart_cpu_fdt.h>
-#ifdef __aarch64__
-extern bus_space_tag_t fdtbus_bs_tag;
-#endif
-
/*
* UART console routines.
*/
@@ -136,9 +132,6 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
char *cp;
int err;
- uart_bus_space_mem = fdtbus_bs_tag;
- uart_bus_space_io = NULL;
-
/* Allow overriding the FDT using the environment. */
class = &uart_ns8250_class;
err = uart_getenv(devtype, di, class);
@@ -195,10 +188,8 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
if (uart_fdt_get_shift(node, &shift) != 0)
shift = uart_getregshift(class);
- if (OF_getprop(node, "current-speed", &br, sizeof(br)) <= 0)
+ if (OF_getencprop(node, "current-speed", &br, sizeof(br)) <= 0)
br = 0;
- else
- br = fdt32_to_cpu(br);
/*
* Finalize configuration.
@@ -212,5 +203,9 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
di->stopbits = 1;
di->parity = UART_PARITY_NONE;
- return (OF_decode_addr(node, 0, &di->bas.bst, &di->bas.bsh, NULL));
+ err = OF_decode_addr(node, 0, &di->bas.bst, &di->bas.bsh, NULL);
+ uart_bus_space_mem = di->bas.bst;
+ uart_bus_space_io = NULL;
+
+ return (err);
}
diff --git a/sys/dev/uart/uart_dev_lpc.c b/sys/dev/uart/uart_dev_lpc.c
index 9a3e12b..f8d77d4 100644
--- a/sys/dev/uart/uart_dev_lpc.c
+++ b/sys/dev/uart/uart_dev_lpc.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
#include <machine/bus.h>
-#include <machine/fdt.h>
#include <dev/uart/uart.h>
#include <dev/uart/uart_cpu.h>
@@ -49,9 +48,9 @@ __FBSDID("$FreeBSD$");
static bus_space_handle_t bsh_clkpwr;
#define lpc_ns8250_get_clkreg(_bas, _reg) \
- bus_space_read_4(fdtbus_bs_tag, bsh_clkpwr, (_reg))
+ bus_space_read_4((_bas)->bst, bsh_clkpwr, (_reg))
#define lpc_ns8250_set_clkreg(_bas, _reg, _val) \
- bus_space_write_4(fdtbus_bs_tag, bsh_clkpwr, (_reg), (_val))
+ bus_space_write_4((_bas)->bst, bsh_clkpwr, (_reg), (_val))
/*
* Clear pending interrupts. THRE is cleared by reading IIR. Data
@@ -292,7 +291,7 @@ lpc_ns8250_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
u_long clkmode;
/* Enable UART clock */
- bus_space_map(fdtbus_bs_tag, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
+ bus_space_map(bas->bst, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
&bsh_clkpwr);
clkmode = lpc_ns8250_get_clkreg(bas, LPC_UART_CLKMODE);
lpc_ns8250_set_clkreg(bas, LPC_UART_CLKMODE, clkmode |
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index 1c1d2b0..0739e28 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -2358,6 +2358,8 @@ xhci_configure_endpoint(struct usb_device *udev,
/* store endpoint mode */
pepext->trb_ep_mode = ep_mode;
+ /* store bMaxPacketSize for control endpoints */
+ pepext->trb_ep_maxp = edesc->wMaxPacketSize[0];
usb_pc_cpu_flush(pepext->page_cache);
if (ep_mode == USB_EP_MODE_STREAMS) {
@@ -2904,6 +2906,17 @@ xhci_transfer_insert(struct usb_xfer *xfer)
return (USB_ERR_NOMEM);
}
+ /* check if bMaxPacketSize changed */
+ if (xfer->flags_int.control_xfr != 0 &&
+ pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) {
+
+ DPRINTFN(8, "Reconfigure control endpoint\n");
+
+ /* force driver to reconfigure endpoint */
+ pepext->trb_halted = 1;
+ pepext->trb_running = 0;
+ }
+
/* check for stopped condition, after putting transfer on interrupt queue */
if (pepext->trb_running == 0) {
struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index 4857450..306400a 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -383,6 +383,7 @@ struct xhci_endpoint_ext {
uint8_t trb_halted;
uint8_t trb_running;
uint8_t trb_ep_mode;
+ uint8_t trb_ep_maxp;
};
enum {
diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c
index e6361a6..dc0ce99 100644
--- a/sys/dev/usb/usb_hid.c
+++ b/sys/dev/usb/usb_hid.c
@@ -354,7 +354,8 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
/* range check usage count */
if (c->loc.count > 255) {
DPRINTFN(0, "Number of "
- "items truncated to 255\n");
+ "items(%u) truncated to 255\n",
+ (unsigned)(c->loc.count));
s->ncount = 255;
} else
s->ncount = c->loc.count;
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2a55e7c..07b3f73 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -835,6 +835,7 @@ product ABOCOM RT2573_4 0xb21e RT2573
product ABOCOM RTL8188CU_1 0x8188 RTL8188CU
product ABOCOM RTL8188CU_2 0x8189 RTL8188CU
product ABOCOM RTL8192CU 0x8178 RTL8192CU
+product ABOCOM RTL8188EU 0x8179 RTL8188EU
product ABOCOM WUG2700 0xb21f WUG2700
/* Acton Research Corp. */
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index a793ba9..d95be56 100644
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -176,6 +176,7 @@ static const STRUCT_USB_HOST_ID urtwn_devs[] = {
URTWN_DEV(TRENDNET, RTL8192CU),
URTWN_DEV(ZYXEL, RTL8192CU),
/* URTWN_RTL8188E */
+ URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
URTWN_RTL8188E_DEV(DLINK, DWA123D1),
URTWN_RTL8188E_DEV(DLINK, DWA125D1),
URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
diff --git a/sys/geom/uncompress/g_uncompress.c b/sys/geom/uncompress/g_uncompress.c
deleted file mode 100644
index 1a83cda..0000000
--- a/sys/geom/uncompress/g_uncompress.c
+++ /dev/null
@@ -1,684 +0,0 @@
-/*-
- * Copyright (c) 2010-2012 Aleksandr Rybalko
- * Copyright (c) 2004 Max Khon
- * 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.
- */
-
-/*
- * GEOM UNCOMPRESS module - simple decompression module for use with read-only
- * copressed images maked by mkuzip(8) or mkulzma(8) utilities.
- *
- * To enable module in kernel config, put this line:
- * device geom_uncompress
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/bio.h>
-#include <sys/endian.h>
-#include <sys/errno.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <sys/zlib.h>
-
-#include <geom/geom.h>
-
-#include <contrib/xz-embedded/linux/include/linux/xz.h>
-
-#ifdef GEOM_UNCOMPRESS_DEBUG
-#define DPRINTF(a) printf a
-extern int g_debugflags;
-#else
-#define DPRINTF(a)
-#endif
-
-static MALLOC_DEFINE(M_GEOM_UNCOMPRESS, "geom_uncompress",
- "GEOM UNCOMPRESS data structures");
-
-#define UNCOMPRESS_CLASS_NAME "UNCOMPRESS"
-#define GEOM_UZIP_MAJVER '2'
-#define GEOM_ULZMA_MAJVER '3'
-
-/*
- * Maximum allowed valid block size (to prevent foot-shooting)
- */
-#define MAX_BLKSZ (MAXPHYS)
-
-/*
- * Integer values (block size, number of blocks, offsets)
- * are stored in big-endian (network) order on disk and struct cloop_header
- * and in native order in struct g_uncompress_softc
- */
-
-#define CLOOP_MAGIC_LEN 128
-static char CLOOP_MAGIC_START[] = "#!/bin/sh\n";
-
-struct cloop_header {
- char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
-};
-
-struct g_uncompress_softc {
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
- uint64_t *offsets;
- enum {
- GEOM_UZIP = 1,
- GEOM_ULZMA
- } type;
-
- struct mtx last_mtx;
- uint32_t last_blk; /* last blk no */
- char *last_buf; /* last blk data */
- int req_total; /* total requests */
- int req_cached; /* cached requests */
-
- /* XZ decoder structs */
- struct xz_buf *b;
- struct xz_dec *s;
- z_stream *zs;
-};
-
-static void
-g_uncompress_softc_free(struct g_uncompress_softc *sc, struct g_geom *gp)
-{
-
- if (gp != NULL) {
- DPRINTF(("%s: %d requests, %d cached\n",
- gp->name, sc->req_total, sc->req_cached));
- }
- if (sc->offsets != NULL) {
- free(sc->offsets, M_GEOM_UNCOMPRESS);
- sc->offsets = NULL;
- }
-
- switch (sc->type) {
- case GEOM_ULZMA:
- if (sc->b) {
- free(sc->b, M_GEOM_UNCOMPRESS);
- sc->b = 0;
- }
- if (sc->s) {
- xz_dec_end(sc->s);
- sc->s = 0;
- }
- break;
- case GEOM_UZIP:
- if (sc->zs) {
- inflateEnd(sc->zs);
- free(sc->zs, M_GEOM_UNCOMPRESS);
- sc->zs = 0;
- }
- break;
- }
-
- mtx_destroy(&sc->last_mtx);
- free(sc->last_buf, M_GEOM_UNCOMPRESS);
- free(sc, M_GEOM_UNCOMPRESS);
-}
-
-static void *
-z_alloc(void *nil, u_int type, u_int size)
-{
- void *ptr;
-
- ptr = malloc(type * size, M_GEOM_UNCOMPRESS, M_NOWAIT);
-
- return (ptr);
-}
-
-static void
-z_free(void *nil, void *ptr)
-{
-
- free(ptr, M_GEOM_UNCOMPRESS);
-}
-
-static void
-g_uncompress_done(struct bio *bp)
-{
- struct g_uncompress_softc *sc;
- struct g_provider *pp, *pp2;
- struct g_consumer *cp;
- struct g_geom *gp;
- struct bio *bp2;
- uint32_t start_blk, i;
- off_t iolen, pos, upos;
- size_t bsize;
- int err;
-
- err = 0;
- bp2 = bp->bio_parent;
- pp = bp2->bio_to;
- gp = pp->geom;
- cp = LIST_FIRST(&gp->consumer);
- pp2 = cp->provider;
- sc = gp->softc;
- DPRINTF(("%s: done\n", gp->name));
-
- bp2->bio_error = bp->bio_error;
- if (bp2->bio_error != 0)
- goto done;
-
- /*
- * Example:
- * Uncompressed block size = 65536
- * User request: 65540-261632
- * (4 uncompressed blocks -4B at start, -512B at end)
- *
- * We have 512(secsize)*63(nsec) = 32256B at offset 1024
- * From: 1024 bp->bio_offset = 1024
- * To: 33280 bp->bio_length = 33280 - 1024 = 32256
- * Compressed blocks: 0-1020, 1020-1080, 1080-4845, 4845-12444,
- * 12444-33210, 33210-44100, ...
- *
- * Get start_blk from user request:
- * start_blk = bp2->bio_offset / 65536 = 65540/65536 = 1
- * bsize (block size of parent) = pp2->sectorsize (Now is 4B)
- * pos(in stream from parent) = sc->offsets[start_blk] % bsize =
- * = sc->offsets[1] % 4 = 1020 % 4 = 0
- */
-
- /*
- * Uncompress data.
- */
- start_blk = bp2->bio_offset / sc->blksz;
- bsize = pp2->sectorsize;
- iolen = bp->bio_completed;
- pos = sc->offsets[start_blk] % bsize;
- upos = 0;
-
- DPRINTF(("%s: done: bio_length %jd bio_completed %jd start_blk %d, "
- "pos %jd, upos %jd (%jd, %d, %zu)\n",
- gp->name, (intmax_t)bp->bio_length, (intmax_t)bp->bio_completed,
- start_blk, (intmax_t)pos, (intmax_t)upos,
- (intmax_t)bp2->bio_offset, sc->blksz, bsize));
-
- for (i = start_blk; upos < bp2->bio_length; i++) {
- off_t len, ulen, uoff;
-
- uoff = i == start_blk ? bp2->bio_offset % sc->blksz : 0;
- ulen = MIN(sc->blksz - uoff, bp2->bio_length - upos);
- len = sc->offsets[i + 1] - sc->offsets[i];
-
- DPRINTF((
- "%s: done: inflate block %d, start %ju, end %ju len %jd\n",
- gp->name, i, (uintmax_t)sc->offsets[i],
- (uintmax_t)sc->offsets[i + 1], (intmax_t)len));
-
- if (len == 0) {
- /* All zero block: no cache update */
- bzero(bp2->bio_data + upos, ulen);
- upos += ulen;
- bp2->bio_completed += ulen;
- continue;
- }
- if (len > iolen) {
- DPRINTF(("%s: done: early termination: len (%jd) > "
- "iolen (%jd)\n",
- gp->name, (intmax_t)len, (intmax_t)iolen));
- break;
- }
- mtx_lock(&sc->last_mtx);
-
-#ifdef GEOM_UNCOMPRESS_DEBUG
- if (g_debugflags & 32)
- hexdump(bp->bio_data + pos, len, 0, 0);
-#endif
-
- switch (sc->type) {
- case GEOM_ULZMA:
- sc->b->in = bp->bio_data + pos;
- sc->b->out = sc->last_buf;
- sc->b->in_pos = sc->b->out_pos = 0;
- sc->b->in_size = len;
- sc->b->out_size = (size_t)-1;
-
- err = (xz_dec_run(sc->s, sc->b) != XZ_STREAM_END) ?
- 1 : 0;
- /* TODO decoder recovery, if needed */
- break;
- case GEOM_UZIP:
- sc->zs->next_in = bp->bio_data + pos;
- sc->zs->avail_in = len;
- sc->zs->next_out = sc->last_buf;
- sc->zs->avail_out = sc->blksz;
-
- err = (inflate(sc->zs, Z_FINISH) != Z_STREAM_END) ?
- 1 : 0;
- if ((err) || (inflateReset(sc->zs) != Z_OK))
- printf("%s: UZIP decoder reset failed\n",
- gp->name);
- break;
- }
-
- if (err) {
- sc->last_blk = -1;
- mtx_unlock(&sc->last_mtx);
- DPRINTF(("%s: done: inflate failed, code=%d\n",
- gp->name, err));
- bp2->bio_error = EIO;
- goto done;
- }
-
-#ifdef GEOM_UNCOMPRESS_DEBUG
- if (g_debugflags & 32)
- hexdump(sc->last_buf, sc->b->out_size, 0, 0);
-#endif
-
- sc->last_blk = i;
- DPRINTF(("%s: done: inflated \n", gp->name));
- memcpy(bp2->bio_data + upos, sc->last_buf + uoff, ulen);
- mtx_unlock(&sc->last_mtx);
-
- pos += len;
- iolen -= len;
- upos += ulen;
- bp2->bio_completed += ulen;
- }
-
-done:
- /*
- * Finish processing the request.
- */
- DPRINTF(("%s: done: (%d, %jd, %ld)\n",
- gp->name, bp2->bio_error, (intmax_t)bp2->bio_completed,
- bp2->bio_resid));
- free(bp->bio_data, M_GEOM_UNCOMPRESS);
- g_destroy_bio(bp);
- g_io_deliver(bp2, bp2->bio_error);
-}
-
-static void
-g_uncompress_start(struct bio *bp)
-{
- struct g_uncompress_softc *sc;
- struct g_provider *pp, *pp2;
- struct g_consumer *cp;
- struct g_geom *gp;
- struct bio *bp2;
- uint32_t start_blk, end_blk;
- size_t bsize;
-
- pp = bp->bio_to;
- gp = pp->geom;
- DPRINTF(("%s: start (%d:%s) to %s off=%jd len=%jd\n",
- gp->name, bp->bio_cmd,
- (bp->bio_cmd == BIO_READ) ? "BIO_READ" : "NOTSUPPORTED",
- pp->name, (intmax_t)bp->bio_offset, (intmax_t)bp->bio_length));
-
- if (bp->bio_cmd != BIO_READ) {
- g_io_deliver(bp, EOPNOTSUPP);
- return;
- }
-
- cp = LIST_FIRST(&gp->consumer);
- pp2 = cp->provider;
- sc = gp->softc;
-
- start_blk = bp->bio_offset / sc->blksz;
- end_blk = howmany(bp->bio_offset + bp->bio_length, sc->blksz);
- KASSERT(start_blk < sc->nblocks, ("start_blk out of range"));
- KASSERT(end_blk <= sc->nblocks, ("end_blk out of range"));
-
- sc->req_total++;
- if (start_blk + 1 == end_blk) {
- mtx_lock(&sc->last_mtx);
- if (start_blk == sc->last_blk) {
- off_t uoff;
-
- uoff = bp->bio_offset % sc->blksz;
- KASSERT(bp->bio_length <= sc->blksz - uoff,
- ("cached data error"));
- memcpy(bp->bio_data, sc->last_buf + uoff,
- bp->bio_length);
- sc->req_cached++;
- mtx_unlock(&sc->last_mtx);
-
- DPRINTF(("%s: start: cached 0 + %jd, %jd + 0 + %jd\n",
- gp->name, (intmax_t)bp->bio_length, (intmax_t)uoff,
- (intmax_t)bp->bio_length));
- bp->bio_completed = bp->bio_length;
- g_io_deliver(bp, 0);
- return;
- }
- mtx_unlock(&sc->last_mtx);
- }
-
- bp2 = g_clone_bio(bp);
- if (bp2 == NULL) {
- g_io_deliver(bp, ENOMEM);
- return;
- }
- DPRINTF(("%s: start (%d..%d), %s: %d + %jd, %s: %d + %jd\n",
- gp->name, start_blk, end_blk,
- pp->name, pp->sectorsize, (intmax_t)pp->mediasize,
- pp2->name, pp2->sectorsize, (intmax_t)pp2->mediasize));
- bsize = pp2->sectorsize;
- bp2->bio_done = g_uncompress_done;
- bp2->bio_offset = rounddown(sc->offsets[start_blk], bsize);
- while (1) {
- bp2->bio_length = roundup(sc->offsets[end_blk], bsize) -
- bp2->bio_offset;
- if (bp2->bio_length < MAXPHYS)
- break;
-
- end_blk--;
- DPRINTF((
- "%s: bio_length (%jd) > MAXPHYS: lowering end_blk to %u\n",
- gp->name, (intmax_t)bp2->bio_length, end_blk));
- }
- DPRINTF(("%s: start %jd + %jd -> %ju + %ju -> %jd + %jd\n",
- gp->name,
- (intmax_t)bp->bio_offset, (intmax_t)bp->bio_length,
- (uintmax_t)sc->offsets[start_blk],
- (uintmax_t)sc->offsets[end_blk] - sc->offsets[start_blk],
- (intmax_t)bp2->bio_offset, (intmax_t)bp2->bio_length));
- bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UNCOMPRESS, M_NOWAIT);
- if (bp2->bio_data == NULL) {
- g_destroy_bio(bp2);
- g_io_deliver(bp, ENOMEM);
- return;
- }
-
- g_io_request(bp2, cp);
- DPRINTF(("%s: start ok\n", gp->name));
-}
-
-static void
-g_uncompress_orphan(struct g_consumer *cp)
-{
- struct g_geom *gp;
-
- g_trace(G_T_TOPOLOGY, "%s(%p/%s)", __func__, cp, cp->provider->name);
- g_topology_assert();
-
- gp = cp->geom;
- g_uncompress_softc_free(gp->softc, gp);
- gp->softc = NULL;
- g_wither_geom(gp, ENXIO);
-}
-
-static int
-g_uncompress_access(struct g_provider *pp, int dr, int dw, int de)
-{
- struct g_consumer *cp;
- struct g_geom *gp;
-
- gp = pp->geom;
- cp = LIST_FIRST(&gp->consumer);
- KASSERT (cp != NULL, ("g_uncompress_access but no consumer"));
-
- if (cp->acw + dw > 0)
- return (EROFS);
-
- return (g_access(cp, dr, dw, de));
-}
-
-static void
-g_uncompress_spoiled(struct g_consumer *cp)
-{
- struct g_geom *gp;
-
- gp = cp->geom;
- g_trace(G_T_TOPOLOGY, "%s(%p/%s)", __func__, cp, gp->name);
- g_topology_assert();
-
- g_uncompress_softc_free(gp->softc, gp);
- gp->softc = NULL;
- g_wither_geom(gp, ENXIO);
-}
-
-static struct g_geom *
-g_uncompress_taste(struct g_class *mp, struct g_provider *pp, int flags)
-{
- struct cloop_header *header;
- struct g_uncompress_softc *sc;
- struct g_provider *pp2;
- struct g_consumer *cp;
- struct g_geom *gp;
- uint64_t *offsets;
- uint32_t i, r, total, total_offsets, type;
- uint8_t *buf;
- int error;
-
- g_trace(G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, pp->name);
- g_topology_assert();
-
- /* Skip providers that are already open for writing. */
- if (pp->acw > 0)
- return (NULL);
-
- buf = NULL;
-
- /*
- * Create geom instance.
- */
- gp = g_new_geomf(mp, "%s.uncompress", pp->name);
- cp = g_new_consumer(gp);
- error = g_attach(cp, pp);
- if (error == 0)
- error = g_access(cp, 1, 0, 0);
- if (error) {
- g_detach(cp);
- g_destroy_consumer(cp);
- g_destroy_geom(gp);
- return (NULL);
- }
- g_topology_unlock();
-
- /*
- * Read cloop header, look for CLOOP magic, perform
- * other validity checks.
- */
- DPRINTF(("%s: media sectorsize %u, mediasize %jd\n",
- gp->name, pp->sectorsize, (intmax_t)pp->mediasize));
- total = roundup(sizeof(struct cloop_header), pp->sectorsize);
- buf = g_read_data(cp, 0, total, NULL);
- if (buf == NULL)
- goto err;
- header = (struct cloop_header *) buf;
- if (strncmp(header->magic, CLOOP_MAGIC_START,
- sizeof(CLOOP_MAGIC_START) - 1) != 0) {
- DPRINTF(("%s: no CLOOP magic\n", gp->name));
- goto err;
- }
-
- switch (header->magic[0x0b]) {
- case 'L':
- type = GEOM_ULZMA;
- if (header->magic[0x0c] < GEOM_ULZMA_MAJVER) {
- DPRINTF(("%s: image version too old\n", gp->name));
- goto err;
- }
- DPRINTF(("%s: GEOM_ULZMA image found\n", gp->name));
- break;
- case 'V':
- type = GEOM_UZIP;
- if (header->magic[0x0c] < GEOM_UZIP_MAJVER) {
- DPRINTF(("%s: image version too old\n", gp->name));
- goto err;
- }
- DPRINTF(("%s: GEOM_UZIP image found\n", gp->name));
- break;
- default:
- DPRINTF(("%s: unsupported image type\n", gp->name));
- goto err;
- }
-
- DPRINTF(("%s: found CLOOP magic\n", gp->name));
- /*
- * Initialize softc and read offsets.
- */
- sc = malloc(sizeof(*sc), M_GEOM_UNCOMPRESS, M_WAITOK | M_ZERO);
- gp->softc = sc;
- sc->type = type;
- sc->blksz = ntohl(header->blksz);
- sc->nblocks = ntohl(header->nblocks);
- if (sc->blksz % 4 != 0) {
- printf("%s: block size (%u) should be multiple of 4.\n",
- gp->name, sc->blksz);
- goto err;
- }
- if (sc->blksz > MAX_BLKSZ) {
- printf("%s: block size (%u) should not be larger than %d.\n",
- gp->name, sc->blksz, MAX_BLKSZ);
- }
- total_offsets = sc->nblocks + 1;
- if (sizeof(struct cloop_header) +
- total_offsets * sizeof(uint64_t) > pp->mediasize) {
- printf("%s: media too small for %u blocks\n",
- gp->name, sc->nblocks);
- goto err;
- }
- g_free(buf);
-
- sc->offsets = malloc(total_offsets * sizeof(uint64_t),
- M_GEOM_UNCOMPRESS, M_WAITOK | M_ZERO);
- total = roundup((sizeof(struct cloop_header) +
- total_offsets * sizeof(uint64_t)), pp->sectorsize);
-#define RSZ ((total - r) > MAXPHYS ? MAXPHYS: (total - r))
- for (r = 0, i = 0; r < total; r += MAXPHYS) {
- buf = g_read_data(cp, r, RSZ, &error);
- if (buf == NULL) {
- free(sc->offsets, M_GEOM_UNCOMPRESS);
- goto err;
- }
- offsets = (uint64_t *)buf;
- if (r == 0)
- offsets +=
- sizeof(struct cloop_header) / sizeof(uint64_t);
- for (; i < total_offsets && offsets < (uint64_t *)(buf + RSZ);
- i++, offsets++)
- sc->offsets[i] = be64toh(*offsets);
- g_free(buf);
- }
-#undef RSZ
- buf = NULL;
- DPRINTF(("%s: done reading offsets\n", gp->name));
- mtx_init(&sc->last_mtx, "geom_uncompress cache", NULL, MTX_DEF);
- sc->last_blk = -1;
- sc->last_buf = malloc(sc->blksz, M_GEOM_UNCOMPRESS, M_WAITOK);
- sc->req_total = 0;
- sc->req_cached = 0;
-
- switch (sc->type) {
- case GEOM_ULZMA:
- xz_crc32_init();
- sc->s = xz_dec_init(XZ_SINGLE, 0);
- sc->b = (struct xz_buf*)malloc(sizeof(struct xz_buf),
- M_GEOM_UNCOMPRESS, M_WAITOK);
- break;
- case GEOM_UZIP:
- sc->zs = (z_stream *)malloc(sizeof(z_stream),
- M_GEOM_UNCOMPRESS, M_WAITOK);
- sc->zs->zalloc = z_alloc;
- sc->zs->zfree = z_free;
- if (inflateInit(sc->zs) != Z_OK) {
- goto err;
- }
- break;
- }
-
- g_topology_lock();
- pp2 = g_new_providerf(gp, "%s", gp->name);
- pp2->sectorsize = 512;
- pp2->mediasize = (off_t)sc->nblocks * sc->blksz;
- if (pp->stripesize > 0) {
- pp2->stripesize = pp->stripesize;
- pp2->stripeoffset = pp->stripeoffset;
- }
- g_error_provider(pp2, 0);
- g_access(cp, -1, 0, 0);
-
- DPRINTF(("%s: taste ok (%d, %jd), (%d, %d), %x\n",
- gp->name,
- pp2->sectorsize, (intmax_t)pp2->mediasize,
- pp2->stripeoffset, pp2->stripesize, pp2->flags));
- DPRINTF(("%s: %u x %u blocks\n", gp->name, sc->nblocks, sc->blksz));
- return (gp);
-
-err:
- g_topology_lock();
- g_access(cp, -1, 0, 0);
- if (buf != NULL)
- g_free(buf);
- if (gp->softc != NULL) {
- g_uncompress_softc_free(gp->softc, NULL);
- gp->softc = NULL;
- }
- g_detach(cp);
- g_destroy_consumer(cp);
- g_destroy_geom(gp);
-
- return (NULL);
-}
-
-static int
-g_uncompress_destroy_geom(struct gctl_req *req, struct g_class *mp,
- struct g_geom *gp)
-{
- struct g_provider *pp;
-
- g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, gp->name);
- g_topology_assert();
-
- if (gp->softc == NULL) {
- DPRINTF(("%s(%s): gp->softc == NULL\n", __func__, gp->name));
- return (ENXIO);
- }
-
- KASSERT(gp != NULL, ("NULL geom"));
- pp = LIST_FIRST(&gp->provider);
- KASSERT(pp != NULL, ("NULL provider"));
- if (pp->acr > 0 || pp->acw > 0 || pp->ace > 0)
- return (EBUSY);
-
- g_uncompress_softc_free(gp->softc, gp);
- gp->softc = NULL;
- g_wither_geom(gp, ENXIO);
-
- return (0);
-}
-
-static struct g_class g_uncompress_class = {
- .name = UNCOMPRESS_CLASS_NAME,
- .version = G_VERSION,
- .taste = g_uncompress_taste,
- .destroy_geom = g_uncompress_destroy_geom,
-
- .start = g_uncompress_start,
- .orphan = g_uncompress_orphan,
- .access = g_uncompress_access,
- .spoiled = g_uncompress_spoiled,
-};
-
-DECLARE_GEOM_CLASS(g_uncompress_class, g_uncompress);
-MODULE_DEPEND(g_uncompress, zlib, 1, 1, 1);
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 8363d06..3660a92 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -1,6 +1,7 @@
/*-
* Copyright (c) 2004 Max Khon
* Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,91 +39,116 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
-#include <sys/zlib.h>
+#include <sys/kthread.h>
#include <geom/geom.h>
-FEATURE(geom_uzip, "GEOM uzip read-only compressed disks support");
+#include <geom/uzip/g_uzip.h>
+#include <geom/uzip/g_uzip_cloop.h>
+#include <geom/uzip/g_uzip_softc.h>
+#include <geom/uzip/g_uzip_dapi.h>
+#include <geom/uzip/g_uzip_zlib.h>
+#include <geom/uzip/g_uzip_lzma.h>
+#include <geom/uzip/g_uzip_wrkthr.h>
+
+MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
+
+FEATURE(geom_uzip, "GEOM read-only compressed disks support");
+
+struct g_uzip_blk {
+ uint64_t offset;
+ uint32_t blen;
+#define BLEN_UNDEF UINT32_MAX
+};
+
+#ifndef ABS
+#define ABS(a) ((a) < 0 ? -(a) : (a))
+#endif
+
+#define BLK_IN_RANGE(mcn, bcn, ilen) \
+ (((bcn) != BLEN_UNDEF) && ( \
+ ((ilen) >= 0 && (mcn >= bcn) && (mcn <= ((intmax_t)(bcn) + (ilen)))) || \
+ ((ilen) < 0 && (mcn <= bcn) && (mcn >= ((intmax_t)(bcn) + (ilen)))) \
+ ))
-#undef GEOM_UZIP_DEBUG
#ifdef GEOM_UZIP_DEBUG
-#define DPRINTF(a) printf a
+# define GEOM_UZIP_DBG_DEFAULT 3
#else
-#define DPRINTF(a)
+# define GEOM_UZIP_DBG_DEFAULT 0
#endif
-static MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures");
+#define GUZ_DBG_ERR 1
+#define GUZ_DBG_INFO 2
+#define GUZ_DBG_IO 3
+#define GUZ_DBG_TOC 4
+
+SYSCTL_DECL(_kern_geom);
+SYSCTL_NODE(_kern_geom, OID_AUTO, uzip, CTLFLAG_RW, 0, "GEOM_UZIP stuff");
+static u_int g_uzip_debug = GEOM_UZIP_DBG_DEFAULT;
+SYSCTL_UINT(_kern_geom_uzip, OID_AUTO, debug, CTLFLAG_RWTUN, &g_uzip_debug, 0,
+ "Debug level (0-4)");
+static u_int g_uzip_debug_block = BLEN_UNDEF;
+SYSCTL_UINT(_kern_geom_uzip, OID_AUTO, debug_block, CTLFLAG_RWTUN,
+ &g_uzip_debug_block, 0, "Debug operations around specific cluster#");
+
+#define DPRINTF(lvl, a) \
+ if ((lvl) <= g_uzip_debug) { \
+ printf a; \
+ }
+#define DPRINTF_BLK(lvl, cn, a) \
+ if ((lvl) <= g_uzip_debug || \
+ BLK_IN_RANGE(cn, g_uzip_debug_block, 8) || \
+ BLK_IN_RANGE(cn, g_uzip_debug_block, -8)) { \
+ printf a; \
+ }
+#define DPRINTF_BRNG(lvl, bcn, ecn, a) \
+ if (bcn >= ecn) { \
+ printf("DPRINTF_BRNG: invalid range (%ju, %ju), BUG BUG " \
+ "BUG!\n", (uintmax_t)bcn, (uintmax_t)ecn); \
+ } else if (((lvl) <= g_uzip_debug) || \
+ BLK_IN_RANGE(g_uzip_debug_block, bcn, \
+ (intmax_t)ecn - (intmax_t)bcn)) { \
+ printf a; \
+ }
#define UZIP_CLASS_NAME "UZIP"
/*
* Maximum allowed valid block size (to prevent foot-shooting)
*/
-#define MAX_BLKSZ (MAXPHYS - MAXPHYS / 1000 - 12)
+#define MAX_BLKSZ (MAXPHYS)
-/*
- * Integer values (block size, number of blocks, offsets)
- * are stored in big-endian (network) order on disk and struct cloop_header
- * and in native order in struct g_uzip_softc
- */
-
-#define CLOOP_MAGIC_LEN 128
static char CLOOP_MAGIC_START[] = "#!/bin/sh\n";
-struct cloop_header {
- char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
-};
-
-struct g_uzip_softc {
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
- uint64_t *offsets;
-
- struct mtx last_mtx;
- uint32_t last_blk; /* last blk no */
- char *last_buf; /* last blk data */
- int req_total; /* total requests */
- int req_cached; /* cached requests */
-};
-
-static void g_uzip_done(struct bio *bp);
+static void g_uzip_read_done(struct bio *bp);
+static void g_uzip_do(struct g_uzip_softc *, struct bio *bp);
static void
g_uzip_softc_free(struct g_uzip_softc *sc, struct g_geom *gp)
{
if (gp != NULL) {
- DPRINTF(("%s: %d requests, %d cached\n",
+ DPRINTF(GUZ_DBG_INFO, ("%s: %d requests, %d cached\n",
gp->name, sc->req_total, sc->req_cached));
}
- if (sc->offsets != NULL) {
- free(sc->offsets, M_GEOM_UZIP);
- sc->offsets = NULL;
+
+ mtx_lock(&sc->queue_mtx);
+ sc->wrkthr_flags |= GUZ_SHUTDOWN;
+ wakeup(sc);
+ while (!(sc->wrkthr_flags & GUZ_EXITING)) {
+ msleep(sc->procp, &sc->queue_mtx, PRIBIO, "guzfree",
+ hz / 10);
}
+ mtx_unlock(&sc->queue_mtx);
+
+ sc->dcp->free(sc->dcp);
+ free(sc->toc, M_GEOM_UZIP);
+ mtx_destroy(&sc->queue_mtx);
mtx_destroy(&sc->last_mtx);
free(sc->last_buf, M_GEOM_UZIP);
free(sc, M_GEOM_UZIP);
}
-static void *
-z_alloc(void *nil, u_int type, u_int size)
-{
- void *ptr;
-
- ptr = malloc(type * size, M_GEOM_UZIP, M_NOWAIT);
-
- return (ptr);
-}
-
-static void
-z_free(void *nil, void *ptr)
-{
-
- free(ptr, M_GEOM_UZIP);
-}
-
static int
g_uzip_cached(struct g_geom *gp, struct bio *bp)
{
@@ -144,8 +170,9 @@ g_uzip_cached(struct g_geom *gp, struct bio *bp)
sc->req_cached++;
mtx_unlock(&sc->last_mtx);
- DPRINTF(("%s/%s: %p: offset=%jd: got %jd bytes from cache\n",
- __func__, gp->name, bp, (intmax_t)ofs, (intmax_t)usz));
+ DPRINTF(GUZ_DBG_IO, ("%s/%s: %p: offset=%jd: got %jd bytes "
+ "from cache\n", __func__, gp->name, bp, (intmax_t)ofs,
+ (intmax_t)usz));
bp->bio_completed += usz;
bp->bio_resid -= usz;
@@ -160,6 +187,19 @@ g_uzip_cached(struct g_geom *gp, struct bio *bp)
return (0);
}
+#define BLK_ENDS(sc, bi) ((sc)->toc[(bi)].offset + \
+ (sc)->toc[(bi)].blen)
+
+#define BLK_IS_CONT(sc, bi) (BLK_ENDS((sc), (bi) - 1) == \
+ (sc)->toc[(bi)].offset)
+#define BLK_IS_NIL(sc, bi) ((sc)->toc[(bi)].blen == 0)
+
+#define TOFF_2_BOFF(sc, pp, bi) ((sc)->toc[(bi)].offset - \
+ (sc)->toc[(bi)].offset % (pp)->sectorsize)
+#define TLEN_2_BLEN(sc, pp, bp, ei) ((BLK_ENDS((sc), (ei)) - \
+ (bp)->bio_offset + (pp)->sectorsize - 1) / \
+ (pp)->sectorsize * (pp)->sectorsize)
+
static int
g_uzip_request(struct g_geom *gp, struct bio *bp)
{
@@ -167,21 +207,14 @@ g_uzip_request(struct g_geom *gp, struct bio *bp)
struct bio *bp2;
struct g_consumer *cp;
struct g_provider *pp;
- off_t ofs;
- size_t start_blk, end_blk;
+ off_t ofs, start_blk_ofs;
+ size_t i, start_blk, end_blk, zsize;
if (g_uzip_cached(gp, bp) != 0)
return (1);
sc = gp->softc;
- bp2 = g_clone_bio(bp);
- if (bp2 == NULL) {
- g_io_deliver(bp, ENOMEM);
- return (1);
- }
- bp2->bio_done = g_uzip_done;
-
cp = LIST_FIRST(&gp->consumer);
pp = cp->provider;
@@ -191,17 +224,54 @@ g_uzip_request(struct g_geom *gp, struct bio *bp)
end_blk = (ofs + bp->bio_resid + sc->blksz - 1) / sc->blksz;
KASSERT(end_blk <= sc->nblocks, ("end_blk out of range"));
- DPRINTF(("%s/%s: %p: start=%u (%jd), end=%u (%jd)\n",
- __func__, gp->name, bp,
- (u_int)start_blk, (intmax_t)sc->offsets[start_blk],
- (u_int)end_blk, (intmax_t)sc->offsets[end_blk]));
+ for (; BLK_IS_NIL(sc, start_blk) && start_blk < end_blk; start_blk++) {
+ /* Fill in any leading Nil blocks */
+ start_blk_ofs = ofs % sc->blksz;
+ zsize = MIN(sc->blksz - start_blk_ofs, bp->bio_resid);
+ DPRINTF_BLK(GUZ_DBG_IO, start_blk, ("%s/%s: %p/%ju: "
+ "filling %ju zero bytes\n", __func__, gp->name, gp,
+ (uintmax_t)bp->bio_completed, (uintmax_t)zsize));
+ bzero(bp->bio_data + bp->bio_completed, zsize);
+ bp->bio_completed += zsize;
+ bp->bio_resid -= zsize;
+ ofs += zsize;
+ }
+
+ if (start_blk == end_blk) {
+ KASSERT(bp->bio_resid == 0, ("bp->bio_resid is invalid"));
+ /*
+ * No non-Nil data is left, complete request immediately.
+ */
+ DPRINTF(GUZ_DBG_IO, ("%s/%s: %p: all done returning %ju "
+ "bytes\n", __func__, gp->name, gp,
+ (uintmax_t)bp->bio_completed));
+ g_io_deliver(bp, 0);
+ return (1);
+ }
+
+ for (i = start_blk + 1; i < end_blk; i++) {
+ /* Trim discontinuous areas if any */
+ if (!BLK_IS_CONT(sc, i)) {
+ end_blk = i;
+ break;
+ }
+ }
+
+ DPRINTF_BRNG(GUZ_DBG_IO, start_blk, end_blk, ("%s/%s: %p: "
+ "start=%u (%ju), end=%u (%ju)\n", __func__, gp->name, bp,
+ (u_int)start_blk, (uintmax_t)sc->toc[start_blk].offset,
+ (u_int)end_blk, (uintmax_t)BLK_ENDS(sc, end_blk - 1)));
+
+ bp2 = g_clone_bio(bp);
+ if (bp2 == NULL) {
+ g_io_deliver(bp, ENOMEM);
+ return (1);
+ }
+ bp2->bio_done = g_uzip_read_done;
- bp2->bio_offset = sc->offsets[start_blk] -
- sc->offsets[start_blk] % pp->sectorsize;
+ bp2->bio_offset = TOFF_2_BOFF(sc, pp, start_blk);
while (1) {
- bp2->bio_length = sc->offsets[end_blk] - bp2->bio_offset;
- bp2->bio_length = (bp2->bio_length + pp->sectorsize - 1) /
- pp->sectorsize * pp->sectorsize;
+ bp2->bio_length = TLEN_2_BLEN(sc, pp, bp2, end_blk - 1);
if (bp2->bio_length <= MAXPHYS)
break;
@@ -215,8 +285,8 @@ g_uzip_request(struct g_geom *gp, struct bio *bp)
return (1);
}
- DPRINTF(("%s/%s: %p: reading %jd bytes from offset %jd\n",
- __func__, gp->name, bp,
+ DPRINTF_BRNG(GUZ_DBG_IO, start_blk, end_blk, ("%s/%s: %p: "
+ "reading %jd bytes from offset %jd\n", __func__, gp->name, bp,
(intmax_t)bp2->bio_length, (intmax_t)bp2->bio_offset));
g_io_request(bp2, cp);
@@ -224,21 +294,36 @@ g_uzip_request(struct g_geom *gp, struct bio *bp)
}
static void
-g_uzip_done(struct bio *bp)
+g_uzip_read_done(struct bio *bp)
+{
+ struct bio *bp2;
+ struct g_geom *gp;
+ struct g_uzip_softc *sc;
+
+ bp2 = bp->bio_parent;
+ gp = bp2->bio_to->geom;
+ sc = gp->softc;
+
+ mtx_lock(&sc->queue_mtx);
+ bioq_disksort(&sc->bio_queue, bp);
+ mtx_unlock(&sc->queue_mtx);
+ wakeup(sc);
+}
+
+static void
+g_uzip_do(struct g_uzip_softc *sc, struct bio *bp)
{
- z_stream zs;
struct bio *bp2;
struct g_provider *pp;
struct g_consumer *cp;
struct g_geom *gp;
- struct g_uzip_softc *sc;
char *data, *data2;
off_t ofs;
- size_t blk, blkofs, len, ulen;
+ size_t blk, blkofs, len, ulen, firstblk;
+ int err;
bp2 = bp->bio_parent;
gp = bp2->bio_to->geom;
- sc = gp->softc;
cp = LIST_FIRST(&gp->consumer);
pp = cp->provider;
@@ -253,46 +338,47 @@ g_uzip_done(struct bio *bp)
goto done;
}
- zs.zalloc = z_alloc;
- zs.zfree = z_free;
- if (inflateInit(&zs) != Z_OK) {
- bp2->bio_error = EILSEQ;
- goto done;
- }
-
ofs = bp2->bio_offset + bp2->bio_completed;
- blk = ofs / sc->blksz;
+ firstblk = blk = ofs / sc->blksz;
blkofs = ofs % sc->blksz;
- data = bp->bio_data + sc->offsets[blk] % pp->sectorsize;
+ data = bp->bio_data + sc->toc[blk].offset % pp->sectorsize;
data2 = bp2->bio_data + bp2->bio_completed;
while (bp->bio_completed && bp2->bio_resid) {
+ if (blk > firstblk && !BLK_IS_CONT(sc, blk)) {
+ DPRINTF_BLK(GUZ_DBG_IO, blk, ("%s/%s: %p: backref'ed "
+ "cluster #%u requested, looping around\n",
+ __func__, gp->name, bp2, (u_int)blk));
+ goto done;
+ }
ulen = MIN(sc->blksz - blkofs, bp2->bio_resid);
- len = sc->offsets[blk + 1] - sc->offsets[blk];
- DPRINTF(("%s/%s: %p/%ju: data2=%p, ulen=%u, data=%p, len=%u\n",
- __func__, gp->name, gp, bp->bio_completed,
- data2, (u_int)ulen, data, (u_int)len));
+ len = sc->toc[blk].blen;
+ DPRINTF(GUZ_DBG_IO, ("%s/%s: %p/%ju: data2=%p, ulen=%u, "
+ "data=%p, len=%u\n", __func__, gp->name, gp,
+ bp->bio_completed, data2, (u_int)ulen, data, (u_int)len));
if (len == 0) {
/* All zero block: no cache update */
bzero(data2, ulen);
} else if (len <= bp->bio_completed) {
- zs.next_in = data;
- zs.avail_in = len;
- zs.next_out = sc->last_buf;
- zs.avail_out = sc->blksz;
mtx_lock(&sc->last_mtx);
- if (inflate(&zs, Z_FINISH) != Z_STREAM_END) {
+ err = sc->dcp->decompress(sc->dcp, gp->name, data,
+ len, sc->last_buf);
+ if (err != 0) {
sc->last_blk = -1;
mtx_unlock(&sc->last_mtx);
- inflateEnd(&zs);
bp2->bio_error = EILSEQ;
+ DPRINTF(GUZ_DBG_ERR, ("%s/%s: decompress"
+ "(%p) failed\n", __func__, gp->name,
+ sc->dcp));
goto done;
}
sc->last_blk = blk;
memcpy(data2, sc->last_buf + blkofs, ulen);
mtx_unlock(&sc->last_mtx);
- if (inflateReset(&zs) != Z_OK) {
- inflateEnd(&zs);
+ err = sc->dcp->rewind(sc->dcp, gp->name);
+ if (err != 0) {
bp2->bio_error = EILSEQ;
+ DPRINTF(GUZ_DBG_ERR, ("%s/%s: rewind(%p) "
+ "failed\n", __func__, gp->name, sc->dcp));
goto done;
}
data += len;
@@ -307,9 +393,6 @@ g_uzip_done(struct bio *bp)
blk++;
}
- if (inflateEnd(&zs) != Z_OK)
- bp2->bio_error = EILSEQ;
-
done:
/* Finish processing the request. */
free(bp->bio_data, M_GEOM_UZIP);
@@ -330,9 +413,9 @@ g_uzip_start(struct bio *bp)
pp = bp->bio_to;
gp = pp->geom;
- DPRINTF(("%s/%s: %p: cmd=%d, offset=%jd, length=%jd, buffer=%p\n",
- __func__, gp->name, bp, bp->bio_cmd, (intmax_t)bp->bio_offset,
- (intmax_t)bp->bio_length, bp->bio_data));
+ DPRINTF(GUZ_DBG_IO, ("%s/%s: %p: cmd=%d, offset=%jd, length=%jd, "
+ "buffer=%p\n", __func__, gp->name, bp, bp->bio_cmd,
+ (intmax_t)bp->bio_offset, (intmax_t)bp->bio_length, bp->bio_data));
sc = gp->softc;
sc->req_total++;
@@ -392,6 +475,92 @@ g_uzip_spoiled(struct g_consumer *cp)
g_wither_geom(gp, ENXIO);
}
+static int
+g_uzip_parse_toc(struct g_uzip_softc *sc, struct g_provider *pp,
+ struct g_geom *gp)
+{
+ uint32_t i, j, backref_to;
+ uint64_t max_offset, min_offset;
+
+ min_offset = sizeof(struct cloop_header) +
+ (sc->nblocks + 1) * sizeof(uint64_t);
+ max_offset = sc->toc[0].offset - 1;
+ for (i = 0; i < sc->nblocks; i++) {
+ /* First do some bounds checking */
+ if ((sc->toc[i].offset < min_offset) ||
+ (sc->toc[i].offset >= pp->mediasize)) {
+ goto error_offset;
+ }
+ DPRINTF_BLK(GUZ_DBG_IO, i, ("%s: cluster #%u "
+ "sc->toc[i].offset=%ju max_offset=%ju\n", gp->name,
+ (u_int)i, (uintmax_t)sc->toc[i].offset,
+ (uintmax_t)max_offset));
+ backref_to = BLEN_UNDEF;
+ if (sc->toc[i].offset < max_offset) {
+ /*
+ * For the backref'ed blocks search already parsed
+ * TOC entries for the matching offset and copy the
+ * size from matched entry.
+ */
+ for (j = 0; j <= i; j++) {
+ if (sc->toc[j].offset == sc->toc[i].offset &&
+ !BLK_IS_NIL(sc, j)) {
+ break;
+ }
+ if (j != i) {
+ continue;
+ }
+ DPRINTF(GUZ_DBG_ERR, ("%s: cannot match "
+ "backref'ed offset at cluster #%u\n",
+ gp->name, i));
+ return (-1);
+ }
+ sc->toc[i].blen = sc->toc[j].blen;
+ backref_to = j;
+ } else {
+ /*
+ * For the "normal blocks" seek forward until we hit
+ * block whose offset is larger than ours and assume
+ * it's going to be the next one.
+ */
+ for (j = i + 1; j < sc->nblocks; j++) {
+ if (sc->toc[j].offset > max_offset) {
+ break;
+ }
+ }
+ sc->toc[i].blen = sc->toc[j].offset -
+ sc->toc[i].offset;
+ if (BLK_ENDS(sc, i) > pp->mediasize) {
+ DPRINTF(GUZ_DBG_ERR, ("%s: cluster #%u "
+ "extends past media boundary (%ju > %ju)\n",
+ gp->name, (u_int)i,
+ (uintmax_t)BLK_ENDS(sc, i),
+ (intmax_t)pp->mediasize));
+ return (-1);
+ }
+ KASSERT(max_offset <= sc->toc[i].offset, (
+ "%s: max_offset is incorrect: %ju",
+ gp->name, (uintmax_t)max_offset));
+ max_offset = BLK_ENDS(sc, i) - 1;
+ }
+ DPRINTF_BLK(GUZ_DBG_TOC, i, ("%s: cluster #%u, original %u "
+ "bytes, in %u bytes", gp->name, i, sc->blksz,
+ sc->toc[i].blen));
+ if (backref_to != BLEN_UNDEF) {
+ DPRINTF_BLK(GUZ_DBG_TOC, i, (" (->#%u)",
+ (u_int)backref_to));
+ }
+ DPRINTF_BLK(GUZ_DBG_TOC, i, ("\n"));
+ }
+ return (0);
+
+error_offset:
+ DPRINTF(GUZ_DBG_ERR, ("%s: cluster #%u: invalid offset %ju, "
+ "min_offset=%ju mediasize=%jd\n", gp->name, (u_int)i,
+ sc->toc[i].offset, min_offset, pp->mediasize));
+ return (-1);
+}
+
static struct g_geom *
g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
{
@@ -403,6 +572,10 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
struct g_geom *gp;
struct g_provider *pp2;
struct g_uzip_softc *sc;
+ enum {
+ GEOM_UZIP = 1,
+ GEOM_ULZMA
+ } type;
g_trace(G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, pp->name);
g_topology_assert();
@@ -422,10 +595,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
if (error == 0)
error = g_access(cp, 1, 0, 0);
if (error) {
- g_detach(cp);
- g_destroy_consumer(cp);
- g_destroy_geom(gp);
- return (NULL);
+ goto e1;
}
g_topology_unlock();
@@ -433,22 +603,47 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
* Read cloop header, look for CLOOP magic, perform
* other validity checks.
*/
- DPRINTF(("%s: media sectorsize %u, mediasize %jd\n",
+ DPRINTF(GUZ_DBG_INFO, ("%s: media sectorsize %u, mediasize %jd\n",
gp->name, pp->sectorsize, (intmax_t)pp->mediasize));
buf = g_read_data(cp, 0, pp->sectorsize, NULL);
if (buf == NULL)
- goto err;
+ goto e2;
header = (struct cloop_header *) buf;
if (strncmp(header->magic, CLOOP_MAGIC_START,
sizeof(CLOOP_MAGIC_START) - 1) != 0) {
- DPRINTF(("%s: no CLOOP magic\n", gp->name));
- goto err;
- }
- if (header->magic[0x0b] != 'V' || header->magic[0x0c] < '2') {
- DPRINTF(("%s: image version too old\n", gp->name));
- goto err;
+ DPRINTF(GUZ_DBG_ERR, ("%s: no CLOOP magic\n", gp->name));
+ goto e3;
}
+ switch (header->magic[CLOOP_OFS_COMPR]) {
+ case CLOOP_COMP_LZMA:
+ case CLOOP_COMP_LZMA_DDP:
+ type = GEOM_ULZMA;
+ if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_LZMA) {
+ DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
+ gp->name));
+ goto e3;
+ }
+ DPRINTF(GUZ_DBG_INFO, ("%s: GEOM_UZIP_LZMA image found\n",
+ gp->name));
+ break;
+ case CLOOP_COMP_LIBZ:
+ case CLOOP_COMP_LIBZ_DDP:
+ type = GEOM_UZIP;
+ if (header->magic[CLOOP_OFS_VERSN] < CLOOP_MINVER_ZLIB) {
+ DPRINTF(GUZ_DBG_ERR, ("%s: image version too old\n",
+ gp->name));
+ goto e3;
+ }
+ DPRINTF(GUZ_DBG_INFO, ("%s: GEOM_UZIP_ZLIB image found\n",
+ gp->name));
+ break;
+ default:
+ DPRINTF(GUZ_DBG_ERR, ("%s: unsupported image type\n",
+ gp->name));
+ goto e3;
+ }
+
/*
* Initialize softc and read offsets.
*/
@@ -459,7 +654,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
if (sc->blksz % 512 != 0) {
printf("%s: block size (%u) should be multiple of 512.\n",
gp->name, sc->blksz);
- goto err;
+ goto e4;
}
if (sc->blksz > MAX_BLKSZ) {
printf("%s: block size (%u) should not be larger than %d.\n",
@@ -470,15 +665,17 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
total_offsets * sizeof(uint64_t) > pp->mediasize) {
printf("%s: media too small for %u blocks\n",
gp->name, sc->nblocks);
- goto err;
+ goto e4;
}
- sc->offsets = malloc(
- total_offsets * sizeof(uint64_t), M_GEOM_UZIP, M_WAITOK);
+ sc->toc = malloc(total_offsets * sizeof(struct g_uzip_blk),
+ M_GEOM_UZIP, M_WAITOK | M_ZERO);
offsets_read = MIN(total_offsets,
(pp->sectorsize - sizeof(*header)) / sizeof(uint64_t));
- for (i = 0; i < offsets_read; i++)
- sc->offsets[i] = be64toh(((uint64_t *) (header + 1))[i]);
- DPRINTF(("%s: %u offsets in the first sector\n",
+ for (i = 0; i < offsets_read; i++) {
+ sc->toc[i].offset = be64toh(((uint64_t *) (header + 1))[i]);
+ sc->toc[i].blen = BLEN_UNDEF;
+ }
+ DPRINTF(GUZ_DBG_INFO, ("%s: %u offsets in the first sector\n",
gp->name, offsets_read));
for (blk = 1; offsets_read < total_offsets; blk++) {
uint32_t nread;
@@ -487,25 +684,59 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
buf = g_read_data(
cp, blk * pp->sectorsize, pp->sectorsize, NULL);
if (buf == NULL)
- goto err;
+ goto e5;
nread = MIN(total_offsets - offsets_read,
pp->sectorsize / sizeof(uint64_t));
- DPRINTF(("%s: %u offsets read from sector %d\n",
+ DPRINTF(GUZ_DBG_TOC, ("%s: %u offsets read from sector %d\n",
gp->name, nread, blk));
for (i = 0; i < nread; i++) {
- sc->offsets[offsets_read + i] =
+ sc->toc[offsets_read + i].offset =
be64toh(((uint64_t *) buf)[i]);
+ sc->toc[offsets_read + i].blen = BLEN_UNDEF;
}
offsets_read += nread;
}
free(buf, M_GEOM);
- DPRINTF(("%s: done reading offsets\n", gp->name));
+ buf = NULL;
+ offsets_read -= 1;
+ DPRINTF(GUZ_DBG_INFO, ("%s: done reading %u block offsets from %u "
+ "sectors\n", gp->name, offsets_read, blk));
+ if (sc->nblocks != offsets_read) {
+ DPRINTF(GUZ_DBG_ERR, ("%s: read %s offsets than expected "
+ "blocks\n", gp->name,
+ sc->nblocks < offsets_read ? "more" : "less"));
+ goto e5;
+ }
+ /* Massage TOC (table of contents), make sure it is sound */
+ if (g_uzip_parse_toc(sc, pp, gp) != 0) {
+ DPRINTF(GUZ_DBG_ERR, ("%s: TOC error\n", gp->name));
+ goto e5;
+ }
mtx_init(&sc->last_mtx, "geom_uzip cache", NULL, MTX_DEF);
+ mtx_init(&sc->queue_mtx, "geom_uzip wrkthread", NULL, MTX_DEF);
+ bioq_init(&sc->bio_queue);
sc->last_blk = -1;
sc->last_buf = malloc(sc->blksz, M_GEOM_UZIP, M_WAITOK);
sc->req_total = 0;
sc->req_cached = 0;
+ if (type == GEOM_UZIP) {
+ sc->dcp = g_uzip_zlib_ctor(sc->blksz);
+ } else {
+ sc->dcp = g_uzip_lzma_ctor(sc->blksz);
+ }
+ if (sc->dcp == NULL) {
+ goto e6;
+ }
+
+ sc->uzip_do = &g_uzip_do;
+
+ error = kproc_create(g_uzip_wrkthr, sc, &sc->procp, 0, 0, "%s",
+ gp->name);
+ if (error != 0) {
+ goto e7;
+ }
+
g_topology_lock();
pp2 = g_new_providerf(gp, "%s", gp->name);
pp2->sectorsize = 512;
@@ -515,22 +746,31 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
g_error_provider(pp2, 0);
g_access(cp, -1, 0, 0);
- DPRINTF(("%s: taste ok (%d, %jd), (%d, %d), %x\n",
- gp->name,
- pp2->sectorsize, (intmax_t)pp2->mediasize,
+ DPRINTF(GUZ_DBG_INFO, ("%s: taste ok (%d, %jd), (%d, %d), %x\n",
+ gp->name, pp2->sectorsize, (intmax_t)pp2->mediasize,
pp2->stripeoffset, pp2->stripesize, pp2->flags));
- DPRINTF(("%s: %u x %u blocks\n", gp->name, sc->nblocks, sc->blksz));
+ DPRINTF(GUZ_DBG_INFO, ("%s: %u x %u blocks\n", gp->name, sc->nblocks,
+ sc->blksz));
return (gp);
-err:
- g_topology_lock();
- g_access(cp, -1, 0, 0);
- if (buf != NULL)
+e7:
+ sc->dcp->free(sc->dcp);
+e6:
+ free(sc->last_buf, M_GEOM);
+ mtx_destroy(&sc->queue_mtx);
+ mtx_destroy(&sc->last_mtx);
+e5:
+ free(sc->toc, M_GEOM);
+e4:
+ free(gp->softc, M_GEOM_UZIP);
+e3:
+ if (buf != NULL) {
free(buf, M_GEOM);
- if (gp->softc != NULL) {
- g_uzip_softc_free(gp->softc, NULL);
- gp->softc = NULL;
}
+e2:
+ g_topology_lock();
+ g_access(cp, -1, 0, 0);
+e1:
g_detach(cp);
g_destroy_consumer(cp);
g_destroy_geom(gp);
@@ -547,7 +787,8 @@ g_uzip_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)
g_topology_assert();
if (gp->softc == NULL) {
- DPRINTF(("%s(%s): gp->softc == NULL\n", __func__, gp->name));
+ DPRINTF(GUZ_DBG_ERR, ("%s(%s): gp->softc == NULL\n", __func__,
+ gp->name));
return (ENXIO);
}
diff --git a/sys/geom/uzip/g_uzip.h b/sys/geom/uzip/g_uzip.h
new file mode 100644
index 0000000..6decc41
--- /dev/null
+++ b/sys/geom/uzip/g_uzip.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+#ifndef __GEOM_G_UZIP_H__
+#define __GEOM_G_UZIP_H__
+
+MALLOC_DECLARE(M_GEOM_UZIP);
+
+#define DEFINE_RAW_METHOD(func, rval, args...) typedef rval (*func##_t)(args)
+
+#endif /* __GEOM_G_UZIP_H__ */
diff --git a/sys/geom/uzip/g_uzip_cloop.h b/sys/geom/uzip/g_uzip_cloop.h
new file mode 100644
index 0000000..219a7b6
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_cloop.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+/* CLOOP format and related constants */
+
+/*
+ * Integer values (block size, number of blocks, offsets)
+ * are stored in big-endian (network) order on disk.
+ */
+
+#define CLOOP_MAGIC_LEN 128
+#define CLOOP_OFS_COMPR 0x0b
+#define CLOOP_OFS_VERSN (CLOOP_OFS_COMPR + 1)
+
+#define CLOOP_MAJVER_2 '2'
+#define CLOOP_MAJVER_3 '3'
+
+#define CLOOP_COMP_LIBZ 'V'
+#define CLOOP_COMP_LIBZ_DDP 'v'
+#define CLOOP_COMP_LZMA 'L'
+#define CLOOP_COMP_LZMA_DDP 'l'
+
+#define CLOOP_MINVER_LZMA CLOOP_MAJVER_3
+#define CLOOP_MINVER_ZLIB CLOOP_MAJVER_2
+
+struct cloop_header {
+ char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
+ uint32_t blksz; /* block size */
+ uint32_t nblocks; /* number of blocks */
+};
diff --git a/sys/geom/uzip/g_uzip_dapi.h b/sys/geom/uzip/g_uzip_dapi.h
new file mode 100644
index 0000000..0689c32
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_dapi.h
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+struct g_uzip_dapi;
+
+DEFINE_RAW_METHOD(g_uzip_dapi_decompress, int, struct g_uzip_dapi *,
+ const char *, void *, size_t, void *);
+DEFINE_RAW_METHOD(g_uzip_dapi_free, void, struct g_uzip_dapi *);
+DEFINE_RAW_METHOD(g_uzip_dapi_rewind, int, struct g_uzip_dapi *, const char *);
+
+struct g_uzip_dapi {
+ g_uzip_dapi_decompress_t decompress;
+ g_uzip_dapi_free_t free;
+ g_uzip_dapi_rewind_t rewind;
+ void *pvt;
+};
diff --git a/sys/geom/uzip/g_uzip_lzma.c b/sys/geom/uzip/g_uzip_lzma.c
new file mode 100644
index 0000000..0a981ba
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_lzma.c
@@ -0,0 +1,111 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/malloc.h>
+
+#include <contrib/xz-embedded/linux/include/linux/xz.h>
+
+#include <geom/uzip/g_uzip.h>
+#include <geom/uzip/g_uzip_dapi.h>
+#include <geom/uzip/g_uzip_lzma.h>
+
+struct g_uzip_lzma {
+ struct g_uzip_dapi pub;
+ /* XZ decoder structs */
+ struct xz_buf b;
+ struct xz_dec *s;
+};
+
+static int g_uzip_lzma_nop(struct g_uzip_dapi *, const char *);
+
+static void
+g_uzip_lzma_free(struct g_uzip_dapi *lzpp)
+{
+ struct g_uzip_lzma *lzp;
+
+ lzp = (struct g_uzip_lzma *)lzpp->pvt;
+ if (lzp->s != NULL) {
+ xz_dec_end(lzp->s);
+ lzp->s = NULL;
+ }
+
+ free(lzp, M_GEOM_UZIP);
+}
+
+static int
+g_uzip_lzma_decompress(struct g_uzip_dapi *lzpp, const char *gp_name,
+ void *ibp, size_t ilen, void *obp)
+{
+ struct g_uzip_lzma *lzp;
+ int err;
+
+ lzp = (struct g_uzip_lzma *)lzpp->pvt;
+
+ lzp->b.in = ibp;
+ lzp->b.out = obp;
+ lzp->b.in_pos = lzp->b.out_pos = 0;
+ lzp->b.in_size = ilen;
+ lzp->b.out_size = (size_t)-1;
+ err = (xz_dec_run(lzp->s, &lzp->b) != XZ_STREAM_END) ? 1 : 0;
+ /* TODO decoder recovery, if needed */
+
+ return (err);
+}
+
+struct g_uzip_dapi *
+g_uzip_lzma_ctor(uint32_t blksz)
+{
+ struct g_uzip_lzma *lzp;
+
+ lzp = malloc(sizeof(struct g_uzip_lzma), M_GEOM_UZIP, M_WAITOK);
+ xz_crc32_init();
+ lzp->s = xz_dec_init(XZ_SINGLE, 0);
+ if (lzp->s == NULL) {
+ goto e1;
+ }
+ lzp->pub.decompress = &g_uzip_lzma_decompress;
+ lzp->pub.free = &g_uzip_lzma_free;
+ lzp->pub.rewind = &g_uzip_lzma_nop;
+ lzp->pub.pvt = lzp;
+ return (&lzp->pub);
+e1:
+ free(lzp, M_GEOM_UZIP);
+ return (NULL);
+}
+
+static int
+g_uzip_lzma_nop(struct g_uzip_dapi *zpp, const char *gp_name)
+{
+
+ return (0);
+}
diff --git a/sys/geom/uzip/g_uzip_lzma.h b/sys/geom/uzip/g_uzip_lzma.h
new file mode 100644
index 0000000..f9f8a27
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_lzma.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * Copyright (c) 2010-2012 Aleksandr Rybalko
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+struct g_uzip_dapi *g_uzip_lzma_ctor(uint32_t);
diff --git a/sys/geom/uzip/g_uzip_softc.h b/sys/geom/uzip/g_uzip_softc.h
new file mode 100644
index 0000000..1d12ac0
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_softc.h
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+struct g_uzip_softc;
+struct bio;
+
+DEFINE_RAW_METHOD(g_uzip_do, void, struct g_uzip_softc *, struct bio *);
+
+struct g_uzip_softc {
+ uint32_t blksz; /* block size */
+ uint32_t nblocks; /* number of blocks */
+ struct g_uzip_blk *toc; /* table of contents */
+
+ struct mtx last_mtx;
+ uint32_t last_blk; /* last blk no */
+ char *last_buf; /* last blk data */
+ int req_total; /* total requests */
+ int req_cached; /* cached requests */
+ struct g_uzip_dapi *dcp; /* decompressor instance */
+
+ g_uzip_do_t uzip_do;
+
+ struct proc *procp;
+ struct bio_queue_head bio_queue;
+ struct mtx queue_mtx;
+ unsigned wrkthr_flags;
+#define GUZ_SHUTDOWN (0x1 << 0)
+#define GUZ_EXITING (0x1 << 1)
+};
diff --git a/sys/geom/uzip/g_uzip_wrkthr.c b/sys/geom/uzip/g_uzip_wrkthr.c
new file mode 100644
index 0000000..ad24cb8
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_wrkthr.c
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/bio.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/kthread.h>
+#include <sys/malloc.h>
+
+#include <geom/uzip/g_uzip.h>
+#include <geom/uzip/g_uzip_softc.h>
+#include <geom/uzip/g_uzip_wrkthr.h>
+
+void
+g_uzip_wrkthr(void *arg)
+{
+ struct g_uzip_softc *sc;
+ struct bio *bp;
+
+ sc = (struct g_uzip_softc *)arg;
+ thread_lock(curthread);
+ sched_prio(curthread, PRIBIO);
+ thread_unlock(curthread);
+
+ for (;;) {
+ mtx_lock(&sc->queue_mtx);
+ if (sc->wrkthr_flags & GUZ_SHUTDOWN) {
+ sc->wrkthr_flags |= GUZ_EXITING;
+ mtx_unlock(&sc->queue_mtx);
+ kproc_exit(0);
+ }
+ bp = bioq_takefirst(&sc->bio_queue);
+ if (!bp) {
+ msleep(sc, &sc->queue_mtx, PRIBIO | PDROP,
+ "wrkwait", 0);
+ continue;
+ }
+ mtx_unlock(&sc->queue_mtx);
+ sc->uzip_do(sc, bp);
+ }
+}
diff --git a/usr.bin/truss/cloudabi.h b/sys/geom/uzip/g_uzip_wrkthr.h
index abc8c0c..8492378 100644
--- a/usr.bin/truss/cloudabi.h
+++ b/sys/geom/uzip/g_uzip_wrkthr.h
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,4 +26,5 @@
* $FreeBSD$
*/
-long cloudabi_convert_errno(long);
+void g_uzip_wrkthr(void *);
+
diff --git a/sys/geom/uzip/g_uzip_zlib.c b/sys/geom/uzip/g_uzip_zlib.c
new file mode 100644
index 0000000..cecac6e
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_zlib.c
@@ -0,0 +1,137 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+
+#include <sys/zlib.h>
+
+#include <geom/uzip/g_uzip.h>
+#include <geom/uzip/g_uzip_dapi.h>
+#include <geom/uzip/g_uzip_zlib.h>
+
+struct g_uzip_zlib {
+ uint32_t blksz;
+ struct g_uzip_dapi pub;
+ /* Zlib decoder structs */
+ z_stream zs;
+};
+
+static void *z_alloc(void *, u_int, u_int);
+static void z_free(void *, void *);
+static int g_uzip_zlib_rewind(struct g_uzip_dapi *, const char *);
+
+static void
+g_uzip_zlib_free(struct g_uzip_dapi *zpp)
+{
+ struct g_uzip_zlib *zp;
+
+ zp = (struct g_uzip_zlib *)zpp->pvt;
+ inflateEnd(&zp->zs);
+ free(zp, M_GEOM_UZIP);
+}
+
+static int
+g_uzip_zlib_decompress(struct g_uzip_dapi *zpp, const char *gp_name, void *ibp,
+ size_t ilen, void *obp)
+{
+ int err;
+ struct g_uzip_zlib *zp;
+
+ zp = (struct g_uzip_zlib *)zpp->pvt;
+
+ zp->zs.next_in = ibp;
+ zp->zs.avail_in = ilen;
+ zp->zs.next_out = obp;
+ zp->zs.avail_out = zp->blksz;
+
+ err = (inflate(&zp->zs, Z_FINISH) != Z_STREAM_END) ? 1 : 0;
+ if (err != 0) {
+ printf("%s: UZIP(zlib) inflate() failed\n", gp_name);
+ }
+ return (err);
+}
+
+static int
+g_uzip_zlib_rewind(struct g_uzip_dapi *zpp, const char *gp_name)
+{
+ int err;
+ struct g_uzip_zlib *zp;
+
+ zp = (struct g_uzip_zlib *)zpp->pvt;
+
+ err = 0;
+ if (inflateReset(&zp->zs) != Z_OK) {
+ printf("%s: UZIP(zlib) decoder reset failed\n", gp_name);
+ err = 1;
+ }
+ return (err);
+}
+
+struct g_uzip_dapi *
+g_uzip_zlib_ctor(uint32_t blksz)
+{
+ struct g_uzip_zlib *zp;
+
+ zp = malloc(sizeof(struct g_uzip_zlib), M_GEOM_UZIP, M_WAITOK);
+ zp->zs.zalloc = z_alloc;
+ zp->zs.zfree = z_free;
+ if (inflateInit(&zp->zs) != Z_OK) {
+ goto e1;
+ }
+ zp->blksz = blksz;
+ zp->pub.decompress = &g_uzip_zlib_decompress;
+ zp->pub.free = &g_uzip_zlib_free;
+ zp->pub.rewind = &g_uzip_zlib_rewind;
+ zp->pub.pvt = (void *)zp;
+ return (&zp->pub);
+e1:
+ free(zp, M_GEOM_UZIP);
+ return (NULL);
+}
+
+static void *
+z_alloc(void *nil, u_int type, u_int size)
+{
+ void *ptr;
+
+ ptr = malloc(type * size, M_GEOM_UZIP, M_NOWAIT);
+
+ return (ptr);
+}
+
+static void
+z_free(void *nil, void *ptr)
+{
+
+ free(ptr, M_GEOM_UZIP);
+}
diff --git a/sys/geom/uzip/g_uzip_zlib.h b/sys/geom/uzip/g_uzip_zlib.h
new file mode 100644
index 0000000..7a767b8
--- /dev/null
+++ b/sys/geom/uzip/g_uzip_zlib.h
@@ -0,0 +1,33 @@
+/*-
+ * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
+ * Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+struct g_geom;
+
+struct g_uzip_dapi *g_uzip_zlib_ctor(uint32_t);
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 2ee260d..60c8b7e 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -422,7 +422,7 @@ sysctl_hostid(SYSCTL_HANDLER_ARGS)
}
SYSCTL_PROC(_kern, KERN_HOSTID, hostid,
- CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE,
+ CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_PRISON | CTLFLAG_MPSAFE | CTLFLAG_CAPRD,
NULL, 0, sysctl_hostid, "LU", "Host ID");
/*
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index e455b10..609151d 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -354,7 +354,7 @@ uipc_abort(struct socket *so)
unp2 = unp->unp_conn;
if (unp2 != NULL) {
UNP_PCB_LOCK(unp2);
- unp_drop(unp2, ECONNABORTED);
+ unp_drop(unp2, ECONNRESET);
UNP_PCB_UNLOCK(unp2);
}
UNP_PCB_UNLOCK(unp);
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ff2ad21..bfed116 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -171,7 +171,7 @@ SYSCTL_ULONG(_debug, OID_AUTO, numcache, CTLFLAG_RD, &numcache, 0,
static u_long numcachehv; /* number of cache entries with vnodes held */
SYSCTL_ULONG(_debug, OID_AUTO, numcachehv, CTLFLAG_RD, &numcachehv, 0,
"Number of namecache entries with vnodes held");
-static u_int ncsizefactor = 2;
+u_int ncsizefactor = 2;
SYSCTL_UINT(_vfs, OID_AUTO, ncsizefactor, CTLFLAG_RW, &ncsizefactor, 0,
"Size factor for namecache");
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index eaa4980..245adbc 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -407,6 +407,27 @@ vnode_fini(void *mem, int size)
rw_destroy(BO_LOCKPTR(bo));
}
+/*
+ * Provide the size of NFS nclnode and NFS fh for calculation of the
+ * vnode memory consumption. The size is specified directly to
+ * eliminate dependency on NFS-private header.
+ *
+ * Other filesystems may use bigger or smaller (like UFS and ZFS)
+ * private inode data, but the NFS-based estimation is ample enough.
+ * Still, we care about differences in the size between 64- and 32-bit
+ * platforms.
+ *
+ * Namecache structure size is heuristically
+ * sizeof(struct namecache_ts) + CACHE_PATH_CUTOFF + 1.
+ */
+#ifdef _LP64
+#define NFS_NCLNODE_SZ (528 + 64)
+#define NC_SZ 148
+#else
+#define NFS_NCLNODE_SZ (360 + 32)
+#define NC_SZ 92
+#endif
+
static void
vntblinit(void *dummy __unused)
{
@@ -422,12 +443,12 @@ vntblinit(void *dummy __unused)
* marginal ratio of desiredvnodes to the physical memory size is
* 1:64. However, desiredvnodes is limited by the kernel's heap
* size. The memory required by desiredvnodes vnodes and vm objects
- * must not exceed 1/7th of the kernel's heap size.
+ * must not exceed 1/10th of the kernel's heap size.
*/
physvnodes = maxproc + pgtok(vm_cnt.v_page_count) / 64 +
3 * min(98304 * 16, pgtok(vm_cnt.v_page_count)) / 64;
- virtvnodes = vm_kmem_size / (7 * (sizeof(struct vm_object) +
- sizeof(struct vnode)));
+ virtvnodes = vm_kmem_size / (10 * (sizeof(struct vm_object) +
+ sizeof(struct vnode) + NC_SZ * ncsizefactor + NFS_NCLNODE_SZ));
desiredvnodes = min(physvnodes, virtvnodes);
if (desiredvnodes > MAXVNODES_MAX) {
if (bootverbose)
diff --git a/sys/mips/conf/ALFA_HORNET_UB b/sys/mips/conf/ALFA_HORNET_UB
index 1986ec5..99e8c81 100644
--- a/sys/mips/conf/ALFA_HORNET_UB
+++ b/sys/mips/conf/ALFA_HORNET_UB
@@ -49,11 +49,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/AP121 b/sys/mips/conf/AP121
index cc49be0..3ffbd79 100644
--- a/sys/mips/conf/AP121
+++ b/sys/mips/conf/AP121
@@ -43,11 +43,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/AP135 b/sys/mips/conf/AP135
index 2807528..11c73ea 100644
--- a/sys/mips/conf/AP135
+++ b/sys/mips/conf/AP135
@@ -46,8 +46,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -64,7 +64,7 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
diff --git a/sys/mips/conf/AP143 b/sys/mips/conf/AP143
index 7cf72b8..021d972 100644
--- a/sys/mips/conf/AP143
+++ b/sys/mips/conf/AP143
@@ -43,11 +43,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/AP91 b/sys/mips/conf/AP91
index 58e7073..c5e6c56 100644
--- a/sys/mips/conf/AP91
+++ b/sys/mips/conf/AP91
@@ -38,9 +38,9 @@ options NO_SWAPPING
# options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Not enough space for these..
nooptions INVARIANTS
diff --git a/sys/mips/conf/AP93 b/sys/mips/conf/AP93
index b53bb74..927bf7f 100644
--- a/sys/mips/conf/AP93
+++ b/sys/mips/conf/AP93
@@ -26,9 +26,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/AP96 b/sys/mips/conf/AP96
index ae7f912..30d1ff8 100644
--- a/sys/mips/conf/AP96
+++ b/sys/mips/conf/AP96
@@ -27,9 +27,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/CARAMBOLA2 b/sys/mips/conf/CARAMBOLA2
index b5b419a..033f37b 100644
--- a/sys/mips/conf/CARAMBOLA2
+++ b/sys/mips/conf/CARAMBOLA2
@@ -45,11 +45,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/DB120 b/sys/mips/conf/DB120
index 0924d25..a491a22 100644
--- a/sys/mips/conf/DB120
+++ b/sys/mips/conf/DB120
@@ -38,8 +38,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -51,4 +51,4 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/DIR-655A1 b/sys/mips/conf/DIR-655A1
index 22004f6..4b66b91 100644
--- a/sys/mips/conf/DIR-655A1
+++ b/sys/mips/conf/DIR-655A1
@@ -41,8 +41,8 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -52,7 +52,7 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
diff --git a/sys/mips/conf/DIR-825B1 b/sys/mips/conf/DIR-825B1
index 40dcbf5..3385c6b 100644
--- a/sys/mips/conf/DIR-825B1
+++ b/sys/mips/conf/DIR-825B1
@@ -54,11 +54,11 @@ options NO_SYSCTL_DESCR
# GEOM modules
device geom_map # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem hackery!
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem hackery!
+options GEOM_UZIP
options GEOM_PART_GPT
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_REALMEM=64*1024*1024
options AR71XX_ENV_UBOOT
diff --git a/sys/mips/conf/DIR-825C1 b/sys/mips/conf/DIR-825C1
index 2721962..c95b2aa 100644
--- a/sys/mips/conf/DIR-825C1
+++ b/sys/mips/conf/DIR-825C1
@@ -48,7 +48,7 @@ options AR71XX_ENV_UBOOT
device geom_map
# uzip - to boot natively from flash
-options GEOM_UNCOMPRESS
+options GEOM_UZIP
options GEOM_PART_GPT
# yes, this board has a PCI connected atheros device
@@ -58,11 +58,11 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# In order to netboot, you have to build the mfsroot into the kernel
# 19443712 or 19M is the biggest rootfs via netboot this thing supports
#options MD_ROOT # md device usable as a potential root device
#options MD_ROOT_SIZE=19444
#makeoptions MFS_IMAGE=/tftpboot/mfsroot-dir825c1.img.ulzma
-#options ROOTDEVNAME=\"ufs:md0.uncompress\"
+#options ROOTDEVNAME=\"ufs:md0.uzip\"
diff --git a/sys/mips/conf/ENH200 b/sys/mips/conf/ENH200
index bece380..f9d8c0d 100644
--- a/sys/mips/conf/ENH200
+++ b/sys/mips/conf/ENH200
@@ -26,9 +26,9 @@ options AR71XX_ENV_UBOOT
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Used for the static uboot partition map
device geom_map
diff --git a/sys/mips/conf/MT7620 b/sys/mips/conf/MT7620
index 4c4c18a..d915517 100644
--- a/sys/mips/conf/MT7620
+++ b/sys/mips/conf/MT7620
@@ -65,7 +65,7 @@ options PSEUDOFS #Pseudo-filesystem framework
#options BOOTP_WIRED_TO=rt0
#options BOOTP_COMPAT
#options CD9660 # ISO 9660 Filesystem
-#options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
+#options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uzip\"
#options TMPFS # TMP Memory Filesystem
options FFS #Berkeley Fast Filesystem
@@ -93,7 +93,7 @@ options FFS #Berkeley Fast Filesystem
options MROUTING # Multicast routing
options IPFIREWALL_DEFAULT_TO_ACCEPT
-options GEOM_UNCOMPRESS
+options GEOM_UZIP
options MD_ROOT
options ROOTDEVNAME=\"ufs:da0s1\"
diff --git a/sys/mips/conf/ONIONOMEGA b/sys/mips/conf/ONIONOMEGA
index 8b3ec46..cdc5c1f 100644
--- a/sys/mips/conf/ONIONOMEGA
+++ b/sys/mips/conf/ONIONOMEGA
@@ -45,11 +45,11 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/PB47 b/sys/mips/conf/PB47
index 8386365..0fe8c82 100644
--- a/sys/mips/conf/PB47
+++ b/sys/mips/conf/PB47
@@ -32,11 +32,11 @@ options AR71XX_REALMEM=64*1024*1024
options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92
index 9ed14e3..6176668 100644
--- a/sys/mips/conf/PB92
+++ b/sys/mips/conf/PB92
@@ -54,9 +54,9 @@ options FFS #Berkeley Fast Filesystem
#options UFS_DIRHASH #Improve performance on big directories
# Support uncompress lzma rootfs
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# PCI bus
device pci
diff --git a/sys/mips/conf/PICOSTATION_M2HP b/sys/mips/conf/PICOSTATION_M2HP
index 3e738e6..aa821ad 100644
--- a/sys/mips/conf/PICOSTATION_M2HP
+++ b/sys/mips/conf/PICOSTATION_M2HP
@@ -38,9 +38,9 @@ options NO_SWAPPING
# options MSDOSFS
# uncompress - to boot read-only lzma natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+device geom_uzip
+options GEOM_UZIP
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
# Not enough space for these..
nooptions INVARIANTS
diff --git a/sys/mips/conf/ROUTERSTATION b/sys/mips/conf/ROUTERSTATION
index 41adccd..3dceace 100644
--- a/sys/mips/conf/ROUTERSTATION
+++ b/sys/mips/conf/ROUTERSTATION
@@ -14,8 +14,8 @@ hints "ROUTERSTATION.hints"
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem support
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem support
+options GEOM_UZIP
# For DOS
options MSDOSFS
@@ -27,4 +27,4 @@ device etherswitch
device ukswitch
# Boot path - redboot MFS
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
diff --git a/sys/mips/conf/RSPRO b/sys/mips/conf/RSPRO
index 43d87b6..fa28cee 100644
--- a/sys/mips/conf/RSPRO
+++ b/sys/mips/conf/RSPRO
@@ -15,8 +15,8 @@ device pcf2123_rtc
# GEOM modules
device geom_redboot # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem support
-options GEOM_UNCOMPRESS
+device geom_uzip # compressed in-memory filesystem support
+options GEOM_UZIP
# For DOS
options MSDOSFS
@@ -28,5 +28,5 @@ device etherswitch
device arswitch
# Boot off of flash
-options ROOTDEVNAME=\"ufs:redboot/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:redboot/rootfs.uzip\"
diff --git a/sys/mips/conf/RT305X b/sys/mips/conf/RT305X
index e5e26f5..ca38c72 100644
--- a/sys/mips/conf/RT305X
+++ b/sys/mips/conf/RT305X
@@ -64,7 +64,7 @@ options BOOTP_NFSV3
options BOOTP_WIRED_TO=rt0
options BOOTP_COMPAT
options CD9660 # ISO 9660 Filesystem
-options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"cd9660:/dev/map/rootfs.uzip\"
options TMPFS # TMP Memory Filesystem
#options FFS #Berkeley Fast Filesystem
diff --git a/sys/mips/conf/RT5350 b/sys/mips/conf/RT5350
index b6ec20b..f897178 100644
--- a/sys/mips/conf/RT5350
+++ b/sys/mips/conf/RT5350
@@ -67,10 +67,10 @@ options TMPFS # TMP Memory Filesystem
options FFS #Berkeley Fast Filesystem
#options ROOTDEVNAME=\"nfs:193.178.153.200:/bsdmips\"
-#device geom_uncompress
-#options GEOM_UNCOMPRESS
+#device geom_uzip
+#options GEOM_UZIP
#options MD_ROOT
-#options ROOTDEVNAME=\"ufs:md0.uncompress\"
+#options ROOTDEVNAME=\"ufs:md0.uzip\"
# Options for making kernel less hangry
makeoptions INLINE_LIMIT=1024
diff --git a/sys/mips/conf/TL-ARCHERC7V2 b/sys/mips/conf/TL-ARCHERC7V2
index 21f26a4..cedd823 100644
--- a/sys/mips/conf/TL-ARCHERC7V2
+++ b/sys/mips/conf/TL-ARCHERC7V2
@@ -46,8 +46,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -64,7 +64,7 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
diff --git a/sys/mips/conf/TL-WDR4300 b/sys/mips/conf/TL-WDR4300
index 3c79744..e091526 100644
--- a/sys/mips/conf/TL-WDR4300
+++ b/sys/mips/conf/TL-WDR4300
@@ -38,8 +38,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -51,4 +51,4 @@ device firmware # Used by the above
options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
diff --git a/sys/mips/conf/TL-WR1043NDv2 b/sys/mips/conf/TL-WR1043NDv2
index 2bcde0c..53a5847 100644
--- a/sys/mips/conf/TL-WR1043NDv2
+++ b/sys/mips/conf/TL-WR1043NDv2
@@ -34,8 +34,8 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
@@ -47,7 +47,7 @@ device geom_map
#options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT
diff --git a/sys/mips/conf/TL-WR740Nv4 b/sys/mips/conf/TL-WR740Nv4
index 5257dd9..59bf73e 100644
--- a/sys/mips/conf/TL-WR740Nv4
+++ b/sys/mips/conf/TL-WR740Nv4
@@ -43,13 +43,13 @@ device arswitch
options AR71XX_ENV_UBOOT
# uzip - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-# options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+# options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# Note: we don't fit in 4MB flash, so the rootfs must be on USB for now
options ROOTDEVNAME=\"ufs:da0\"
diff --git a/sys/mips/conf/TP-WN1043ND b/sys/mips/conf/TP-WN1043ND
index c5832a2..7866de3 100644
--- a/sys/mips/conf/TP-WN1043ND
+++ b/sys/mips/conf/TP-WN1043ND
@@ -37,14 +37,14 @@ options MSDOSFS
options AR71XX_ENV_UBOOT
# uncompress - to boot natively from flash
-device geom_uncompress
-options GEOM_UNCOMPRESS
+device geom_uzip
+options GEOM_UZIP
# Used for the static uboot partition map
device geom_map
# Boot off of the rootfs, as defined in the geom_map setup.
-options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
# We bite the performance overhead for now; the kernel won't
# fit if the mutexes are inlined.
diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index 90c5dc6..c059dbb 100644
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -26,9 +26,9 @@ options BOOTVERBOSE
# GEOM modules
device geom_map # to get access to the SPI flash partitions
-device geom_uncompress # compressed in-memory filesystem hackery!
+device geom_uzip # compressed in-memory filesystem hackery!
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
diff --git a/sys/mips/conf/WZR-HPAG300H b/sys/mips/conf/WZR-HPAG300H
index 7d01b6d..dcb36f5 100644
--- a/sys/mips/conf/WZR-HPAG300H
+++ b/sys/mips/conf/WZR-HPAG300H
@@ -25,10 +25,10 @@ options AR71XX_ENV_UBOOT
options BOOTVERBOSE
# GEOM modules
-device geom_uncompress # compressed in-memory filesystem hackery!
+device geom_uzip # compressed in-memory filesystem hackery!
device geom_map # to get access to the SPI flash partitions
-options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
+options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash
options ATH_EEPROM_FIRMWARE # Use EEPROM from flash
diff --git a/sys/modules/filemon/Makefile.depend b/sys/modules/filemon/Makefile.depend
index 9873a17..f80275d 100644
--- a/sys/modules/filemon/Makefile.depend
+++ b/sys/modules/filemon/Makefile.depend
@@ -8,6 +8,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-filemon.o: opt_compat.h
-filemon.po: opt_compat.h
.endif
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
index f54a3e8..8d7e3c6 100644
--- a/sys/modules/geom/Makefile
+++ b/sys/modules/geom/Makefile
@@ -21,7 +21,6 @@ SUBDIR= geom_bde \
geom_sched \
geom_shsec \
geom_stripe \
- geom_uncompress \
geom_uzip \
geom_vinum \
geom_virstor \
diff --git a/sys/modules/geom/geom_uncompress/Makefile b/sys/modules/geom/geom_uncompress/Makefile
deleted file mode 100644
index 1bebeb5..0000000
--- a/sys/modules/geom/geom_uncompress/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../geom/uncompress \
- ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \
- ${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ \
- ${.CURDIR}/../../../contrib/xz-embedded/linux/include/linux/ \
- ${.CURDIR}/../../../net
-
-KMOD= geom_uncompress
-CFLAGS+= -I${.CURDIR}/../../../geom/uncompress/ \
- -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \
- -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/
-SRCS= g_uncompress.c xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \
- xz_malloc.c
-SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile
index 3efeb80..a336f63 100644
--- a/sys/modules/geom/geom_uzip/Makefile
+++ b/sys/modules/geom/geom_uzip/Makefile
@@ -3,7 +3,20 @@
.PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net
KMOD= geom_uzip
-SRCS= g_uzip.c
+SRCS= g_uzip.c g_uzip_zlib.c g_uzip_lzma.c g_uzip_wrkthr.c
+SRCS+= g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \
+ g_uzip_wrkthr.h
#CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS
+.PATH: ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \
+ ${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ \
+ ${.CURDIR}/../../../contrib/xz-embedded/linux/include/linux/ \
+ ${.CURDIR}/../../../net
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \
+ -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/
+SRCS+= xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \
+ xz_malloc.c
+SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h
+
.include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index f94e441..c1b6d4f 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../dev/hyperv/utilities
KMOD= hv_utils
-SRCS= hv_util.c hv_kvp.c
+SRCS= hv_util.c hv_kvp.c hv_timesync.c hv_shutdown.c hv_heartbeat.c
SRCS+= bus_if.h device_if.h
CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 82cfccf..6ac3655 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -2683,7 +2683,6 @@ ieee80211_node_leave(struct ieee80211_node *ni)
IEEE80211_LOCK(ic);
IEEE80211_AID_CLR(vap, ni->ni_associd);
- ni->ni_associd = 0;
vap->iv_sta_assoc--;
ic->ic_sta_assoc--;
diff --git a/sys/netinet/tcp_stacks/fastpath.c b/sys/netinet/tcp_stacks/fastpath.c
index 6af9212..2cf7895 100644
--- a/sys/netinet/tcp_stacks/fastpath.c
+++ b/sys/netinet/tcp_stacks/fastpath.c
@@ -2453,4 +2453,4 @@ static moduledata_t new_tcp_fastpaths = {
};
MODULE_VERSION(kern_tcpfastpaths, 1);
-DECLARE_MODULE(kern_tcpfastpaths, new_tcp_fastpaths, SI_SUB_PSEUDO, SI_ORDER_ANY);
+DECLARE_MODULE(kern_tcpfastpaths, new_tcp_fastpaths, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY);
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index e6fdb7d..ddbd129 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -263,9 +263,20 @@ static struct tcp_function_block tcp_def_funcblk = {
0
};
+int t_functions_inited = 0;
struct tcp_funchead t_functions;
static struct tcp_function_block *tcp_func_set_ptr = &tcp_def_funcblk;
+static void
+init_tcp_functions(void)
+{
+ if (t_functions_inited == 0) {
+ TAILQ_INIT(&t_functions);
+ rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0);
+ t_functions_inited = 1;
+ }
+}
+
static struct tcp_function_block *
find_tcp_functions_locked(struct tcp_function_set *fs)
{
@@ -503,6 +514,9 @@ register_tcp_functions(struct tcp_function_block *blk, int wait)
struct tcp_function *n;
struct tcp_function_set fs;
+ if (t_functions_inited == 0) {
+ init_tcp_functions();
+ }
if ((blk->tfb_tcp_output == NULL) ||
(blk->tfb_tcp_do_segment == NULL) ||
(blk->tfb_tcp_ctloutput == NULL) ||
@@ -681,8 +695,7 @@ tcp_init(void)
tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT;
tcp_tcbhashsize = hashsize;
/* Setup the tcp function block list */
- TAILQ_INIT(&t_functions);
- rw_init_flags(&tcp_function_lock, "tcp_func_lock" , 0);
+ init_tcp_functions();
register_tcp_functions(&tcp_def_funcblk, M_WAITOK);
if (tcp_soreceive_stream) {
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 176fc97..daae99e 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -1009,6 +1009,7 @@ sctp6_getaddr(struct socket *so, struct sockaddr **addr)
stcb = LIST_FIRST(&inp->sctp_asoc_list);
if (stcb == NULL) {
SCTP_INP_RUNLOCK(inp);
+ SCTP_FREE_SONAME(sin6);
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, ENOENT);
return (ENOENT);
}
@@ -1028,6 +1029,7 @@ sctp6_getaddr(struct socket *so, struct sockaddr **addr)
if ((!fnd) || (sin_a6 == NULL)) {
/* punt */
SCTP_INP_RUNLOCK(inp);
+ SCTP_FREE_SONAME(sin6);
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, ENOENT);
return (ENOENT);
}
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 01c589e..85b6e79 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -7204,8 +7204,7 @@ key_parse(struct mbuf *m, struct socket *so)
orglen = PFKEY_UNUNIT64(msg->sadb_msg_len);
target = KEY_SENDUP_ONE;
- if ((m->m_flags & M_PKTHDR) == 0 ||
- m->m_pkthdr.len != m->m_pkthdr.len) {
+ if ((m->m_flags & M_PKTHDR) == 0 || m->m_pkthdr.len != orglen) {
ipseclog((LOG_DEBUG, "%s: invalid message length.\n",__func__));
PFKEYSTAT_INC(out_invlen);
error = EINVAL;
diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index 750c812..2d0d2f4 100644
--- a/sys/netpfil/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -1711,7 +1711,7 @@ do { \
break;
/* DSCP bitmask is stored as low_u32 high_u32 */
- if (x > 32)
+ if (x >= 32)
match = *(p + 1) & (1 << (x - 32));
else
match = *p & (1 << x);
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c
index 717e98a..f67aa29 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.c
+++ b/sys/powerpc/mpc85xx/mpc85xx.c
@@ -157,7 +157,8 @@ law_find_free(void)
return (i);
}
-#define _LAW_SR(trgt,size) (0x80000000 | (trgt << 20) | (ffsl(size) - 2))
+#define _LAW_SR(trgt,size) (0x80000000 | (trgt << 20) | \
+ (flsl(size + (size - 1)) - 2))
int
law_enable(int trgt, uint64_t bar, uint32_t size)
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index 2565921..d8c6fdb 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -70,7 +70,13 @@ options MAC # TrustedBSD MAC Framework
options RACCT # Resource accounting framework
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
options RCTL # Resource limits
-# options SMP
+options SMP
+
+# Uncomment for memory disk
+# options MD_ROOT
+# options MD_ROOT_SIZE=8192 # 8MB ram disk
+# makeoptions MFS_IMAGE=/path/to/img
+# options ROOTDEVNAME=\"ufs:/dev/md0\"
# Debugging support. Always need this:
# options KDB # Enable kernel debugger support.
diff --git a/sys/riscv/htif/htif.c b/sys/riscv/htif/htif.c
index f8143dc..b07b789 100644
--- a/sys/riscv/htif/htif.c
+++ b/sys/riscv/htif/htif.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include "htif.h"
static struct resource_spec htif_spec[] = {
- { SYS_RES_IRQ, 0, RF_ACTIVE },
+ { SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE},
{ -1, 0 }
};
@@ -126,9 +126,9 @@ htif_intr(void *arg)
sc = arg;
- htif_handle_entry(sc);
+ csr_clear(sip, SIP_SSIP);
- csr_clear(sip, SIE_SSIE);
+ htif_handle_entry(sc);
return (FILTER_HANDLED);
}
diff --git a/sys/riscv/htif/htif_block.c b/sys/riscv/htif/htif_block.c
index 58804d7..c9d2ffc 100644
--- a/sys/riscv/htif/htif_block.c
+++ b/sys/riscv/htif/htif_block.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -117,6 +117,9 @@ htif_blk_intr(void *arg, uint64_t entry)
if (sc->curtag == data) {
sc->cmd_done = 1;
wakeup(&sc->intr_chan);
+ } else {
+ device_printf(sc->dev, "Unexpected tag %d (should be %d)\n",
+ data, sc->curtag);
}
}
@@ -212,6 +215,8 @@ htif_blk_task(void *arg)
HTIF_BLK_UNLOCK(sc);
if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) {
+ HTIF_BLK_LOCK(sc);
+
req.offset = (bp->bio_pblkno * sc->disk->d_sectorsize);
req.size = bp->bio_bcount;
paddr = vtophys(bp->bio_data);
@@ -233,7 +238,6 @@ htif_blk_task(void *arg)
htif_command(cmd);
/* Wait for interrupt */
- HTIF_BLK_LOCK(sc);
i = 0;
while (sc->cmd_done == 0) {
msleep(&sc->intr_chan, &sc->sc_mtx, PRIBIO, "intr", hz/2);
diff --git a/sys/riscv/htif/htif_console.c b/sys/riscv/htif/htif_console.c
index b4a4676..10e4349 100644
--- a/sys/riscv/htif/htif_console.c
+++ b/sys/riscv/htif/htif_console.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -89,6 +89,7 @@ CONSOLE_DRIVER(riscv);
#define MAX_BURST_LEN 1
#define QUEUE_SIZE 256
#define CONSOLE_DEFAULT_ID 1ul
+#define SPIN_IN_MACHINE_MODE 1
struct queue_entry {
uint64_t data;
@@ -109,7 +110,12 @@ htif_putc(int c)
cmd |= (CONSOLE_DEFAULT_ID << HTIF_DEV_ID_SHIFT);
cmd |= c;
+#ifdef SPIN_IN_MACHINE_MODE
+ machine_command(ECALL_HTIF_LOWPUTC, cmd);
+#else
htif_command(cmd);
+#endif
+
}
static uint8_t
@@ -141,6 +147,7 @@ riscv_putc(int c)
htif_putc(c);
+#ifndef SPIN_IN_MACHINE_MODE
/* Wait for an interrupt */
__asm __volatile(
"li %0, 1\n" /* counter = 1 */
@@ -153,6 +160,7 @@ riscv_putc(int c)
"2:"
: "=&r"(counter), "=&r"(val) : "r"(cc)
);
+#endif
}
#ifdef EARLY_PRINTF
diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h
index 569f7c9..57d5e5d 100644
--- a/sys/riscv/include/intr.h
+++ b/sys/riscv/include/intr.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -51,4 +51,16 @@ typedef unsigned long * riscv_intrcnt_t;
riscv_intrcnt_t riscv_intrcnt_create(const char *);
void riscv_intrcnt_setname(riscv_intrcnt_t, const char *);
+#ifdef SMP
+void riscv_setup_ipihandler(driver_filter_t *);
+void riscv_unmask_ipi(void);
+#endif
+
+enum {
+ IRQ_SOFTWARE,
+ IRQ_TIMER,
+ IRQ_HTIF,
+ NIRQS
+};
+
#endif /* !_MACHINE_INTR_MACHDEP_H_ */
diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h
index 2c80058..f22e747 100644
--- a/sys/riscv/include/param.h
+++ b/sys/riscv/include/param.h
@@ -51,7 +51,7 @@
#if defined(SMP) || defined(KLD_MODULE)
#ifndef MAXCPU
-#define MAXCPU 2
+#define MAXCPU 16
#endif
#else
#define MAXCPU 1
diff --git a/sys/riscv/include/pcpu.h b/sys/riscv/include/pcpu.h
index 7dfe23d..8dacc4a 100644
--- a/sys/riscv/include/pcpu.h
+++ b/sys/riscv/include/pcpu.h
@@ -1,7 +1,16 @@
/*-
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -36,7 +45,10 @@
#define ALT_STACK_SIZE 128
#define PCPU_MD_FIELDS \
- char __pad[129]
+ uint32_t pc_pending_ipis; /* IPIs pending to this CPU */ \
+ uint64_t pc_sptbr; /* L0 page table base (VA) */ \
+ uint64_t pc_reg; /* CPU MMIO base (PA) */ \
+ char __pad[109]
#ifdef _KERNEL
diff --git a/sys/riscv/include/riscvreg.h b/sys/riscv/include/riscvreg.h
index 3f93428..76cba49 100644
--- a/sys/riscv/include/riscvreg.h
+++ b/sys/riscv/include/riscvreg.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -38,12 +38,16 @@
#define _MACHINE_RISCVREG_H_
/* Machine mode requests */
-#define ECALL_MTIMECMP 0x1
-#define ECALL_CLEAR_PENDING 0x2
-#define ECALL_HTIF_CMD 0x3
-#define ECALL_HTIF_GET_ENTRY 0x4
-#define ECALL_MCPUID_GET 0x5
-#define ECALL_MIMPID_GET 0x6
+#define ECALL_MTIMECMP 0x01
+#define ECALL_CLEAR_PENDING 0x02
+#define ECALL_HTIF_CMD 0x03
+#define ECALL_HTIF_GET_ENTRY 0x04
+#define ECALL_MCPUID_GET 0x05
+#define ECALL_MIMPID_GET 0x06
+#define ECALL_SEND_IPI 0x07
+#define ECALL_CLEAR_IPI 0x08
+#define ECALL_HTIF_LOWPUTC 0x09
+#define ECALL_MIE_SET 0x10
#define EXCP_SHIFT 0
#define EXCP_MASK (0xf << EXCP_SHIFT)
@@ -109,9 +113,14 @@
#define SIE_SSIE (1 << 1)
#define SIE_STIE (1 << 5)
-/* Note: sip register is not yet implement in Spike simulator */
+/* Note: sip register has no SIP_STIP bit in Spike simulator */
+#define SIP_SSIP (1 << 1)
#define SIP_STIP (1 << 5)
+#define NCSRS 4096
+#define CSR_IPI 0x783
+#define XLEN 8
+
#define CSR_ZIMM(val) \
(__builtin_constant_p(val) && ((u_long)(val) < 32))
diff --git a/sys/riscv/include/smp.h b/sys/riscv/include/smp.h
index da23dbe..52bdf64 100644
--- a/sys/riscv/include/smp.h
+++ b/sys/riscv/include/smp.h
@@ -1 +1,55 @@
-/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2016 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MACHINE_SMP_H_
+#define _MACHINE_SMP_H_
+
+#include <machine/pcb.h>
+
+#define IPI_AST (1 << 0)
+#define IPI_PREEMPT (1 << 1)
+#define IPI_RENDEZVOUS (1 << 2)
+#define IPI_STOP (1 << 3)
+#define IPI_STOP_HARD (1 << 4)
+#define IPI_HARDCLOCK (1 << 5)
+
+void ipi_all_but_self(u_int ipi);
+void ipi_cpu(int cpu, u_int ipi);
+void ipi_selected(cpuset_t cpus, u_int ipi);
+
+extern struct pcb stoppcbs[];
+
+#endif /* !_MACHINE_SMP_H_ */
diff --git a/sys/riscv/riscv/cpufunc_asm.S b/sys/riscv/riscv/cpufunc_asm.S
index 21bce53..1d44c22 100644
--- a/sys/riscv/riscv/cpufunc_asm.S
+++ b/sys/riscv/riscv/cpufunc_asm.S
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -64,7 +64,7 @@ END(riscv_tlb_flushID_SE)
* void riscv_dcache_wb_range(vm_offset_t, vm_size_t)
*/
ENTRY(riscv_dcache_wb_range)
- /* RISCVTODO */
+ sfence.vm
ret
END(riscv_dcache_wb_range)
@@ -72,7 +72,7 @@ END(riscv_dcache_wb_range)
* void riscv_dcache_wbinv_range(vm_offset_t, vm_size_t)
*/
ENTRY(riscv_dcache_wbinv_range)
- /* RISCVTODO */
+ sfence.vm
ret
END(riscv_dcache_wbinv_range)
@@ -80,7 +80,7 @@ END(riscv_dcache_wbinv_range)
* void riscv_dcache_inv_range(vm_offset_t, vm_size_t)
*/
ENTRY(riscv_dcache_inv_range)
- /* RISCVTODO */
+ sfence.vm
ret
END(riscv_dcache_inv_range)
@@ -88,7 +88,8 @@ END(riscv_dcache_inv_range)
* void riscv_idcache_wbinv_range(vm_offset_t, vm_size_t)
*/
ENTRY(riscv_idcache_wbinv_range)
- /* RISCVTODO */
+ fence.i
+ sfence.vm
ret
END(riscv_idcache_wbinv_range)
@@ -96,6 +97,6 @@ END(riscv_idcache_wbinv_range)
* void riscv_icache_sync_range(vm_offset_t, vm_size_t)
*/
ENTRY(riscv_icache_sync_range)
- /* RISCVTODO */
+ fence.i
ret
END(riscv_icache_sync_range)
diff --git a/sys/riscv/riscv/exception.S b/sys/riscv/riscv/exception.S
index 814fcf6..f1f127a 100644
--- a/sys/riscv/riscv/exception.S
+++ b/sys/riscv/riscv/exception.S
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -229,6 +229,7 @@ bad_trap:
j bad_trap
user_trap:
+ /* Save state */
csrrw sp, mscratch, sp
addi sp, sp, -64
sd t0, (8 * 0)(sp)
@@ -282,7 +283,31 @@ machine_interrupt:
j 1b
software_interrupt:
- /* Redirect to supervisor */
+ li t0, MIP_MSIP
+ csrc mip, t0
+ li t0, MIP_SSIP
+ csrs mip, t0
+
+ /* If PRV1 is PRV_U (user) then serve the trap */
+ csrr t0, mstatus
+ li t1, (MSTATUS_PRV_M << MSTATUS_PRV1_SHIFT)
+ and t0, t0, t1
+ beqz t0, 1f
+
+ /*
+ * If PRV1 is supervisor and interrupts were enabled,
+ * then serve the trap.
+ */
+ csrr t0, mstatus
+ li t1, (SR_IE1 | (MSTATUS_PRV_M << MSTATUS_PRV1_SHIFT))
+ and t0, t0, t1
+ li t1, (SR_IE1 | (MSTATUS_PRV_S << MSTATUS_PRV1_SHIFT))
+ beq t0, t1, 1f
+
+ j exit
+
+1:
+ /* Serve a trap in supervisor mode */
j exit_mrts
timer_interrupt:
@@ -294,17 +319,20 @@ timer_interrupt:
li t0, MIP_MTIP
csrc mip, t0
- /* Post supervisor software interrupt */
+ /* Post supervisor timer interrupt */
li t0, MIP_STIP
csrs mip, t0
- /* If PRV1 is PRV_U (user) then serve a trap */
+ /* If PRV1 is PRV_U (user) then serve the trap */
csrr t0, mstatus
li t1, (MSTATUS_PRV_M << MSTATUS_PRV1_SHIFT)
and t0, t0, t1
beqz t0, 1f
- /* If PRV1 is supervisor and interrupts were enabled, then serve a trap */
+ /*
+ * If PRV1 is supervisor and interrupts were enabled,
+ * then serve the trap.
+ */
csrr t0, mstatus
li t1, (SR_IE1 | (MSTATUS_PRV_M << MSTATUS_PRV1_SHIFT))
and t0, t0, t1
@@ -332,25 +360,35 @@ htif_interrupt:
la t0, console_intr
li t1, 1
sd t1, 0(t0)
- j 3f
+
+ /* Check if there is any other pending event */
+ j 1b
2:
/* Save entry */
- la t0, htif_ring_cursor
- beqz t0, 3f /* not initialized */
- ld t0, 0(t0) /* load struct */
- sd t5, 0(t0) /* put entry */
+ la t0, htif_ring
+ csrr t1, mhartid
+ li t4, (HTIF_RING_SIZE + 16)
+ mulw t4, t4, t1
+ add t0, t0, t4
+ li t4, (HTIF_RING_SIZE)
+ add t0, t0, t4 /* t0 == htif_ring_cursor */
+
+ ld t1, 0(t0) /* load ptr to cursor */
+ sd t5, 0(t1) /* put entry */
li t4, 1
- sd t4, 8(t0) /* mark used */
- ld t4, 16(t0) /* take next */
+ sd t4, 8(t1) /* mark used */
+ ld t4, 16(t1) /* take next */
/* Update cursor */
- la t0, htif_ring_cursor
sd t4, 0(t0)
/* Post supervisor software interrupt */
li t0, MIP_SSIP
csrs mip, t0
+ /* Check if there is any other pending event */
+ j 1b
+
3:
j exit
@@ -369,6 +407,18 @@ supervisor_call:
beq t5, t4, mcpuid_get
li t4, ECALL_MIMPID_GET
beq t5, t4, mimpid_get
+ li t4, ECALL_SEND_IPI
+ beq t5, t4, send_ipi
+ li t4, ECALL_CLEAR_IPI
+ beq t5, t4, clear_ipi
+ li t4, ECALL_HTIF_LOWPUTC
+ beq t5, t4, htif_lowputc
+ li t4, ECALL_MIE_SET
+ beq t5, t4, mie_set
+ j exit_next_instr
+
+mie_set:
+ csrs mie, t6
j exit_next_instr
mcpuid_get:
@@ -379,28 +429,111 @@ mimpid_get:
csrr t6, mimpid
j exit_next_instr
+send_ipi:
+ /* CPU mmio base in t6 */
+ mv t0, t6
+ li t2, (CSR_IPI * XLEN)
+ add t0, t0, t2 /* t0 = CSR_IPI */
+ li t2, 1
+ sd t2, 0(t0)
+ j exit_next_instr
+
+clear_ipi:
+ /* Do only clear if there are no new entries in HTIF ring */
+ la t0, htif_ring
+ csrr t2, mhartid
+ li t4, (HTIF_RING_SIZE + 16)
+ mulw t4, t4, t2
+ add t0, t0, t4
+ li t4, (HTIF_RING_SIZE)
+ add t0, t0, t4 /* t0 == ptr to htif_ring_cursor */
+ ld t2, 8(t0) /* load htif_ring_last */
+ ld t2, 8(t2) /* load used */
+ bnez t2, 1f
+
+ /* Clear supervisor software interrupt pending bit */
+ li t0, MIP_SSIP
+ csrc mip, t0
+
+1:
+ j exit_next_instr
+
htif_get_entry:
+ /* Get a htif_ring for current core */
+ la t0, htif_ring
+ csrr t2, mhartid
+ li t4, (HTIF_RING_SIZE + 16)
+ mulw t4, t4, t2
+ add t0, t0, t4
+ li t4, (HTIF_RING_SIZE + 8)
+ add t0, t0, t4 /* t0 == htif_ring_last */
+
+ /* Check for new entries */
li t6, 0 /* preset return value */
- la t0, htif_ring_last
- ld t0, 0(t0) /* load struct */
- ld t4, 8(t0) /* get used */
- beqz t4, 1f
- ld t6, 0(t0) /* get entry */
+ ld t2, 0(t0) /* load ptr to last */
+ ld t4, 8(t2) /* get used */
+ beqz t4, 1f /* No new entries. Exit */
+
+ /* Get one */
+ ld t6, 0(t2) /* get entry */
li t4, 0
- sd t4, 8(t0) /* mark free */
- sd t4, 0(t0) /* free entry, just in case */
- ld t4, 16(t0) /* take next */
- la t0, htif_ring_last
- sd t4, 0(t0)
+ sd t4, 8(t2) /* mark free */
+ sd t4, 0(t2) /* free entry, just in case */
+ ld t4, 16(t2) /* take next */
+ sd t4, 0(t0) /* update ptr to last */
1:
/* Exit. Result is stored in t6 */
j exit_next_instr
htif_cmd:
+1:
mv t0, t6
+ csrrw t0, mtohost, t0
+ bnez t0, 1b
+ j exit_next_instr
+
+htif_lowputc:
1:
+ mv t0, t6
csrrw t0, mtohost, t0
bnez t0, 1b
+
+2:
+ li t4, 0
+ csrrw t5, mfromhost, t4
+ beqz t5, 2b
+
+ /* Console PUT intr ? */
+ mv t2, t5
+ srli t2, t2, 48
+ li t3, 0x0101
+ beq t2, t3, 3f
+
+ /* Not a console PUT, so save entry */
+ la t0, htif_ring
+ csrr t2, mhartid
+ li t4, (HTIF_RING_SIZE + 16)
+ mulw t4, t4, t2
+ add t0, t0, t4
+ li t4, (HTIF_RING_SIZE)
+ add t0, t0, t4 /* t0 == htif_ring_cursor */
+
+ ld t2, 0(t0) /* load ptr to cursor */
+ sd t5, 0(t2) /* put entry */
+ li t4, 1
+ sd t4, 8(t2) /* mark used */
+ ld t4, 16(t2) /* take next */
+ /* Update cursor */
+ sd t4, 0(t0)
+
+ /* Post supervisor software interrupt */
+ li t0, MIP_SSIP
+ csrs mip, t0
+
+ /* Wait for console intr again */
+ j 2b
+
+3:
j exit_next_instr
set_mtimecmp:
diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c
index c5dec83..81b3e13 100644
--- a/sys/riscv/riscv/genassym.c
+++ b/sys/riscv/riscv/genassym.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -75,6 +75,7 @@ ASSYM(PCB_A, offsetof(struct pcb, pcb_a));
ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));
ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb));
+ASSYM(PC_SPTBR, offsetof(struct pcpu, pc_sptbr));
ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread));
ASSYM(TD_PCB, offsetof(struct thread, td_pcb));
diff --git a/sys/riscv/riscv/intr_machdep.c b/sys/riscv/riscv/intr_machdep.c
index c51075c..5ed109f 100644
--- a/sys/riscv/riscv/intr_machdep.c
+++ b/sys/riscv/riscv/intr_machdep.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
+#include <sys/cpuset.h>
#include <sys/interrupt.h>
+#include <sys/smp.h>
#include <machine/clock.h>
#include <machine/cpu.h>
@@ -46,12 +48,9 @@ __FBSDID("$FreeBSD$");
#include <machine/frame.h>
#include <machine/intr.h>
-enum {
- IRQ_SOFTWARE,
- IRQ_TIMER,
- IRQ_HTIF,
- NIRQS
-};
+#ifdef SMP
+#include <machine/smp.h>
+#endif
u_long intrcnt[NIRQS];
size_t sintrcnt = sizeof(intrcnt);
@@ -159,8 +158,12 @@ riscv_setup_intr(const char *name, driver_filter_t *filt,
riscv_unmask_irq((void*)(uintptr_t)irq);
}
- intr_event_add_handler(event, name, filt, handler, arg,
+ error = intr_event_add_handler(event, name, filt, handler, arg,
intr_priority(flags), flags, cookiep);
+ if (error) {
+ printf("Failed to setup intr: %d\n", irq);
+ return (error);
+ }
riscv_intrcnt_setname(riscv_intr_counters[irq],
event->ie_fullname);
@@ -221,3 +224,74 @@ riscv_cpu_intr(struct trapframe *frame)
critical_exit();
}
+
+#ifdef SMP
+void
+riscv_setup_ipihandler(driver_filter_t *filt)
+{
+
+ riscv_setup_intr("ipi", filt, NULL, NULL, IRQ_SOFTWARE,
+ INTR_TYPE_MISC, NULL);
+}
+
+void
+riscv_unmask_ipi(void)
+{
+
+ csr_set(sie, SIE_SSIE);
+}
+
+/* Sending IPI */
+static void
+ipi_send(struct pcpu *pc, int ipi)
+{
+
+ CTR3(KTR_SMP, "%s: cpu=%d, ipi=%x", __func__, pc->pc_cpuid, ipi);
+
+ atomic_set_32(&pc->pc_pending_ipis, ipi);
+ machine_command(ECALL_SEND_IPI, pc->pc_reg);
+
+ CTR1(KTR_SMP, "%s: sent", __func__);
+}
+
+void
+ipi_all_but_self(u_int ipi)
+{
+ cpuset_t other_cpus;
+
+ other_cpus = all_cpus;
+ CPU_CLR(PCPU_GET(cpuid), &other_cpus);
+
+ CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
+ ipi_selected(other_cpus, ipi);
+}
+
+void
+ipi_cpu(int cpu, u_int ipi)
+{
+ cpuset_t cpus;
+
+ CPU_ZERO(&cpus);
+ CPU_SET(cpu, &cpus);
+
+ CTR3(KTR_SMP, "%s: cpu: %d, ipi: %x\n", __func__, cpu, ipi);
+ ipi_send(cpuid_to_pcpu[cpu], ipi);
+}
+
+void
+ipi_selected(cpuset_t cpus, u_int ipi)
+{
+ struct pcpu *pc;
+
+ CTR1(KTR_SMP, "ipi_selected: ipi: %x", ipi);
+
+ STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
+ if (CPU_ISSET(pc->pc_cpuid, &cpus)) {
+ CTR3(KTR_SMP, "%s: pc: %p, ipi: %x\n", __func__, pc,
+ ipi);
+ ipi_send(pc, ipi);
+ }
+ }
+}
+
+#endif
diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S
index 0744167..9f32cac0 100644
--- a/sys/riscv/riscv/locore.S
+++ b/sys/riscv/riscv/locore.S
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -43,8 +43,55 @@
#include <machine/riscvreg.h>
#include <machine/pte.h>
-#define HTIF_RING_SIZE (64)
-#define HTIF_RING_LAST (24 * (HTIF_RING_SIZE - 1))
+#define HTIF_RING_NENTRIES (512)
+#define HTIF_RING_ENTRY_SZ (24)
+#define HTIF_RING_SIZE (HTIF_RING_ENTRY_SZ * HTIF_RING_NENTRIES)
+#define HW_STACK_SIZE (96)
+
+/*
+ * Event queue for each CPU core:
+ *
+ * struct htif_ring {
+ * uint64_t data;
+ * uint64_t used;
+ * uint64_t next;
+ * } htif_ring[HTIF_RING_NENTRIES];
+ * uint64_t htif_ring_cursor;
+ * uint64_t htif_ring_last;
+ */
+
+.macro build_ring
+ la t0, htif_ring
+#ifdef SMP
+ csrr a0, mhartid
+ li s0, (HTIF_RING_SIZE + 16)
+ mulw s0, a0, s0
+ add t0, t0, s0
+#endif
+ li t1, 0
+ sd t1, 0(t0) /* zero data */
+ sd t1, 8(t0) /* zero used */
+ mv t2, t0
+ mv t3, t0
+ li t5, (HTIF_RING_SIZE - HTIF_RING_ENTRY_SZ)
+ li t6, 0
+ add t4, t0, t5
+1:
+ addi t3, t3, 24 /* pointer to next */
+ beq t3, t4, 2f /* finish */
+ sd t3, 16(t2) /* store pointer */
+ addi t2, t2, 24 /* next entry */
+ addi t6, t6, 1 /* counter */
+ j 1b
+2:
+ sd t0, 16(t3) /* last -> first */
+
+ li t2, (HTIF_RING_SIZE)
+ add s0, t0, t2
+ sd t0, 0(s0) /* cursor */
+ sd t0, 8(s0) /* last */
+ /* finish building ring */
+.endm
.globl kernbase
.set kernbase, KERNBASE
@@ -74,33 +121,14 @@ mentry:
.align 8
.globl _start
_start:
- li s11, KERNBASE
+ /* Direct secondary cores to mpentry */
+ csrr a0, mhartid
+ bnez a0, mpentry
- /* Build ring */
- la t0, htif_ring
- li t1, 0
- sd t1, 0(t0) /* zero data */
- sd t1, 8(t0) /* zero used */
- mv t2, t0
- mv t3, t0
- li t5, HTIF_RING_LAST
- li t6, 0
- add t4, t0, t5
-1:
- addi t3, t3, 24 /* pointer to next */
- beq t3, t4, 2f /* finish */
- sd t3, 16(t2) /* store pointer */
- addi t2, t2, 24 /* next entry */
- addi t6, t6, 1 /* counter */
- j 1b
-2:
- sd t0, 16(t3) /* last -> first */
- la t1, htif_ring_cursor
- sd t0, 0(t1)
- la t1, htif_ring_last
- sd t0, 0(t1)
- /* finish building ring */
+ /* Build event queue for current core */
+ build_ring
+ /* Setup machine-mode stack for CPU 0 */
la t0, hardstack_end
csrw mscratch, t0
@@ -129,7 +157,14 @@ _start:
li a6, PTE_SIZE
mulw a5, a5, a6
add t0, s1, a5
+ /* Store it to pagetable_l0 for each cpu */
+ li t1, MAXCPU
+ li t2, PAGE_SIZE
+1:
sd t6, 0(t0)
+ add t0, t0, t2
+ addi t1, t1, -1
+ bnez t1, 1b
/* Level 1 */
la s1, pagetable_l1
@@ -177,8 +212,16 @@ _start:
(MSTATUS_PRV_U << MSTATUS_PRV2_SHIFT));
csrw mstatus, s0
+ /*
+ * Enable machine-mode software interrupts
+ * so we can deliver IPI to this core.
+ */
+ li t0, MIE_MSIE
+ csrs mie, t0
+
/* Exit from machine mode */
la t0, .Lmmu_on
+ li s11, KERNBASE
add t0, t0, s11
csrw mepc, t0
eret
@@ -213,24 +256,16 @@ initstack:
.space (PAGE_SIZE * KSTACK_PAGES)
initstack_end:
hardstack:
- .space (PAGE_SIZE)
+ .space (HW_STACK_SIZE * MAXCPU)
hardstack_end:
.globl htif_ring
htif_ring:
- .space (24 * 1024)
-
- .globl htif_ring_cursor
-htif_ring_cursor:
- .space (8)
-
- .globl htif_ring_last
-htif_ring_last:
- .space (8)
+ .space ((HTIF_RING_SIZE + 16) * MAXCPU)
.globl console_intr
console_intr:
- .space (8)
+ .space (8)
ENTRY(sigcode)
mv a0, sp
@@ -259,7 +294,7 @@ szsigcode:
.align 12
.globl pagetable_l0
pagetable_l0:
- .space PAGE_SIZE
+ .space (PAGE_SIZE * MAXCPU)
pagetable_l1:
.space PAGE_SIZE
pagetable_l2:
@@ -270,4 +305,95 @@ pagetable_end:
init_pt_va:
.quad pagetable_l2 /* XXX: Keep page tables VA */
+#ifndef SMP
+ENTRY(mpentry)
+1:
+ wfi
+ j 1b
+END(mpentry)
+#else
+/*
+ * mpentry(unsigned long)
+ *
+ * Called by a core when it is being brought online.
+ * The data in x0 is passed straight to init_secondary.
+ */
+ENTRY(mpentry)
+ /*
+ * Calculate the offset to __riscv_boot_ap
+ * for current core, cpuid in a0.
+ */
+ li t1, 4
+ mulw t1, t1, a0
+ /* Get pointer */
+ la t0, __riscv_boot_ap
+ add t0, t0, t1
+
+1:
+ /* Wait the kernel to be ready */
+ lw t1, 0(t0)
+ beqz t1, 1b
+
+ /* Setup machine exception vector */
+ la t0, mentry
+ csrw mtvec, t0
+
+ /* Build event queue ring for this core */
+ build_ring
+
+ /* Set page tables base register */
+ la t0, pagetable_l0
+ li t1, PAGE_SIZE
+ mulw t1, t1, a0
+ add t0, t0, t1
+ csrw sptbr, t0
+ /* Page tables END */
+
+ /* Configure mstatus */
+ li s0, ((MSTATUS_VM_SV48 << MSTATUS_VM_SHIFT) | \
+ (MSTATUS_PRV_M << MSTATUS_PRV_SHIFT) | \
+ (MSTATUS_PRV_S << MSTATUS_PRV1_SHIFT) | \
+ (MSTATUS_PRV_U << MSTATUS_PRV2_SHIFT));
+ csrw mstatus, s0
+
+ /* Setup stack for machine mode exceptions */
+ la t0, hardstack_end
+ li t1, HW_STACK_SIZE
+ mulw t1, t1, a0
+ sub t0, t0, t1
+ csrw mscratch, t0
+
+ li t0, 0
+ csrw sscratch, t0
+
+ /*
+ * Enable machine-mode software interrupts
+ * so we can deliver IPI to this core.
+ */
+ li t0, MIE_MSIE
+ csrs mie, t0
+
+ /*
+ * Exit from machine mode and go to
+ * the virtual address space.
+ */
+ la t0, mp_virtdone
+ li s11, KERNBASE
+ add t0, t0, s11
+ csrw mepc, t0
+ eret
+
+mp_virtdone:
+ /* We are now in virtual address space */
+
+ /* Setup stack pointer */
+ la t0, secondary_stacks
+ li t1, (PAGE_SIZE * KSTACK_PAGES)
+ mulw t1, t1, a0
+ add sp, t0, t1
+
+ call init_secondary
+END(mpentry)
+#endif
+
#include "exception.S"
diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c
index 399be20..0c6676e 100644
--- a/sys/riscv/riscv/machdep.c
+++ b/sys/riscv/riscv/machdep.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2014 Andrew Turner
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$");
#endif
struct pcpu __pcpu[MAXCPU];
+extern uint64_t pagetable_l0;
static struct trapframe proc0_tf;
@@ -389,7 +390,12 @@ cpu_est_clockrate(int cpu_id, uint64_t *rate)
void
cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size)
{
+ uint64_t addr;
+ addr = (uint64_t)&pagetable_l0;
+ addr += (cpuid * PAGE_SIZE);
+
+ pcpu->pc_sptbr = addr;
}
void
@@ -729,9 +735,13 @@ fake_preload_metadata(struct riscv_bootparams *rvbp __unused)
void
initriscv(struct riscv_bootparams *rvbp)
{
+ struct mem_region mem_regions[FDT_MEM_REGIONS];
vm_offset_t lastaddr;
+ int mem_regions_sz;
vm_size_t kernlen;
+ uint32_t memsize;
caddr_t kmdp;
+ int i;
/* Set the module data location */
lastaddr = fake_preload_metadata(rvbp);
@@ -752,11 +762,12 @@ initriscv(struct riscv_bootparams *rvbp)
/* Load the physical memory ranges */
physmap_idx = 0;
- /*
- * RISCVTODO: figure out whether platform provides ranges,
- * or grab from FDT.
- */
- add_physmap_entry(0, 0x8000000, physmap, &physmap_idx);
+ /* Grab physical memory regions information from device tree. */
+ if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, &memsize) != 0)
+ panic("Cannot get physical memory regions");
+ for (i = 0; i < mem_regions_sz; i++)
+ add_physmap_entry(mem_regions[i].mr_start,
+ mem_regions[i].mr_size, physmap, &physmap_idx);
/* Set the pcpu data, this is needed by pmap_bootstrap */
pcpup = &__pcpu[0];
diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c
new file mode 100644
index 0000000..9152e70
--- /dev/null
+++ b/sys/riscv/riscv/mp_machdep.c
@@ -0,0 +1,453 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * Copyright (c) 2016 Ruslan Bukin <br@bsdpad.com>
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Andrew Turner under
+ * sponsorship from the FreeBSD Foundation.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * 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.
+ */
+
+#include "opt_kstack_pages.h"
+#include "opt_platform.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/smp.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+
+#include <machine/intr.h>
+#include <machine/smp.h>
+#ifdef VFP
+#include <machine/vfp.h>
+#endif
+
+#ifdef FDT
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_cpu.h>
+#endif
+
+boolean_t ofw_cpu_reg(phandle_t node, u_int, cell_t *);
+
+extern struct pcpu __pcpu[];
+
+uint32_t __riscv_boot_ap[MAXCPU];
+
+static enum {
+ CPUS_UNKNOWN,
+#ifdef FDT
+ CPUS_FDT,
+#endif
+} cpu_enum_method;
+
+static device_identify_t riscv64_cpu_identify;
+static device_probe_t riscv64_cpu_probe;
+static device_attach_t riscv64_cpu_attach;
+
+static int ipi_handler(void *);
+
+struct mtx ap_boot_mtx;
+struct pcb stoppcbs[MAXCPU];
+
+#ifdef INVARIANTS
+static uint32_t cpu_reg[MAXCPU][2];
+#endif
+static device_t cpu_list[MAXCPU];
+
+void mpentry(unsigned long cpuid);
+void init_secondary(uint64_t);
+
+uint8_t secondary_stacks[MAXCPU - 1][PAGE_SIZE * KSTACK_PAGES] __aligned(16);
+
+/* Set to 1 once we're ready to let the APs out of the pen. */
+volatile int aps_ready = 0;
+
+/* Temporary variables for init_secondary() */
+void *dpcpu[MAXCPU - 1];
+
+static device_method_t riscv64_cpu_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_identify, riscv64_cpu_identify),
+ DEVMETHOD(device_probe, riscv64_cpu_probe),
+ DEVMETHOD(device_attach, riscv64_cpu_attach),
+
+ DEVMETHOD_END
+};
+
+static devclass_t riscv64_cpu_devclass;
+static driver_t riscv64_cpu_driver = {
+ "riscv64_cpu",
+ riscv64_cpu_methods,
+ 0
+};
+
+DRIVER_MODULE(riscv64_cpu, cpu, riscv64_cpu_driver, riscv64_cpu_devclass, 0, 0);
+
+static void
+riscv64_cpu_identify(driver_t *driver, device_t parent)
+{
+
+ if (device_find_child(parent, "riscv64_cpu", -1) != NULL)
+ return;
+ if (BUS_ADD_CHILD(parent, 0, "riscv64_cpu", -1) == NULL)
+ device_printf(parent, "add child failed\n");
+}
+
+static int
+riscv64_cpu_probe(device_t dev)
+{
+ u_int cpuid;
+
+ cpuid = device_get_unit(dev);
+ if (cpuid >= MAXCPU || cpuid > mp_maxid)
+ return (EINVAL);
+
+ device_quiet(dev);
+ return (0);
+}
+
+static int
+riscv64_cpu_attach(device_t dev)
+{
+ const uint32_t *reg;
+ size_t reg_size;
+ u_int cpuid;
+ int i;
+
+ cpuid = device_get_unit(dev);
+
+ if (cpuid >= MAXCPU || cpuid > mp_maxid)
+ return (EINVAL);
+ KASSERT(cpu_list[cpuid] == NULL, ("Already have cpu %u", cpuid));
+
+ reg = cpu_get_cpuid(dev, &reg_size);
+ if (reg == NULL)
+ return (EINVAL);
+
+ if (bootverbose) {
+ device_printf(dev, "register <");
+ for (i = 0; i < reg_size; i++)
+ printf("%s%x", (i == 0) ? "" : " ", reg[i]);
+ printf(">\n");
+ }
+
+ /* Set the device to start it later */
+ cpu_list[cpuid] = dev;
+
+ return (0);
+}
+
+static void
+release_aps(void *dummy __unused)
+{
+ int cpu, i;
+
+ if (mp_ncpus == 1)
+ return;
+
+ /* Setup the IPI handler */
+ riscv_setup_ipihandler(ipi_handler);
+
+ atomic_store_rel_int(&aps_ready, 1);
+
+ printf("Release APs\n");
+
+ for (i = 0; i < 2000; i++) {
+ if (smp_started) {
+ for (cpu = 0; cpu <= mp_maxid; cpu++) {
+ if (CPU_ABSENT(cpu))
+ continue;
+ }
+ return;
+ }
+ DELAY(1000);
+ }
+
+ printf("APs not started\n");
+}
+SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);
+
+void
+init_secondary(uint64_t cpu)
+{
+ struct pcpu *pcpup;
+
+ /* Setup the pcpu pointer */
+ pcpup = &__pcpu[cpu];
+ __asm __volatile("mv gp, %0" :: "r"(pcpup));
+
+ /* Spin until the BSP releases the APs */
+ while (!aps_ready)
+ __asm __volatile("wfi");
+
+ /* Initialize curthread */
+ KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
+ pcpup->pc_curthread = pcpup->pc_idlethread;
+ pcpup->pc_curpcb = pcpup->pc_idlethread->td_pcb;
+
+ /*
+ * Identify current CPU. This is necessary to setup
+ * affinity registers and to provide support for
+ * runtime chip identification.
+ */
+ identify_cpu();
+
+ /* Enable software interrupts */
+ riscv_unmask_ipi();
+
+ /* Start per-CPU event timers. */
+ cpu_initclocks_ap();
+
+#ifdef VFP
+ /* TODO: init FPU */
+#endif
+
+ /* Enable interrupts */
+ intr_enable();
+
+ mtx_lock_spin(&ap_boot_mtx);
+
+ atomic_add_rel_32(&smp_cpus, 1);
+
+ if (smp_cpus == mp_ncpus) {
+ /* enable IPI's, tlb shootdown, freezes etc */
+ atomic_store_rel_int(&smp_started, 1);
+ }
+
+ mtx_unlock_spin(&ap_boot_mtx);
+
+ /* Enter the scheduler */
+ sched_throw(NULL);
+
+ panic("scheduler returned us to init_secondary");
+ /* NOTREACHED */
+}
+
+static int
+ipi_handler(void *arg)
+{
+ u_int ipi_bitmap;
+ u_int cpu, ipi;
+ int bit;
+
+ /*
+ * We have shared interrupt line for both IPI and HTIF,
+ * so we don't really need to clear pending bit here
+ * as it will be cleared later in htif_intr.
+ * But lets assume HTIF is optional part, so do clear
+ * pending bit if there is no new entires in htif_ring.
+ */
+ machine_command(ECALL_CLEAR_IPI, 0);
+
+ cpu = PCPU_GET(cpuid);
+
+ mb();
+
+ ipi_bitmap = atomic_readandclear_int(PCPU_PTR(pending_ipis));
+ if (ipi_bitmap == 0)
+ return (FILTER_HANDLED);
+
+ while ((bit = ffs(ipi_bitmap))) {
+ bit = (bit - 1);
+ ipi = (1 << bit);
+ ipi_bitmap &= ~ipi;
+
+ mb();
+
+ switch (ipi) {
+ case IPI_AST:
+ CTR0(KTR_SMP, "IPI_AST");
+ break;
+ case IPI_PREEMPT:
+ CTR1(KTR_SMP, "%s: IPI_PREEMPT", __func__);
+ sched_preempt(curthread);
+ break;
+ case IPI_RENDEZVOUS:
+ CTR0(KTR_SMP, "IPI_RENDEZVOUS");
+ smp_rendezvous_action();
+ break;
+ case IPI_STOP:
+ case IPI_STOP_HARD:
+ CTR0(KTR_SMP, (ipi == IPI_STOP) ? "IPI_STOP" : "IPI_STOP_HARD");
+ savectx(&stoppcbs[cpu]);
+
+ /* Indicate we are stopped */
+ CPU_SET_ATOMIC(cpu, &stopped_cpus);
+
+ /* Wait for restart */
+ while (!CPU_ISSET(cpu, &started_cpus))
+ cpu_spinwait();
+
+ CPU_CLR_ATOMIC(cpu, &started_cpus);
+ CPU_CLR_ATOMIC(cpu, &stopped_cpus);
+ CTR0(KTR_SMP, "IPI_STOP (restart)");
+ break;
+ case IPI_HARDCLOCK:
+ CTR1(KTR_SMP, "%s: IPI_HARDCLOCK", __func__);
+ hardclockintr();
+ break;
+ default:
+ panic("Unknown IPI %#0x on cpu %d", ipi, curcpu);
+ }
+ }
+
+ return (FILTER_HANDLED);
+}
+
+struct cpu_group *
+cpu_topo(void)
+{
+
+ return (smp_topo_none());
+}
+
+/* Determine if we running MP machine */
+int
+cpu_mp_probe(void)
+{
+
+ return (mp_ncpus > 1);
+}
+
+#ifdef FDT
+static boolean_t
+cpu_init_fdt(u_int id, phandle_t node, u_int addr_size, pcell_t *reg)
+{
+ uint64_t target_cpu;
+ struct pcpu *pcpup;
+
+ /* Check we are able to start this cpu */
+ if (id > mp_maxid)
+ return (0);
+
+ KASSERT(id < MAXCPU, ("Too many CPUs"));
+
+ KASSERT(addr_size == 1 || addr_size == 2, ("Invalid register size"));
+#ifdef INVARIANTS
+ cpu_reg[id][0] = reg[0];
+ if (addr_size == 2)
+ cpu_reg[id][1] = reg[1];
+#endif
+
+ target_cpu = reg[0];
+ if (addr_size == 2) {
+ target_cpu <<= 32;
+ target_cpu |= reg[1];
+ }
+
+ pcpup = &__pcpu[id];
+
+ /* We are already running on cpu 0 */
+ if (id == 0) {
+ pcpup->pc_reg = target_cpu;
+ return (1);
+ }
+
+ pcpu_init(pcpup, id, sizeof(struct pcpu));
+ pcpup->pc_reg = target_cpu;
+
+ dpcpu[id - 1] = (void *)kmem_malloc(kernel_arena, DPCPU_SIZE,
+ M_WAITOK | M_ZERO);
+ dpcpu_init(dpcpu[id - 1], id);
+
+ printf("Starting CPU %u (%lx)\n", id, target_cpu);
+ __riscv_boot_ap[id] = 1;
+
+ CPU_SET(id, &all_cpus);
+
+ return (1);
+}
+#endif
+
+/* Initialize and fire up non-boot processors */
+void
+cpu_mp_start(void)
+{
+
+ mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
+
+ CPU_SET(0, &all_cpus);
+
+ switch(cpu_enum_method) {
+#ifdef FDT
+ case CPUS_FDT:
+ ofw_cpu_early_foreach(cpu_init_fdt, true);
+ break;
+#endif
+ case CPUS_UNKNOWN:
+ break;
+ }
+}
+
+/* Introduce rest of cores to the world */
+void
+cpu_mp_announce(void)
+{
+}
+
+void
+cpu_mp_setmaxid(void)
+{
+#ifdef FDT
+ int cores;
+
+ cores = ofw_cpu_early_foreach(NULL, false);
+ if (cores > 0) {
+ cores = MIN(cores, MAXCPU);
+ if (bootverbose)
+ printf("Found %d CPUs in the device tree\n", cores);
+ mp_ncpus = cores;
+ mp_maxid = cores - 1;
+ cpu_enum_method = CPUS_FDT;
+ return;
+ }
+#endif
+
+ if (bootverbose)
+ printf("No CPU data, limiting to 1 core\n");
+ mp_ncpus = 1;
+ mp_maxid = 0;
+}
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index ef25b16..30bdd53 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -13,7 +13,7 @@
* All rights reserved.
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -217,8 +217,6 @@ struct msgbuf *msgbufp = NULL;
static struct rwlock_padalign pvh_global_lock;
-extern uint64_t pagetable_l0;
-
/*
* Data for the pv entry allocation mechanism
*/
@@ -3097,7 +3095,7 @@ pmap_activate(struct thread *td)
pn = (td->td_pcb->pcb_l1addr / PAGE_SIZE);
entry = (PTE_VALID | (PTE_TYPE_PTR << PTE_TYPE_S));
entry |= (pn << PTE_PPN0_S);
- pmap_load_store(&pagetable_l0, entry);
+ pmap_load_store((uint64_t *)PCPU_GET(sptbr), entry);
pmap_invalidate_all(pmap);
critical_exit();
diff --git a/sys/riscv/riscv/swtch.S b/sys/riscv/riscv/swtch.S
index 1a9092f..a9f890d 100644
--- a/sys/riscv/riscv/swtch.S
+++ b/sys/riscv/riscv/swtch.S
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2016 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Portions of this software were developed by SRI International and the
@@ -55,13 +55,13 @@ ENTRY(cpu_throw)
sfence.vm
/* Switch to the new pmap */
- la t0, pagetable_l0
ld t1, PCB_L1ADDR(x13) /* Link to next level PN */
srli t1, t1, PAGE_SHIFT /* PN no */
li t2, (PTE_VALID | (PTE_TYPE_PTR << PTE_TYPE_S))
slli t3, t1, PTE_PPN0_S /* (t1 << PTE_PPN0_S) */
or t4, t2, t3
/* Store single level0 PTE entry to position */
+ ld t0, PC_SPTBR(gp)
sd t4, 0(t0)
/* TODO: Invalidate the TLB */
@@ -140,13 +140,13 @@ ENTRY(cpu_switch)
sfence.vm
/* Switch to the new pmap */
- la t0, pagetable_l0
ld t1, PCB_L1ADDR(x13) /* Link to next level PN */
srli t1, t1, PAGE_SHIFT /* PN no */
li t2, (PTE_VALID | (PTE_TYPE_PTR << PTE_TYPE_S))
slli t3, t1, PTE_PPN0_S /* (t1 << PTE_PPN0_S) */
or t4, t2, t3
/* Store single level0 PTE entry to position */
+ ld t0, PC_SPTBR(gp)
sd t4, 0(t0)
/* TODO: Invalidate the TLB */
@@ -156,7 +156,11 @@ ENTRY(cpu_switch)
/* Release the old thread */
sd a2, TD_LOCK(a0)
#if defined(SCHED_ULE) && defined(SMP)
- /* TODO */
+ /* Spin if TD_LOCK points to a blocked_lock */
+ la a2, _C_LABEL(blocked_lock)
+1:
+ ld t0, TD_LOCK(a1)
+ beq t0, a2, 1b
#endif
/* Restore the registers */
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 004eb34..c941fe8 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -372,6 +372,8 @@ struct vattr {
MALLOC_DECLARE(M_VNODE);
#endif
+extern u_int ncsizefactor;
+
/*
* Convert between vnode types and inode formats (since POSIX.1
* defines mode word of stat structure in terms of inode formats).
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index b41e04b..c8dac1b 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -184,7 +184,7 @@ ffs_truncate(vp, length, flags, cred)
struct inode *ip;
ufs2_daddr_t bn, lbn, lastblock, lastiblock[NIADDR], indir_lbn[NIADDR];
ufs2_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
- ufs2_daddr_t count, blocksreleased = 0, datablocks;
+ ufs2_daddr_t count, blocksreleased = 0, datablocks, blkno;
struct bufobj *bo;
struct fs *fs;
struct buf *bp;
@@ -192,7 +192,7 @@ ffs_truncate(vp, length, flags, cred)
int softdeptrunc, journaltrunc;
int needextclean, extblocks;
int offset, size, level, nblocks;
- int i, error, allerror;
+ int i, error, allerror, indiroff;
off_t osize;
ip = VTOI(vp);
@@ -329,16 +329,57 @@ ffs_truncate(vp, length, flags, cred)
ip->i_flag |= IN_CHANGE | IN_UPDATE;
return (ffs_update(vp, !DOINGASYNC(vp)));
}
- if (DOINGSOFTDEP(vp)) {
+ /*
+ * Lookup block number for a given offset. Zero length files
+ * have no blocks, so return a blkno of -1.
+ */
+ lbn = lblkno(fs, length - 1);
+ if (length == 0) {
+ blkno = -1;
+ } else if (lbn < NDADDR) {
+ blkno = DIP(ip, i_db[lbn]);
+ } else {
+ error = UFS_BALLOC(vp, lblktosize(fs, (off_t)lbn), fs->fs_bsize,
+ cred, BA_METAONLY, &bp);
+ if (error)
+ return (error);
+ indiroff = (lbn - NDADDR) % NINDIR(fs);
+ if (ip->i_ump->um_fstype == UFS1)
+ blkno = ((ufs1_daddr_t *)(bp->b_data))[indiroff];
+ else
+ blkno = ((ufs2_daddr_t *)(bp->b_data))[indiroff];
+ /*
+ * If the block number is non-zero, then the indirect block
+ * must have been previously allocated and need not be written.
+ * If the block number is zero, then we may have allocated
+ * the indirect block and hence need to write it out.
+ */
+ if (blkno != 0)
+ brelse(bp);
+ else if (DOINGSOFTDEP(vp) || DOINGASYNC(vp))
+ bdwrite(bp);
+ else
+ bwrite(bp);
+ }
+ /*
+ * If the block number at the new end of the file is zero,
+ * then we must allocate it to ensure that the last block of
+ * the file is allocated. Soft updates does not handle this
+ * case, so here we have to clean up the soft updates data
+ * structures describing the allocation past the truncation
+ * point. Finding and deallocating those structures is a lot of
+ * work. Since partial truncation with a hole at the end occurs
+ * rarely, we solve the problem by syncing the file so that it
+ * will have no soft updates data structures left.
+ */
+ if (blkno == 0 && (error = ffs_syncvnode(vp, MNT_WAIT, 0)) != 0)
+ return (error);
+ if (blkno != 0 && DOINGSOFTDEP(vp)) {
if (softdeptrunc == 0 && journaltrunc == 0) {
/*
- * If a file is only partially truncated, then
- * we have to clean up the data structures
- * describing the allocation past the truncation
- * point. Finding and deallocating those structures
- * is a lot of work. Since partial truncation occurs
- * rarely, we solve the problem by syncing the file
- * so that it will have no data structures left.
+ * If soft updates cannot handle this truncation,
+ * clean up soft dependency data structures and
+ * fall through to the synchronous truncation.
*/
if ((error = ffs_syncvnode(vp, MNT_WAIT, 0)) != 0)
return (error);
@@ -358,15 +399,17 @@ ffs_truncate(vp, length, flags, cred)
}
}
/*
- * Shorten the size of the file. If the file is not being
- * truncated to a block boundary, the contents of the
- * partial block following the end of the file must be
- * zero'ed in case it ever becomes accessible again because
- * of subsequent file growth. Directories however are not
+ * Shorten the size of the file. If the last block of the
+ * shortened file is unallocated, we must allocate it.
+ * Additionally, if the file is not being truncated to a
+ * block boundary, the contents of the partial block
+ * following the end of the file must be zero'ed in
+ * case it ever becomes accessible again because of
+ * subsequent file growth. Directories however are not
* zero'ed as they should grow back initialized to empty.
*/
offset = blkoff(fs, length);
- if (offset == 0) {
+ if (blkno != 0 && offset == 0) {
ip->i_size = length;
DIP_SET(ip, i_size, length);
} else {
@@ -390,7 +433,7 @@ ffs_truncate(vp, length, flags, cred)
ip->i_size = length;
DIP_SET(ip, i_size, length);
size = blksize(fs, ip, lbn);
- if (vp->v_type != VDIR)
+ if (vp->v_type != VDIR && offset != 0)
bzero((char *)bp->b_data + offset,
(u_int)(size - offset));
/* Kirk's code has reallocbuf(bp, size, 1) here */
diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c
index 8778c0d..cced5e34 100644
--- a/sys/x86/isa/clock.c
+++ b/sys/x86/isa/clock.c
@@ -166,7 +166,7 @@ clkintr(void *arg)
mtx_unlock_spin(&clock_lock);
}
- if (sc && sc->et.et_active && sc->mode != MODE_STOP)
+ if (sc->et.et_active && sc->mode != MODE_STOP)
sc->et.et_event_cb(&sc->et, sc->et.et_arg);
#ifdef DEV_MCA
diff --git a/targets/Makefile.xtras b/targets/Makefile.xtras
index 57a0453..7acf130 100644
--- a/targets/Makefile.xtras
+++ b/targets/Makefile.xtras
@@ -29,6 +29,9 @@ no-default:
.if make(show-valid-targets)
OTHER_TARGETS = \
destroy \
+ destroy-arch \
+ destroy-host \
+ destroy-stage \
BUILD_TARGETS != cd ${_here} && \
find . \( -name Makefile.depend -o -name ${.MAKE.DEPENDFILE:T} \) | \
@@ -51,6 +54,7 @@ show-help:
not-valid-target:
@echo "ERROR: '${_TARGETS}' is not a valid target for ${MACHINE}."
+.include <bsd.obj.mk>
.for t in ${_TARGETS:Nlove}
.if !target($t)
diff --git a/targets/pseudo/hosttools/Makefile.depend b/targets/pseudo/hosttools/Makefile.depend
index ea364f1..e8dd16c 100644
--- a/targets/pseudo/hosttools/Makefile.depend
+++ b/targets/pseudo/hosttools/Makefile.depend
@@ -2,6 +2,10 @@
# This file is not autogenerated - take care!
+.if !defined(MK_KERBEROS)
+.include <src.opts.mk>
+.endif
+
DIRDEPS = \
lib/clang/include.host \
lib/libc++.host \
@@ -20,6 +24,13 @@ DIRDEPS = \
usr.bin/xlint/xlint.host \
usr.sbin/config.host \
+.if ${MK_KERBEROS} != "no"
+DIRDEPS+= \
+ kerberos5/tools/asn1_compile.host \
+ kerberos5/tools/make-roken.host \
+ usr.bin/compile_et.host \
+
+.endif
.include <dirdeps.mk>
diff --git a/targets/pseudo/kernel/Makefile b/targets/pseudo/kernel/Makefile
index b619eeb..502c830 100644
--- a/targets/pseudo/kernel/Makefile
+++ b/targets/pseudo/kernel/Makefile
@@ -14,7 +14,6 @@ ${KERNCONF}.config: .MAKE .META
mkdir -p ${KERN_OBJDIR:H}
(cd ${KERN_CONFDIR} && \
${CONFIG} ${CONFIGARGS} -d ${KERN_OBJDIR} ${KERNCONF})
- (cd ${KERN_OBJDIR} && ${.MAKE} depend)
@touch $@
# we need to pass curdirOk=yes to meta mode, since we want .meta files
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index a7130dd..cebce7c 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -297,7 +297,6 @@ DIRDEPS+= \
usr.bin/mklocale \
usr.bin/mkstr \
usr.bin/mktemp \
- usr.bin/mkulzma \
usr.bin/mkuzip \
usr.bin/msgs \
usr.bin/mt \
diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile.depend b/tools/tools/ath/ath_ee_9300_print/Makefile.depend
index f4dfeaf..cda9eb2 100644
--- a/tools/tools/ath/ath_ee_9300_print/Makefile.depend
+++ b/tools/tools/ath/ath_ee_9300_print/Makefile.depend
@@ -14,6 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-main.o: opt_ah.h
-main.po: opt_ah.h
.endif
diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc
index 11079d3..34eddd9 100644
--- a/tools/tools/net80211/w00t/Makefile.inc
+++ b/tools/tools/net80211/w00t/Makefile.inc
@@ -2,9 +2,10 @@
W00T= ../libw00t
# NB: we get crc32 from -lz
-DPADD= ${W00T}/libw00t.a ${LIBCRYPTO} ${LIBZ}
+DPADD= ${W00T}/libw00t.a
LDFLAGS= -L${W00T}
-LDADD= -lw00t -lcrypto -lz
+LDADD= -lw00t
+LIBADD+= crypto z
BINDIR= /usr/local/bin
CFLAGS= -g -I${W00T}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 474bee1..a30476f 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -99,7 +99,6 @@ SUBDIR= alias \
mkimg \
mklocale \
mktemp \
- mkulzma \
mkuzip \
mt \
ncal \
diff --git a/usr.bin/ar/Makefile.depend b/usr.bin/ar/Makefile.depend
index cabff68..8def7bc 100644
--- a/usr.bin/ar/Makefile.depend
+++ b/usr.bin/ar/Makefile.depend
@@ -24,10 +24,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-acplex.o: acplex.c
-acplex.o: y.tab.h
-acplex.po: acplex.c
-acplex.po: y.tab.h
-acpyacc.o: acpyacc.c
-acpyacc.po: acpyacc.c
.endif
diff --git a/usr.bin/awk/Makefile.depend b/usr.bin/awk/Makefile.depend
index 2fddd14..cb80454 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -17,24 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-awkgram.o: awkgram.c
-awkgram.po: awkgram.c
-b.o: ytab.h
-b.po: ytab.h
-lex.o: ytab.h
-lex.po: ytab.h
-lib.o: ytab.h
-lib.po: ytab.h
-main.o: ytab.h
-main.po: ytab.h
-parse.o: ytab.h
-parse.po: ytab.h
-proctab.o: proctab.c
-proctab.o: ytab.h
-proctab.po: proctab.c
-proctab.po: ytab.h
-run.o: ytab.h
-run.po: ytab.h
-tran.o: ytab.h
-tran.po: ytab.h
.endif
diff --git a/usr.bin/bc/Makefile.depend b/usr.bin/bc/Makefile.depend
index e759653..eb5b174 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -18,10 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bc.o: bc.c
-bc.po: bc.c
-scan.o: bc.h
-scan.o: scan.c
-scan.po: bc.h
-scan.po: scan.c
.endif
diff --git a/usr.bin/clang/bugpoint/Makefile.depend b/usr.bin/clang/bugpoint/Makefile.depend
index 2b2e060..4540509 100644
--- a/usr.bin/clang/bugpoint/Makefile.depend
+++ b/usr.bin/clang/bugpoint/Makefile.depend
@@ -42,6 +42,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bugpoint.o: Intrinsics.inc.h
-bugpoint.po: Intrinsics.inc.h
.endif
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index bee00f5..24611b4 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -100,26 +100,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cc1_main.o: DiagnosticCommonKinds.inc.h
-cc1_main.o: DiagnosticDriverKinds.inc.h
-cc1_main.o: DiagnosticFrontendKinds.inc.h
-cc1_main.o: Options.inc.h
-cc1_main.po: DiagnosticCommonKinds.inc.h
-cc1_main.po: DiagnosticDriverKinds.inc.h
-cc1_main.po: DiagnosticFrontendKinds.inc.h
-cc1_main.po: Options.inc.h
-cc1as_main.o: DiagnosticCommonKinds.inc.h
-cc1as_main.o: DiagnosticDriverKinds.inc.h
-cc1as_main.o: DiagnosticFrontendKinds.inc.h
-cc1as_main.o: Options.inc.h
-cc1as_main.po: DiagnosticCommonKinds.inc.h
-cc1as_main.po: DiagnosticDriverKinds.inc.h
-cc1as_main.po: DiagnosticFrontendKinds.inc.h
-cc1as_main.po: Options.inc.h
-driver.o: DiagnosticCommonKinds.inc.h
-driver.o: DiagnosticDriverKinds.inc.h
-driver.o: Options.inc.h
-driver.po: DiagnosticCommonKinds.inc.h
-driver.po: DiagnosticDriverKinds.inc.h
-driver.po: Options.inc.h
.endif
diff --git a/usr.bin/clang/llc/Makefile.depend b/usr.bin/clang/llc/Makefile.depend
index b61b871..89b7ace 100644
--- a/usr.bin/clang/llc/Makefile.depend
+++ b/usr.bin/clang/llc/Makefile.depend
@@ -80,6 +80,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-llc.o: Intrinsics.inc.h
-llc.po: Intrinsics.inc.h
.endif
diff --git a/usr.bin/clang/llvm-dis/Makefile.depend b/usr.bin/clang/llvm-dis/Makefile.depend
index fd46482..9ff2a96 100644
--- a/usr.bin/clang/llvm-dis/Makefile.depend
+++ b/usr.bin/clang/llvm-dis/Makefile.depend
@@ -24,6 +24,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-llvm-dis.o: Intrinsics.inc.h
-llvm-dis.po: Intrinsics.inc.h
.endif
diff --git a/usr.bin/clang/llvm-lto/Makefile.depend b/usr.bin/clang/llvm-lto/Makefile.depend
index cea3df4..65a810f 100644
--- a/usr.bin/clang/llvm-lto/Makefile.depend
+++ b/usr.bin/clang/llvm-lto/Makefile.depend
@@ -83,6 +83,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-llvm-lto.o: Intrinsics.inc.h
-llvm-lto.po: Intrinsics.inc.h
.endif
diff --git a/usr.bin/clang/opt/Makefile.depend b/usr.bin/clang/opt/Makefile.depend
index 029d956..021f7a6 100644
--- a/usr.bin/clang/opt/Makefile.depend
+++ b/usr.bin/clang/opt/Makefile.depend
@@ -84,12 +84,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-AnalysisWrappers.o: Intrinsics.inc.h
-AnalysisWrappers.po: Intrinsics.inc.h
-PassPrinters.o: Intrinsics.inc.h
-PassPrinters.po: Intrinsics.inc.h
-PrintSCC.o: Intrinsics.inc.h
-PrintSCC.po: Intrinsics.inc.h
-opt.o: Intrinsics.inc.h
-opt.po: Intrinsics.inc.h
.endif
diff --git a/usr.bin/colldef/Makefile.depend b/usr.bin/colldef/Makefile.depend
index 3ca32c6..26839bd 100644
--- a/usr.bin/colldef/Makefile.depend
+++ b/usr.bin/colldef/Makefile.depend
@@ -18,10 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-scan.o: scan.c
-scan.o: y.tab.h
-scan.po: scan.c
-scan.po: y.tab.h
.endif
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index 94ad84e..1288666 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -20,12 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-compile_et.o: parse.h
-compile_et.po: parse.h
-lex.o: lex.c
-lex.o: parse.h
-lex.po: lex.c
-lex.po: parse.h
-parse.o: parse.c
-parse.po: parse.c
.endif
diff --git a/usr.bin/find/Makefile.depend b/usr.bin/find/Makefile.depend
index 9de4374..ca0b2f9 100644
--- a/usr.bin/find/Makefile.depend
+++ b/usr.bin/find/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-getdate.o: getdate.c
-getdate.po: getdate.c
.endif
diff --git a/usr.bin/getconf/Makefile.depend b/usr.bin/getconf/Makefile.depend
index cd02691..3646e2e 100644
--- a/usr.bin/getconf/Makefile.depend
+++ b/usr.bin/getconf/Makefile.depend
@@ -15,14 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-confstr.o: confstr.c
-confstr.po: confstr.c
-limits.o: limits.c
-limits.po: limits.c
-pathconf.o: pathconf.c
-pathconf.po: pathconf.c
-progenv.o: progenv.c
-progenv.po: progenv.c
-sysconf.o: sysconf.c
-sysconf.po: sysconf.c
.endif
diff --git a/usr.bin/iscsictl/Makefile.depend b/usr.bin/iscsictl/Makefile.depend
index 05df091..6146f86 100644
--- a/usr.bin/iscsictl/Makefile.depend
+++ b/usr.bin/iscsictl/Makefile.depend
@@ -19,10 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index e3c5ae7..4faacfd 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -19,10 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-kdump.o: kdump_subr.h
-kdump.po: kdump_subr.h
-kdump_subr.o: kdump_subr.c
-kdump_subr.o: kdump_subr.h
-kdump_subr.po: kdump_subr.c
-kdump_subr.po: kdump_subr.h
.endif
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 8fe03ea..b4a1f69 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -142,28 +142,6 @@ static struct ktr_header ktr_header;
c = ','; \
} while (0)
-#if defined(__amd64__) || defined(__i386__)
-
-void linux_ktrsysret(struct ktr_sysret *, u_int);
-
-/*
- * from linux.h
- * Linux syscalls return negative errno's, we do positive and map them
- */
-static int bsd_to_linux_errno[ELAST + 1] = {
- -0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
- -10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
- -20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
- -30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
- -90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
- -100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
- -110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
- -116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
- -72, -67, -71
-};
-#endif
-
struct proc_info
{
TAILQ_ENTRY(proc_info) info;
@@ -393,13 +371,7 @@ main(int argc, char *argv[])
ktrsyscall((struct ktr_syscall *)m, sv_flags);
break;
case KTR_SYSRET:
-#if defined(__amd64__) || defined(__i386__)
- if ((sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)
- linux_ktrsysret((struct ktr_sysret *)m,
- sv_flags);
- else
-#endif
- ktrsysret((struct ktr_sysret *)m, sv_flags);
+ ktrsysret((struct ktr_sysret *)m, sv_flags);
break;
case KTR_NAMEI:
case KTR_SYSCTL:
@@ -1366,7 +1338,8 @@ ktrsysret(struct ktr_sysret *ktr, u_int sv_flags)
else if (error == EJUSTRETURN)
printf("JUSTRETURN");
else {
- printf("-1 errno %d", ktr->ktr_error);
+ printf("-1 errno %d", sysdecode_freebsd_to_abi_errno(
+ syscallabi(sv_flags), error));
if (fancy)
printf(" %s", strerror(ktr->ktr_error));
}
@@ -1852,44 +1825,6 @@ ktrfaultend(struct ktr_faultend *ktr)
printf("\n");
}
-#if defined(__amd64__) || defined(__i386__)
-void
-linux_ktrsysret(struct ktr_sysret *ktr, u_int sv_flags)
-{
- register_t ret = ktr->ktr_retval;
- int error = ktr->ktr_error;
-
- syscallname(ktr->ktr_code, sv_flags);
- printf(" ");
-
- if (error == 0) {
- if (fancy) {
- printf("%ld", (long)ret);
- if (ret < 0 || ret > 9)
- printf("/%#lx", (unsigned long)ret);
- } else {
- if (decimal)
- printf("%ld", (long)ret);
- else
- printf("%#lx", (unsigned long)ret);
- }
- } else if (error == ERESTART)
- printf("RESTART");
- else if (error == EJUSTRETURN)
- printf("JUSTRETURN");
- else {
- if (ktr->ktr_error <= ELAST + 1)
- error = abs(bsd_to_linux_errno[ktr->ktr_error]);
- else
- error = 999;
- printf("-1 errno %d", error);
- if (fancy)
- printf(" %s", strerror(ktr->ktr_error));
- }
- putchar('\n');
-}
-#endif
-
void
usage(void)
{
diff --git a/usr.bin/lex/Makefile.depend b/usr.bin/lex/Makefile.depend
index ae5191b..ca0b2f9 100644
--- a/usr.bin/lex/Makefile.depend
+++ b/usr.bin/lex/Makefile.depend
@@ -16,14 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-scan.o: parse.h
-scan.o: scan.c
-scan.po: parse.h
-scan.po: scan.c
-skel.o: skel.c
-skel.po: skel.c
-yylex.o: parse.h
-yylex.po: parse.h
.endif
diff --git a/usr.bin/localedef/Makefile.depend b/usr.bin/localedef/Makefile.depend
index ac5eda1..ca0b2f9 100644
--- a/usr.bin/localedef/Makefile.depend
+++ b/usr.bin/localedef/Makefile.depend
@@ -16,24 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-charmap.o: parser.h
-charmap.po: parser.h
-collate.o: parser.h
-collate.po: parser.h
-ctype.o: parser.h
-ctype.po: parser.h
-localedef.o: parser.h
-localedef.po: parser.h
-messages.o: parser.h
-messages.po: parser.h
-monetary.o: parser.h
-monetary.po: parser.h
-numeric.o: parser.h
-numeric.po: parser.h
-parser.o: parser.c
-parser.po: parser.c
-scanner.o: parser.h
-scanner.po: parser.h
-time.o: parser.h
-time.po: parser.h
.endif
diff --git a/usr.bin/m4/Makefile.depend b/usr.bin/m4/Makefile.depend
index 8ccf846..d97824a 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parser.o: parser.c
-parser.po: parser.c
-tokenizer.o: parser.h
-tokenizer.o: tokenizer.c
-tokenizer.po: parser.h
-tokenizer.po: tokenizer.c
.endif
diff --git a/usr.bin/mkcsmapper/Makefile.depend b/usr.bin/mkcsmapper/Makefile.depend
index b0cb3ac..75e2766 100644
--- a/usr.bin/mkcsmapper/Makefile.depend
+++ b/usr.bin/mkcsmapper/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
.endif
diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile
index e16471a..21014e9 100644
--- a/usr.bin/mkcsmapper_static/Makefile
+++ b/usr.bin/mkcsmapper_static/Makefile
@@ -7,9 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
citrus_lookup_factory.c citrus_pivot_factory.c
MAN=
NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
build-tools: mkcsmapper_static
diff --git a/usr.bin/mkcsmapper_static/Makefile.depend b/usr.bin/mkcsmapper_static/Makefile.depend
index ffee33f..75e2766 100644
--- a/usr.bin/mkcsmapper_static/Makefile.depend
+++ b/usr.bin/mkcsmapper_static/Makefile.depend
@@ -2,22 +2,19 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ usr.bin/yacc.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
.endif
diff --git a/usr.bin/mkesdb/Makefile.depend b/usr.bin/mkesdb/Makefile.depend
index 091f950..ca0b2f9 100644
--- a/usr.bin/mkesdb/Makefile.depend
+++ b/usr.bin/mkesdb/Makefile.depend
@@ -16,10 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
.endif
diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile
index fb10f01..2696a23 100644
--- a/usr.bin/mkesdb_static/Makefile
+++ b/usr.bin/mkesdb_static/Makefile
@@ -7,9 +7,7 @@ SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
citrus_lookup_factory.c
MAN=
NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
build-tools: mkesdb_static
diff --git a/usr.bin/mkulzma/Makefile.depend b/usr.bin/mkesdb_static/Makefile.depend
index 987c487..75e2766 100644
--- a/usr.bin/mkulzma/Makefile.depend
+++ b/usr.bin/mkesdb_static/Makefile.depend
@@ -5,12 +5,12 @@ DIRDEPS = \
gnu/lib/csu \
gnu/lib/libgcc \
include \
+ include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/liblzma \
- lib/libthr \
+ usr.bin/yacc.host \
.include <dirdeps.mk>
diff --git a/usr.bin/mklocale/Makefile.depend b/usr.bin/mklocale/Makefile.depend
index b3bfc6d..75e2766 100644
--- a/usr.bin/mklocale/Makefile.depend
+++ b/usr.bin/mklocale/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: y.tab.h
-lex.po: lex.c
-lex.po: y.tab.h
-yacc.o: yacc.c
-yacc.po: yacc.c
.endif
diff --git a/usr.bin/mkulzma/Makefile b/usr.bin/mkulzma/Makefile
deleted file mode 100644
index 15596bf..0000000
--- a/usr.bin/mkulzma/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= mkulzma
-MAN= mkulzma.8
-
-LIBADD= lzma
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/mkulzma/mkulzma.8 b/usr.bin/mkulzma/mkulzma.8
deleted file mode 100644
index b4ac33f..0000000
--- a/usr.bin/mkulzma/mkulzma.8
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" ----------------------------------------------------------------------------
-.\" Derived from mkuzip.8 by Aleksandr Rybalko <ray@ddteam.net>
-.\" ----------------------------------------------------------------------------
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <sobomax@FreeBSD.ORG> wrote this file. As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return. Maxim Sobolev
-.\" ----------------------------------------------------------------------------
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 17, 2006
-.Dt MKULZMA 8
-.Os
-.Sh NAME
-.Nm mkulzma
-.Nd compress disk image for use with
-.Xr geom_uncompress 4
-class
-.Sh SYNOPSIS
-.Nm
-.Op Fl v
-.Op Fl o Ar outfile
-.Op Fl s Ar cluster_size
-.Ar infile
-.Sh DESCRIPTION
-The
-.Nm
-utility compresses a disk image file so that the
-.Xr geom_uncompress 4
-class will be able to decompress the resulting image at run-time.
-This allows for a significant reduction of size of disk image at
-the expense of some CPU time required to decompress the data each
-time it is read.
-The
-.Nm
-utility
-works in two phases:
-.Bl -enum
-.It
-An
-.Ar infile
-image is split into clusters; each cluster is compressed using liblzma.
-.It
-The resulting set of compressed clusters along with headers that allow
-locating each individual cluster is written to the output file.
-.El
-.Pp
-The options are:
-.Bl -tag -width indent
-.It Fl o Ar outfile
-Name of the output file
-.Ar outfile .
-The default is to use the input name with the suffix
-.Pa .ulzma .
-.It Fl s Ar cluster_size
-Split the image into clusters of
-.Ar cluster_size
-bytes, 16384 bytes by default.
-The
-.Ar cluster_size
-should be a multiple of 512 bytes.
-.It Fl v
-Display verbose messages.
-.El
-.Sh NOTES
-The compression ratio largely depends on the cluster size used.
-.\" The following two sentences are unclear: how can xz(1) be
-.\" used in a comparable fashion, and wouldn't a lzma-compressed
-.\" image suffer from larger cluster sizes as well?
-For large cluster sizes (16K and higher), typical compression ratios
-are only 1-2% less than those achieved with
-.Xr lzma 1 .
-However, it should be kept in mind that larger cluster
-sizes lead to higher overhead in the
-.Xr geom_uncompress 4
-class, as the class has to decompress the whole cluster even if
-only a few bytes from that cluster have to be read.
-.Pp
-The
-.Nm
-utility
-inserts a short shell script at the beginning of the generated image,
-which makes it possible to
-.Dq run
-the image just like any other shell script.
-The script tries to load the
-.Xr geom_uncompress 4
-class if it is not loaded, configure the image as an
-.Xr md 4
-disk device using
-.Xr mdconfig 8 ,
-and automatically mount it using
-.Xr mount_cd9660 8
-on the mount point provided as the first argument to the script.
-.Sh EXIT STATUS
-.Ex -std
-.Sh SEE ALSO
-.Xr lzma 1 ,
-.Xr geom 4 ,
-.Xr geom_uncompress 4 ,
-.Xr md 4 ,
-.Xr mdconfig 8 ,
-.Xr mount_cd9660 8
-.Sh AUTHORS
-.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
-.An Aleksandr Rybalko Aq Mt ray@ddteam.net
diff --git a/usr.bin/mkulzma/mkulzma.c b/usr.bin/mkulzma/mkulzma.c
deleted file mode 100644
index b046c1e..0000000
--- a/usr.bin/mkulzma/mkulzma.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * Derived from mkuzip.c by Aleksandr Rybalko <ray@ddteam.net>
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <sobomax@FreeBSD.ORG> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Maxim Sobolev
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD$
- *
- */
-
-#include <sys/disk.h>
-#include <sys/endian.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <lzma.h>
-
-#define CLSTSIZE 16384
-#define DEFAULT_SUFX ".ulzma"
-
-#define USED_BLOCKSIZE DEV_BSIZE
-
-#define CLOOP_MAGIC_LEN 128
-/* Format L3.0, since we move to XZ API */
-static char CLOOP_MAGIC_START[] =
- "#!/bin/sh\n"
- "#L3.0\n"
- "n=uncompress\n"
- "m=geom_$n\n"
- "(kldstat -m $m 2>&-||kldload $m)>&-&&"
- "mount_cd9660 /dev/`mdconfig -af $0`.$n $1\n"
- "exit $?\n";
-
-static char *readblock(int, char *, u_int32_t);
-static void usage(void);
-static void *safe_malloc(size_t);
-static void cleanup(void);
-
-static char *cleanfile = NULL;
-
-int main(int argc, char **argv)
-{
- char *iname, *oname, *obuf, *ibuf;
- int fdr, fdw, i, opt, verbose, tmp;
- struct iovec iov[2];
- struct stat sb;
- uint32_t destlen;
- uint64_t offset;
- uint64_t *toc;
- lzma_filter filters[2];
- lzma_options_lzma opt_lzma;
- lzma_ret ret;
- lzma_stream strm = LZMA_STREAM_INIT;
- struct cloop_header {
- char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
- } hdr;
-
- memset(&hdr, 0, sizeof(hdr));
- hdr.blksz = CLSTSIZE;
- strcpy(hdr.magic, CLOOP_MAGIC_START);
- oname = NULL;
- verbose = 0;
-
- while((opt = getopt(argc, argv, "o:s:v")) != -1) {
- switch(opt) {
- case 'o':
- oname = optarg;
- break;
-
- case 's':
- tmp = atoi(optarg);
- if (tmp <= 0) {
- errx(1,
- "invalid cluster size specified: %s",
- optarg);
- /* Not reached */
- }
- if (tmp % USED_BLOCKSIZE != 0) {
- errx(1,
- "cluster size should be multiple of %d",
- USED_BLOCKSIZE);
- /* Not reached */
- }
- if ( tmp > MAXPHYS) {
- errx(1, "cluster size is too large");
- /* Not reached */
- }
- hdr.blksz = tmp;
- break;
-
- case 'v':
- verbose = 1;
- break;
-
- default:
- usage();
- /* Not reached */
- }
- }
- argc -= optind;
- argv += optind;
-
- if (argc != 1) {
- usage();
- /* Not reached */
- }
-
- iname = argv[0];
- if (oname == NULL) {
- asprintf(&oname, "%s%s", iname, DEFAULT_SUFX);
- if (oname == NULL) {
- err(1, "can't allocate memory");
- /* Not reached */
- }
- }
-
- obuf = safe_malloc(hdr.blksz*2);
- ibuf = safe_malloc(hdr.blksz);
-
- signal(SIGHUP, exit);
- signal(SIGINT, exit);
- signal(SIGTERM, exit);
- signal(SIGXCPU, exit);
- signal(SIGXFSZ, exit);
- atexit(cleanup);
-
- fdr = open(iname, O_RDONLY);
- if (fdr < 0) {
- err(1, "open(%s)", iname);
- /* Not reached */
- }
- if (fstat(fdr, &sb) != 0) {
- err(1, "fstat(%s)", iname);
- /* Not reached */
- }
- if (S_ISCHR(sb.st_mode)) {
- off_t ms;
-
- if (ioctl(fdr, DIOCGMEDIASIZE, &ms) < 0) {
- err(1, "ioctl(DIOCGMEDIASIZE)");
- /* Not reached */
- }
- sb.st_size = ms;
- } else if (!S_ISREG(sb.st_mode)) {
- fprintf(stderr,
- "%s: not a character device or regular file\n",
- iname);
- exit(1);
- }
- hdr.nblocks = sb.st_size / hdr.blksz;
- if ((sb.st_size % hdr.blksz) != 0) {
- if (verbose != 0)
- fprintf(stderr, "file size is not multiple "
- "of %d, padding data\n", hdr.blksz);
- hdr.nblocks++;
- }
- toc = safe_malloc((hdr.nblocks + 1) * sizeof(*toc));
-
- fdw = open(oname, O_WRONLY | O_TRUNC | O_CREAT,
- S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
- if (fdw < 0) {
- err(1, "open(%s)", oname);
- /* Not reached */
- }
- cleanfile = oname;
-
- /*
- * Prepare header that we will write later when we have index ready.
- */
- iov[0].iov_base = (char *)&hdr;
- iov[0].iov_len = sizeof(hdr);
- iov[1].iov_base = (char *)toc;
- iov[1].iov_len = (hdr.nblocks + 1) * sizeof(*toc);
- offset = iov[0].iov_len + iov[1].iov_len;
-
- /* Reserve space for header */
- lseek(fdw, offset, SEEK_SET);
-
- if (verbose != 0)
- fprintf(stderr, "data size %ju bytes, number of clusters "
- "%u, index length %zu bytes\n", sb.st_size,
- hdr.nblocks, iov[1].iov_len);
-
- /* Init lzma encoder */
- if (lzma_lzma_preset(&opt_lzma, LZMA_PRESET_DEFAULT))
- errx(1, "Error loading LZMA preset");
-
- filters[0].id = LZMA_FILTER_LZMA2;
- filters[0].options = &opt_lzma;
- filters[1].id = LZMA_VLI_UNKNOWN;
-
- for(i = 0; i == 0 || ibuf != NULL; i++) {
- ibuf = readblock(fdr, ibuf, hdr.blksz);
- if (ibuf != NULL) {
- destlen = hdr.blksz*2;
-
- ret = lzma_stream_encoder(&strm, filters,
- LZMA_CHECK_CRC32);
- if (ret != LZMA_OK) {
- if (ret == LZMA_MEMLIMIT_ERROR)
- errx(1, "can't compress data: "
- "LZMA_MEMLIMIT_ERROR");
-
- errx(1, "can't compress data: "
- "LZMA compressor ERROR");
- }
-
- strm.next_in = ibuf;
- strm.avail_in = hdr.blksz;
- strm.next_out = obuf;
- strm.avail_out = hdr.blksz*2;
-
- ret = lzma_code(&strm, LZMA_FINISH);
-
- if (ret != LZMA_STREAM_END) {
- /* Error */
- errx(1, "lzma_code FINISH failed, code=%d, "
- "pos(in=%zd, out=%zd)",
- ret,
- (hdr.blksz - strm.avail_in),
- (hdr.blksz*2 - strm.avail_out));
- }
-
- destlen -= strm.avail_out;
-
- lzma_end(&strm);
-
- if (verbose != 0)
- fprintf(stderr, "cluster #%d, in %u bytes, "
- "out %u bytes\n", i, hdr.blksz, destlen);
- } else {
- destlen = USED_BLOCKSIZE - (offset % USED_BLOCKSIZE);
- memset(obuf, 0, destlen);
- if (verbose != 0)
- fprintf(stderr, "padding data with %u bytes"
- " so that file size is multiple of %d\n",
- destlen,
- USED_BLOCKSIZE);
- }
- if (write(fdw, obuf, destlen) < 0) {
- err(1, "write(%s)", oname);
- /* Not reached */
- }
- toc[i] = htobe64(offset);
- offset += destlen;
- }
- close(fdr);
-
- if (verbose != 0)
- fprintf(stderr, "compressed data to %ju bytes, saved %lld "
- "bytes, %.2f%% decrease.\n", offset,
- (long long)(sb.st_size - offset),
- 100.0 * (long long)(sb.st_size - offset) /
- (float)sb.st_size);
-
- /* Convert to big endian */
- hdr.blksz = htonl(hdr.blksz);
- hdr.nblocks = htonl(hdr.nblocks);
- /* Write headers into pre-allocated space */
- lseek(fdw, 0, SEEK_SET);
- if (writev(fdw, iov, 2) < 0) {
- err(1, "writev(%s)", oname);
- /* Not reached */
- }
- cleanfile = NULL;
- close(fdw);
-
- exit(0);
-}
-
-static char *
-readblock(int fd, char *ibuf, u_int32_t clstsize)
-{
- int numread;
-
- bzero(ibuf, clstsize);
- numread = read(fd, ibuf, clstsize);
- if (numread < 0) {
- err(1, "read() failed");
- /* Not reached */
- }
- if (numread == 0) {
- return NULL;
- }
- return ibuf;
-}
-
-static void
-usage(void)
-{
-
- fprintf(stderr, "usage: mkulzma [-v] [-o outfile] [-s cluster_size] "
- "infile\n");
- exit(1);
-}
-
-static void *
-safe_malloc(size_t size)
-{
- void *retval;
-
- retval = malloc(size);
- if (retval == NULL) {
- err(1, "can't allocate memory");
- /* Not reached */
- }
- return retval;
-}
-
-static void
-cleanup(void)
-{
-
- if (cleanfile != NULL)
- unlink(cleanfile);
-}
diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile
index 92ab43e..4050ad0 100644
--- a/usr.bin/mkuzip/Makefile
+++ b/usr.bin/mkuzip/Makefile
@@ -2,7 +2,8 @@
PROG= mkuzip
MAN= mkuzip.8
+SRCS= mkuzip.c mkuz_blockcache.c mkuz_lzma.c mkuz_zlib.c
-LIBADD= z
+LIBADD= z md lzma
.include <bsd.prog.mk>
diff --git a/usr.bin/mkuzip/Makefile.depend b/usr.bin/mkuzip/Makefile.depend
index d209adb..9d045c8 100644
--- a/usr.bin/mkuzip/Makefile.depend
+++ b/usr.bin/mkuzip/Makefile.depend
@@ -9,6 +9,9 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/liblzma \
+ lib/libmd \
+ lib/libthr \
lib/libz \
diff --git a/usr.bin/mkuzip/mkuz_blockcache.c b/usr.bin/mkuzip/mkuz_blockcache.c
new file mode 100644
index 0000000..a3ac564
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_blockcache.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <md5.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if defined(MKUZ_DEBUG)
+# include <stdio.h>
+#endif
+
+#include "mkuz_blockcache.h"
+
+struct mkuz_blkcache {
+ struct mkuz_blkcache_hit hit;
+ off_t data_offset;
+ unsigned char digest[16];
+ struct mkuz_blkcache *next;
+};
+
+static struct mkuz_blkcache blkcache;
+
+struct mkuz_blkcache_hit *
+mkuz_blkcache_regblock(int fd, uint32_t blkno, off_t offset, ssize_t len,
+ void *data)
+{
+ struct mkuz_blkcache *bcep;
+ MD5_CTX mcontext;
+ off_t data_offset;
+ unsigned char mdigest[16];
+
+ data_offset = lseek(fd, 0, SEEK_CUR);
+ if (data_offset < 0) {
+ return (NULL);
+ }
+ MD5Init(&mcontext);
+ MD5Update(&mcontext, data, len);
+ MD5Final(mdigest, &mcontext);
+ if (blkcache.hit.len == 0) {
+ bcep = &blkcache;
+ } else {
+ for (bcep = &blkcache; bcep != NULL; bcep = bcep->next) {
+ if (bcep->hit.len != len)
+ continue;
+ if (memcmp(mdigest, bcep->digest, sizeof(mdigest)) == 0) {
+ break;
+ }
+ }
+ if (bcep != NULL) {
+#if defined(MKUZ_DEBUG)
+ printf("cache hit %d, %d, %d\n", (int)bcep->hit.offset, (int)data_offset, (int)len);
+#endif
+ return (&bcep->hit);
+ }
+ bcep = malloc(sizeof(struct mkuz_blkcache));
+ if (bcep == NULL)
+ return (NULL);
+ memset(bcep, '\0', sizeof(struct mkuz_blkcache));
+ bcep->next = blkcache.next;
+ blkcache.next = bcep;
+ }
+ memcpy(bcep->digest, mdigest, sizeof(mdigest));
+ bcep->data_offset = data_offset;
+ bcep->hit.offset = offset;
+ bcep->hit.len = len;
+ bcep->hit.blkno = blkno;
+ return (NULL);
+}
diff --git a/usr.bin/mkuzip/mkuz_blockcache.h b/usr.bin/mkuzip/mkuz_blockcache.h
new file mode 100644
index 0000000..2154ae8
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_blockcache.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+struct mkuz_blkcache_hit {
+ uint64_t offset;
+ ssize_t len;
+ uint32_t blkno;
+};
+
+struct mkuz_blkcache_hit *mkuz_blkcache_regblock(int, uint32_t, off_t, ssize_t,
+ void *);
diff --git a/usr.bin/mkuzip/mkuz_cloop.h b/usr.bin/mkuzip/mkuz_cloop.h
new file mode 100644
index 0000000..4ed7c50
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_cloop.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+/* CLOOP format and related constants */
+
+/*
+ * Integer values (block size, number of blocks, offsets)
+ * are stored in big-endian (network) order on disk.
+ */
+
+#define CLOOP_MAGIC_LEN 128
+#define CLOOP_OFS_COMPR 0x0b
+#define CLOOP_OFS_VERSN (CLOOP_OFS_COMPR + 1)
+
+#define CLOOP_MAJVER_2 '2'
+#define CLOOP_MAJVER_3 '3'
+
+#define CLOOP_COMP_LIBZ 'V'
+#define CLOOP_COMP_LZMA 'L'
+
+struct cloop_header {
+ char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
+ uint32_t blksz; /* block size */
+ uint32_t nblocks; /* number of blocks */
+};
diff --git a/usr.bin/mkuzip/mkuz_lzma.c b/usr.bin/mkuzip/mkuz_lzma.c
new file mode 100644
index 0000000..d62376e
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_lzma.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * Copyright (c) 2011 Aleksandr Rybalko <ray@ddteam.net>
+ * 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <err.h>
+#include <stdint.h>
+
+#include <lzma.h>
+
+#include "mkuzip.h"
+#include "mkuz_lzma.h"
+
+#define USED_BLOCKSIZE DEV_BSIZE
+
+struct mkuz_lzma {
+ lzma_filter filters[2];
+ lzma_options_lzma opt_lzma;
+ lzma_stream strm;
+ char *obuf;
+ uint32_t blksz;
+};
+
+static struct mkuz_lzma ulzma = {.strm = LZMA_STREAM_INIT};
+
+void *
+mkuz_lzma_init(uint32_t blksz)
+{
+ if (blksz % USED_BLOCKSIZE != 0) {
+ errx(1, "cluster size should be multiple of %d",
+ USED_BLOCKSIZE);
+ /* Not reached */
+ }
+ if (blksz > MAXPHYS) {
+ errx(1, "cluster size is too large");
+ /* Not reached */
+ }
+ ulzma.obuf = mkuz_safe_malloc(blksz * 2);
+
+ /* Init lzma encoder */
+ if (lzma_lzma_preset(&ulzma.opt_lzma, LZMA_PRESET_DEFAULT))
+ errx(1, "Error loading LZMA preset");
+
+ ulzma.filters[0].id = LZMA_FILTER_LZMA2;
+ ulzma.filters[0].options = &ulzma.opt_lzma;
+ ulzma.filters[1].id = LZMA_VLI_UNKNOWN;
+
+ ulzma.blksz = blksz;
+
+ return (ulzma.obuf);
+}
+
+void
+mkuz_lzma_compress(const char *ibuf, uint32_t *destlen)
+{
+ lzma_ret ret;
+
+ ret = lzma_stream_encoder(&ulzma.strm, ulzma.filters, LZMA_CHECK_CRC32);
+ if (ret != LZMA_OK) {
+ if (ret == LZMA_MEMLIMIT_ERROR)
+ errx(1, "can't compress data: LZMA_MEMLIMIT_ERROR");
+
+ errx(1, "can't compress data: LZMA compressor ERROR");
+ }
+
+ ulzma.strm.next_in = ibuf;
+ ulzma.strm.avail_in = ulzma.blksz;
+ ulzma.strm.next_out = ulzma.obuf;
+ ulzma.strm.avail_out = ulzma.blksz * 2;
+
+ ret = lzma_code(&ulzma.strm, LZMA_FINISH);
+
+ if (ret != LZMA_STREAM_END) {
+ /* Error */
+ errx(1, "lzma_code FINISH failed, code=%d, pos(in=%zd, "
+ "out=%zd)", ret, (ulzma.blksz - ulzma.strm.avail_in),
+ (ulzma.blksz * 2 - ulzma.strm.avail_out));
+ }
+
+ lzma_end(&ulzma.strm);
+
+ *destlen = (ulzma.blksz * 2) - ulzma.strm.avail_out;
+}
diff --git a/usr.bin/mkuzip/mkuz_lzma.h b/usr.bin/mkuzip/mkuz_lzma.h
new file mode 100644
index 0000000..426f8bc
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_lzma.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * Copyright (c) 2011 Aleksandr Rybalko <ray@ddteam.net>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+/* Format L3.0, since we move to XZ API */
+#define CLOOP_MAGIC_LZMA \
+ "#!/bin/sh\n" \
+ "#L3.0\n" \
+ "n=uncompress\n" \
+ "m=geom_$n\n" \
+ "(kldstat -m $m 2>&-||kldload $m)>&-&&" \
+ "mount_cd9660 /dev/`mdconfig -af $0`.$n $1\n" \
+ "exit $?\n"
+#define DEFAULT_SUFX_LZMA ".ulzma"
+
+void *mkuz_lzma_init(uint32_t);
+void mkuz_lzma_compress(const char *, uint32_t *);
diff --git a/usr.bin/mkuzip/mkuz_zlib.c b/usr.bin/mkuzip/mkuz_zlib.c
new file mode 100644
index 0000000..8828891
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_zlib.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <err.h>
+#include <stdint.h>
+
+#include <zlib.h>
+
+#include "mkuzip.h"
+#include "mkuz_zlib.h"
+
+struct mkuz_zlib {
+ char *obuf;
+ uLongf oblen;
+ uint32_t blksz;
+};
+
+static struct mkuz_zlib uzip;
+
+void *
+mkuz_zlib_init(uint32_t blksz)
+{
+ if (blksz % DEV_BSIZE != 0) {
+ errx(1, "cluster size should be multiple of %d",
+ DEV_BSIZE);
+ /* Not reached */
+ }
+ if (compressBound(blksz) > MAXPHYS) {
+ errx(1, "cluster size is too large");
+ /* Not reached */
+ }
+ uzip.oblen = compressBound(blksz);
+ uzip.obuf = mkuz_safe_malloc(uzip.oblen);
+ uzip.blksz = blksz;
+
+ return (uzip.obuf);
+}
+
+void
+mkuz_zlib_compress(const char *ibuf, uint32_t *destlen)
+{
+ uLongf destlen_z;
+
+ destlen_z = uzip.oblen;
+ if (compress2(uzip.obuf, &destlen_z, ibuf, uzip.blksz,
+ Z_BEST_COMPRESSION) != Z_OK) {
+ errx(1, "can't compress data: compress2() "
+ "failed");
+ /* Not reached */
+ }
+
+ *destlen = (uint32_t)destlen_z;
+}
diff --git a/usr.bin/mkuzip/mkuz_zlib.h b/usr.bin/mkuzip/mkuz_zlib.h
new file mode 100644
index 0000000..f50bba2
--- /dev/null
+++ b/usr.bin/mkuzip/mkuz_zlib.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#define DEFAULT_SUFX_ZLIB ".uzip"
+
+#define CLOOP_MAGIC_ZLIB "#!/bin/sh\n#V2.0 Format\n" \
+ "(kldstat -qm g_uzip||kldload geom_uzip)>&-&&" \
+ "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n"
+
+void *mkuz_zlib_init(uint32_t);
+void mkuz_zlib_compress(const char *, uint32_t *);
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index c0b8315..c839551 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -1,9 +1,27 @@
-.\" ----------------------------------------------------------------------------
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <sobomax@FreeBSD.org> wrote this file. As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return. Maxim Sobolev
-.\" ----------------------------------------------------------------------------
+.\"-
+.\" Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+.\" 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.
.\"
.\" $FreeBSD$
.\"
@@ -39,7 +57,9 @@ works in two phases:
An
.Ar infile
image is split into clusters; each cluster is compressed using
-.Xr zlib 3 .
+.Xr zlib 3
+or
+.Xr lzma 3 .
.It
The resulting set of compressed clusters along with headers that allow
locating each individual cluster is written to the output file.
@@ -51,7 +71,23 @@ The options are:
Name of the output file
.Ar outfile .
The default is to use the input name with the suffix
-.Pa .uzip .
+.Pa .uzip
+for the
+.Xr zlib 3
+compression or
+.Pa .ulzma
+for the
+.Xr lzma 3 .
+.It Fl L
+Use
+.Xr lzma 3
+compression algorithm instead of the default
+.Xr zlib 3 .
+The
+.Xr lzma 3
+provides noticeable better compression levels on the same data set
+at the expense of much slower compression speed (10-20x) and somewhat slower
+decompression (2-3x).
.It Fl s Ar cluster_size
Split the image into clusters of
.Ar cluster_size
@@ -61,6 +97,27 @@ The
should be a multiple of 512 bytes.
.It Fl v
Display verbose messages.
+.It Fl Z
+Disable zero-blocks detection and elimination.
+When this option is set, the
+.Nm
+would compress empty blocks (i.e. clusters that consist of only zero bytes)
+just as it would any other block.
+When the option is not set, the
+.Nm
+detects such blocks and skips them from the output.
+Setting
+.Fl Z
+results is slight increase of compressed image size, typically less than 0.1%
+of a final size of the compressed image.
+.It Fl d
+Enable de-duplication.
+When the option is enabled the
+.Nm
+detects identical blocks in the input and replaces each subsequent occurence
+of such block with pointer to the very first one in the output.
+Setting this option results is moderate decrease of compressed image size,
+typically around 3-5% of a final size of the compressed image.
.El
.Sh NOTES
The compression ratio largely depends on the cluster size used.
@@ -92,11 +149,20 @@ disk device using
and automatically mount it using
.Xr mount_cd9660 8
on the mount point provided as the first argument to the script.
+.Pp
+The de-duplication is a
+.Fx
+specific feature and while it does not require any changes to on-disk
+compressed image format, however it did require some matching changes to the
+.Xr geom_uzip 4
+to handle resulting images correctly.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
.Xr gzip 1 ,
+.Xr xz 1 ,
.Xr zlib 3 ,
+.Xr lzma 3 ,
.Xr geom 4 ,
.Xr geom_uzip 4 ,
.Xr md 4 ,
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c
index 08c8ed0..1e3a204 100644
--- a/usr.bin/mkuzip/mkuzip.c
+++ b/usr.bin/mkuzip/mkuzip.c
@@ -1,15 +1,33 @@
/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <sobomax@FreeBSD.ORG> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return. Maxim Sobolev
- * ----------------------------------------------------------------------------
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * All rights reserved.
*
- * $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.
*
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/types.h>
#include <sys/disk.h>
#include <sys/endian.h>
@@ -17,7 +35,7 @@
#include <sys/stat.h>
#include <sys/uio.h>
#include <netinet/in.h>
-#include <zlib.h>
+#include <ctype.h>
#include <err.h>
#include <fcntl.h>
#include <signal.h>
@@ -26,18 +44,44 @@
#include <string.h>
#include <unistd.h>
-#define CLSTSIZE 16384
-#define DEFAULT_SUFX ".uzip"
+#include "mkuzip.h"
+#include "mkuz_cloop.h"
+#include "mkuz_blockcache.h"
+#include "mkuz_zlib.h"
+#include "mkuz_lzma.h"
+
+#define DEFINE_RAW_METHOD(func, rval, args...) typedef rval (*func##_t)(args)
+
+#define DEFAULT_CLSTSIZE 16384
+
+DEFINE_RAW_METHOD(f_init, void *, uint32_t);
+DEFINE_RAW_METHOD(f_compress, void, const char *, uint32_t *);
-#define CLOOP_MAGIC_LEN 128
-static char CLOOP_MAGIC_START[] = "#!/bin/sh\n#V2.0 Format\n"
- "(kldstat -qm g_uzip||kldload geom_uzip)>&-&&"
- "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n";
+struct mkuz_format {
+ const char *magic;
+ const char *default_sufx;
+ f_init_t f_init;
+ f_compress_t f_compress;
+};
+
+static struct mkuz_format uzip_fmt = {
+ .magic = CLOOP_MAGIC_ZLIB,
+ .default_sufx = DEFAULT_SUFX_ZLIB,
+ .f_init = &mkuz_zlib_init,
+ .f_compress = &mkuz_zlib_compress
+};
+
+static struct mkuz_format ulzma_fmt = {
+ .magic = CLOOP_MAGIC_LZMA,
+ .default_sufx = DEFAULT_SUFX_LZMA,
+ .f_init = &mkuz_lzma_init,
+ .f_compress = &mkuz_lzma_compress
+};
static char *readblock(int, char *, u_int32_t);
static void usage(void);
-static void *safe_malloc(size_t);
static void cleanup(void);
+static int memvcmp(const void *, unsigned char, size_t);
static char *cleanfile = NULL;
@@ -45,24 +89,24 @@ int main(int argc, char **argv)
{
char *iname, *oname, *obuf, *ibuf;
uint64_t *toc;
- int fdr, fdw, i, opt, verbose, tmp;
+ int fdr, fdw, i, opt, verbose, no_zcomp, tmp, en_dedup;
struct iovec iov[2];
struct stat sb;
- uLongf destlen;
- uint64_t offset;
- struct cloop_header {
- char magic[CLOOP_MAGIC_LEN]; /* cloop magic */
- uint32_t blksz; /* block size */
- uint32_t nblocks; /* number of blocks */
- } hdr;
+ uint32_t destlen;
+ uint64_t offset, last_offset;
+ struct cloop_header hdr;
+ struct mkuz_blkcache_hit *chit;
+ const struct mkuz_format *handler;
memset(&hdr, 0, sizeof(hdr));
- hdr.blksz = CLSTSIZE;
- strcpy(hdr.magic, CLOOP_MAGIC_START);
+ hdr.blksz = DEFAULT_CLSTSIZE;
oname = NULL;
verbose = 0;
+ no_zcomp = 0;
+ en_dedup = 0;
+ handler = &uzip_fmt;
- while((opt = getopt(argc, argv, "o:s:v")) != -1) {
+ while((opt = getopt(argc, argv, "o:s:vZdL")) != -1) {
switch(opt) {
case 'o':
oname = optarg;
@@ -75,15 +119,6 @@ int main(int argc, char **argv)
optarg);
/* Not reached */
}
- if (tmp % DEV_BSIZE != 0) {
- errx(1, "cluster size should be multiple of %d",
- DEV_BSIZE);
- /* Not reached */
- }
- if (compressBound(tmp) > MAXPHYS) {
- errx(1, "cluster size is too large");
- /* Not reached */
- }
hdr.blksz = tmp;
break;
@@ -91,6 +126,18 @@ int main(int argc, char **argv)
verbose = 1;
break;
+ case 'Z':
+ no_zcomp = 1;
+ break;
+
+ case 'd':
+ en_dedup = 1;
+ break;
+
+ case 'L':
+ handler = &ulzma_fmt;
+ break;
+
default:
usage();
/* Not reached */
@@ -104,17 +151,26 @@ int main(int argc, char **argv)
/* Not reached */
}
+ strcpy(hdr.magic, handler->magic);
+
+ if (en_dedup != 0) {
+ hdr.magic[CLOOP_OFS_VERSN] = CLOOP_MAJVER_3;
+ hdr.magic[CLOOP_OFS_COMPR] =
+ tolower(hdr.magic[CLOOP_OFS_COMPR]);
+ }
+
+ obuf = handler->f_init(hdr.blksz);
+
iname = argv[0];
if (oname == NULL) {
- asprintf(&oname, "%s%s", iname, DEFAULT_SUFX);
+ asprintf(&oname, "%s%s", iname, handler->default_sufx);
if (oname == NULL) {
err(1, "can't allocate memory");
/* Not reached */
}
}
- obuf = safe_malloc(compressBound(hdr.blksz));
- ibuf = safe_malloc(hdr.blksz);
+ ibuf = mkuz_safe_malloc(hdr.blksz);
signal(SIGHUP, exit);
signal(SIGINT, exit);
@@ -152,7 +208,7 @@ int main(int argc, char **argv)
"of %d, padding data\n", hdr.blksz);
hdr.nblocks++;
}
- toc = safe_malloc((hdr.nblocks + 1) * sizeof(*toc));
+ toc = mkuz_safe_malloc((hdr.nblocks + 1) * sizeof(*toc));
fdw = open(oname, O_WRONLY | O_TRUNC | O_CREAT,
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
@@ -177,40 +233,73 @@ int main(int argc, char **argv)
"%u, index length %zu bytes\n", sb.st_size,
hdr.nblocks, iov[1].iov_len);
+ last_offset = 0;
for(i = 0; i == 0 || ibuf != NULL; i++) {
ibuf = readblock(fdr, ibuf, hdr.blksz);
if (ibuf != NULL) {
- destlen = compressBound(hdr.blksz);
- if (compress2(obuf, &destlen, ibuf, hdr.blksz,
- Z_BEST_COMPRESSION) != Z_OK) {
- errx(1, "can't compress data: compress2() "
- "failed");
- /* Not reached */
+ if (no_zcomp == 0 && \
+ memvcmp(ibuf, '\0', hdr.blksz) != 0) {
+ /* All zeroes block */
+ destlen = 0;
+ } else {
+ handler->f_compress(ibuf, &destlen);
}
- if (verbose != 0)
- fprintf(stderr, "cluster #%d, in %u bytes, "
- "out %lu bytes\n", i, hdr.blksz, destlen);
} else {
destlen = DEV_BSIZE - (offset % DEV_BSIZE);
memset(obuf, 0, destlen);
if (verbose != 0)
- fprintf(stderr, "padding data with %lu bytes so "
- "that file size is multiple of %d\n", destlen,
- DEV_BSIZE);
+ fprintf(stderr, "padding data with %lu bytes "
+ "so that file size is multiple of %d\n",
+ (u_long)destlen, DEV_BSIZE);
}
- if (write(fdw, obuf, destlen) < 0) {
- err(1, "write(%s)", oname);
- /* Not reached */
+ if (destlen > 0 && en_dedup != 0) {
+ chit = mkuz_blkcache_regblock(fdw, i, offset, destlen,
+ obuf);
+ /*
+ * There should be at least one non-empty block
+ * between us and the backref'ed offset, otherwise
+ * we won't be able to parse that sequence correctly
+ * as it would be indistinguishible from another
+ * empty block.
+ */
+ if (chit != NULL && chit->offset == last_offset) {
+ chit = NULL;
+ }
+ } else {
+ chit = NULL;
+ }
+ if (chit != NULL) {
+ toc[i] = htobe64(chit->offset);
+ } else {
+ if (destlen > 0 && write(fdw, obuf, destlen) < 0) {
+ err(1, "write(%s)", oname);
+ /* Not reached */
+ }
+ toc[i] = htobe64(offset);
+ last_offset = offset;
+ offset += destlen;
+ }
+ if (ibuf != NULL && verbose != 0) {
+ fprintf(stderr, "cluster #%d, in %u bytes, "
+ "out len=%lu offset=%lu", i, hdr.blksz,
+ chit == NULL ? (u_long)destlen : 0,
+ (u_long)be64toh(toc[i]));
+ if (chit != NULL) {
+ fprintf(stderr, " (backref'ed to #%d)",
+ chit->blkno);
+ }
+ fprintf(stderr, "\n");
+
}
- toc[i] = htobe64(offset);
- offset += destlen;
}
close(fdr);
if (verbose != 0)
fprintf(stderr, "compressed data to %ju bytes, saved %lld "
- "bytes, %.2f%% decrease.\n", offset, (long long)(sb.st_size - offset),
- 100.0 * (long long)(sb.st_size - offset) / (float)sb.st_size);
+ "bytes, %.2f%% decrease.\n", offset,
+ (long long)(sb.st_size - offset),
+ 100.0 * (long long)(sb.st_size - offset) /
+ (float)sb.st_size);
/* Convert to big endian */
hdr.blksz = htonl(hdr.blksz);
@@ -248,12 +337,13 @@ static void
usage(void)
{
- fprintf(stderr, "usage: mkuzip [-v] [-o outfile] [-s cluster_size] infile\n");
+ fprintf(stderr, "usage: mkuzip [-vZdL] [-o outfile] [-s cluster_size] "
+ "infile\n");
exit(1);
}
-static void *
-safe_malloc(size_t size)
+void *
+mkuz_safe_malloc(size_t size)
{
void *retval;
@@ -272,3 +362,12 @@ cleanup(void)
if (cleanfile != NULL)
unlink(cleanfile);
}
+
+static int
+memvcmp(const void *memory, unsigned char val, size_t size)
+{
+ const u_char *mm;
+
+ mm = (const u_char *)memory;
+ return (*mm == val) && memcmp(mm, mm + 1, size - 1) == 0;
+}
diff --git a/usr.bin/mkuzip/mkuzip.h b/usr.bin/mkuzip/mkuzip.h
new file mode 100644
index 0000000..4028b3a
--- /dev/null
+++ b/usr.bin/mkuzip/mkuzip.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2004-2016 Maxim Sobolev <sobomax@FreeBSD.org>
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+void *mkuz_safe_malloc(size_t);
diff --git a/usr.bin/netstat/Makefile.depend b/usr.bin/netstat/Makefile.depend
index 2abbfbf..27fa660 100644
--- a/usr.bin/netstat/Makefile.depend
+++ b/usr.bin/netstat/Makefile.depend
@@ -22,14 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-main.o: nl_defs.h
-main.po: nl_defs.h
-mroute.o: nl_defs.h
-mroute.po: nl_defs.h
-netisr.o: nl_defs.h
-netisr.po: nl_defs.h
-nl_symbols.o: nl_symbols.c
-nl_symbols.po: nl_symbols.c
-route.o: nl_defs.h
-route.po: nl_defs.h
.endif
diff --git a/usr.bin/top/Makefile.depend b/usr.bin/top/Makefile.depend
index accbe52..fafa76b 100644
--- a/usr.bin/top/Makefile.depend
+++ b/usr.bin/top/Makefile.depend
@@ -20,12 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-commands.o: sigdesc.h
-commands.po: sigdesc.h
-display.o: top.local.h
-display.po: top.local.h
-top.o: top.local.h
-top.po: top.local.h
-username.o: top.local.h
-username.po: top.local.h
.endif
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index b28098c..7ba4392 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -2,7 +2,7 @@
NO_WERROR=
PROG= truss
-SRCS= cloudabi.c main.c setup.c syscalls.c
+SRCS= main.c setup.c syscalls.c
LIBADD= sysdecode
diff --git a/usr.bin/truss/aarch64-cloudabi64.c b/usr.bin/truss/aarch64-cloudabi64.c
index f2891af..27906ea 100644
--- a/usr.bin/truss/aarch64-cloudabi64.c
+++ b/usr.bin/truss/aarch64-cloudabi64.c
@@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
#include <machine/armreg.h>
-#include <errno.h>
#include <stdio.h>
#include <sysdecode.h>
-#include "cloudabi.h"
#include "truss.h"
static int
@@ -74,8 +72,6 @@ aarch64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
retval[0] = regs.x[0];
retval[1] = regs.x[1];
*errorp = (regs.spsr & PSR_C) != 0;
- if (*errorp)
- retval[0] = cloudabi_convert_errno(retval[0]);
return (0);
}
diff --git a/usr.bin/truss/amd64-cloudabi64.c b/usr.bin/truss/amd64-cloudabi64.c
index ce8b189..f7d7c1a 100644
--- a/usr.bin/truss/amd64-cloudabi64.c
+++ b/usr.bin/truss/amd64-cloudabi64.c
@@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
-#include <errno.h>
#include <stdio.h>
#include <sysdecode.h>
-#include "cloudabi.h"
#include "truss.h"
static int
@@ -83,8 +81,6 @@ amd64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
retval[0] = regs.r_rax;
retval[1] = regs.r_rdx;
*errorp = (regs.r_rflags & PSL_C) != 0;
- if (*errorp)
- retval[0] = cloudabi_convert_errno(retval[0]);
return (0);
}
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 873ef01..279d228 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -83,28 +83,12 @@ amd64_linux32_fetch_args(struct trussinfo *trussinfo, u_int narg)
return (0);
}
-/*
- * Linux syscalls return negative errno's, we do positive and map them
- */
-static const int bsd_to_linux_errno[] = {
- -0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
- -10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
- -20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
- -30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
- -90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
- -100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
- -110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
- -116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6,
-};
-
static int
amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
int *errorp)
{
struct reg regs;
lwpid_t tid;
- size_t i;
tid = trussinfo->curthread->tid;
if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@@ -117,17 +101,6 @@ amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
*errorp = !!(regs.r_rflags & PSL_C);
if (*errorp)
retval[0] = (int)retval[0];
-
- if (*errorp) {
- for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
- if (retval[0] == bsd_to_linux_errno[i]) {
- retval[0] = i;
- return (0);
- }
- }
-
- /* XXX: How to handle unknown errors? */
- }
return (0);
}
diff --git a/usr.bin/truss/cloudabi.c b/usr.bin/truss/cloudabi.c
deleted file mode 100644
index d426500..0000000
--- a/usr.bin/truss/cloudabi.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-
-#include <errno.h>
-
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
-
-#include "cloudabi.h"
-
-long
-cloudabi_convert_errno(long error)
-{
- static const int table[] = {
- [CLOUDABI_E2BIG] = E2BIG,
- [CLOUDABI_EACCES] = EACCES,
- [CLOUDABI_EADDRINUSE] = EADDRINUSE,
- [CLOUDABI_EADDRNOTAVAIL] = EADDRNOTAVAIL,
- [CLOUDABI_EAFNOSUPPORT] = EAFNOSUPPORT,
- [CLOUDABI_EAGAIN] = EAGAIN,
- [CLOUDABI_EALREADY] = EALREADY,
- [CLOUDABI_EBADF] = EBADF,
- [CLOUDABI_EBADMSG] = EBADMSG,
- [CLOUDABI_EBUSY] = EBUSY,
- [CLOUDABI_ECANCELED] = ECANCELED,
- [CLOUDABI_ECHILD] = ECHILD,
- [CLOUDABI_ECONNABORTED] = ECONNABORTED,
- [CLOUDABI_ECONNREFUSED] = ECONNREFUSED,
- [CLOUDABI_ECONNRESET] = ECONNRESET,
- [CLOUDABI_EDEADLK] = EDEADLK,
- [CLOUDABI_EDESTADDRREQ] = EDESTADDRREQ,
- [CLOUDABI_EDOM] = EDOM,
- [CLOUDABI_EDQUOT] = EDQUOT,
- [CLOUDABI_EEXIST] = EEXIST,
- [CLOUDABI_EFAULT] = EFAULT,
- [CLOUDABI_EFBIG] = EFBIG,
- [CLOUDABI_EHOSTUNREACH] = EHOSTUNREACH,
- [CLOUDABI_EIDRM] = EIDRM,
- [CLOUDABI_EILSEQ] = EILSEQ,
- [CLOUDABI_EINPROGRESS] = EINPROGRESS,
- [CLOUDABI_EINTR] = EINTR,
- [CLOUDABI_EINVAL] = EINVAL,
- [CLOUDABI_EIO] = EIO,
- [CLOUDABI_EISCONN] = EISCONN,
- [CLOUDABI_EISDIR] = EISDIR,
- [CLOUDABI_ELOOP] = ELOOP,
- [CLOUDABI_EMFILE] = EMFILE,
- [CLOUDABI_EMLINK] = EMLINK,
- [CLOUDABI_EMSGSIZE] = EMSGSIZE,
- [CLOUDABI_EMULTIHOP] = EMULTIHOP,
- [CLOUDABI_ENAMETOOLONG] = ENAMETOOLONG,
- [CLOUDABI_ENETDOWN] = ENETDOWN,
- [CLOUDABI_ENETRESET] = ENETRESET,
- [CLOUDABI_ENETUNREACH] = ENETUNREACH,
- [CLOUDABI_ENFILE] = ENFILE,
- [CLOUDABI_ENOBUFS] = ENOBUFS,
- [CLOUDABI_ENODEV] = ENODEV,
- [CLOUDABI_ENOENT] = ENOENT,
- [CLOUDABI_ENOEXEC] = ENOEXEC,
- [CLOUDABI_ENOLCK] = ENOLCK,
- [CLOUDABI_ENOLINK] = ENOLINK,
- [CLOUDABI_ENOMEM] = ENOMEM,
- [CLOUDABI_ENOMSG] = ENOMSG,
- [CLOUDABI_ENOPROTOOPT] = ENOPROTOOPT,
- [CLOUDABI_ENOSPC] = ENOSPC,
- [CLOUDABI_ENOSYS] = ENOSYS,
- [CLOUDABI_ENOTCONN] = ENOTCONN,
- [CLOUDABI_ENOTDIR] = ENOTDIR,
- [CLOUDABI_ENOTEMPTY] = ENOTEMPTY,
- [CLOUDABI_ENOTRECOVERABLE] = ENOTRECOVERABLE,
- [CLOUDABI_ENOTSOCK] = ENOTSOCK,
- [CLOUDABI_ENOTSUP] = ENOTSUP,
- [CLOUDABI_ENOTTY] = ENOTTY,
- [CLOUDABI_ENXIO] = ENXIO,
- [CLOUDABI_EOVERFLOW] = EOVERFLOW,
- [CLOUDABI_EOWNERDEAD] = EOWNERDEAD,
- [CLOUDABI_EPERM] = EPERM,
- [CLOUDABI_EPIPE] = EPIPE,
- [CLOUDABI_EPROTO] = EPROTO,
- [CLOUDABI_EPROTONOSUPPORT] = EPROTONOSUPPORT,
- [CLOUDABI_EPROTOTYPE] = EPROTOTYPE,
- [CLOUDABI_ERANGE] = ERANGE,
- [CLOUDABI_EROFS] = EROFS,
- [CLOUDABI_ESPIPE] = ESPIPE,
- [CLOUDABI_ESRCH] = ESRCH,
- [CLOUDABI_ESTALE] = ESTALE,
- [CLOUDABI_ETIMEDOUT] = ETIMEDOUT,
- [CLOUDABI_ETXTBSY] = ETXTBSY,
- [CLOUDABI_EXDEV] = EXDEV,
- [CLOUDABI_ENOTCAPABLE] = ENOTCAPABLE,
- };
-
- if (error < 0 || error >= nitems(table) || table[error] == 0)
- return (error);
- return (table[error]);
-}
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index 708d055..5ce3d3b 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -31,6 +31,7 @@
* $FreeBSD$
*/
+extern int print_line_prefix(struct trussinfo *);
extern void setup_and_wait(struct trussinfo *, char **);
extern void start_tracing(struct trussinfo *, pid_t);
extern void restore_proc(int);
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index c5f625d..52232b4 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -83,27 +83,11 @@ i386_linux_fetch_args(struct trussinfo *trussinfo, u_int narg)
return (0);
}
-/*
- * Linux syscalls return negative errno's, we do positive and map them
- */
-static const int bsd_to_linux_errno[] = {
- -0, -1, -2, -3, -4, -5, -6, -7, -8, -9,
- -10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
- -20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
- -30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
- -90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
- -100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
- -110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
- -116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6,
-};
-
static int
i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
{
struct reg regs;
lwpid_t tid;
- size_t i;
tid = trussinfo->curthread->tid;
if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@@ -114,17 +98,6 @@ i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
retval[0] = regs.r_eax;
retval[1] = regs.r_edx;
*errorp = !!(regs.r_eflags & PSL_C);
-
- if (*errorp) {
- for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
- if (retval[0] == bsd_to_linux_errno[i]) {
- retval[0] = i;
- return (0);
- }
- }
-
- /* XXX: How to handle unknown errors? */
- }
return (0);
}
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 531d7db..38626fd 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -96,7 +96,7 @@ main(int ac, char **av)
trussinfo->curthread = NULL;
LIST_INIT(&trussinfo->proclist);
init_syscalls();
- while ((c = getopt(ac, av, "p:o:facedDs:S")) != -1) {
+ while ((c = getopt(ac, av, "p:o:facedDs:SH")) != -1) {
switch (c) {
case 'p': /* specified pid */
pid = atoi(optarg);
@@ -132,6 +132,9 @@ main(int ac, char **av)
case 'S': /* Don't trace signals */
trussinfo->flags |= NOSIGS;
break;
+ case 'H':
+ trussinfo->flags |= DISPLAYTIDS;
+ break;
default:
usage();
}
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 24126ad..36dd571f 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -439,26 +439,46 @@ exit_syscall(struct trussinfo *info, struct ptrace_lwpinfo *pl)
}
}
-static void
-report_exit(struct trussinfo *info, siginfo_t *si)
+int
+print_line_prefix(struct trussinfo *info)
{
struct timespec timediff;
+ struct threadinfo *t;
+ int len;
- if (info->flags & FOLLOWFORKS)
- fprintf(info->outfile, "%5d: ", si->si_pid);
- clock_gettime(CLOCK_REALTIME, &info->curthread->after);
+ len = 0;
+ t = info->curthread;
+ if (info->flags & (FOLLOWFORKS | DISPLAYTIDS)) {
+ if (info->flags & FOLLOWFORKS)
+ len += fprintf(info->outfile, "%5d", t->proc->pid);
+ if ((info->flags & (FOLLOWFORKS | DISPLAYTIDS)) ==
+ (FOLLOWFORKS | DISPLAYTIDS))
+ len += fprintf(info->outfile, " ");
+ if (info->flags & DISPLAYTIDS)
+ len += fprintf(info->outfile, "%6d", t->tid);
+ len += fprintf(info->outfile, ": ");
+ }
if (info->flags & ABSOLUTETIMESTAMPS) {
- timespecsubt(&info->curthread->after, &info->start_time,
- &timediff);
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
+ timespecsubt(&t->after, &info->start_time, &timediff);
+ len += fprintf(info->outfile, "%jd.%09ld ",
+ (intmax_t)timediff.tv_sec, timediff.tv_nsec);
}
if (info->flags & RELATIVETIMESTAMPS) {
- timespecsubt(&info->curthread->after, &info->curthread->before,
- &timediff);
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
+ timespecsubt(&t->after, &t->before, &timediff);
+ len += fprintf(info->outfile, "%jd.%09ld ",
+ (intmax_t)timediff.tv_sec, timediff.tv_nsec);
}
+ return (len);
+}
+
+static void
+report_exit(struct trussinfo *info, siginfo_t *si)
+{
+ struct threadinfo *t;
+
+ t = info->curthread;
+ clock_gettime(CLOCK_REALTIME, &t->after);
+ print_line_prefix(info);
if (si->si_code == CLD_EXITED)
fprintf(info->outfile, "process exit, rval = %u\n",
si->si_status);
@@ -469,48 +489,26 @@ report_exit(struct trussinfo *info, siginfo_t *si)
}
static void
-report_new_child(struct trussinfo *info, pid_t pid)
+report_new_child(struct trussinfo *info)
{
- struct timespec timediff;
+ struct threadinfo *t;
- clock_gettime(CLOCK_REALTIME, &info->curthread->after);
- assert(info->flags & FOLLOWFORKS);
- fprintf(info->outfile, "%5d: ", pid);
- if (info->flags & ABSOLUTETIMESTAMPS) {
- timespecsubt(&info->curthread->after, &info->start_time,
- &timediff);
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
- }
- if (info->flags & RELATIVETIMESTAMPS) {
- timediff.tv_sec = 0;
- timediff.tv_nsec = 0;
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
- }
+ t = info->curthread;
+ clock_gettime(CLOCK_REALTIME, &t->after);
+ t->before = t->after;
+ print_line_prefix(info);
fprintf(info->outfile, "<new process>\n");
}
static void
report_signal(struct trussinfo *info, siginfo_t *si)
{
- struct timespec timediff;
+ struct threadinfo *t;
char *signame;
- if (info->flags & FOLLOWFORKS)
- fprintf(info->outfile, "%5d: ", si->si_pid);
- if (info->flags & ABSOLUTETIMESTAMPS) {
- timespecsubt(&info->curthread->after, &info->start_time,
- &timediff);
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
- }
- if (info->flags & RELATIVETIMESTAMPS) {
- timespecsubt(&info->curthread->after, &info->curthread->before,
- &timediff);
- fprintf(info->outfile, "%jd.%09ld ", (intmax_t)timediff.tv_sec,
- timediff.tv_nsec);
- }
+ t = info->curthread;
+ clock_gettime(CLOCK_REALTIME, &t->after);
+ print_line_prefix(info);
signame = strsig(si->si_status);
fprintf(info->outfile, "SIGNAL %u (%s)\n", si->si_status,
signame == NULL ? "?" : signame);
@@ -572,7 +570,7 @@ eventloop(struct trussinfo *info)
pending_signal = 0;
} else if (pl.pl_flags & PL_FLAG_CHILD) {
if ((info->flags & COUNTONLY) == 0)
- report_new_child(info, si.si_pid);
+ report_new_child(info);
pending_signal = 0;
} else {
if ((info->flags & NOSIGS) == 0)
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index b013390..b3a4c42 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -2005,38 +2005,18 @@ print_arg(struct syscall_args *sc, unsigned long *args, long *retval,
void
print_syscall(struct trussinfo *trussinfo)
{
- struct timespec timediff;
struct threadinfo *t;
const char *name;
char **s_args;
int i, len, nargs;
- len = 0;
t = trussinfo->curthread;
- if (trussinfo->flags & FOLLOWFORKS)
- len += fprintf(trussinfo->outfile, "%5d: ",
- t->proc->pid);
name = t->cs.name;
nargs = t->cs.nargs;
s_args = t->cs.s_args;
- if (name != NULL && (strcmp(name, "execve") == 0 ||
- strcmp(name, "exit") == 0)) {
- clock_gettime(CLOCK_REALTIME, &t->after);
- }
-
- if (trussinfo->flags & ABSOLUTETIMESTAMPS) {
- timespecsubt(&t->after, &trussinfo->start_time, &timediff);
- len += fprintf(trussinfo->outfile, "%jd.%09ld ",
- (intmax_t)timediff.tv_sec, timediff.tv_nsec);
- }
-
- if (trussinfo->flags & RELATIVETIMESTAMPS) {
- timespecsubt(&t->after, &t->before, &timediff);
- len += fprintf(trussinfo->outfile, "%jd.%09ld ",
- (intmax_t)timediff.tv_sec, timediff.tv_nsec);
- }
+ len = print_line_prefix(trussinfo);
len += fprintf(trussinfo->outfile, "%s(", name);
for (i = 0; i < nargs; i++) {
@@ -2059,11 +2039,11 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
struct timespec timediff;
struct threadinfo *t;
struct syscall *sc;
+ int error;
t = trussinfo->curthread;
sc = t->cs.sc;
if (trussinfo->flags & COUNTONLY) {
- clock_gettime(CLOCK_REALTIME, &t->after);
timespecsubt(&t->after, &t->before, &timediff);
timespecadd(&sc->time, &timediff, &sc->time);
sc->ncalls++;
@@ -2074,9 +2054,12 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
print_syscall(trussinfo);
fflush(trussinfo->outfile);
- if (errorp)
+ if (errorp) {
+ error = sysdecode_abi_to_freebsd_errno(t->proc->abi->abi,
+ retval[0]);
fprintf(trussinfo->outfile, " ERR#%ld '%s'\n", retval[0],
- strerror(retval[0]));
+ error == INT_MAX ? "Unknown error" : strerror(error));
+ }
#ifndef __LP64__
else if (sc->ret_type == 2) {
off_t off;
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index fb02cb4..0246fa9 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -1,6 +1,6 @@
.\" $FreeBSD$
.\"
-.Dd October 9, 2015
+.Dd February 23, 2016
.Dt TRUSS 1
.Os
.Sh NAME
@@ -8,12 +8,12 @@
.Nd trace system calls
.Sh SYNOPSIS
.Nm
-.Op Fl facedDS
+.Op Fl facedDHS
.Op Fl o Ar file
.Op Fl s Ar strsize
.Fl p Ar pid
.Nm
-.Op Fl facedDS
+.Op Fl facedDHS
.Op Fl o Ar file
.Op Fl s Ar strsize
.Ar command Op Ar args
@@ -32,6 +32,10 @@ Trace descendants of the original traced process created by
.Xr fork 2 ,
.Xr vfork 2 ,
etc.
+To distinguish events between processes,
+the process ID
+.Pq PID
+of the process is included in the output of each event.
.It Fl a
Show the argument strings that are passed in each
.Xr execve 2
@@ -52,6 +56,8 @@ since the trace was started.
.It Fl D
Include timestamps in the output showing the time elapsed
since the last recorded event.
+.It Fl H
+Include the thread ID of in the output of each event.
.It Fl S
Do not display information about signals received by the process.
(Normally,
diff --git a/usr.bin/truss/truss.h b/usr.bin/truss/truss.h
index 5ef2444..582ab0b 100644
--- a/usr.bin/truss/truss.h
+++ b/usr.bin/truss/truss.h
@@ -35,6 +35,7 @@
#define EXECVEARGS 0x00000010
#define EXECVEENVS 0x00000020
#define COUNTONLY 0x00000040
+#define DISPLAYTIDS 0x00000080
struct procinfo;
struct trussinfo;
diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend
index 1636b07..b0af42f 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vacation.o: sm_os.h
-vacation.po: sm_os.h
.endif
diff --git a/usr.bin/xlint/lint1/Makefile.depend b/usr.bin/xlint/lint1/Makefile.depend
index 22a5556..dab7995 100644
--- a/usr.bin/xlint/lint1/Makefile.depend
+++ b/usr.bin/xlint/lint1/Makefile.depend
@@ -18,14 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-cgram.o: cgram.c
-cgram.po: cgram.c
-func.o: cgram.h
-func.po: cgram.h
-scan.o: cgram.h
-scan.o: scan.c
-scan.po: cgram.h
-scan.po: scan.c
-tree.o: cgram.h
-tree.po: cgram.h
.endif
diff --git a/usr.sbin/acpi/iasl/Makefile.depend b/usr.sbin/acpi/iasl/Makefile.depend
index ef1c922..ca0b2f9 100644
--- a/usr.sbin/acpi/iasl/Makefile.depend
+++ b/usr.sbin/acpi/iasl/Makefile.depend
@@ -16,92 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-aslanalyze.o: aslcompiler.y.h
-aslanalyze.po: aslcompiler.y.h
-aslbtypes.o: aslcompiler.y.h
-aslbtypes.po: aslcompiler.y.h
-aslcodegen.o: aslcompiler.y.h
-aslcodegen.po: aslcompiler.y.h
-aslcompilerlex.o: aslcompiler.y.h
-aslcompilerlex.o: aslcompilerlex.c
-aslcompilerlex.po: aslcompiler.y.h
-aslcompilerlex.po: aslcompilerlex.c
-aslcompilerparse.o: aslcompilerparse.c
-aslcompilerparse.po: aslcompilerparse.c
-aslfold.o: aslcompiler.y.h
-aslfold.po: aslcompiler.y.h
-asllength.o: aslcompiler.y.h
-asllength.po: aslcompiler.y.h
-asllisting.o: aslcompiler.y.h
-asllisting.po: aslcompiler.y.h
-asllistsup.o: aslcompiler.y.h
-asllistsup.po: aslcompiler.y.h
-aslload.o: aslcompiler.y.h
-aslload.po: aslcompiler.y.h
-asllookup.o: aslcompiler.y.h
-asllookup.po: aslcompiler.y.h
-aslmapoutput.o: aslcompiler.y.h
-aslmapoutput.po: aslcompiler.y.h
-aslmaputils.o: aslcompiler.y.h
-aslmaputils.po: aslcompiler.y.h
-aslmethod.o: aslcompiler.y.h
-aslmethod.po: aslcompiler.y.h
-aslnamesp.o: aslcompiler.y.h
-aslnamesp.po: aslcompiler.y.h
-asloffset.o: aslcompiler.y.h
-asloffset.po: aslcompiler.y.h
-aslopcodes.o: aslcompiler.y.h
-aslopcodes.po: aslcompiler.y.h
-asloperands.o: aslcompiler.y.h
-asloperands.po: aslcompiler.y.h
-aslopt.o: aslcompiler.y.h
-aslopt.po: aslcompiler.y.h
-aslpredef.o: aslcompiler.y.h
-aslpredef.po: aslcompiler.y.h
-aslprepkg.o: aslcompiler.y.h
-aslprepkg.po: aslcompiler.y.h
-aslprintf.o: aslcompiler.y.h
-aslprintf.po: aslcompiler.y.h
-aslprune.o: aslcompiler.y.h
-aslprune.po: aslcompiler.y.h
-aslresource.o: aslcompiler.y.h
-aslresource.po: aslcompiler.y.h
-aslrestype1.o: aslcompiler.y.h
-aslrestype1.po: aslcompiler.y.h
-aslrestype1i.o: aslcompiler.y.h
-aslrestype1i.po: aslcompiler.y.h
-aslrestype2.o: aslcompiler.y.h
-aslrestype2.po: aslcompiler.y.h
-aslrestype2d.o: aslcompiler.y.h
-aslrestype2d.po: aslcompiler.y.h
-aslrestype2q.o: aslcompiler.y.h
-aslrestype2q.po: aslcompiler.y.h
-aslrestype2s.o: aslcompiler.y.h
-aslrestype2s.po: aslcompiler.y.h
-aslrestype2w.o: aslcompiler.y.h
-aslrestype2w.po: aslcompiler.y.h
-asltransform.o: aslcompiler.y.h
-asltransform.po: aslcompiler.y.h
-asltree.o: aslcompiler.y.h
-asltree.po: aslcompiler.y.h
-aslutils.o: aslcompiler.y.h
-aslutils.po: aslcompiler.y.h
-aslwalks.o: aslcompiler.y.h
-aslwalks.po: aslcompiler.y.h
-aslxref.o: aslcompiler.y.h
-aslxref.po: aslcompiler.y.h
-dtexpress.o: dtparser.y.h
-dtexpress.po: dtparser.y.h
-dtparserlex.o: dtparser.y.h
-dtparserlex.o: dtparserlex.c
-dtparserlex.po: dtparser.y.h
-dtparserlex.po: dtparserlex.c
-dtparserparse.o: dtparserparse.c
-dtparserparse.po: dtparserparse.c
-prparserlex.o: prparser.y.h
-prparserlex.o: prparserlex.c
-prparserlex.po: prparser.y.h
-prparserlex.po: prparserlex.c
-prparserparse.o: prparserparse.c
-prparserparse.po: prparserparse.c
.endif
diff --git a/usr.sbin/amd/amd/Makefile.depend b/usr.sbin/amd/amd/Makefile.depend
index c0afb66..5f63255 100644
--- a/usr.sbin/amd/amd/Makefile.depend
+++ b/usr.sbin/amd/amd/Makefile.depend
@@ -22,12 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-conf_parse.o: conf_parse.c
-conf_parse.po: conf_parse.c
-conf_tok.o: conf_parse.h
-conf_tok.o: conf_tok.c
-conf_tok.po: conf_parse.h
-conf_tok.po: conf_tok.c
-mount_xdr.o: mount_xdr.c
-mount_xdr.po: mount_xdr.c
.endif
diff --git a/usr.sbin/amd/fsinfo/Makefile.depend b/usr.sbin/amd/fsinfo/Makefile.depend
index 5d30d8b..5f63255 100644
--- a/usr.sbin/amd/fsinfo/Makefile.depend
+++ b/usr.sbin/amd/fsinfo/Makefile.depend
@@ -22,12 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-fsi_gram.o: fsi_gram.c
-fsi_gram.po: fsi_gram.c
-fsi_lex.o: fsi_gram.h
-fsi_lex.o: fsi_lex.c
-fsi_lex.po: fsi_gram.h
-fsi_lex.po: fsi_lex.c
-fsinfo.o: fsi_gram.h
-fsinfo.po: fsi_gram.h
.endif
diff --git a/usr.sbin/amd/libamu/Makefile.depend b/usr.sbin/amd/libamu/Makefile.depend
index ee19de4..c6f8f4b 100644
--- a/usr.sbin/amd/libamu/Makefile.depend
+++ b/usr.sbin/amd/libamu/Makefile.depend
@@ -15,8 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-nfs_prot_x.o: nfs_prot_x.c
-nfs_prot_x.po: nfs_prot_x.c
-xdr_func_%undef.o: xdr_func_%undef.c
-xdr_func_%undef.po: xdr_func_%undef.c
.endif
diff --git a/usr.sbin/apmd/Makefile.depend b/usr.sbin/apmd/Makefile.depend
index bae339a..79eb58b 100644
--- a/usr.sbin/apmd/Makefile.depend
+++ b/usr.sbin/apmd/Makefile.depend
@@ -13,10 +13,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-apmdlex.o: apmdlex.c
-apmdlex.o: y.tab.h
-apmdlex.po: apmdlex.c
-apmdlex.po: y.tab.h
-apmdparse.o: apmdparse.c
-apmdparse.po: apmdparse.c
.endif
diff --git a/usr.sbin/auditdistd/Makefile.depend b/usr.sbin/auditdistd/Makefile.depend
index b939d66..82c7f95 100644
--- a/usr.sbin/auditdistd/Makefile.depend
+++ b/usr.sbin/auditdistd/Makefile.depend
@@ -22,10 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: parse.h
-token.o: token.c
-token.po: parse.h
-token.po: token.c
.endif
diff --git a/usr.sbin/autofs/Makefile.depend b/usr.sbin/autofs/Makefile.depend
index 61f3b2b..58f9a33 100644
--- a/usr.sbin/autofs/Makefile.depend
+++ b/usr.sbin/autofs/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-token.o: token.c
-token.po: token.c
.endif
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
index 32222f2..bc60d30 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
@@ -19,10 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lexer.o: lexer.c
-lexer.o: parser.h
-lexer.po: lexer.c
-lexer.po: parser.h
-parser.o: parser.c
-parser.po: parser.c
.endif
diff --git a/usr.sbin/bluetooth/bthidd/Makefile.depend b/usr.sbin/bluetooth/bthidd/Makefile.depend
index a1ed9d7..5c2aa9d 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidd/Makefile.depend
@@ -18,10 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lexer.o: lexer.c
-lexer.o: parser.h
-lexer.po: lexer.c
-lexer.po: parser.h
-parser.o: parser.c
-parser.po: parser.c
.endif
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile.depend b/usr.sbin/bluetooth/hcsecd/Makefile.depend
index 4a1ee3f..f11236e 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile.depend
+++ b/usr.sbin/bluetooth/hcsecd/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lexer.o: lexer.c
-lexer.o: parser.h
-lexer.po: lexer.c
-lexer.po: parser.h
-parser.o: parser.c
-parser.po: parser.c
.endif
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile.depend b/usr.sbin/bootparamd/bootparamd/Makefile.depend
index a1d24b5..c0b7a14 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile.depend
+++ b/usr.sbin/bootparamd/bootparamd/Makefile.depend
@@ -18,16 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bootparam_prot_svc.o: bootparam_prot.h
-bootparam_prot_svc.o: bootparam_prot_svc.c
-bootparam_prot_svc.po: bootparam_prot.h
-bootparam_prot_svc.po: bootparam_prot_svc.c
-bootparam_prot_xdr.o: bootparam_prot.h
-bootparam_prot_xdr.o: bootparam_prot_xdr.c
-bootparam_prot_xdr.po: bootparam_prot.h
-bootparam_prot_xdr.po: bootparam_prot_xdr.c
-bootparamd.o: bootparam_prot.h
-bootparamd.po: bootparam_prot.h
-main.o: bootparam_prot.h
-main.po: bootparam_prot.h
.endif
diff --git a/usr.sbin/bootparamd/callbootd/Makefile.depend b/usr.sbin/bootparamd/callbootd/Makefile.depend
index e34ede1..c0b7a14 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile.depend
+++ b/usr.sbin/bootparamd/callbootd/Makefile.depend
@@ -18,14 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bootparam_prot_clnt.o: bootparam_prot.h
-bootparam_prot_clnt.o: bootparam_prot_clnt.c
-bootparam_prot_clnt.po: bootparam_prot.h
-bootparam_prot_clnt.po: bootparam_prot_clnt.c
-bootparam_prot_xdr.o: bootparam_prot.h
-bootparam_prot_xdr.o: bootparam_prot_xdr.c
-bootparam_prot_xdr.po: bootparam_prot.h
-bootparam_prot_xdr.po: bootparam_prot_xdr.c
-callbootd.o: bootparam_prot.h
-callbootd.po: bootparam_prot.h
.endif
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
index 3df74f7..bb28dec 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
@@ -20,32 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-action.o: oid.h
-action.o: tree.h
-action.po: oid.h
-action.po: tree.h
-config.o: tree.h
-config.po: tree.h
-export.o: tree.h
-export.po: tree.h
-main.o: oid.h
-main.o: tree.h
-main.po: oid.h
-main.po: tree.h
-trans_lsock.o: oid.h
-trans_lsock.o: tree.h
-trans_lsock.po: oid.h
-trans_lsock.po: tree.h
-trans_udp.o: oid.h
-trans_udp.o: tree.h
-trans_udp.po: oid.h
-trans_udp.po: tree.h
-trap.o: oid.h
-trap.o: tree.h
-trap.po: oid.h
-trap.po: tree.h
-tree.o: tree.c
-tree.o: tree.h
-tree.po: tree.c
-tree.po: tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
index aecafbc..0d36898 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
@@ -19,16 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-atm_sys.So: atm_oid.h
-atm_sys.So: atm_tree.h
-atm_sys.po: atm_oid.h
-atm_sys.po: atm_tree.h
-atm_tree.So: atm_tree.c
-atm_tree.So: atm_tree.h
-atm_tree.po: atm_tree.c
-atm_tree.po: atm_tree.h
-snmp_atm.So: atm_oid.h
-snmp_atm.So: atm_tree.h
-snmp_atm.po: atm_oid.h
-snmp_atm.po: atm_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
index f391300..2391f3d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
@@ -18,24 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-bridge_addrs.So: bridge_tree.h
-bridge_addrs.po: bridge_tree.h
-bridge_if.So: bridge_oid.h
-bridge_if.So: bridge_tree.h
-bridge_if.po: bridge_oid.h
-bridge_if.po: bridge_tree.h
-bridge_pf.So: bridge_tree.h
-bridge_pf.po: bridge_tree.h
-bridge_port.So: bridge_tree.h
-bridge_port.po: bridge_tree.h
-bridge_snmp.So: bridge_oid.h
-bridge_snmp.So: bridge_tree.h
-bridge_snmp.po: bridge_oid.h
-bridge_snmp.po: bridge_tree.h
-bridge_sys.So: bridge_tree.h
-bridge_sys.po: bridge_tree.h
-bridge_tree.So: bridge_tree.c
-bridge_tree.So: bridge_tree.h
-bridge_tree.po: bridge_tree.c
-bridge_tree.po: bridge_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
index 140fffb..7f84027 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
@@ -20,18 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-hast_snmp.So: hast_oid.h
-hast_snmp.So: hast_tree.h
-hast_snmp.po: hast_oid.h
-hast_snmp.po: hast_tree.h
-hast_tree.So: hast_tree.c
-hast_tree.So: hast_tree.h
-hast_tree.po: hast_tree.c
-hast_tree.po: hast_tree.h
-parse.So: parse.c
-parse.po: parse.c
-token.So: token.c
-token.So: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
index a492080..77b21c3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
@@ -23,60 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-hostres_begemot.So: hostres_oid.h
-hostres_begemot.So: hostres_tree.h
-hostres_begemot.po: hostres_oid.h
-hostres_begemot.po: hostres_tree.h
-hostres_device_tbl.So: hostres_oid.h
-hostres_device_tbl.So: hostres_tree.h
-hostres_device_tbl.po: hostres_oid.h
-hostres_device_tbl.po: hostres_tree.h
-hostres_diskstorage_tbl.So: hostres_oid.h
-hostres_diskstorage_tbl.So: hostres_tree.h
-hostres_diskstorage_tbl.po: hostres_oid.h
-hostres_diskstorage_tbl.po: hostres_tree.h
-hostres_fs_tbl.So: hostres_oid.h
-hostres_fs_tbl.So: hostres_tree.h
-hostres_fs_tbl.po: hostres_oid.h
-hostres_fs_tbl.po: hostres_tree.h
-hostres_network_tbl.So: hostres_oid.h
-hostres_network_tbl.So: hostres_tree.h
-hostres_network_tbl.po: hostres_oid.h
-hostres_network_tbl.po: hostres_tree.h
-hostres_partition_tbl.So: hostres_oid.h
-hostres_partition_tbl.So: hostres_tree.h
-hostres_partition_tbl.po: hostres_oid.h
-hostres_partition_tbl.po: hostres_tree.h
-hostres_printer_tbl.So: hostres_oid.h
-hostres_printer_tbl.So: hostres_tree.h
-hostres_printer_tbl.po: hostres_oid.h
-hostres_printer_tbl.po: hostres_tree.h
-hostres_processor_tbl.So: hostres_oid.h
-hostres_processor_tbl.So: hostres_tree.h
-hostres_processor_tbl.po: hostres_oid.h
-hostres_processor_tbl.po: hostres_tree.h
-hostres_scalars.So: hostres_oid.h
-hostres_scalars.So: hostres_tree.h
-hostres_scalars.po: hostres_oid.h
-hostres_scalars.po: hostres_tree.h
-hostres_snmp.So: hostres_oid.h
-hostres_snmp.So: hostres_tree.h
-hostres_snmp.po: hostres_oid.h
-hostres_snmp.po: hostres_tree.h
-hostres_storage_tbl.So: hostres_oid.h
-hostres_storage_tbl.So: hostres_tree.h
-hostres_storage_tbl.po: hostres_oid.h
-hostres_storage_tbl.po: hostres_tree.h
-hostres_swinstalled_tbl.So: hostres_oid.h
-hostres_swinstalled_tbl.So: hostres_tree.h
-hostres_swinstalled_tbl.po: hostres_oid.h
-hostres_swinstalled_tbl.po: hostres_tree.h
-hostres_swrun_tbl.So: hostres_oid.h
-hostres_swrun_tbl.So: hostres_tree.h
-hostres_swrun_tbl.po: hostres_oid.h
-hostres_swrun_tbl.po: hostres_tree.h
-hostres_tree.So: hostres_tree.c
-hostres_tree.So: hostres_tree.h
-hostres_tree.po: hostres_tree.c
-hostres_tree.po: hostres_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
index e3d0506..b83e8c5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
@@ -17,12 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lm75_tree.So: lm75_tree.c
-lm75_tree.So: lm75_tree.h
-lm75_tree.po: lm75_tree.c
-lm75_tree.po: lm75_tree.h
-snmp_lm75.So: lm75_oid.h
-snmp_lm75.So: lm75_tree.h
-snmp_lm75.po: lm75_oid.h
-snmp_lm75.po: lm75_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
index 32018d0..fc79573 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
@@ -17,54 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-mibII.So: mibII_oid.h
-mibII.So: mibII_tree.h
-mibII.po: mibII_oid.h
-mibII.po: mibII_tree.h
-mibII_begemot.So: mibII_oid.h
-mibII_begemot.So: mibII_tree.h
-mibII_begemot.po: mibII_oid.h
-mibII_begemot.po: mibII_tree.h
-mibII_ifmib.So: mibII_oid.h
-mibII_ifmib.So: mibII_tree.h
-mibII_ifmib.po: mibII_oid.h
-mibII_ifmib.po: mibII_tree.h
-mibII_ifstack.So: mibII_tree.h
-mibII_ifstack.po: mibII_tree.h
-mibII_interfaces.So: mibII_oid.h
-mibII_interfaces.So: mibII_tree.h
-mibII_interfaces.po: mibII_oid.h
-mibII_interfaces.po: mibII_tree.h
-mibII_ip.So: mibII_oid.h
-mibII_ip.So: mibII_tree.h
-mibII_ip.po: mibII_oid.h
-mibII_ip.po: mibII_tree.h
-mibII_ipaddr.So: mibII_oid.h
-mibII_ipaddr.So: mibII_tree.h
-mibII_ipaddr.po: mibII_oid.h
-mibII_ipaddr.po: mibII_tree.h
-mibII_nettomedia.So: mibII_oid.h
-mibII_nettomedia.So: mibII_tree.h
-mibII_nettomedia.po: mibII_oid.h
-mibII_nettomedia.po: mibII_tree.h
-mibII_rcvaddr.So: mibII_oid.h
-mibII_rcvaddr.So: mibII_tree.h
-mibII_rcvaddr.po: mibII_oid.h
-mibII_rcvaddr.po: mibII_tree.h
-mibII_route.So: mibII_oid.h
-mibII_route.So: mibII_tree.h
-mibII_route.po: mibII_oid.h
-mibII_route.po: mibII_tree.h
-mibII_tcp.So: mibII_oid.h
-mibII_tcp.So: mibII_tree.h
-mibII_tcp.po: mibII_oid.h
-mibII_tcp.po: mibII_tree.h
-mibII_tree.So: mibII_tree.c
-mibII_tree.So: mibII_tree.h
-mibII_tree.po: mibII_tree.c
-mibII_tree.po: mibII_tree.h
-mibII_udp.So: mibII_oid.h
-mibII_udp.So: mibII_tree.h
-mibII_udp.po: mibII_oid.h
-mibII_udp.po: mibII_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
index cad32c9..ced7822 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
@@ -18,12 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-netgraph_tree.So: netgraph_tree.c
-netgraph_tree.So: netgraph_tree.h
-netgraph_tree.po: netgraph_tree.c
-netgraph_tree.po: netgraph_tree.h
-snmp_netgraph.So: netgraph_oid.h
-snmp_netgraph.So: netgraph_tree.h
-snmp_netgraph.po: netgraph_oid.h
-snmp_netgraph.po: netgraph_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
index 855779d..b83e8c5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
@@ -17,12 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-pf_snmp.So: pf_oid.h
-pf_snmp.So: pf_tree.h
-pf_snmp.po: pf_oid.h
-pf_snmp.po: pf_tree.h
-pf_tree.So: pf_tree.c
-pf_tree.So: pf_tree.h
-pf_tree.po: pf_tree.c
-pf_tree.po: pf_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
index 66ec571..fc311a3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
@@ -16,12 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-target_snmp.So: target_oid.h
-target_snmp.So: target_tree.h
-target_snmp.po: target_oid.h
-target_snmp.po: target_tree.h
-target_tree.So: target_tree.c
-target_tree.So: target_tree.h
-target_tree.po: target_tree.c
-target_tree.po: target_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
index a7180f9..fc311a3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
@@ -16,12 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-usm_snmp.So: usm_oid.h
-usm_snmp.So: usm_tree.h
-usm_snmp.po: usm_oid.h
-usm_snmp.po: usm_tree.h
-usm_tree.So: usm_tree.c
-usm_tree.So: usm_tree.h
-usm_tree.po: usm_tree.c
-usm_tree.po: usm_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
index 89b4f2b..fc311a3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
@@ -16,12 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-vacm_snmp.So: vacm_oid.h
-vacm_snmp.So: vacm_tree.h
-vacm_snmp.po: vacm_oid.h
-vacm_snmp.po: vacm_tree.h
-vacm_tree.So: vacm_tree.c
-vacm_tree.So: vacm_tree.h
-vacm_tree.po: vacm_tree.c
-vacm_tree.po: vacm_tree.h
.endif
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
index 329da3d..2391f3d 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
@@ -18,14 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-wlan_snmp.So: wlan_oid.h
-wlan_snmp.So: wlan_tree.h
-wlan_snmp.po: wlan_oid.h
-wlan_snmp.po: wlan_tree.h
-wlan_sys.So: wlan_tree.h
-wlan_sys.po: wlan_tree.h
-wlan_tree.So: wlan_tree.c
-wlan_tree.So: wlan_tree.h
-wlan_tree.po: wlan_tree.c
-wlan_tree.po: wlan_tree.h
.endif
diff --git a/usr.sbin/config/Makefile.depend b/usr.sbin/config/Makefile.depend
index b443a43..88ef4a6 100644
--- a/usr.sbin/config/Makefile.depend
+++ b/usr.sbin/config/Makefile.depend
@@ -18,20 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-config.o: config.c
-config.po: config.c
-kernconf.o: kernconf.c
-kernconf.po: kernconf.c
-lang.o: lang.c
-lang.o: y.tab.h
-lang.po: lang.c
-lang.po: y.tab.h
-main.o: y.tab.h
-main.po: y.tab.h
-mkheaders.o: y.tab.h
-mkheaders.po: y.tab.h
-mkmakefile.o: y.tab.h
-mkmakefile.po: y.tab.h
-mkoptions.o: y.tab.h
-mkoptions.po: y.tab.h
.endif
diff --git a/usr.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend
index f384605..3646e2e 100644
--- a/usr.sbin/crunch/crunchgen/Makefile.depend
+++ b/usr.sbin/crunch/crunchgen/Makefile.depend
@@ -15,6 +15,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-crunched_skel.o: crunched_skel.c
-crunched_skel.po: crunched_skel.c
.endif
diff --git a/usr.sbin/ctld/Makefile.depend b/usr.sbin/ctld/Makefile.depend
index a7783f1..4941767 100644
--- a/usr.sbin/ctld/Makefile.depend
+++ b/usr.sbin/ctld/Makefile.depend
@@ -24,10 +24,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
.endif
diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index bc24fb7..b0af42f 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-editmap.o: sm_os.h
-editmap.po: sm_os.h
.endif
diff --git a/usr.sbin/fifolog/lib/Makefile.depend b/usr.sbin/fifolog/lib/Makefile.depend
index f91d860..5deb34f 100644
--- a/usr.sbin/fifolog/lib/Makefile.depend
+++ b/usr.sbin/fifolog/lib/Makefile.depend
@@ -12,6 +12,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-getdate.o: getdate.c
-getdate.po: getdate.c
.endif
diff --git a/usr.sbin/gssd/Makefile.depend b/usr.sbin/gssd/Makefile.depend
index 63f755c..642bb5d 100644
--- a/usr.sbin/gssd/Makefile.depend
+++ b/usr.sbin/gssd/Makefile.depend
@@ -29,16 +29,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-gssd.o: gssd.h
-gssd.po: gssd.h
-gssd_prot.o: gssd.h
-gssd_prot.po: gssd.h
-gssd_svc.o: gssd.h
-gssd_svc.o: gssd_svc.c
-gssd_svc.po: gssd.h
-gssd_svc.po: gssd_svc.c
-gssd_xdr.o: gssd.h
-gssd_xdr.o: gssd_xdr.c
-gssd_xdr.po: gssd.h
-gssd_xdr.po: gssd_xdr.c
.endif
diff --git a/usr.sbin/jail/Makefile.depend b/usr.sbin/jail/Makefile.depend
index b24d6ea4..9b995ab 100644
--- a/usr.sbin/jail/Makefile.depend
+++ b/usr.sbin/jail/Makefile.depend
@@ -22,10 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-jaillex.o: jaillex.c
-jaillex.o: y.tab.h
-jaillex.po: jaillex.c
-jaillex.po: y.tab.h
-jailparse.o: jailparse.c
-jailparse.po: jailparse.c
.endif
diff --git a/usr.sbin/kbdcontrol/Makefile.depend b/usr.sbin/kbdcontrol/Makefile.depend
index 523c8ae..dc77d0e 100644
--- a/usr.sbin/kbdcontrol/Makefile.depend
+++ b/usr.sbin/kbdcontrol/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.po: lex.c
.endif
diff --git a/usr.sbin/keyserv/Makefile.depend b/usr.sbin/keyserv/Makefile.depend
index 839d12b..bae15c2 100644
--- a/usr.sbin/keyserv/Makefile.depend
+++ b/usr.sbin/keyserv/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-crypt_server.o: crypt.h
-crypt_server.po: crypt.h
-crypt_svc.o: crypt.h
-crypt_svc.o: crypt_svc.c
-crypt_svc.po: crypt.h
-crypt_svc.po: crypt_svc.c
.endif
diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index 0f94091..ed1b531 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -17,6 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-mailstats.o: sm_os.h
-mailstats.po: sm_os.h
.endif
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index 3e7ef5e..b0af42f 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-makemap.o: sm_os.h
-makemap.po: sm_os.h
.endif
diff --git a/usr.sbin/ndiscvt/Makefile.depend b/usr.sbin/ndiscvt/Makefile.depend
index f55c806..b066929 100644
--- a/usr.sbin/ndiscvt/Makefile.depend
+++ b/usr.sbin/ndiscvt/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-inf-parse.o: inf-parse.c
-inf-parse.po: inf-parse.c
-inf-token.o: inf-token.c
-inf-token.o: y.tab.h
-inf-token.po: inf-token.c
-inf-token.po: y.tab.h
.endif
diff --git a/usr.sbin/ntp/libntp/Makefile.depend b/usr.sbin/ntp/libntp/Makefile.depend
index aa72b94..1890c38 100644
--- a/usr.sbin/ntp/libntp/Makefile.depend
+++ b/usr.sbin/ntp/libntp/Makefile.depend
@@ -14,6 +14,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend b/usr.sbin/ntp/ntpd/Makefile.depend
index 0fc69e4..e42a4da 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend
+++ b/usr.sbin/ntp/ntpd/Makefile.depend
@@ -22,6 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend b/usr.sbin/ntp/ntpdate/Makefile.depend
index 31c07ab..a231d4a 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend
@@ -20,6 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/ntp/ntpdc/Makefile.depend b/usr.sbin/ntp/ntpdc/Makefile.depend
index 7531e73..6cb342f 100644
--- a/usr.sbin/ntp/ntpdc/Makefile.depend
+++ b/usr.sbin/ntp/ntpdc/Makefile.depend
@@ -23,6 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/ntp/ntpq/Makefile.depend b/usr.sbin/ntp/ntpq/Makefile.depend
index 7531e73..6cb342f 100644
--- a/usr.sbin/ntp/ntpq/Makefile.depend
+++ b/usr.sbin/ntp/ntpq/Makefile.depend
@@ -23,6 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 75daedb..b0af42f 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-praliases.o: sm_os.h
-praliases.po: sm_os.h
.endif
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index fe44520..0b4df5e 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -228,14 +228,14 @@ main(int argc, char *argv[])
clean = FILE_INSECURE;
cp(buf2, buf, PERM_INSECURE);
dp = dbopen(buf,
- O_RDWR|O_EXCL|O_SYNC, PERM_INSECURE, DB_HASH, &openinfo);
+ O_RDWR|O_EXCL, PERM_INSECURE, DB_HASH, &openinfo);
if (dp == NULL)
error(buf);
clean = FILE_SECURE;
cp(sbuf2, sbuf, PERM_SECURE);
sdp = dbopen(sbuf,
- O_RDWR|O_EXCL|O_SYNC, PERM_SECURE, DB_HASH, &openinfo);
+ O_RDWR|O_EXCL, PERM_SECURE, DB_HASH, &openinfo);
if (sdp == NULL)
error(sbuf);
@@ -292,13 +292,13 @@ main(int argc, char *argv[])
method = 0;
} else {
dp = dbopen(buf,
- O_RDWR|O_CREAT|O_EXCL|O_SYNC, PERM_INSECURE, DB_HASH, &openinfo);
+ O_RDWR|O_CREAT|O_EXCL, PERM_INSECURE, DB_HASH, &openinfo);
if (dp == NULL)
error(buf);
clean = FILE_INSECURE;
sdp = dbopen(sbuf,
- O_RDWR|O_CREAT|O_EXCL|O_SYNC, PERM_SECURE, DB_HASH, &openinfo);
+ O_RDWR|O_CREAT|O_EXCL, PERM_SECURE, DB_HASH, &openinfo);
if (sdp == NULL)
error(sbuf);
clean = FILE_SECURE;
diff --git a/usr.sbin/rpc.lockd/Makefile.depend b/usr.sbin/rpc.lockd/Makefile.depend
index 2e2391d..b3a9fa6 100644
--- a/usr.sbin/rpc.lockd/Makefile.depend
+++ b/usr.sbin/rpc.lockd/Makefile.depend
@@ -20,6 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-nlm_prot_svc.o: nlm_prot_svc.c
-nlm_prot_svc.po: nlm_prot_svc.c
.endif
diff --git a/usr.sbin/rpc.statd/Makefile.depend b/usr.sbin/rpc.statd/Makefile.depend
index a356b97..bdd7bc2 100644
--- a/usr.sbin/rpc.statd/Makefile.depend
+++ b/usr.sbin/rpc.statd/Makefile.depend
@@ -19,14 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-file.o: sm_inter.h
-file.po: sm_inter.h
-procs.o: sm_inter.h
-procs.po: sm_inter.h
-sm_inter_svc.o: sm_inter.h
-sm_inter_svc.o: sm_inter_svc.c
-sm_inter_svc.po: sm_inter.h
-sm_inter_svc.po: sm_inter_svc.c
-statd.o: sm_inter.h
-statd.po: sm_inter.h
.endif
diff --git a/usr.sbin/rpc.yppasswdd/Makefile.depend b/usr.sbin/rpc.yppasswdd/Makefile.depend
index ffc93ca..669b7c8 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile.depend
+++ b/usr.sbin/rpc.yppasswdd/Makefile.depend
@@ -21,28 +21,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-yp_clnt.o: yp.h
-yp_clnt.o: yp_clnt.c
-yp_clnt.po: yp.h
-yp_clnt.po: yp_clnt.c
-yppasswd_private_svc.o: yppasswd_private.h
-yppasswd_private_svc.o: yppasswd_private_svc.c
-yppasswd_private_svc.po: yppasswd_private.h
-yppasswd_private_svc.po: yppasswd_private_svc.c
-yppasswd_private_xdr.o: yppasswd_private.h
-yppasswd_private_xdr.o: yppasswd_private_xdr.c
-yppasswd_private_xdr.po: yppasswd_private.h
-yppasswd_private_xdr.po: yppasswd_private_xdr.c
-yppasswd_svc.o: yppasswd.h
-yppasswd_svc.o: yppasswd_svc.c
-yppasswd_svc.po: yppasswd.h
-yppasswd_svc.po: yppasswd_svc.c
-yppasswdd_main.o: yppasswd.h
-yppasswdd_main.o: yppasswd_private.h
-yppasswdd_main.po: yppasswd.h
-yppasswdd_main.po: yppasswd_private.h
-yppasswdd_server.o: yppasswd.h
-yppasswdd_server.o: yppasswd_private.h
-yppasswdd_server.po: yppasswd.h
-yppasswdd_server.po: yppasswd_private.h
.endif
diff --git a/usr.sbin/rpc.ypupdated/Makefile.depend b/usr.sbin/rpc.ypupdated/Makefile.depend
index 11b2940..c8383bd 100644
--- a/usr.sbin/rpc.ypupdated/Makefile.depend
+++ b/usr.sbin/rpc.ypupdated/Makefile.depend
@@ -18,12 +18,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ypupdate_prot_svc.o: ypupdate_prot.h
-ypupdate_prot_svc.o: ypupdate_prot_svc.c
-ypupdate_prot_svc.po: ypupdate_prot.h
-ypupdate_prot_svc.po: ypupdate_prot_svc.c
-ypupdated_main.o: ypupdate_prot.h
-ypupdated_main.po: ypupdate_prot.h
-ypupdated_server.o: ypupdate_prot.h
-ypupdated_server.po: ypupdate_prot.h
.endif
diff --git a/usr.sbin/rpc.ypxfrd/Makefile.depend b/usr.sbin/rpc.ypxfrd/Makefile.depend
index 08d54b2..bdd7bc2 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile.depend
+++ b/usr.sbin/rpc.ypxfrd/Makefile.depend
@@ -19,12 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ypxfrd_main.o: ypxfrd.h
-ypxfrd_main.po: ypxfrd.h
-ypxfrd_server.o: ypxfrd.h
-ypxfrd_server.po: ypxfrd.h
-ypxfrd_svc.o: ypxfrd.h
-ypxfrd_svc.o: ypxfrd_svc.c
-ypxfrd_svc.po: ypxfrd.h
-ypxfrd_svc.po: ypxfrd_svc.c
.endif
diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend
index 13367d0..88d8ceb 100644
--- a/usr.sbin/rrenumd/Makefile.depend
+++ b/usr.sbin/rrenumd/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-lexer.o: lexer.c
-lexer.o: y.tab.h
-lexer.po: lexer.c
-lexer.po: y.tab.h
-parser.o: parser.c
-parser.po: parser.c
.endif
diff --git a/usr.sbin/sendmail/Makefile.depend b/usr.sbin/sendmail/Makefile.depend
index a272438..c734c3b 100644
--- a/usr.sbin/sendmail/Makefile.depend
+++ b/usr.sbin/sendmail/Makefile.depend
@@ -23,84 +23,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-alias.o: sm_os.h
-alias.po: sm_os.h
-arpadate.o: sm_os.h
-arpadate.po: sm_os.h
-bf.o: sm_os.h
-bf.po: sm_os.h
-collect.o: sm_os.h
-collect.po: sm_os.h
-conf.o: sm_os.h
-conf.po: sm_os.h
-control.o: sm_os.h
-control.po: sm_os.h
-convtime.o: sm_os.h
-convtime.po: sm_os.h
-daemon.o: sm_os.h
-daemon.po: sm_os.h
-deliver.o: sm_os.h
-deliver.po: sm_os.h
-domain.o: sm_os.h
-domain.po: sm_os.h
-envelope.o: sm_os.h
-envelope.po: sm_os.h
-err.o: sm_os.h
-err.po: sm_os.h
-headers.o: sm_os.h
-headers.po: sm_os.h
-macro.o: sm_os.h
-macro.po: sm_os.h
-main.o: sm_os.h
-main.po: sm_os.h
-map.o: sm_os.h
-map.po: sm_os.h
-mci.o: sm_os.h
-mci.po: sm_os.h
-milter.o: sm_os.h
-milter.po: sm_os.h
-mime.o: sm_os.h
-mime.po: sm_os.h
-parseaddr.o: sm_os.h
-parseaddr.po: sm_os.h
-queue.o: sm_os.h
-queue.po: sm_os.h
-ratectrl.o: sm_os.h
-ratectrl.po: sm_os.h
-readcf.o: sm_os.h
-readcf.po: sm_os.h
-recipient.o: sm_os.h
-recipient.po: sm_os.h
-sasl.o: sm_os.h
-sasl.po: sm_os.h
-savemail.o: sm_os.h
-savemail.po: sm_os.h
-sfsasl.o: sm_os.h
-sfsasl.po: sm_os.h
-shmticklib.o: sm_os.h
-shmticklib.po: sm_os.h
-sm_resolve.o: sm_os.h
-sm_resolve.po: sm_os.h
-srvrsmtp.o: sm_os.h
-srvrsmtp.po: sm_os.h
-stab.o: sm_os.h
-stab.po: sm_os.h
-stats.o: sm_os.h
-stats.po: sm_os.h
-sysexits.o: sm_os.h
-sysexits.po: sm_os.h
-timers.o: sm_os.h
-timers.po: sm_os.h
-tls.o: sm_os.h
-tls.po: sm_os.h
-trace.o: sm_os.h
-trace.po: sm_os.h
-udb.o: sm_os.h
-udb.po: sm_os.h
-usersmtp.o: sm_os.h
-usersmtp.po: sm_os.h
-util.o: sm_os.h
-util.po: sm_os.h
-version.o: sm_os.h
-version.po: sm_os.h
.endif
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend b/usr.sbin/tcpdump/tcpdump/Makefile.depend
index 481ce6b..52b1994 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile.depend
+++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend
@@ -22,6 +22,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/traceroute/Makefile.depend b/usr.sbin/traceroute/Makefile.depend
index 60e14c2..27cbf26 100644
--- a/usr.sbin/traceroute/Makefile.depend
+++ b/usr.sbin/traceroute/Makefile.depend
@@ -17,6 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-version.o: version.c
-version.po: version.c
.endif
diff --git a/usr.sbin/yppush/Makefile.depend b/usr.sbin/yppush/Makefile.depend
index 3d736ab..ddd5dbd 100644
--- a/usr.sbin/yppush/Makefile.depend
+++ b/usr.sbin/yppush/Makefile.depend
@@ -17,12 +17,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-yp_clnt.o: yp.h
-yp_clnt.o: yp_clnt.c
-yp_clnt.po: yp.h
-yp_clnt.po: yp_clnt.c
-yppush_svc.o: yp.h
-yppush_svc.o: yppush_svc.c
-yppush_svc.po: yp.h
-yppush_svc.po: yppush_svc.c
.endif
diff --git a/usr.sbin/ypserv/Makefile.depend b/usr.sbin/ypserv/Makefile.depend
index 5283d7e..16d959f 100644
--- a/usr.sbin/ypserv/Makefile.depend
+++ b/usr.sbin/ypserv/Makefile.depend
@@ -19,16 +19,4 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-yp_main.o: yp.h
-yp_main.po: yp.h
-yp_server.o: yp.h
-yp_server.po: yp.h
-yp_svc.o: yp.h
-yp_svc.o: yp_svc.c
-yp_svc.po: yp.h
-yp_svc.po: yp_svc.c
-ypxfr_clnt.o: yp.h
-ypxfr_clnt.o: ypxfr_clnt.c
-ypxfr_clnt.po: yp.h
-ypxfr_clnt.po: ypxfr_clnt.c
.endif
OpenPOWER on IntegriCloud