diff options
Diffstat (limited to 'lib')
325 files changed, 1063 insertions, 682 deletions
diff --git a/lib/Makefile b/lib/Makefile index bee05ab..b8b3a52 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -147,7 +147,6 @@ SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libuti SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd -SUBDIR_DEPEND_libreadline= ncurses SUBDIR_DEPEND_libsmb= libkiconv SUBDIR_DEPEND_libstdc++= msun SUBDIR_DEPEND_libtacplus= libmd diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend index 4920fa8..5de4727 100644 --- a/lib/atf/libatf-c++/Makefile.depend +++ b/lib/atf/libatf-c++/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/atf/libatf-c/Makefile.depend b/lib/atf/libatf-c/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/atf/libatf-c/Makefile.depend +++ b/lib/atf/libatf-c/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index c4ce724..5cb0dd0 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -39,7 +39,6 @@ CXXFLAGS.clang+= -stdlib=libc++ .PATH: ${LLVM_SRCS}/${SRCDIR} -#.info ${MACHINE BOOTSTRAPPING_TOOLS LEGACY_TOOLS:L:@v@$v=${$v}@} .if empty(TOOLSDIR) || !exists(${TOOLSDIR}/usr/bin/clang-tblgen) .if ${MACHINE} == "host" && defined(BOOTSTRAPPING_TOOLS) .if !empty(LEGACY_TOOLS) && exists(${LEGACY_TOOLS}/usr/bin/tblgen) @@ -60,7 +59,6 @@ CLANG_TBLGEN= ${TOOLSDIR}/usr/bin/clang-tblgen .endif TBLGEN?= tblgen CLANG_TBLGEN?= clang-tblgen -#.info ${TOOLSDIR TBLGEN CLANG_TBLGEN:L:@v@$v=${$v}@} Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td ${TBLGEN} -gen-intrinsic \ diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile index 0e6ac6e..d78b20d 100644 --- a/lib/clang/include/Makefile +++ b/lib/clang/include/Makefile @@ -8,7 +8,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers -INCSDIR=${LIBDIR}/clang/3.6.0/include +INCSDIR=${LIBDIR}/clang/3.6.1/include INCS= __stddef_max_align_t.h \ __wmmintrin_aes.h \ diff --git a/lib/clang/include/Makefile.depend b/lib/clang/include/Makefile.depend index 11aba52..f80275d 100644 --- a/lib/clang/include/Makefile.depend +++ b/lib/clang/include/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index c6d4a8e..e13af79 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,11 +1,11 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 3.6.0 +#define CLANG_VERSION 3.6.1 #define CLANG_VERSION_MAJOR 3 #define CLANG_VERSION_MINOR 6 -#define CLANG_VERSION_PATCHLEVEL 0 +#define CLANG_VERSION_PATCHLEVEL 1 #define CLANG_VENDOR "FreeBSD " -#define CLANG_VENDOR_SUFFIX " 20150225" +#define CLANG_VENDOR_SUFFIX " 20150525" -#define SVN_REVISION "230434" +#define SVN_REVISION "237755" diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index 9c4512d..bb435f9 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -28,7 +28,7 @@ /* Define if we have libxml2 */ /* #undef CLANG_HAVE_LIBXML */ -#define PACKAGE_STRING "LLVM 3.6.0" +#define PACKAGE_STRING "LLVM 3.6.1" /* The LLVM product name and version */ #define BACKEND_PACKAGE_STRING PACKAGE_STRING diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 3fc38be..7a4e7ea 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -431,6 +431,9 @@ /* Have host's __chkstk */ /* #undef HAVE___CHKSTK */ +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + /* Have host's __cmpdi2 */ /* #undef HAVE___CMPDI2 */ @@ -555,10 +558,10 @@ #define LLVM_VERSION_MINOR 6 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 0 +#define LLVM_VERSION_PATCH 1 /* LLVM version string */ -#define LLVM_VERSION_STRING "3.6.0" +#define LLVM_VERSION_STRING "3.6.1" /* The shared library extension */ #define LTDL_SHLIB_EXT ".so" @@ -574,13 +577,13 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 3.6.0" +#define PACKAGE_STRING "LLVM 3.6.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "llvm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.6.0" +#define PACKAGE_VERSION "3.6.1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index ba95263..a44de59 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -95,9 +95,9 @@ #define LLVM_VERSION_MINOR 6 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 0 +#define LLVM_VERSION_PATCH 1 /* LLVM version string */ -#define LLVM_VERSION_STRING "3.6.0" +#define LLVM_VERSION_STRING "3.6.1" #endif diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend index 116d55c..5c5da718 100644 --- a/lib/clang/libclanganalysis/Makefile.depend +++ b/lib/clang/libclanganalysis/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend index 9a1733e..70e0854 100644 --- a/lib/clang/libclangarcmigrate/Makefile.depend +++ b/lib/clang/libclangarcmigrate/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend index 9a49e74..89d2a29 100644 --- a/lib/clang/libclangast/Makefile.depend +++ b/lib/clang/libclangast/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend index 29d9bc9..ea23a70 100644 --- a/lib/clang/libclangbasic/Makefile.depend +++ b/lib/clang/libclangbasic/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend index 3573fe7..bb7fc0e 100644 --- a/lib/clang/libclangcodegen/Makefile.depend +++ b/lib/clang/libclangcodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend index 9c27455..24c1e09 100644 --- a/lib/clang/libclangdriver/Makefile.depend +++ b/lib/clang/libclangdriver/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend index e3ab3a6..778a945 100644 --- a/lib/clang/libclangedit/Makefile.depend +++ b/lib/clang/libclangedit/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend index a0f6b20..8605e39 100644 --- a/lib/clang/libclangfrontend/Makefile.depend +++ b/lib/clang/libclangfrontend/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend index a775732..78a5190 100644 --- a/lib/clang/libclangfrontendtool/Makefile.depend +++ b/lib/clang/libclangfrontendtool/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend index 58c03db..ae88032 100644 --- a/lib/clang/libclanglex/Makefile.depend +++ b/lib/clang/libclanglex/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend index 4672353..52a5e4e 100644 --- a/lib/clang/libclangparse/Makefile.depend +++ b/lib/clang/libclangparse/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangrewrite/Makefile.depend b/lib/clang/libclangrewrite/Makefile.depend index 099fc62..a6f8e9c 100644 --- a/lib/clang/libclangrewrite/Makefile.depend +++ b/lib/clang/libclangrewrite/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangrewritefrontend/Makefile.depend b/lib/clang/libclangrewritefrontend/Makefile.depend index f4dda4d..6bb290f 100644 --- a/lib/clang/libclangrewritefrontend/Makefile.depend +++ b/lib/clang/libclangrewritefrontend/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend index 3d2730b..158b16d 100644 --- a/lib/clang/libclangsema/Makefile.depend +++ b/lib/clang/libclangsema/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend index 1c2cb9f..6ee9d58 100644 --- a/lib/clang/libclangserialization/Makefile.depend +++ b/lib/clang/libclangserialization/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend index 4b797b8..6d91abe 100644 --- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend +++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend index d018547..7a1f856 100644 --- a/lib/clang/libclangstaticanalyzercore/Makefile.depend +++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend index eaac03f..77ea2dd 100644 --- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend +++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64asmparser/Makefile.depend b/lib/clang/libllvmaarch64asmparser/Makefile.depend index 9c80e95..745dfbc 100644 --- a/lib/clang/libllvmaarch64asmparser/Makefile.depend +++ b/lib/clang/libllvmaarch64asmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64codegen/Makefile.depend b/lib/clang/libllvmaarch64codegen/Makefile.depend new file mode 100644 index 0000000..e6dc7bf --- /dev/null +++ b/lib/clang/libllvmaarch64codegen/Makefile.depend @@ -0,0 +1,204 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include <dirdeps.mk> + +.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.po: AArch64GenInstrInfo.inc.h +AArch64TargetMachine.po: AArch64GenRegisterInfo.inc.h +AArch64TargetMachine.po: AArch64GenSubtargetInfo.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 790d0e3..b21faa8 100644 --- a/lib/clang/libllvmaarch64desc/Makefile.depend +++ b/lib/clang/libllvmaarch64desc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64disassembler/Makefile.depend b/lib/clang/libllvmaarch64disassembler/Makefile.depend index ea61fad..7c5f0d9 100644 --- a/lib/clang/libllvmaarch64disassembler/Makefile.depend +++ b/lib/clang/libllvmaarch64disassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64info/Makefile.depend b/lib/clang/libllvmaarch64info/Makefile.depend index 18d28d6..385072f 100644 --- a/lib/clang/libllvmaarch64info/Makefile.depend +++ b/lib/clang/libllvmaarch64info/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64instprinter/Makefile.depend b/lib/clang/libllvmaarch64instprinter/Makefile.depend index ae51163..56c8d39 100644 --- a/lib/clang/libllvmaarch64instprinter/Makefile.depend +++ b/lib/clang/libllvmaarch64instprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmaarch64utils/Makefile.depend b/lib/clang/libllvmaarch64utils/Makefile.depend index 93a05f4..c7f43d4 100644 --- a/lib/clang/libllvmaarch64utils/Makefile.depend +++ b/lib/clang/libllvmaarch64utils/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend index d7ef225..274e6ed 100644 --- a/lib/clang/libllvmanalysis/Makefile.depend +++ b/lib/clang/libllvmanalysis/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend index 6efd01d..6fa25b5 100644 --- a/lib/clang/libllvmarmasmparser/Makefile.depend +++ b/lib/clang/libllvmarmasmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend index e287534..deda9fb 100644 --- a/lib/clang/libllvmarmcodegen/Makefile.depend +++ b/lib/clang/libllvmarmcodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend index 72650d0..1d70a65 100644 --- a/lib/clang/libllvmarmdesc/Makefile.depend +++ b/lib/clang/libllvmarmdesc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend index 1185dc6..59787f1 100644 --- a/lib/clang/libllvmarmdisassembler/Makefile.depend +++ b/lib/clang/libllvmarmdisassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend index 7bd1454..eb09777 100644 --- a/lib/clang/libllvmarminfo/Makefile.depend +++ b/lib/clang/libllvmarminfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend index 679c240..ba60d06 100644 --- a/lib/clang/libllvmarminstprinter/Makefile.depend +++ b/lib/clang/libllvmarminstprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmasmparser/Makefile.depend b/lib/clang/libllvmasmparser/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmasmparser/Makefile.depend +++ b/lib/clang/libllvmasmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend index 4c488fb..ed98ab4 100644 --- a/lib/clang/libllvmasmprinter/Makefile.depend +++ b/lib/clang/libllvmasmprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend index 3ebccd2..387067c 100644 --- a/lib/clang/libllvmbitreader/Makefile.depend +++ b/lib/clang/libllvmbitreader/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmbitwriter/Makefile.depend b/lib/clang/libllvmbitwriter/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmbitwriter/Makefile.depend +++ b/lib/clang/libllvmbitwriter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend index d4f1f49..98484cb 100644 --- a/lib/clang/libllvmcodegen/Makefile.depend +++ b/lib/clang/libllvmcodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend index a3ed923..212908d 100644 --- a/lib/clang/libllvmcore/Makefile.depend +++ b/lib/clang/libllvmcore/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmdebuginfo/Makefile.depend b/lib/clang/libllvmdebuginfo/Makefile.depend index 4d8f064..c9899bc 100644 --- a/lib/clang/libllvmdebuginfo/Makefile.depend +++ b/lib/clang/libllvmdebuginfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvmexecutionengine/Makefile.depend b/lib/clang/libllvmexecutionengine/Makefile.depend index 4d8f064..c9899bc 100644 --- a/lib/clang/libllvmexecutionengine/Makefile.depend +++ b/lib/clang/libllvmexecutionengine/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend index d128463..d2df3e5 100644 --- a/lib/clang/libllvminstcombine/Makefile.depend +++ b/lib/clang/libllvminstcombine/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend index 60f060f..625288d 100644 --- a/lib/clang/libllvminstrumentation/Makefile.depend +++ b/lib/clang/libllvminstrumentation/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend index 6f6ff77..4fc7d45 100644 --- a/lib/clang/libllvminterpreter/Makefile.depend +++ b/lib/clang/libllvminterpreter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend index e1b83e0..cc9dba5 100644 --- a/lib/clang/libllvmipa/Makefile.depend +++ b/lib/clang/libllvmipa/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend index d549f14..39715a7 100644 --- a/lib/clang/libllvmipo/Makefile.depend +++ b/lib/clang/libllvmipo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmirreader/Makefile.depend b/lib/clang/libllvmirreader/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmirreader/Makefile.depend +++ b/lib/clang/libllvmirreader/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmlinker/Makefile.depend b/lib/clang/libllvmlinker/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmlinker/Makefile.depend +++ b/lib/clang/libllvmlinker/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmc/Makefile.depend b/lib/clang/libllvmmc/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmmc/Makefile.depend +++ b/lib/clang/libllvmmc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmcdisassembler/Makefile.depend b/lib/clang/libllvmmcdisassembler/Makefile.depend index 4d8f064..c9899bc 100644 --- a/lib/clang/libllvmmcdisassembler/Makefile.depend +++ b/lib/clang/libllvmmcdisassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvmmcjit/Makefile.depend b/lib/clang/libllvmmcjit/Makefile.depend index 4d8f064..c9899bc 100644 --- a/lib/clang/libllvmmcjit/Makefile.depend +++ b/lib/clang/libllvmmcjit/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvmmcparser/Makefile.depend b/lib/clang/libllvmmcparser/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmmcparser/Makefile.depend +++ b/lib/clang/libllvmmcparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend index 7b56cd3..541f726 100644 --- a/lib/clang/libllvmmipsasmparser/Makefile.depend +++ b/lib/clang/libllvmmipsasmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend index a145f9a..a4cd81a 100644 --- a/lib/clang/libllvmmipscodegen/Makefile.depend +++ b/lib/clang/libllvmmipscodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend index f27206a..ccc26d1 100644 --- a/lib/clang/libllvmmipsdesc/Makefile.depend +++ b/lib/clang/libllvmmipsdesc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipsdisassembler/Makefile.depend b/lib/clang/libllvmmipsdisassembler/Makefile.depend index 0e59343..5e10f87 100644 --- a/lib/clang/libllvmmipsdisassembler/Makefile.depend +++ b/lib/clang/libllvmmipsdisassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend index 7d75918..04d7394 100644 --- a/lib/clang/libllvmmipsinfo/Makefile.depend +++ b/lib/clang/libllvmmipsinfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend index 8cfc680..2426018 100644 --- a/lib/clang/libllvmmipsinstprinter/Makefile.depend +++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmobjcarcopts/Makefile.depend b/lib/clang/libllvmobjcarcopts/Makefile.depend index 553854e..dc5c465 100644 --- a/lib/clang/libllvmobjcarcopts/Makefile.depend +++ b/lib/clang/libllvmobjcarcopts/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmobject/Makefile.depend b/lib/clang/libllvmobject/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmobject/Makefile.depend +++ b/lib/clang/libllvmobject/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmoption/Makefile.depend b/lib/clang/libllvmoption/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmoption/Makefile.depend +++ b/lib/clang/libllvmoption/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpcasmparser/Makefile.depend b/lib/clang/libllvmpowerpcasmparser/Makefile.depend index 2245911..6a84c65 100644 --- a/lib/clang/libllvmpowerpcasmparser/Makefile.depend +++ b/lib/clang/libllvmpowerpcasmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend index bbdeedc..d7ad295 100644 --- a/lib/clang/libllvmpowerpccodegen/Makefile.depend +++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend index d694c9d..cb4da9d 100644 --- a/lib/clang/libllvmpowerpcdesc/Makefile.depend +++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend b/lib/clang/libllvmpowerpcdisassembler/Makefile.depend index 798d1555..ae1219e 100644 --- a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend +++ b/lib/clang/libllvmpowerpcdisassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend index d465551..2b87d9d 100644 --- a/lib/clang/libllvmpowerpcinfo/Makefile.depend +++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend index e679c82..9ddadfa 100644 --- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend +++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmprofiledata/Makefile.depend b/lib/clang/libllvmprofiledata/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmprofiledata/Makefile.depend +++ b/lib/clang/libllvmprofiledata/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmruntimedyld/Makefile.depend b/lib/clang/libllvmruntimedyld/Makefile.depend index 4d8f064..c9899bc 100644 --- a/lib/clang/libllvmruntimedyld/Makefile.depend +++ b/lib/clang/libllvmruntimedyld/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend index fb802c9..c33d392 100644 --- a/lib/clang/libllvmscalaropts/Makefile.depend +++ b/lib/clang/libllvmscalaropts/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend index 9e219b9..9dbab9a 100644 --- a/lib/clang/libllvmselectiondag/Makefile.depend +++ b/lib/clang/libllvmselectiondag/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparcasmparser/Makefile.depend b/lib/clang/libllvmsparcasmparser/Makefile.depend index 7082fc0..256ccd8 100644 --- a/lib/clang/libllvmsparcasmparser/Makefile.depend +++ b/lib/clang/libllvmsparcasmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparccodegen/Makefile.depend b/lib/clang/libllvmsparccodegen/Makefile.depend index 3309d0f..64226f6 100644 --- a/lib/clang/libllvmsparccodegen/Makefile.depend +++ b/lib/clang/libllvmsparccodegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparcdesc/Makefile.depend b/lib/clang/libllvmsparcdesc/Makefile.depend index 38f81e8..5b5db5f 100644 --- a/lib/clang/libllvmsparcdesc/Makefile.depend +++ b/lib/clang/libllvmsparcdesc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparcdisassembler/Makefile.depend b/lib/clang/libllvmsparcdisassembler/Makefile.depend index 46bcee8..213789e 100644 --- a/lib/clang/libllvmsparcdisassembler/Makefile.depend +++ b/lib/clang/libllvmsparcdisassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparcinfo/Makefile.depend b/lib/clang/libllvmsparcinfo/Makefile.depend index 5b70773..ac56ca5 100644 --- a/lib/clang/libllvmsparcinfo/Makefile.depend +++ b/lib/clang/libllvmsparcinfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsparcinstprinter/Makefile.depend b/lib/clang/libllvmsparcinstprinter/Makefile.depend index deb858d..6571fb4 100644 --- a/lib/clang/libllvmsparcinstprinter/Makefile.depend +++ b/lib/clang/libllvmsparcinstprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmsupport/Makefile.depend b/lib/clang/libllvmsupport/Makefile.depend index ef8fa43..424f5a8 100644 --- a/lib/clang/libllvmsupport/Makefile.depend +++ b/lib/clang/libllvmsupport/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmtablegen/Makefile.depend b/lib/clang/libllvmtablegen/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmtablegen/Makefile.depend +++ b/lib/clang/libllvmtablegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmtarget/Makefile.depend +++ b/lib/clang/libllvmtarget/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend index b11adc7..f3a7d48 100644 --- a/lib/clang/libllvmtransformutils/Makefile.depend +++ b/lib/clang/libllvmtransformutils/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend index 1aaac6e..daeb031 100644 --- a/lib/clang/libllvmvectorize/Makefile.depend +++ b/lib/clang/libllvmvectorize/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend index 96ece14..d4b04c6 100644 --- a/lib/clang/libllvmx86asmparser/Makefile.depend +++ b/lib/clang/libllvmx86asmparser/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend index a0b95c8..889d747 100644 --- a/lib/clang/libllvmx86codegen/Makefile.depend +++ b/lib/clang/libllvmx86codegen/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend index a682e28..b68230d 100644 --- a/lib/clang/libllvmx86desc/Makefile.depend +++ b/lib/clang/libllvmx86desc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend index b4f5943..e463379 100644 --- a/lib/clang/libllvmx86disassembler/Makefile.depend +++ b/lib/clang/libllvmx86disassembler/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend index b62bf66..511a4d1 100644 --- a/lib/clang/libllvmx86info/Makefile.depend +++ b/lib/clang/libllvmx86info/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend index 17a02b4..dfc7c0f 100644 --- a/lib/clang/libllvmx86instprinter/Makefile.depend +++ b/lib/clang/libllvmx86instprinter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/clang/libllvmx86utils/Makefile.depend b/lib/clang/libllvmx86utils/Makefile.depend index 1cb182e..3e7f3f5 100644 --- a/lib/clang/libllvmx86utils/Makefile.depend +++ b/lib/clang/libllvmx86utils/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/csu/amd64/Makefile.depend b/lib/csu/amd64/Makefile.depend index 993ab06..79506ce 100644 --- a/lib/csu/amd64/Makefile.depend +++ b/lib/csu/amd64/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/csu/arm/Makefile.depend b/lib/csu/arm/Makefile.depend index ff699f7..e8d7c61 100644 --- a/lib/csu/arm/Makefile.depend +++ b/lib/csu/arm/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/csu/i386/Makefile.depend b/lib/csu/i386/Makefile.depend index 7d982eb..76d719e 100644 --- a/lib/csu/i386/Makefile.depend +++ b/lib/csu/i386/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/csu/mips/Makefile.depend b/lib/csu/mips/Makefile.depend index ff699f7..e8d7c61 100644 --- a/lib/csu/mips/Makefile.depend +++ b/lib/csu/mips/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/csu/powerpc/Makefile.depend b/lib/csu/powerpc/Makefile.depend index ff699f7..e8d7c61 100644 --- a/lib/csu/powerpc/Makefile.depend +++ b/lib/csu/powerpc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/csu/powerpc64/Makefile.depend b/lib/csu/powerpc64/Makefile.depend index ff699f7..e8d7c61 100644 --- a/lib/csu/powerpc64/Makefile.depend +++ b/lib/csu/powerpc64/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/csu/sparc64/Makefile.depend b/lib/csu/sparc64/Makefile.depend index ff699f7..e8d7c61 100644 --- a/lib/csu/sparc64/Makefile.depend +++ b/lib/csu/sparc64/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libalias/libalias/Makefile.depend b/lib/libalias/libalias/Makefile.depend index bd8ae02..69d1724 100644 --- a/lib/libalias/libalias/Makefile.depend +++ b/lib/libalias/libalias/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libalias/modules/cuseeme/Makefile.depend b/lib/libalias/modules/cuseeme/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/cuseeme/Makefile.depend +++ b/lib/libalias/modules/cuseeme/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/dummy/Makefile.depend b/lib/libalias/modules/dummy/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/dummy/Makefile.depend +++ b/lib/libalias/modules/dummy/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/ftp/Makefile.depend b/lib/libalias/modules/ftp/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/ftp/Makefile.depend +++ b/lib/libalias/modules/ftp/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/irc/Makefile.depend b/lib/libalias/modules/irc/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/irc/Makefile.depend +++ b/lib/libalias/modules/irc/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/nbt/Makefile.depend b/lib/libalias/modules/nbt/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/nbt/Makefile.depend +++ b/lib/libalias/modules/nbt/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/pptp/Makefile.depend b/lib/libalias/modules/pptp/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/pptp/Makefile.depend +++ b/lib/libalias/modules/pptp/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/skinny/Makefile.depend b/lib/libalias/modules/skinny/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/skinny/Makefile.depend +++ b/lib/libalias/modules/skinny/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libalias/modules/smedia/Makefile.depend b/lib/libalias/modules/smedia/Makefile.depend index 96aa2a2..3646e2e 100644 --- a/lib/libalias/modules/smedia/Makefile.depend +++ b/lib/libalias/modules/smedia/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ diff --git a/lib/libarchive/Makefile.depend b/lib/libarchive/Makefile.depend index a4f9ef4..b254993 100644 --- a/lib/libarchive/Makefile.depend +++ b/lib/libarchive/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libauditd/Makefile.depend +++ b/lib/libauditd/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libbegemot/Makefile.depend b/lib/libbegemot/Makefile.depend index 8bbd7a2..9e2283a 100644 --- a/lib/libbegemot/Makefile.depend +++ b/lib/libbegemot/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libblocksruntime/Makefile.depend b/lib/libblocksruntime/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libblocksruntime/Makefile.depend +++ b/lib/libblocksruntime/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libbluetooth/Makefile.depend b/lib/libbluetooth/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libbluetooth/Makefile.depend +++ b/lib/libbluetooth/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libbsm/Makefile.depend b/lib/libbsm/Makefile.depend index bd8ae02..69d1724 100644 --- a/lib/libbsm/Makefile.depend +++ b/lib/libbsm/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libbsnmp/libbsnmp/Makefile.depend b/lib/libbsnmp/libbsnmp/Makefile.depend index 004583e..5781764 100644 --- a/lib/libbsnmp/libbsnmp/Makefile.depend +++ b/lib/libbsnmp/libbsnmp/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libbz2/Makefile.depend b/lib/libbz2/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libbz2/Makefile.depend +++ b/lib/libbz2/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend index 12e148a..cb81639 100644 --- a/lib/libc++/Makefile.depend +++ b/lib/libc++/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend index 2058aff..9e7bf04 100644 --- a/lib/libc/Makefile.depend +++ b/lib/libc/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ include \ include/rpc \ diff --git a/lib/libc/aarch64/gen/setjmp.S b/lib/libc/aarch64/gen/setjmp.S index 80a9484..790ed73 100644 --- a/lib/libc/aarch64/gen/setjmp.S +++ b/lib/libc/aarch64/gen/setjmp.S @@ -80,7 +80,7 @@ ENTRY(longjmp) str x1, [sp, #16] /* Restore the signal mask */ - mov x1, #0 /* oset */ + mov x2, #0 /* oset */ add x1, x0, #(_JB_SIGMASK * 8) /* set */ mov x0, #3 /* SIG_BLOCK */ bl sigprocmask diff --git a/lib/libc/arm/SYS.h b/lib/libc/arm/SYS.h index 3254c45..1173087 100644 --- a/lib/libc/arm/SYS.h +++ b/lib/libc/arm/SYS.h @@ -39,15 +39,11 @@ #include <sys/syscall.h> #include <machine/swi.h> -#ifdef __ARM_EABI__ #define SYSTRAP(x) \ mov ip, r7; \ ldr r7, =SYS_ ## x; \ swi 0; \ mov r7, ip -#else -#define SYSTRAP(x) swi 0 | SYS_ ## x -#endif #define CERROR _C_LABEL(cerror) #define CURBRK _C_LABEL(curbrk) diff --git a/lib/libc/arm/aeabi/aeabi_asm_double.S b/lib/libc/arm/aeabi/aeabi_asm_double.S index ab44362..7a5af82 100644 --- a/lib/libc/arm/aeabi/aeabi_asm_double.S +++ b/lib/libc/arm/aeabi/aeabi_asm_double.S @@ -56,7 +56,7 @@ ENTRY(__aeabi_cdcmple) cmp r0, #1 bne 1f /* Yes, clear Z and C */ - msr cpsr_c, #(0) + mov ip, #(0) b 99f 1: @@ -70,14 +70,15 @@ ENTRY(__aeabi_cdcmple) cmp r0, #1 bne 2f /* Yes, set Z and C */ - msr cpsr_c, #(PCR_Z | PCR_C) + mov ip, #(PCR_Z | PCR_C) b 99f 2: /* Not less than or equal, set C and clear Z */ - msr cpsr_c, #(PCR_C) + mov ip, #(PCR_C) 99: + msr cpsr_c, ip pop {r4, r5, r6, r7, ip, pc} END(__aeabi_cdcmple) @@ -112,6 +113,7 @@ ENTRY(__aeabi_cdcmpeq) RET 1: - msr cpsr_c, #(PCR_C) + mov ip, #(PCR_C) + msr cpsr_c, ip RET END(__aeabi_cdcmpeq) diff --git a/lib/libc/arm/aeabi/aeabi_asm_float.S b/lib/libc/arm/aeabi/aeabi_asm_float.S index bf32af7..e05daa5 100644 --- a/lib/libc/arm/aeabi/aeabi_asm_float.S +++ b/lib/libc/arm/aeabi/aeabi_asm_float.S @@ -54,7 +54,7 @@ ENTRY(__aeabi_cfcmple) cmp r0, #1 bne 1f /* Yes, clear Z and C */ - msr cpsr_c, #(0) + mov ip, #(0) b 99f 1: @@ -66,14 +66,15 @@ ENTRY(__aeabi_cfcmple) cmp r0, #1 bne 2f /* Yes, set Z and C */ - msr cpsr_c, #(PCR_Z | PCR_C) + mov ip, #(PCR_Z | PCR_C) b 99f 2: /* Not less than or equal, set C and clear Z */ - msr cpsr_c, #(PCR_C) + mov ip, #(PCR_C) 99: + msr cpsr_c, ip pop {r4, r5, ip, pc} END(__aeabi_cfcmple) @@ -103,6 +104,7 @@ ENTRY(__aeabi_cfcmpeq) RET 1: - msreq cpsr_c, #(PCR_C) + mov ip, #(PCR_C) + msr cpsr_c, ip RET END(__aeabi_cfcmpeq) diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S index 3de9d99..853f61c 100644 --- a/lib/libc/arm/gen/_setjmp.S +++ b/lib/libc/arm/gen/_setjmp.S @@ -36,7 +36,7 @@ #error FPA is not supported anymore #endif -#if defined(__ARM_EABI__) && !defined(_STANDALONE) +#if !defined(_STANDALONE) .fpu vfp #endif @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); ENTRY(_setjmp) ldr r1, .L_setjmp_magic -#if defined(__ARM_EABI__) && !defined(_STANDALONE) +#if !defined(_STANDALONE) ldr r2, .Lfpu_present #ifdef PIC GOT_INIT(r3, .L_setjmp_got, .L_setjmp_gotinit) @@ -79,7 +79,7 @@ ENTRY(_setjmp) vmrs r2, fpscr str r2, [r0, #(_JB_REG_FPSCR * 4)] 1: -#endif /* __ARM_EABI__ */ +#endif /* !_STANDALONE */ str r1, [r0] @@ -99,11 +99,11 @@ END(_setjmp) .L_setjmp_magic: .word _JB_MAGIC__SETJMP -#if defined(__ARM_EABI__) && !defined(_STANDALONE) +#if !defined(_STANDALONE) GOT_INITSYM(.L_setjmp_got, .L_setjmp_gotinit) .Lfpu_present: .word PIC_SYM(_libc_arm_fpu_present, GOTOFF) -#endif /* __ARM_EABI__ */ +#endif /* !_STANDALONE */ WEAK_ALIAS(___longjmp, _longjmp) ENTRY(_longjmp) @@ -114,7 +114,7 @@ ENTRY(_longjmp) teq ip, r3 /* magic correct? */ bne botch /* no, botch */ -#if defined(__ARM_EABI__) && !defined(_STANDALONE) +#if !defined(_STANDALONE) teq r3, r2 /* did magic change? */ beq 1f /* no, don't restore VFP */ add ip, r0, #(_JB_REG_D8 * 4) @@ -122,7 +122,7 @@ ENTRY(_longjmp) ldr ip, [r0, #(_JB_REG_FPSCR * 4)] vmsr fpscr, ip 1: -#endif /* __ARM_EABI__ */ +#endif /* !_STANDALONE */ add r0, r0, #(_JB_REG_R4 * 4) /* Restore integer registers */ diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S index 6269563..c9ae329 100644 --- a/lib/libc/arm/gen/setjmp.S +++ b/lib/libc/arm/gen/setjmp.S @@ -36,9 +36,7 @@ #error FPA is not supported anymore #endif -#ifdef __ARM_EABI__ .fpu vfp -#endif #include <machine/asm.h> #include <machine/setjmp.h> @@ -66,7 +64,6 @@ ENTRY(setjmp) ldr r1, .Lsetjmp_magic -#ifdef __ARM_EABI__ ldr r2, .Lfpu_present #ifdef PIC GOT_INIT(r3, .Lsetjmp_got, .Lsetjmp_gotinit) @@ -84,7 +81,6 @@ ENTRY(setjmp) vmrs r2, fpscr str r2, [r0, #(_JB_REG_FPSCR * 4)] 1: -#endif /* __ARM_EABI__ */ str r1, [r0] /* store magic */ @@ -102,11 +98,9 @@ ENTRY(setjmp) .Lsetjmp_magic: .word _JB_MAGIC_SETJMP -#ifdef __ARM_EABI__ GOT_INITSYM(.Lsetjmp_got, .Lsetjmp_gotinit) .Lfpu_present: .word PIC_SYM(_libc_arm_fpu_present, GOTOFF) -#endif /* __ARM_EABI__ */ END(setjmp) .weak _C_LABEL(longjmp) @@ -126,7 +120,6 @@ ENTRY(__longjmp) bl PIC_SYM(_C_LABEL(sigprocmask), PLT) ldmfd sp!, {r0-r2, r14} -#ifdef __ARM_EABI__ tst r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP) /* is this a VFP magic? */ beq 1f /* no, don't restore VFP */ @@ -135,7 +128,6 @@ ENTRY(__longjmp) ldr ip, [r0, #(_JB_REG_FPSCR * 4)] vmsr fpscr, ip 1: -#endif /* __ARM_EABI__ */ add r0, r0, #(_JB_REG_R4 * 4) /* Restore integer registers */ diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S index 4567f6c..cc7f396 100644 --- a/lib/libc/arm/string/ffs.S +++ b/lib/libc/arm/string/ffs.S @@ -78,6 +78,7 @@ ENTRY(ffs) .byte 31, 0, 0, 0, 0, 24, 0, 20 /* 48-55 */ .byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */ #else + itt ne clzne r0, r0 rsbne r0, r0, #32 RET diff --git a/lib/libc/arm/string/memmove.S b/lib/libc/arm/string/memmove.S index 94e5474..2cd5a5e 100644 --- a/lib/libc/arm/string/memmove.S +++ b/lib/libc/arm/string/memmove.S @@ -48,7 +48,9 @@ ENTRY(bcopy) #endif /* Do the buffers overlap? */ cmp r0, r1 + it eq RETeq /* Bail now if src/dst are the same */ + ite cc subcc r3, r0, r1 /* if (dst > src) r3 = dst - src */ subcs r3, r1, r0 /* if (src > dsr) r3 = src - dst */ cmp r3, r2 /* if (r3 < len) we have an overlap */ @@ -56,8 +58,10 @@ ENTRY(bcopy) /* Determine copy direction */ cmp r1, r0 + it cc bcc .Lmemmove_backwards + itt eq moveq r0, #0 /* Quick abort for len=0 */ RETeq @@ -88,6 +92,7 @@ ENTRY(bcopy) bge .Lmemmove_floop32 cmn r2, #0x10 + ittt ge ldmiage r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ stmiage r0!, {r3, r4, r12, lr} subge r2, r2, #0x10 @@ -98,6 +103,7 @@ ENTRY(bcopy) /* blat 12 bytes at a time */ .Lmemmove_floop12: + ittt ge ldmiage r1!, {r3, r12, lr} stmiage r0!, {r3, r12, lr} subsge r2, r2, #0x0c @@ -108,8 +114,10 @@ ENTRY(bcopy) blt .Lmemmove_fl4 subs r2, r2, #4 + itt lt ldrlt r3, [r1], #4 strlt r3, [r0], #4 + ittt ge ldmiage r1!, {r3, r12} stmiage r0!, {r3, r12} subge r2, r2, #4 @@ -117,14 +125,17 @@ ENTRY(bcopy) .Lmemmove_fl4: /* less than 4 bytes to go */ adds r2, r2, #4 + it eq ldmiaeq sp!, {r0, pc} /* done */ /* copy the crud byte at a time */ cmp r2, #2 ldrb r3, [r1], #1 strb r3, [r0], #1 + itt ge ldrbge r3, [r1], #1 strbge r3, [r0], #1 + itt gt ldrbgt r3, [r1], #1 strbgt r3, [r0], #1 ldmia sp!, {r0, pc} @@ -137,8 +148,10 @@ ENTRY(bcopy) /* align destination with byte copies */ ldrb r3, [r1], #1 strb r3, [r0], #1 + itt ge ldrbge r3, [r1], #1 strbge r3, [r0], #1 + itt gt ldrbgt r3, [r1], #1 strbgt r3, [r0], #1 subs r2, r2, r12 @@ -355,10 +368,12 @@ ENTRY(bcopy) .Lmemmove_bl32: cmn r2, #0x10 + ittt ge ldmdbge r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ stmdbge r0!, {r3, r4, r12, lr} subge r2, r2, #0x10 adds r2, r2, #0x14 + ittt ge ldmdbge r1!, {r3, r12, lr} /* blat a remaining 12 bytes */ stmdbge r0!, {r3, r12, lr} subge r2, r2, #0x0c @@ -368,8 +383,10 @@ ENTRY(bcopy) adds r2, r2, #8 blt .Lmemmove_bl4 subs r2, r2, #4 + itt lt ldrlt r3, [r1, #-4]! strlt r3, [r0, #-4]! + ittt ge ldmdbge r1!, {r3, r12} stmdbge r0!, {r3, r12} subge r2, r2, #4 @@ -377,14 +394,17 @@ ENTRY(bcopy) .Lmemmove_bl4: /* less than 4 bytes to go */ adds r2, r2, #4 + it eq RETeq /* done */ /* copy the crud byte at a time */ cmp r2, #2 ldrb r3, [r1, #-1]! strb r3, [r0, #-1]! + itt ge ldrbge r3, [r1, #-1]! strbge r3, [r0, #-1]! + itt gt ldrbgt r3, [r1, #-1]! strbgt r3, [r0, #-1]! RET @@ -396,8 +416,10 @@ ENTRY(bcopy) /* align destination with byte copies */ ldrb r3, [r1, #-1]! strb r3, [r0, #-1]! + itt ge ldrbge r3, [r1, #-1]! strbge r3, [r0, #-1]! + itt gt ldrbgt r3, [r1, #-1]! strbgt r3, [r0, #-1]! subs r2, r2, r12 diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S index 66af33e..6d76901 100644 --- a/lib/libc/arm/string/memset.S +++ b/lib/libc/arm/string/memset.S @@ -114,6 +114,7 @@ ENTRY(memset) orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */ #endif #ifdef _ARM_ARCH_5E + itt ne subne r1, r1, #0x04 /* Quad-align if necessary */ strne r3, [ip], #0x04 cmp r1, #0x10 @@ -127,18 +128,22 @@ ENTRY(memset) .Lmemset_loop128: subs r1, r1, #0x80 #ifdef _ARM_ARCH_5E + itttt ge strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 + itttt ge strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 + itttt ge strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 + itttt ge strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 @@ -162,6 +167,7 @@ ENTRY(memset) stmiage ip!, {r2-r3} #endif bgt .Lmemset_loop128 + it eq RETeq /* Zero length so just exit */ add r1, r1, #0x80 /* Adjust for extra sub */ @@ -169,6 +175,7 @@ ENTRY(memset) /* Do 32 bytes at a time */ .Lmemset_loop32: subs r1, r1, #0x20 + itttt ge #ifdef _ARM_ARCH_5E strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 @@ -181,11 +188,13 @@ ENTRY(memset) stmiage ip!, {r2-r3} #endif bgt .Lmemset_loop32 + it eq RETeq /* Zero length so just exit */ adds r1, r1, #0x10 /* Partially adjust for extra sub */ /* Deal with 16 bytes or more */ + itt ge #ifdef _ARM_ARCH_5E strdge r2, [ip], #0x08 strdge r2, [ip], #0x08 @@ -193,20 +202,25 @@ ENTRY(memset) stmiage ip!, {r2-r3} stmiage ip!, {r2-r3} #endif + it eq RETeq /* Zero length so just exit */ + it lt addlt r1, r1, #0x10 /* Possibly adjust for extra sub */ /* We have at least 4 bytes so copy as words */ .Lmemset_loop4: subs r1, r1, #0x04 + it ge strge r3, [ip], #0x04 bgt .Lmemset_loop4 + it eq RETeq /* Zero length so just exit */ #ifdef _ARM_ARCH_5E /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 + it eq RETeq cmp r1, #2 #else @@ -214,7 +228,9 @@ ENTRY(memset) #endif strb r3, [ip], #0x01 /* Set 1 byte */ + it ge strbge r3, [ip], #0x01 /* Set another byte */ + it gt strbgt r3, [ip] /* and a third */ RET /* Exit */ @@ -222,18 +238,24 @@ ENTRY(memset) rsb r2, r2, #0x004 strb r3, [ip], #0x01 /* Set 1 byte */ cmp r2, #0x02 + it ge strbge r3, [ip], #0x01 /* Set another byte */ sub r1, r1, r2 + it gt strbgt r3, [ip], #0x01 /* and a third */ cmp r1, #0x04 /* More than 4 bytes left? */ + it ge bge .Lmemset_wordaligned /* Yup */ .Lmemset_lessthanfour: cmp r1, #0x00 + it eq RETeq /* Zero length so exit */ strb r3, [ip], #0x01 /* Set 1 byte */ cmp r1, #0x02 + it ge strbge r3, [ip], #0x01 /* Set another byte */ + it gt strbgt r3, [ip] /* and a third */ RET /* Exit */ #ifdef _BZERO diff --git a/lib/libc/arm/string/strcmp.S b/lib/libc/arm/string/strcmp.S index 3dd7453..d610fea 100644 --- a/lib/libc/arm/string/strcmp.S +++ b/lib/libc/arm/string/strcmp.S @@ -37,6 +37,7 @@ ENTRY(strcmp) ldrb r2, [r0], #1 ldrb r3, [r1], #1 cmp r2, #1 + it cs cmpcs r2, r3 beq 1b sub r0, r2, r3 diff --git a/lib/libc/arm/string/strlen.S b/lib/libc/arm/string/strlen.S index 7447710..c9334f9 100644 --- a/lib/libc/arm/string/strlen.S +++ b/lib/libc/arm/string/strlen.S @@ -52,8 +52,10 @@ ENTRY(strlen) #else ands r3, r2, #0xff000000 #endif + it ne addne r1, r1, #1 .Ldo_3: + itt ne #ifndef __ARMEB__ andsne r3, r2, #0x0000ff00 #else @@ -61,6 +63,7 @@ ENTRY(strlen) #endif addne r1, r1, #1 .Ldo_2: + itt ne #ifndef __ARMEB__ andsne r3, r2, #0x00ff0000 #else @@ -68,6 +71,7 @@ ENTRY(strlen) #endif addne r1, r1, #1 .Ldo_1: + ittt ne #ifndef __ARMEB__ andsne r3, r2, #0xff000000 #else diff --git a/lib/libc/arm/string/strncmp.S b/lib/libc/arm/string/strncmp.S index ac59deb..a5c0320 100644 --- a/lib/libc/arm/string/strncmp.S +++ b/lib/libc/arm/string/strncmp.S @@ -35,18 +35,21 @@ __FBSDID("$FreeBSD$"); ENTRY(strncmp) /* if (len == 0) return 0 */ cmp r2, #0 + itt eq moveq r0, #0 moveq pc, lr /* ip == last src address to compare */ adds ip, r0, r2 /* Use last possible address on overflow. */ + it cs movcs ip, #0 sub ip, ip, #1 1: ldrb r2, [r0], #1 ldrb r3, [r1], #1 cmp ip, r0 + itt cs cmpcs r2, #1 cmpcs r2, r3 beq 1b diff --git a/lib/libc/arm/sys/fork.S b/lib/libc/arm/sys/fork.S deleted file mode 100644 index a5ae1f0..0000000 --- a/lib/libc/arm/sys/fork.S +++ /dev/null @@ -1,49 +0,0 @@ -/* $NetBSD: fork.S,v 1.5 2003/08/07 16:42:04 agc Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * from: @(#)fork.s 5.1 (Berkeley) 4/23/90 - */ - -#include <machine/asm.h> -__FBSDID("$FreeBSD$"); -#include "SYS.h" - -/* - * pid = fork(); - * - * On return from the SWI: - * r1 == 0 in parent process, r1 == 1 in child process. - * r0 == pid of child in parent, r0 == pid of parent in child. - */ - -_SYSCALL(fork) - sub r1, r1, #1 /* r1 == 0xffffffff if parent, 0 if child */ - and r0, r0, r1 /* r0 == 0 if child, else unchanged */ - RET diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c index 754a1df..444b551 100644 --- a/lib/libc/gen/fpclassify.c +++ b/lib/libc/gen/fpclassify.c @@ -29,6 +29,8 @@ #include <sys/endian.h> +#include <machine/float.h> + #include <math.h> #include <stdint.h> @@ -84,10 +86,18 @@ __fpclassifyl(long double e) return (FP_SUBNORMAL); } mask_nbit_l(u); /* Mask normalization bit if applicable. */ +#if LDBL_MANT_DIG == 53 + if (u.bits.exp == 2047) { + if ((u.bits.manl | u.bits.manh) == 0) + return (FP_INFINITE); + return (FP_NAN); + } +#else if (u.bits.exp == 32767) { if ((u.bits.manl | u.bits.manh) == 0) return (FP_INFINITE); return (FP_NAN); } +#endif return (FP_NORMAL); } diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c index 4a4152a..0eb8b9f 100644 --- a/lib/libc/gen/isinf.c +++ b/lib/libc/gen/isinf.c @@ -26,6 +26,8 @@ * $FreeBSD$ */ +#include <machine/float.h> + #include <math.h> #include "fpmath.h" @@ -62,9 +64,9 @@ __isinfl(long double e) u.e = e; mask_nbit_l(u); -#ifndef __alpha__ - return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0); -#else +#if LDBL_MANT_DIG == 53 return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0); +#else + return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0); #endif } diff --git a/lib/libc/mips/sys/Makefile.inc b/lib/libc/mips/sys/Makefile.inc index 460e69b..c0bd5ad9 100644 --- a/lib/libc/mips/sys/Makefile.inc +++ b/lib/libc/mips/sys/Makefile.inc @@ -3,7 +3,7 @@ SRCS+= trivial-vdso_tc.c MDASM= Ovfork.S brk.S cerror.S exect.S \ - fork.S pipe.S ptrace.S sbrk.S syscall.S + pipe.S ptrace.S sbrk.S syscall.S # Don't generate default code for these syscalls: NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o diff --git a/lib/libc/mips/sys/fork.S b/lib/libc/mips/sys/fork.S deleted file mode 100644 index 7636bd3..0000000 --- a/lib/libc/mips/sys/fork.S +++ /dev/null @@ -1,57 +0,0 @@ -/* $NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $ */ - -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. - * - * 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. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 <machine/asm.h> -__FBSDID("$FreeBSD$"); -#include "SYS.h" - -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)fork.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $") -#endif /* LIBC_SCCS and not lint */ - -LEAF(__sys_fork) - WEAK_ALIAS(fork, __sys_fork) - WEAK_ALIAS(_fork, __sys_fork) - PIC_PROLOGUE(__sys_fork) - li v0, SYS_fork # pid = fork() - syscall - bne a3, zero, 2f - beq v1, zero, 1f # v1 == 0 in parent, 1 in child - move v0, zero -1: - PIC_RETURN() -2: - PIC_TAILCALL(__cerror) -END(__sys_fork) diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c index 539d974..279ea23 100644 --- a/lib/libc/resolv/res_comp.c +++ b/lib/libc/resolv/res_comp.c @@ -147,12 +147,12 @@ dn_skipname(const u_char *ptr, const u_char *eom) { || ((c) >= 0x61 && (c) <= 0x7a)) #define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) -#define borderchar(c) (alphachar(c) || digitchar(c)) #ifdef RES_ENFORCE_RFC1034 -#define middlechar(c) (borderchar(c) || hyphenchar(c)) +#define borderchar(c) (alphachar(c) || digitchar(c)) #else -#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c)) +#define borderchar(c) (alphachar(c) || digitchar(c) || underscorechar(c)) #endif +#define middlechar(c) (borderchar(c) || hyphenchar(c)) #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) int diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3 index 31cdf77..a0db94f 100644 --- a/lib/libc/string/memmem.3 +++ b/lib/libc/string/memmem.3 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 24, 2005 +.Dd May 26, 2015 .Dt MEMMEM 3 .Os .Sh NAME @@ -51,14 +51,12 @@ in the byte string .Fa big . .Sh RETURN VALUES If -.Fa big_len -is smaller than -.Fa little_len , -if .Fa little_len -is 0, if -.Fa big_len -is 0 or if +is zero +.Fa big +is returned (that is, an empty little is deemed to match at the beginning of +big); +if .Fa little occurs nowhere in .Fa big , @@ -84,3 +82,11 @@ function first appeared in .Sh BUGS This function was broken in Linux libc up to and including version 5.0.9 and in GNU libc prior to version 2.1. +Prior to +.Fx 11.0 +.Nm +returned +.Dv NULL +when +.Fa little_len +equals 0. diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c index 72e6517..3fd05df 100644 --- a/lib/libc/string/memmem.c +++ b/lib/libc/string/memmem.c @@ -42,9 +42,9 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len) const char *cl = (const char *)l; const char *cs = (const char *)s; - /* we need something to compare */ - if (l_len == 0 || s_len == 0) - return NULL; + /* empty "s" matches the beginning of "l" */ + if (s_len == 0) + return (void *)cl; /* "s" must be smaller or equal to "l" */ if (l_len < s_len) diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3 index 6117831..a39ea3e 100644 --- a/lib/libc/string/strchr.3 +++ b/lib/libc/string/strchr.3 @@ -113,10 +113,12 @@ and .Fn strrchr conform to .St -isoC . -The +The function .Fn strchrnul -is a GNU extension . -.Sh History +is a +.Tn GNU +extension. +.Sh HISTORY The .Fn strchrnul function first appeared in glibc 2.1.1 and was added in diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 4435119..4138171 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -76,9 +76,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 }; * Not a filter, but a convenient utility nonetheless */ void -xdr_free(proc, objp) - xdrproc_t proc; - void *objp; +xdr_free(xdrproc_t proc, void *objp) { XDR x; @@ -101,9 +99,7 @@ xdr_void(void) * XDR integers */ bool_t -xdr_int(xdrs, ip) - XDR *xdrs; - int *ip; +xdr_int(XDR *xdrs, int *ip) { long l; @@ -131,9 +127,7 @@ xdr_int(xdrs, ip) * XDR unsigned integers */ bool_t -xdr_u_int(xdrs, up) - XDR *xdrs; - u_int *up; +xdr_u_int(XDR *xdrs, u_int *up) { u_long l; @@ -163,9 +157,7 @@ xdr_u_int(xdrs, up) * same as xdr_u_long - open coded to save a proc call! */ bool_t -xdr_long(xdrs, lp) - XDR *xdrs; - long *lp; +xdr_long(XDR *xdrs, long *lp) { switch (xdrs->x_op) { case XDR_ENCODE: @@ -184,9 +176,7 @@ xdr_long(xdrs, lp) * same as xdr_long - open coded to save a proc call! */ bool_t -xdr_u_long(xdrs, ulp) - XDR *xdrs; - u_long *ulp; +xdr_u_long(XDR *xdrs, u_long *ulp) { switch (xdrs->x_op) { case XDR_ENCODE: @@ -206,9 +196,7 @@ xdr_u_long(xdrs, ulp) * same as xdr_u_int32_t - open coded to save a proc call! */ bool_t -xdr_int32_t(xdrs, int32_p) - XDR *xdrs; - int32_t *int32_p; +xdr_int32_t(XDR *xdrs, int32_t *int32_p) { long l; @@ -237,9 +225,7 @@ xdr_int32_t(xdrs, int32_p) * same as xdr_int32_t - open coded to save a proc call! */ bool_t -xdr_u_int32_t(xdrs, u_int32_p) - XDR *xdrs; - u_int32_t *u_int32_p; +xdr_u_int32_t(XDR *xdrs, u_int32_t *u_int32_p) { u_long l; @@ -268,9 +254,7 @@ xdr_u_int32_t(xdrs, u_int32_p) * same as xdr_int32_t - open coded to save a proc call! */ bool_t -xdr_uint32_t(xdrs, u_int32_p) - XDR *xdrs; - uint32_t *u_int32_p; +xdr_uint32_t(XDR *xdrs, uint32_t *u_int32_p) { u_long l; @@ -298,9 +282,7 @@ xdr_uint32_t(xdrs, u_int32_p) * XDR short integers */ bool_t -xdr_short(xdrs, sp) - XDR *xdrs; - short *sp; +xdr_short(XDR *xdrs, short *sp) { long l; @@ -328,9 +310,7 @@ xdr_short(xdrs, sp) * XDR unsigned short integers */ bool_t -xdr_u_short(xdrs, usp) - XDR *xdrs; - u_short *usp; +xdr_u_short(XDR *xdrs, u_short *usp) { u_long l; @@ -359,9 +339,7 @@ xdr_u_short(xdrs, usp) * XDR 16-bit integers */ bool_t -xdr_int16_t(xdrs, int16_p) - XDR *xdrs; - int16_t *int16_p; +xdr_int16_t(XDR *xdrs, int16_t *int16_p) { long l; @@ -389,9 +367,7 @@ xdr_int16_t(xdrs, int16_p) * XDR unsigned 16-bit integers */ bool_t -xdr_u_int16_t(xdrs, u_int16_p) - XDR *xdrs; - u_int16_t *u_int16_p; +xdr_u_int16_t(XDR *xdrs, u_int16_t *u_int16_p) { u_long l; @@ -419,9 +395,7 @@ xdr_u_int16_t(xdrs, u_int16_p) * XDR unsigned 16-bit integers */ bool_t -xdr_uint16_t(xdrs, u_int16_p) - XDR *xdrs; - uint16_t *u_int16_p; +xdr_uint16_t(XDR *xdrs, uint16_t *u_int16_p) { u_long l; @@ -450,9 +424,7 @@ xdr_uint16_t(xdrs, u_int16_p) * XDR a char */ bool_t -xdr_char(xdrs, cp) - XDR *xdrs; - char *cp; +xdr_char(XDR *xdrs, char *cp) { int i; @@ -468,9 +440,7 @@ xdr_char(xdrs, cp) * XDR an unsigned char */ bool_t -xdr_u_char(xdrs, cp) - XDR *xdrs; - u_char *cp; +xdr_u_char(XDR *xdrs, u_char *cp) { u_int u; @@ -486,9 +456,7 @@ xdr_u_char(xdrs, cp) * XDR booleans */ bool_t -xdr_bool(xdrs, bp) - XDR *xdrs; - bool_t *bp; +xdr_bool(XDR *xdrs, bool_t *bp) { long lb; @@ -516,9 +484,7 @@ xdr_bool(xdrs, bp) * XDR enumerations */ bool_t -xdr_enum(xdrs, ep) - XDR *xdrs; - enum_t *ep; +xdr_enum(XDR *xdrs, enum_t *ep) { enum sizecheck { SIZEVAL }; /* used to find the size of an enum */ @@ -542,10 +508,7 @@ xdr_enum(xdrs, ep) * cp points to the opaque object and cnt gives the byte length. */ bool_t -xdr_opaque(xdrs, cp, cnt) - XDR *xdrs; - caddr_t cp; - u_int cnt; +xdr_opaque(XDR *xdrs, caddr_t cp, u_int cnt) { u_int rndup; static int crud[BYTES_PER_XDR_UNIT]; @@ -594,11 +557,7 @@ xdr_opaque(xdrs, cp, cnt) * If *cpp is NULL maxsize bytes are allocated */ bool_t -xdr_bytes(xdrs, cpp, sizep, maxsize) - XDR *xdrs; - char **cpp; - u_int *sizep; - u_int maxsize; +xdr_bytes(XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize) { char *sp = *cpp; /* sp is the actual string pointer */ u_int nodesize; @@ -650,9 +609,7 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) * Implemented here due to commonality of the object. */ bool_t -xdr_netobj(xdrs, np) - XDR *xdrs; - struct netobj *np; +xdr_netobj(XDR *xdrs, struct netobj *np) { return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ)); @@ -670,12 +627,14 @@ xdr_netobj(xdrs, np) * If there is no specific or default routine an error is returned. */ bool_t -xdr_union(xdrs, dscmp, unp, choices, dfault) - XDR *xdrs; - enum_t *dscmp; /* enum to decide which arm to work on */ - char *unp; /* the union itself */ - const struct xdr_discrim *choices; /* [value, xdr proc] for each arm */ - xdrproc_t dfault; /* default xdr routine */ +xdr_union(XDR *xdrs, enum_t *dscmp, char *unp, const struct xdr_discrim *choices, xdrproc_t dfault) +/* + * XDR *xdrs; + * enum_t *dscmp; // enum to decide which arm to work on + * char *unp; // the union itself + * const struct xdr_discrim *choices; // [value, xdr proc] for each arm + * xdrproc_t dfault; // default xdr routine + */ { enum_t dscm; @@ -719,10 +678,7 @@ xdr_union(xdrs, dscmp, unp, choices, dfault) * of the string as specified by a protocol. */ bool_t -xdr_string(xdrs, cpp, maxsize) - XDR *xdrs; - char **cpp; - u_int maxsize; +xdr_string(XDR *xdrs, char **cpp, u_int maxsize) { char *sp = *cpp; /* sp is the actual string pointer */ u_int size; @@ -786,9 +742,7 @@ xdr_string(xdrs, cpp, maxsize) * routines like clnt_call */ bool_t -xdr_wrapstring(xdrs, cpp) - XDR *xdrs; - char **cpp; +xdr_wrapstring(XDR *xdrs, char **cpp) { return xdr_string(xdrs, cpp, LASTUNSIGNED); } @@ -805,9 +759,7 @@ xdr_wrapstring(xdrs, cpp) * XDR 64-bit integers */ bool_t -xdr_int64_t(xdrs, llp) - XDR *xdrs; - int64_t *llp; +xdr_int64_t(XDR *xdrs, int64_t *llp) { u_long ul[2]; @@ -838,9 +790,7 @@ xdr_int64_t(xdrs, llp) * XDR unsigned 64-bit integers */ bool_t -xdr_u_int64_t(xdrs, ullp) - XDR *xdrs; - u_int64_t *ullp; +xdr_u_int64_t(XDR *xdrs, u_int64_t *ullp) { u_long ul[2]; @@ -870,9 +820,7 @@ xdr_u_int64_t(xdrs, ullp) * XDR unsigned 64-bit integers */ bool_t -xdr_uint64_t(xdrs, ullp) - XDR *xdrs; - uint64_t *ullp; +xdr_uint64_t(XDR *xdrs, uint64_t *ullp) { u_long ul[2]; @@ -903,9 +851,7 @@ xdr_uint64_t(xdrs, ullp) * XDR hypers */ bool_t -xdr_hyper(xdrs, llp) - XDR *xdrs; - longlong_t *llp; +xdr_hyper(XDR *xdrs, longlong_t *llp) { /* @@ -920,9 +866,7 @@ xdr_hyper(xdrs, llp) * XDR unsigned hypers */ bool_t -xdr_u_hyper(xdrs, ullp) - XDR *xdrs; - u_longlong_t *ullp; +xdr_u_hyper(XDR *xdrs, u_longlong_t *ullp) { /* @@ -937,9 +881,7 @@ xdr_u_hyper(xdrs, ullp) * XDR longlong_t's */ bool_t -xdr_longlong_t(xdrs, llp) - XDR *xdrs; - longlong_t *llp; +xdr_longlong_t(XDR *xdrs, longlong_t *llp) { /* @@ -954,9 +896,7 @@ xdr_longlong_t(xdrs, llp) * XDR u_longlong_t's */ bool_t -xdr_u_longlong_t(xdrs, ullp) - XDR *xdrs; - u_longlong_t *ullp; +xdr_u_longlong_t(XDR *xdrs, u_longlong_t *ullp) { /* diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c index 620155c..a11c7a1 100644 --- a/lib/libc/xdr/xdr_array.c +++ b/lib/libc/xdr/xdr_array.c @@ -64,13 +64,15 @@ __FBSDID("$FreeBSD$"); * xdr procedure to call to handle each element of the array. */ bool_t -xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc) - XDR *xdrs; - caddr_t *addrp; /* array pointer */ - u_int *sizep; /* number of elements */ - u_int maxsize; /* max numberof elements */ - u_int elsize; /* size in bytes of each element */ - xdrproc_t elproc; /* xdr routine to handle each element */ +xdr_array(XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize, xdrproc_t elproc) +/* + * XDR *xdrs; + * caddr_t *addrp; // array pointer + * u_int *sizep; // number of elements + * u_int maxsize; // max numberof elements + * u_int elsize; // size in bytes of each element + * xdrproc_t elproc; // xdr routine to handle each element + */ { u_int i; caddr_t target = *addrp; @@ -142,12 +144,7 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc) * > xdr_elem: routine to XDR each element */ bool_t -xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem) - XDR *xdrs; - char *basep; - u_int nelem; - u_int elemsize; - xdrproc_t xdr_elem; +xdr_vector(XDR *xdrs, char *basep, u_int nelem, u_int elemsize, xdrproc_t xdr_elem) { u_int i; char *elptr; diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c index 1d3bb61..fc024fc 100644 --- a/lib/libc/xdr/xdr_float.c +++ b/lib/libc/xdr/xdr_float.c @@ -204,9 +204,7 @@ static struct dbl_limits { bool_t -xdr_double(xdrs, dp) - XDR *xdrs; - double *dp; +xdr_double(XDR *xdrs, double *dp) { #ifdef IEEEFP int32_t *i32p; diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c index 70f79c6..0455a5a 100644 --- a/lib/libc/xdr/xdr_mem.c +++ b/lib/libc/xdr/xdr_mem.c @@ -98,11 +98,7 @@ static const struct xdr_ops xdrmem_ops_unaligned = { * memory buffer. */ void -xdrmem_create(xdrs, addr, size, op) - XDR *xdrs; - char *addr; - u_int size; - enum xdr_op op; +xdrmem_create(XDR *xdrs, char *addr, u_int size, enum xdr_op op) { xdrs->x_op = op; @@ -114,16 +110,13 @@ xdrmem_create(xdrs, addr, size, op) /*ARGSUSED*/ static void -xdrmem_destroy(xdrs) - XDR *xdrs; +xdrmem_destroy(XDR *xdrs) { } static bool_t -xdrmem_getlong_aligned(xdrs, lp) - XDR *xdrs; - long *lp; +xdrmem_getlong_aligned(XDR *xdrs, long *lp) { if (xdrs->x_handy < sizeof(int32_t)) @@ -135,9 +128,7 @@ xdrmem_getlong_aligned(xdrs, lp) } static bool_t -xdrmem_putlong_aligned(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrmem_putlong_aligned(XDR *xdrs, const long *lp) { if (xdrs->x_handy < sizeof(int32_t)) @@ -149,9 +140,7 @@ xdrmem_putlong_aligned(xdrs, lp) } static bool_t -xdrmem_getlong_unaligned(xdrs, lp) - XDR *xdrs; - long *lp; +xdrmem_getlong_unaligned(XDR *xdrs, long *lp) { u_int32_t l; @@ -165,9 +154,7 @@ xdrmem_getlong_unaligned(xdrs, lp) } static bool_t -xdrmem_putlong_unaligned(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrmem_putlong_unaligned(XDR *xdrs, const long *lp) { u_int32_t l; @@ -181,10 +168,7 @@ xdrmem_putlong_unaligned(xdrs, lp) } static bool_t -xdrmem_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrmem_getbytes(XDR *xdrs, char *addr, u_int len) { if (xdrs->x_handy < len) @@ -196,10 +180,7 @@ xdrmem_getbytes(xdrs, addr, len) } static bool_t -xdrmem_putbytes(xdrs, addr, len) - XDR *xdrs; - const char *addr; - u_int len; +xdrmem_putbytes(XDR *xdrs, const char *addr, u_int len) { if (xdrs->x_handy < len) @@ -211,8 +192,7 @@ xdrmem_putbytes(xdrs, addr, len) } static u_int -xdrmem_getpos(xdrs) - XDR *xdrs; +xdrmem_getpos(XDR *xdrs) { /* XXX w/64-bit pointers, u_int not enough! */ @@ -220,9 +200,7 @@ xdrmem_getpos(xdrs) } static bool_t -xdrmem_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrmem_setpos(XDR *xdrs, u_int pos) { char *newaddr = xdrs->x_base + pos; char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy; @@ -235,9 +213,7 @@ xdrmem_setpos(xdrs, pos) } static int32_t * -xdrmem_inline_aligned(xdrs, len) - XDR *xdrs; - u_int len; +xdrmem_inline_aligned(XDR *xdrs, u_int len) { int32_t *buf = 0; @@ -251,9 +227,7 @@ xdrmem_inline_aligned(xdrs, len) /* ARGSUSED */ static int32_t * -xdrmem_inline_unaligned(xdrs, len) - XDR *xdrs; - u_int len; +xdrmem_inline_unaligned(XDR *xdrs, u_int len) { return (0); diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index 3f63498..f818ed94 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -161,15 +161,18 @@ static bool_t realloc_stream(RECSTREAM *, int); * calls expect that they take an opaque handle rather than an fd. */ void -xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) - XDR *xdrs; - u_int sendsize; - u_int recvsize; - void *tcp_handle; - /* like read, but pass it a tcp_handle, not sock */ - int (*readit)(void *, void *, int); - /* like write, but pass it a tcp_handle, not sock */ - int (*writeit)(void *, void *, int); +xdrrec_create(XDR *xdrs, u_int sendsize, u_int recvsize, void *tcp_handle, + int (*readit)(void *, void *, int), int (*writeit)(void *, void *, int)) +/* + * XDR *xdrs; + * u_int sendsize; + * u_int recvsize; + * void *tcp_handle; + * // like read, but pass it a tcp_handle, not sock + * int (*readit)(void *, void *, int); + * // like write, but pass it a tcp_handle, not sock + * int (*writeit)(void *, void *, int); + */ { RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM)); @@ -229,9 +232,7 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) */ static bool_t -xdrrec_getlong(xdrs, lp) - XDR *xdrs; - long *lp; +xdrrec_getlong(XDR *xdrs, long *lp) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger); @@ -253,9 +254,7 @@ xdrrec_getlong(xdrs, lp) } static bool_t -xdrrec_putlong(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrrec_putlong(XDR *xdrs, const long *lp) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger)); @@ -277,10 +276,7 @@ xdrrec_putlong(xdrs, lp) } static bool_t /* must manage buffers, fragments, and records */ -xdrrec_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrrec_getbytes(XDR *xdrs, char *addr, u_int len) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); int current; @@ -305,10 +301,7 @@ xdrrec_getbytes(xdrs, addr, len) } static bool_t -xdrrec_putbytes(xdrs, addr, len) - XDR *xdrs; - const char *addr; - u_int len; +xdrrec_putbytes(XDR *xdrs, const char *addr, u_int len) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); size_t current; @@ -331,8 +324,7 @@ xdrrec_putbytes(xdrs, addr, len) } static u_int -xdrrec_getpos(xdrs) - XDR *xdrs; +xdrrec_getpos(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; off_t pos; @@ -358,9 +350,7 @@ xdrrec_getpos(xdrs) } static bool_t -xdrrec_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrrec_setpos(XDR *xdrs, u_int pos) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; u_int currpos = xdrrec_getpos(xdrs); @@ -397,9 +387,7 @@ xdrrec_setpos(xdrs, pos) } static int32_t * -xdrrec_inline(xdrs, len) - XDR *xdrs; - u_int len; +xdrrec_inline(XDR *xdrs, u_int len) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; int32_t *buf = NULL; @@ -429,8 +417,7 @@ xdrrec_inline(xdrs, len) } static void -xdrrec_destroy(xdrs) - XDR *xdrs; +xdrrec_destroy(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; @@ -449,8 +436,7 @@ xdrrec_destroy(xdrs) * this procedure to guarantee proper record alignment. */ bool_t -xdrrec_skiprecord(xdrs) - XDR *xdrs; +xdrrec_skiprecord(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); enum xprt_stat xstat; @@ -485,8 +471,7 @@ xdrrec_skiprecord(xdrs) * after consuming the rest of the current record. */ bool_t -xdrrec_eof(xdrs) - XDR *xdrs; +xdrrec_eof(XDR *xdrs) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); @@ -509,9 +494,7 @@ xdrrec_eof(xdrs) * pipelined procedure calls.) TRUE => immmediate flush to tcp connection. */ bool_t -xdrrec_endofrecord(xdrs, sendnow) - XDR *xdrs; - bool_t sendnow; +xdrrec_endofrecord(XDR *xdrs, bool_t sendnow) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); u_long len; /* fragment length */ @@ -535,10 +518,7 @@ xdrrec_endofrecord(xdrs, sendnow) * Return true if a record is available in the buffer, false if not. */ bool_t -__xdrrec_getrec(xdrs, statp, expectdata) - XDR *xdrs; - enum xprt_stat *statp; - bool_t expectdata; +__xdrrec_getrec(XDR *xdrs, enum xprt_stat *statp, bool_t expectdata) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); ssize_t n; @@ -618,9 +598,7 @@ __xdrrec_getrec(xdrs, statp, expectdata) } bool_t -__xdrrec_setnonblock(xdrs, maxrec) - XDR *xdrs; - int maxrec; +__xdrrec_setnonblock(XDR *xdrs, int maxrec) { RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); @@ -635,9 +613,7 @@ __xdrrec_setnonblock(xdrs, maxrec) * Internal useful routines */ static bool_t -flush_out(rstrm, eor) - RECSTREAM *rstrm; - bool_t eor; +flush_out(RECSTREAM *rstrm, bool_t eor) { u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; u_int32_t len = (u_int32_t)((u_long)(rstrm->out_finger) - @@ -655,8 +631,7 @@ flush_out(rstrm, eor) } static bool_t /* knows nothing about records! Only about input buffers */ -fill_input_buf(rstrm) - RECSTREAM *rstrm; +fill_input_buf(RECSTREAM *rstrm) { char *where; u_int32_t i; @@ -678,10 +653,7 @@ fill_input_buf(rstrm) } static bool_t /* knows nothing about records! Only about input buffers */ -get_input_bytes(rstrm, addr, len) - RECSTREAM *rstrm; - char *addr; - int len; +get_input_bytes(RECSTREAM *rstrm, char *addr, int len) { size_t current; @@ -711,8 +683,7 @@ get_input_bytes(rstrm, addr, len) } static bool_t /* next two bytes of the input stream are treated as a header */ -set_input_fragment(rstrm) - RECSTREAM *rstrm; +set_input_fragment(RECSTREAM *rstrm) { u_int32_t header; @@ -737,9 +708,7 @@ set_input_fragment(rstrm) } static bool_t /* consumes input bytes; knows nothing about records! */ -skip_input_bytes(rstrm, cnt) - RECSTREAM *rstrm; - long cnt; +skip_input_bytes(RECSTREAM *rstrm, long cnt) { u_int32_t current; @@ -759,8 +728,7 @@ skip_input_bytes(rstrm, cnt) } static u_int -fix_buf_size(s) - u_int s; +fix_buf_size(u_int s) { if (s < 100) @@ -772,9 +740,7 @@ fix_buf_size(s) * Reallocate the input buffer for a non-block stream. */ static bool_t -realloc_stream(rstrm, size) - RECSTREAM *rstrm; - int size; +realloc_stream(RECSTREAM *rstrm, int size) { ptrdiff_t diff; char *buf; diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c index 146dcf2..9acdd96 100644 --- a/lib/libc/xdr/xdr_reference.c +++ b/lib/libc/xdr/xdr_reference.c @@ -65,11 +65,13 @@ __FBSDID("$FreeBSD$"); * proc is the routine to handle the referenced structure. */ bool_t -xdr_reference(xdrs, pp, size, proc) - XDR *xdrs; - caddr_t *pp; /* the pointer to work on */ - u_int size; /* size of the object pointed to */ - xdrproc_t proc; /* xdr routine to handle the object */ +xdr_reference(XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc) +/* + * XDR *xdrs; + * caddr_t *pp; // the pointer to work on + * u_int size; // size of the object pointed to + * xdrproc_t proc; // xdr routine to handle the object + */ { caddr_t loc = *pp; bool_t stat; @@ -122,11 +124,7 @@ xdr_reference(xdrs, pp, size, proc) * */ bool_t -xdr_pointer(xdrs,objpp,obj_size,xdr_obj) - XDR *xdrs; - char **objpp; - u_int obj_size; - xdrproc_t xdr_obj; +xdr_pointer(XDR *xdrs, char **objpp, u_int obj_size, xdrproc_t xdr_obj) { bool_t more_data; diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c index 3daaa0c..f4b2874 100644 --- a/lib/libc/xdr/xdr_sizeof.c +++ b/lib/libc/xdr/xdr_sizeof.c @@ -47,9 +47,7 @@ __FBSDID("$FreeBSD$"); /* ARGSUSED */ static bool_t -x_putlong(xdrs, longp) - XDR *xdrs; - long *longp; +x_putlong(XDR *xdrs, const long *longp) { xdrs->x_handy += BYTES_PER_XDR_UNIT; return (TRUE); @@ -57,36 +55,28 @@ x_putlong(xdrs, longp) /* ARGSUSED */ static bool_t -x_putbytes(xdrs, bp, len) - XDR *xdrs; - char *bp; - u_int len; +x_putbytes(XDR *xdrs, const char *bp, u_int len) { xdrs->x_handy += len; return (TRUE); } static u_int -x_getpostn(xdrs) - XDR *xdrs; +x_getpostn(XDR *xdrs) { return (xdrs->x_handy); } /* ARGSUSED */ static bool_t -x_setpostn(xdrs, pos) - XDR *xdrs; - u_int pos; +x_setpostn(XDR *xdrs, u_int pos) { /* This is not allowed */ return (FALSE); } static int32_t * -x_inline(xdrs, len) - XDR *xdrs; - u_int len; +x_inline(XDR *xdrs, u_int len) { if (len == 0) { return (NULL); @@ -113,15 +103,14 @@ x_inline(xdrs, len) } static int -harmless() +harmless(void) { /* Always return FALSE/NULL, as the case may be */ return (0); } static void -x_destroy(xdrs) - XDR *xdrs; +x_destroy(XDR *xdrs) { xdrs->x_handy = 0; xdrs->x_base = 0; @@ -133,9 +122,7 @@ x_destroy(xdrs) } unsigned long -xdr_sizeof(func, data) - xdrproc_t func; - void *data; +xdr_sizeof(xdrproc_t func, void *data) { XDR x; struct xdr_ops ops; diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c index 832b308..0065154 100644 --- a/lib/libc/xdr/xdr_stdio.c +++ b/lib/libc/xdr/xdr_stdio.c @@ -83,10 +83,7 @@ static const struct xdr_ops xdrstdio_ops = { * Operation flag is set to op. */ void -xdrstdio_create(xdrs, file, op) - XDR *xdrs; - FILE *file; - enum xdr_op op; +xdrstdio_create(XDR *xdrs, FILE *file, enum xdr_op op) { xdrs->x_op = op; @@ -101,17 +98,14 @@ xdrstdio_create(xdrs, file, op) * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create. */ static void -xdrstdio_destroy(xdrs) - XDR *xdrs; +xdrstdio_destroy(XDR *xdrs) { (void)fflush((FILE *)xdrs->x_private); /* XXX: should we close the file ?? */ } static bool_t -xdrstdio_getlong(xdrs, lp) - XDR *xdrs; - long *lp; +xdrstdio_getlong(XDR *xdrs, long *lp) { u_int32_t temp; @@ -122,9 +116,7 @@ xdrstdio_getlong(xdrs, lp) } static bool_t -xdrstdio_putlong(xdrs, lp) - XDR *xdrs; - const long *lp; +xdrstdio_putlong(XDR *xdrs, const long *lp) { int32_t mycopy = htonl((u_int32_t)*lp); @@ -134,10 +126,7 @@ xdrstdio_putlong(xdrs, lp) } static bool_t -xdrstdio_getbytes(xdrs, addr, len) - XDR *xdrs; - char *addr; - u_int len; +xdrstdio_getbytes(XDR *xdrs, char *addr, u_int len) { if ((len != 0) && (fread(addr, (size_t)len, 1, (FILE *)xdrs->x_private) != 1)) @@ -146,10 +135,7 @@ xdrstdio_getbytes(xdrs, addr, len) } static bool_t -xdrstdio_putbytes(xdrs, addr, len) - XDR *xdrs; - const char *addr; - u_int len; +xdrstdio_putbytes(XDR *xdrs, const char *addr, u_int len) { if ((len != 0) && (fwrite(addr, (size_t)len, 1, @@ -159,17 +145,14 @@ xdrstdio_putbytes(xdrs, addr, len) } static u_int -xdrstdio_getpos(xdrs) - XDR *xdrs; +xdrstdio_getpos(XDR *xdrs) { return ((u_int) ftell((FILE *)xdrs->x_private)); } static bool_t -xdrstdio_setpos(xdrs, pos) - XDR *xdrs; - u_int pos; +xdrstdio_setpos(XDR *xdrs, u_int pos) { return ((fseek((FILE *)xdrs->x_private, (long)pos, 0) < 0) ? @@ -178,9 +161,7 @@ xdrstdio_setpos(xdrs, pos) /* ARGSUSED */ static int32_t * -xdrstdio_inline(xdrs, len) - XDR *xdrs; - u_int len; +xdrstdio_inline(XDR *xdrs, u_int len) { /* diff --git a/lib/libc_nonshared/Makefile.depend b/lib/libc_nonshared/Makefile.depend index 15a1f9c..18be76b 100644 --- a/lib/libc_nonshared/Makefile.depend +++ b/lib/libc_nonshared/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libcalendar/Makefile.depend b/lib/libcalendar/Makefile.depend index c9d74dc..3699b06 100644 --- a/lib/libcalendar/Makefile.depend +++ b/lib/libcalendar/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libcam/Makefile.depend b/lib/libcam/Makefile.depend index 2a956d8..114b842 100644 --- a/lib/libcam/Makefile.depend +++ b/lib/libcam/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libcapsicum/Makefile.depend b/lib/libcapsicum/Makefile.depend index bf32038..5016551 100644 --- a/lib/libcapsicum/Makefile.depend +++ b/lib/libcapsicum/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index be0122e..03873f2 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -5,7 +5,7 @@ CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/} CRTSRC=${.CURDIR}/../../../contrib/compiler-rt -LIBDIR=/usr/lib/clang/3.6.0/lib/freebsd +LIBDIR=/usr/lib/clang/3.6.1/lib/freebsd NO_PIC= MK_PROFILE=no diff --git a/lib/libcom_err/Makefile.depend b/lib/libcom_err/Makefile.depend index 593d407..3646e2e 100644 --- a/lib/libcom_err/Makefile.depend +++ b/lib/libcom_err/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -8,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libcompat/Makefile.depend b/lib/libcompat/Makefile.depend index 639d45d..18be76b 100644 --- a/lib/libcompat/Makefile.depend +++ b/lib/libcompat/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ include \ include/xlocale \ diff --git a/lib/libcompiler_rt/Makefile.depend b/lib/libcompiler_rt/Makefile.depend index 993ab06..79506ce 100644 --- a/lib/libcompiler_rt/Makefile.depend +++ b/lib/libcompiler_rt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend index bd8ae02..54c1f6f 100644 --- a/lib/libcrypt/Makefile.depend +++ b/lib/libcrypt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -9,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libcrypt/tests/Makefile.depend b/lib/libcrypt/tests/Makefile.depend index 42ba839..d0caca1 100644 --- a/lib/libcrypt/tests/Makefile.depend +++ b/lib/libcrypt/tests/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libcrypt/tests/crypt_tests.c b/lib/libcrypt/tests/crypt_tests.c index ea7cfbc..426d10e 100644 --- a/lib/libcrypt/tests/crypt_tests.c +++ b/lib/libcrypt/tests/crypt_tests.c @@ -2,6 +2,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> +#include <crypt.h> #include <unistd.h> #include <atf-c.h> diff --git a/lib/libcuse/Makefile.depend b/lib/libcuse/Makefile.depend index 37acbe0..441e1ee 100644 --- a/lib/libcuse/Makefile.depend +++ b/lib/libcuse/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libcxxrt/Makefile.depend b/lib/libcxxrt/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libcxxrt/Makefile.depend +++ b/lib/libcxxrt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libcxxrt/Makefile.depend.host b/lib/libcxxrt/Makefile.depend.host index 8dc8a74..9f46a2f 100644 --- a/lib/libcxxrt/Makefile.depend.host +++ b/lib/libcxxrt/Makefile.depend.host @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libdevinfo/Makefile.depend b/lib/libdevinfo/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libdevinfo/Makefile.depend +++ b/lib/libdevinfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libdevstat/Makefile.depend b/lib/libdevstat/Makefile.depend index a785d0c..96ad505 100644 --- a/lib/libdevstat/Makefile.depend +++ b/lib/libdevstat/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c index d52332b..68b5028 100644 --- a/lib/libdevstat/devstat.c +++ b/lib/libdevstat/devstat.c @@ -334,7 +334,6 @@ devstat_getdevs(kvm_t *kd, struct statinfo *stats) { int error; size_t dssize; - int oldnumdevs; long oldgeneration; int retval = 0; struct devinfo *dinfo; @@ -348,7 +347,6 @@ devstat_getdevs(kvm_t *kd, struct statinfo *stats) return(-1); } - oldnumdevs = dinfo->numdevs; oldgeneration = dinfo->generation; if (kd == NULL) { diff --git a/lib/libdpv/Makefile.depend b/lib/libdpv/Makefile.depend index 027da9c..6f24a33 100644 --- a/lib/libdpv/Makefile.depend +++ b/lib/libdpv/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libdpv/dprompt.c b/lib/libdpv/dprompt.c index 031f550..e3d636a 100644 --- a/lib/libdpv/dprompt.c +++ b/lib/libdpv/dprompt.c @@ -391,7 +391,6 @@ dprompt_add_files(struct dpv_file_node *file_list, enum dprompt_state dstate; int estext_lsize; int estext_rsize; - int estext_size; int flabel_size; int hlen; int lsize; @@ -559,13 +558,11 @@ dprompt_add_files(struct dpv_file_node *file_list, bg_code = "\\Zr\\Z1"; /* Red */ estext_lsize = fail_lsize; estext_rsize = fail_rsize; - estext_size = fail_size; estext = fail; } else { /* e.g., DPV_STATUS_DONE */ bg_code = "\\Zr\\Z2"; /* Green */ estext_lsize = done_lsize; estext_rsize = done_rsize; - estext_size = done_size; estext = done; } switch (dstate) { diff --git a/lib/libdpv/dpv.c b/lib/libdpv/dpv.c index fd44360..6a03922 100644 --- a/lib/libdpv/dpv.c +++ b/lib/libdpv/dpv.c @@ -692,7 +692,7 @@ dpv(struct dpv_config *config, struct dpv_file_node *file_list) if (!dpv_interrupt) printf("\n"); } else - warnx("%s: %lli lines read", __func__, dpv_overall_read); + warnx("%s: %lli overall read", __func__, dpv_overall_read); if (dpv_interrupt || dpv_abort) return (-1); diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend index 07e629e..2a416d0 100644 --- a/lib/libdwarf/Makefile.depend +++ b/lib/libdwarf/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend index d4b7b5c..3c91e80 100644 --- a/lib/libedit/Makefile.depend +++ b/lib/libedit/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/libedit/edit/readline/Makefile.depend b/lib/libedit/edit/readline/Makefile.depend index 11aba52..f80275d 100644 --- a/lib/libedit/edit/readline/Makefile.depend +++ b/lib/libedit/edit/readline/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libedit/edit/readline/readline.h b/lib/libedit/edit/readline/readline.h index 4371457..e25781b 100644 --- a/lib/libedit/edit/readline/readline.h +++ b/lib/libedit/edit/readline/readline.h @@ -1,4 +1,4 @@ -/* $NetBSD: readline.h,v 1.34 2013/05/28 00:10:34 christos Exp $ */ +/* $NetBSD: readline.h,v 1.37 2015/06/02 15:36:45 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -41,9 +41,8 @@ /* typedefs */ typedef int Function(const char *, int); typedef void VFunction(void); -typedef void VCPFunction(char *); -typedef char *CPFunction(const char *, int); -typedef char **CPPFunction(const char *, int, int); +typedef void rl_vcpfunc_t(char *); +typedef char **rl_completion_func_t(const char *, int, int); typedef char *rl_compentry_func_t(const char *, int); typedef int rl_command_func_t(int, int); @@ -110,9 +109,9 @@ extern int max_input_history; extern char *rl_basic_word_break_characters; extern char *rl_completer_word_break_characters; extern char *rl_completer_quote_characters; -extern Function *rl_completion_entry_function; +extern rl_compentry_func_t *rl_completion_entry_function; extern char *(*rl_completion_word_break_hook)(void); -extern CPPFunction *rl_attempted_completion_function; +extern rl_completion_func_t *rl_attempted_completion_function; extern int rl_attempted_completion_over; extern int rl_completion_type; extern int rl_completion_query_items; @@ -177,7 +176,7 @@ char *filename_completion_function(const char *, int); char *username_completion_function(const char *, int); int rl_complete(int, int); int rl_read_key(void); -char **completion_matches(const char *, CPFunction *); +char **completion_matches(const char *, rl_compentry_func_t *); void rl_display_match_list(char **, int, int); int rl_insert(int, int); @@ -186,7 +185,7 @@ void rl_reset_terminal(const char *); int rl_bind_key(int, rl_command_func_t *); int rl_newline(int, int); void rl_callback_read_char(void); -void rl_callback_handler_install(const char *, VCPFunction *); +void rl_callback_handler_install(const char *, rl_vcpfunc_t *); void rl_callback_handler_remove(void); void rl_redisplay(void); int rl_get_previous_history(int, int); @@ -196,7 +195,7 @@ int rl_read_init_file(const char *); int rl_parse_and_bind(const char *); int rl_variable_bind(const char *, const char *); void rl_stuff_char(int); -int rl_add_defun(const char *, Function *, int); +int rl_add_defun(const char *, rl_command_func_t *, int); HISTORY_STATE *history_get_history_state(void); void rl_get_screen_size(int *, int *); void rl_set_screen_size(int, int); diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 2dd7f4f..caddb9f 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $ */ +/* $NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.117 2015/06/02 15:35:31 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -80,7 +80,7 @@ FILE *rl_outstream = NULL; int rl_point = 0; int rl_end = 0; char *rl_line_buffer = NULL; -VCPFunction *rl_linefunc = NULL; +rl_vcpfunc_t *rl_linefunc = NULL; int rl_done = 0; VFunction *rl_event_hook = NULL; KEYMAP_ENTRY_ARRAY emacs_standard_keymap, @@ -109,9 +109,9 @@ int rl_attempted_completion_over = 0; char *rl_basic_word_break_characters = break_chars; char *rl_completer_word_break_characters = NULL; char *rl_completer_quote_characters = NULL; -Function *rl_completion_entry_function = NULL; +rl_compentry_func_t *rl_completion_entry_function = NULL; char *(*rl_completion_word_break_hook)(void) = NULL; -CPPFunction *rl_attempted_completion_function = NULL; +rl_completion_func_t *rl_attempted_completion_function = NULL; Function *rl_pre_input_hook = NULL; Function *rl_startup1_hook = NULL; int (*rl_getc_function)(FILE *) = NULL; @@ -162,7 +162,7 @@ int rl_completion_append_character = ' '; static History *h = NULL; static EditLine *e = NULL; -static Function *map[256]; +static rl_command_func_t *map[256]; static jmp_buf topbuf; /* internal functions */ @@ -1829,9 +1829,11 @@ rl_complete(int ignore __attribute__((__unused__)), int invoking_key) else breakchars = rl_basic_word_break_characters; + _rl_update_pos(); + /* Just look at how many global variables modify this operation! */ return fn_complete(e, - (CPFunction *)rl_completion_entry_function, + (rl_compentry_func_t *)rl_completion_entry_function, rl_attempted_completion_function, ct_decode_string(rl_basic_word_break_characters, &wbreak_conv), ct_decode_string(breakchars, &sprefix_conv), @@ -1960,7 +1962,7 @@ rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c) _rl_update_pos(); - (*map[c])(NULL, c); + (*map[c])(1, c); /* If rl_done was set by the above call, deal with it here */ if (rl_done) @@ -1970,7 +1972,7 @@ rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c) } int -rl_add_defun(const char *name, Function *fun, int c) +rl_add_defun(const char *name, rl_command_func_t *fun, int c) { char dest[8]; if ((size_t)c >= sizeof(map) / sizeof(map[0]) || c < 0) @@ -2009,7 +2011,7 @@ rl_callback_read_char(void) } void -rl_callback_handler_install(const char *prompt, VCPFunction *linefunc) +rl_callback_handler_install(const char *prompt, rl_vcpfunc_t *linefunc) { if (e == NULL) { rl_initialize(); diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend index 5830cc8..cc4f1d2 100644 --- a/lib/libelf/Makefile.depend +++ b/lib/libelf/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libelftc/elftc_version.c b/lib/libelftc/elftc_version.c index fb0a731..e8a11d4 100644 --- a/lib/libelftc/elftc_version.c +++ b/lib/libelftc/elftc_version.c @@ -6,5 +6,5 @@ const char * elftc_version(void) { - return "elftoolchain r3197M"; + return "elftoolchain r3223M"; } diff --git a/lib/libevent/Makefile.depend b/lib/libevent/Makefile.depend index 639d45d..ccd19e5 100644 --- a/lib/libevent/Makefile.depend +++ b/lib/libevent/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libexecinfo/Makefile.depend b/lib/libexecinfo/Makefile.depend index f895c37..5bc9039 100644 --- a/lib/libexecinfo/Makefile.depend +++ b/lib/libexecinfo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libexpat/Makefile.depend +++ b/lib/libexpat/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libfetch/Makefile.depend b/lib/libfetch/Makefile.depend index a9a742b..df3495b 100644 --- a/lib/libfetch/Makefile.depend +++ b/lib/libfetch/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libfigpar/Makefile.depend b/lib/libfigpar/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libfigpar/Makefile.depend +++ b/lib/libfigpar/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libgeom/Makefile.depend b/lib/libgeom/Makefile.depend index e604936..9af4728 100644 --- a/lib/libgeom/Makefile.depend +++ b/lib/libgeom/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libgpib/Makefile.depend b/lib/libgpib/Makefile.depend index 7cedd5f..4370d1e 100644 --- a/lib/libgpib/Makefile.depend +++ b/lib/libgpib/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libgpio/Makefile.depend b/lib/libgpio/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libgpio/Makefile.depend +++ b/lib/libgpio/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libgssapi/Makefile.depend b/lib/libgssapi/Makefile.depend index a27ab52..7602ef9 100644 --- a/lib/libgssapi/Makefile.depend +++ b/lib/libgssapi/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/libgssapi/gss_accept_sec_context.c b/lib/libgssapi/gss_accept_sec_context.c index b424092..930da7f 100644 --- a/lib/libgssapi/gss_accept_sec_context.c +++ b/lib/libgssapi/gss_accept_sec_context.c @@ -165,7 +165,6 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status, struct _gss_mechanism_cred *mc; gss_cred_id_t acceptor_mc, delegated_mc; gss_name_t src_mn; - int allocated_ctx; *minor_status = 0; if (src_name) @@ -206,11 +205,8 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status, free(ctx); return (GSS_S_BAD_MECH); } - allocated_ctx = 1; - } else { + } else m = ctx->gc_mech; - allocated_ctx = 0; - } if (cred) { SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) diff --git a/lib/libiconv_modules/BIG5/Makefile.depend b/lib/libiconv_modules/BIG5/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/BIG5/Makefile.depend +++ b/lib/libiconv_modules/BIG5/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/DECHanyu/Makefile.depend b/lib/libiconv_modules/DECHanyu/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/DECHanyu/Makefile.depend +++ b/lib/libiconv_modules/DECHanyu/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/EUC/Makefile.depend b/lib/libiconv_modules/EUC/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/EUC/Makefile.depend +++ b/lib/libiconv_modules/EUC/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/EUCTW/Makefile.depend b/lib/libiconv_modules/EUCTW/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/EUCTW/Makefile.depend +++ b/lib/libiconv_modules/EUCTW/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/GBK2K/Makefile.depend b/lib/libiconv_modules/GBK2K/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/GBK2K/Makefile.depend +++ b/lib/libiconv_modules/GBK2K/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/HZ/Makefile.depend b/lib/libiconv_modules/HZ/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/HZ/Makefile.depend +++ b/lib/libiconv_modules/HZ/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/ISO2022/Makefile.depend b/lib/libiconv_modules/ISO2022/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/ISO2022/Makefile.depend +++ b/lib/libiconv_modules/ISO2022/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/JOHAB/Makefile.depend b/lib/libiconv_modules/JOHAB/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/JOHAB/Makefile.depend +++ b/lib/libiconv_modules/JOHAB/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/MSKanji/Makefile.depend b/lib/libiconv_modules/MSKanji/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/MSKanji/Makefile.depend +++ b/lib/libiconv_modules/MSKanji/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/UES/Makefile.depend b/lib/libiconv_modules/UES/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/UES/Makefile.depend +++ b/lib/libiconv_modules/UES/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/UTF1632/Makefile.depend b/lib/libiconv_modules/UTF1632/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/UTF1632/Makefile.depend +++ b/lib/libiconv_modules/UTF1632/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/UTF7/Makefile.depend b/lib/libiconv_modules/UTF7/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/UTF7/Makefile.depend +++ b/lib/libiconv_modules/UTF7/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/UTF7/citrus_utf7.c index ce74cfe..fa00a68 100644 --- a/lib/libiconv_modules/UTF7/citrus_utf7.c +++ b/lib/libiconv_modules/UTF7/citrus_utf7.c @@ -62,8 +62,7 @@ typedef struct { unsigned int mode: 1, /* whether base64 mode */ bits: 4, /* need to hold 0 - 15 */ - cache: 22, /* 22 = BASE64_BIT + UTF16_BIT */ - surrogate: 1; /* whether surrogate pair or not */ + cache: 22; /* 22 = BASE64_BIT + UTF16_BIT */ int chlen; char ch[4]; /* BASE64_IN, 3 * 6 = 18, most closed to UTF16_BIT */ } _UTF7State; @@ -154,21 +153,17 @@ _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei, uint16_t * __restrict u16, char ** __restrict s, size_t n, _UTF7State * __restrict psenc, size_t * __restrict nresult) { - _UTF7State sv; char *s0; int done, i, len; + *nresult = 0; s0 = *s; - sv = *psenc; for (i = 0, done = 0; done == 0; i++) { if (i == psenc->chlen) { if (n-- < 1) { *nresult = (size_t)-2; *s = s0; - sv.chlen = psenc->chlen; - memcpy(sv.ch, psenc->ch, sizeof(sv.ch)); - *psenc = sv; return (0); } psenc->ch[psenc->chlen++] = *s0++; @@ -257,34 +252,31 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei, *nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT; return (0); } - if (psenc->surrogate) { - hi = (psenc->cache >> psenc->bits) & UTF16_MAX; - if (hi < HISRG_MIN || hi > HISRG_MAX) - return (EINVAL); - siz = 0; - } else { - err = _citrus_UTF7_mbtoutf16(ei, &hi, s, n, psenc, &nr); - if (nr == (size_t)-1 || nr == (size_t)-2) { - *nresult = nr; - return (err); - } - if (err != 0) - return (err); - n -= nr; - siz = nr; - if (hi < HISRG_MIN || hi > HISRG_MAX) { - u32 = (uint32_t)hi; - goto done; - } - psenc->surrogate = 1; + err = _citrus_UTF7_mbtoutf16(ei, &hi, s, n, psenc, &nr); + if (nr == (size_t)-1 || nr == (size_t)-2) { + *nresult = nr; + return (err); + } + if (err != 0) + return (err); + n -= nr; + siz = nr; + if (hi < HISRG_MIN || hi > HISRG_MAX) { + u32 = (uint32_t)hi; + goto done; } err = _citrus_UTF7_mbtoutf16(ei, &lo, s, n, psenc, &nr); if (nr == (size_t)-1 || nr == (size_t)-2) { + psenc->chlen = 1; /* make get_state_desc return incomplete */ *nresult = nr; return (err); } if (err != 0) return (err); + if (lo < LOSRG_MIN || lo > LOSRG_MAX) { + *nresult = (size_t)-1; + return (EILSEQ); + } hi -= HISRG_MIN; lo -= LOSRG_MIN; u32 = (hi << 10 | lo) + SRG_BASE; @@ -297,7 +289,6 @@ done: _citrus_UTF7_init_state(ei, psenc); } else { *nresult = siz; - psenc->surrogate = 0; } return (err); } @@ -396,7 +387,7 @@ _citrus_UTF7_put_state_reset(_UTF7EncodingInfo * __restrict ei __unused, { int bits, pos; - if (psenc->chlen != 0 || psenc->bits > BASE64_BIT || psenc->surrogate) + if (psenc->chlen != 0 || psenc->bits > BASE64_BIT) return (EINVAL); if (psenc->mode) { diff --git a/lib/libiconv_modules/UTF8/Makefile.depend b/lib/libiconv_modules/UTF8/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/UTF8/Makefile.depend +++ b/lib/libiconv_modules/UTF8/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/VIQR/Makefile.depend b/lib/libiconv_modules/VIQR/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/VIQR/Makefile.depend +++ b/lib/libiconv_modules/VIQR/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/ZW/Makefile.depend b/lib/libiconv_modules/ZW/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/ZW/Makefile.depend +++ b/lib/libiconv_modules/ZW/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/iconv_none/Makefile.depend b/lib/libiconv_modules/iconv_none/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/iconv_none/Makefile.depend +++ b/lib/libiconv_modules/iconv_none/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/iconv_std/Makefile.depend b/lib/libiconv_modules/iconv_std/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/iconv_std/Makefile.depend +++ b/lib/libiconv_modules/iconv_std/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_646/Makefile.depend b/lib/libiconv_modules/mapper_646/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_646/Makefile.depend +++ b/lib/libiconv_modules/mapper_646/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_none/Makefile.depend b/lib/libiconv_modules/mapper_none/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_none/Makefile.depend +++ b/lib/libiconv_modules/mapper_none/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_parallel/Makefile.depend b/lib/libiconv_modules/mapper_parallel/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_parallel/Makefile.depend +++ b/lib/libiconv_modules/mapper_parallel/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_serial/Makefile.depend b/lib/libiconv_modules/mapper_serial/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_serial/Makefile.depend +++ b/lib/libiconv_modules/mapper_serial/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_std/Makefile.depend b/lib/libiconv_modules/mapper_std/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_std/Makefile.depend +++ b/lib/libiconv_modules/mapper_std/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libiconv_modules/mapper_zone/Makefile.depend b/lib/libiconv_modules/mapper_zone/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libiconv_modules/mapper_zone/Makefile.depend +++ b/lib/libiconv_modules/mapper_zone/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend index 60bd0fe..56cf3d8 100644 --- a/lib/libipsec/Makefile.depend +++ b/lib/libipsec/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libjail/Makefile.depend b/lib/libjail/Makefile.depend index bd8ae02..69d1724 100644 --- a/lib/libjail/Makefile.depend +++ b/lib/libjail/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libkiconv/Makefile.depend +++ b/lib/libkiconv/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libkvm/Makefile.depend b/lib/libkvm/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libkvm/Makefile.depend +++ b/lib/libkvm/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libldns/Makefile.depend b/lib/libldns/Makefile.depend index 42849eb..b3f22d1 100644 --- a/lib/libldns/Makefile.depend +++ b/lib/libldns/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -11,7 +12,6 @@ DIRDEPS = \ lib/libcompiler_rt \ secure/lib/libcrypto \ secure/lib/libssl \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend index 38b6435..21499e6 100644 --- a/lib/liblzma/Makefile.depend +++ b/lib/liblzma/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend index ecdbd37..002f937 100644 --- a/lib/libmagic/Makefile.depend +++ b/lib/libmagic/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 47f3347..956b040 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -75,6 +75,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + /* Define to 1 if the system has the type `intptr_t'. */ #define HAVE_INTPTR_T 1 @@ -93,6 +96,9 @@ /* Define to 1 if you have the <locale.h> header file. */ #define HAVE_LOCALE_H 1 +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -122,6 +128,12 @@ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the <signal.h> header file. */ +#define HAVE_SIGNAL_H 1 + +/* Have sig_t type */ +#define HAVE_SIG_T 1 + /* Define to 1 if you have the <stddef.h> header file. */ #define HAVE_STDDEF_H 1 @@ -278,7 +290,7 @@ #define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "file 5.22" +#define PACKAGE_STRING "file 5.23" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "file" @@ -287,7 +299,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.22" +#define PACKAGE_VERSION "5.23" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -318,7 +330,7 @@ /* Version number of package */ -#define VERSION "5.22" +#define VERSION "5.23" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend index a54cafa..00038a0 100644 --- a/lib/libmd/Makefile.depend +++ b/lib/libmd/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libmd/Makefile.depend.host b/lib/libmd/Makefile.depend.host index 3f41a3f..fd7c8da 100644 --- a/lib/libmd/Makefile.depend.host +++ b/lib/libmd/Makefile.depend.host @@ -1,9 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat \ - gnu/usr.bin/binutils/ld \ - usr.bin/xinstall \ .include <dirdeps.mk> diff --git a/lib/libmemstat/Makefile.depend b/lib/libmemstat/Makefile.depend index a785d0c..96ad505 100644 --- a/lib/libmemstat/Makefile.depend +++ b/lib/libmemstat/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend index e092bec..17c2027 100644 --- a/lib/libmilter/Makefile.depend +++ b/lib/libmilter/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libmp/Makefile.depend b/lib/libmp/Makefile.depend index 399ee78..6476d4c 100644 --- a/lib/libmp/Makefile.depend +++ b/lib/libmp/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libmt/Makefile.depend b/lib/libmt/Makefile.depend index e604936..9af4728 100644 --- a/lib/libmt/Makefile.depend +++ b/lib/libmt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libnetbsd/Makefile.depend b/lib/libnetbsd/Makefile.depend index 217d6b6..cf2961c 100644 --- a/lib/libnetbsd/Makefile.depend +++ b/lib/libnetbsd/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libnetgraph/Makefile.depend b/lib/libnetgraph/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libnetgraph/Makefile.depend +++ b/lib/libnetgraph/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend index bd8ae02..69d1724 100644 --- a/lib/libngatm/Makefile.depend +++ b/lib/libngatm/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libnv/Makefile.depend b/lib/libnv/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libnv/Makefile.depend +++ b/lib/libnv/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libohash/Makefile.depend b/lib/libohash/Makefile.depend index 15a1f9c..18be76b 100644 --- a/lib/libohash/Makefile.depend +++ b/lib/libohash/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libopie/Makefile.depend b/lib/libopie/Makefile.depend index 14d8b0f..6a2d406 100644 --- a/lib/libopie/Makefile.depend +++ b/lib/libopie/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -10,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libmd \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/libpam/Makefile.depend b/lib/libpam/libpam/Makefile.depend index 593d407..3646e2e 100644 --- a/lib/libpam/libpam/Makefile.depend +++ b/lib/libpam/libpam/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -8,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_chroot/Makefile.depend b/lib/libpam/modules/pam_chroot/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_chroot/Makefile.depend +++ b/lib/libpam/modules/pam_chroot/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_deny/Makefile.depend b/lib/libpam/modules/pam_deny/Makefile.depend index 7cedd5f..1078f33 100644 --- a/lib/libpam/modules/pam_deny/Makefile.depend +++ b/lib/libpam/modules/pam_deny/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -9,7 +8,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_echo/Makefile.depend b/lib/libpam/modules/pam_echo/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_echo/Makefile.depend +++ b/lib/libpam/modules/pam_echo/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_exec/Makefile.depend b/lib/libpam/modules/pam_exec/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_exec/Makefile.depend +++ b/lib/libpam/modules/pam_exec/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_ftpusers/Makefile.depend b/lib/libpam/modules/pam_ftpusers/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_ftpusers/Makefile.depend +++ b/lib/libpam/modules/pam_ftpusers/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_group/Makefile.depend b/lib/libpam/modules/pam_group/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_group/Makefile.depend +++ b/lib/libpam/modules/pam_group/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_guest/Makefile.depend b/lib/libpam/modules/pam_guest/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_guest/Makefile.depend +++ b/lib/libpam/modules/pam_guest/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_krb5/Makefile.depend b/lib/libpam/modules/pam_krb5/Makefile.depend index f6e886e..2cde78f 100644 --- a/lib/libpam/modules/pam_krb5/Makefile.depend +++ b/lib/libpam/modules/pam_krb5/Makefile.depend @@ -1,24 +1,19 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ kerberos5/lib/libasn1 \ - kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ - lib/libcrypt \ lib/libpam/libpam \ - secure/lib/libcrypto \ - usr.bin/xinstall.host \ + lib/libthr \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_ksu/Makefile.depend b/lib/libpam/modules/pam_ksu/Makefile.depend index f6e886e..d360572 100644 --- a/lib/libpam/modules/pam_ksu/Makefile.depend +++ b/lib/libpam/modules/pam_ksu/Makefile.depend @@ -1,24 +1,18 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ kerberos5/lib/libasn1 \ - kerberos5/lib/libhx509 \ kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ - lib/libcrypt \ lib/libpam/libpam \ - secure/lib/libcrypto \ - usr.bin/xinstall.host \ + lib/libthr \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_lastlog/Makefile.depend b/lib/libpam/modules/pam_lastlog/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_lastlog/Makefile.depend +++ b/lib/libpam/modules/pam_lastlog/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_login_access/Makefile.depend b/lib/libpam/modules/pam_login_access/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_login_access/Makefile.depend +++ b/lib/libpam/modules/pam_login_access/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_nologin/Makefile.depend b/lib/libpam/modules/pam_nologin/Makefile.depend index 0e5a167..8f9750f 100644 --- a/lib/libpam/modules/pam_nologin/Makefile.depend +++ b/lib/libpam/modules/pam_nologin/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libpam/libpam \ lib/libutil \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_opie/Makefile.depend b/lib/libpam/modules/pam_opie/Makefile.depend index 1e75b4a..62a9408 100644 --- a/lib/libpam/modules/pam_opie/Makefile.depend +++ b/lib/libpam/modules/pam_opie/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libopie \ lib/libpam/libpam \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_opieaccess/Makefile.depend b/lib/libpam/modules/pam_opieaccess/Makefile.depend index 7316349..cbfda79 100644 --- a/lib/libpam/modules/pam_opieaccess/Makefile.depend +++ b/lib/libpam/modules/pam_opieaccess/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -11,7 +10,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libopie \ lib/libpam/libpam \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_passwdqc/Makefile.depend b/lib/libpam/modules/pam_passwdqc/Makefile.depend index 7cce822..e82ea24 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile.depend +++ b/lib/libpam/modules/pam_passwdqc/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcrypt \ lib/libpam/libpam \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_permit/Makefile.depend b/lib/libpam/modules/pam_permit/Makefile.depend index 7cedd5f..1078f33 100644 --- a/lib/libpam/modules/pam_permit/Makefile.depend +++ b/lib/libpam/modules/pam_permit/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -9,7 +8,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_radius/Makefile.depend b/lib/libpam/modules/pam_radius/Makefile.depend index 8daba2c..f8940bf 100644 --- a/lib/libpam/modules/pam_radius/Makefile.depend +++ b/lib/libpam/modules/pam_radius/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libpam/libpam \ lib/libradius \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_rhosts/Makefile.depend b/lib/libpam/modules/pam_rhosts/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_rhosts/Makefile.depend +++ b/lib/libpam/modules/pam_rhosts/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_rootok/Makefile.depend b/lib/libpam/modules/pam_rootok/Makefile.depend index 7cedd5f..1078f33 100644 --- a/lib/libpam/modules/pam_rootok/Makefile.depend +++ b/lib/libpam/modules/pam_rootok/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -9,7 +8,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_securetty/Makefile.depend b/lib/libpam/modules/pam_securetty/Makefile.depend index 467741f..8e09560 100644 --- a/lib/libpam/modules/pam_securetty/Makefile.depend +++ b/lib/libpam/modules/pam_securetty/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -10,7 +9,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_self/Makefile.depend b/lib/libpam/modules/pam_self/Makefile.depend index 7cedd5f..1078f33 100644 --- a/lib/libpam/modules/pam_self/Makefile.depend +++ b/lib/libpam/modules/pam_self/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -9,7 +8,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ + lib/libpam/libpam \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend index e46aac4..08fb149 100644 --- a/lib/libpam/modules/pam_ssh/Makefile.depend +++ b/lib/libpam/modules/pam_ssh/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -11,12 +10,10 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libcrypt \ lib/libpam/libpam \ lib/libutil \ secure/lib/libcrypto \ secure/lib/libssh \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_tacplus/Makefile.depend b/lib/libpam/modules/pam_tacplus/Makefile.depend index c3edc9b..98723a0 100644 --- a/lib/libpam/modules/pam_tacplus/Makefile.depend +++ b/lib/libpam/modules/pam_tacplus/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libpam/libpam \ lib/libtacplus \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/modules/pam_unix/Makefile.depend b/lib/libpam/modules/pam_unix/Makefile.depend index 47a9e7e..0876f5f 100644 --- a/lib/libpam/modules/pam_unix/Makefile.depend +++ b/lib/libpam/modules/pam_unix/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -15,7 +14,6 @@ DIRDEPS = \ lib/libpam/libpam \ lib/libutil \ lib/libypclnt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libpam/static_modules/Makefile b/lib/libpam/static_modules/Makefile index 07a6c69..429e660 100644 --- a/lib/libpam/static_modules/Makefile +++ b/lib/libpam/static_modules/Makefile @@ -1,5 +1,5 @@ #- -# Copyright (c) 1998, 2013 Juniper Networks, Inc. +# Copyright (c) 1998-2015 Juniper Networks, Inc. # All rights reserved. # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. @@ -43,8 +43,7 @@ all: SRCS = openpam_static.c -NO_PROFILE= -NO_MAN= +MAN= # # Static modules @@ -62,11 +61,11 @@ STATICOBJS+= openpam_static_modules.o CLEANFILES+= openpam_static.o \ openpam_static_modules.o -openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} - ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} - .include <bsd.prog.mk> .if empty(_SKIP_BUILD) +openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} + ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} + all: ${STATICOBJS} .endif diff --git a/lib/libpam/static_modules/Makefile.depend b/lib/libpam/static_modules/Makefile.depend index fc4eb35..373bac4 100644 --- a/lib/libpam/static_modules/Makefile.depend +++ b/lib/libpam/static_modules/Makefile.depend @@ -1,9 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend index 54902e7..7426299 100644 --- a/lib/libpcap/Makefile.depend +++ b/lib/libpcap/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libpmc/Makefile.depend +++ b/lib/libpmc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index d9d7902..9305618 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -268,6 +268,16 @@ static const struct pmc_event_descr westmereuc_event_table[] = __PMC_EV_ALIAS_WESTMEREUC() }; +static const struct pmc_event_descr cortex_a8_event_table[] = +{ + __PMC_EV_ALIAS_ARMV7_CORTEX_A8() +}; + +static const struct pmc_event_descr cortex_a9_event_table[] = +{ + __PMC_EV_ALIAS_ARMV7_CORTEX_A9() +}; + static const struct pmc_event_descr cortex_a53_event_table[] = { __PMC_EV_ALIAS_ARMV8_CORTEX_A53() @@ -308,7 +318,8 @@ PMC_MDEP_TABLE(p4, P4, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(p5, P5, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE); -PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); +PMC_MDEP_TABLE(cortex_a8, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); +PMC_MDEP_TABLE(cortex_a9, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); PMC_MDEP_TABLE(cortex_a53, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); PMC_MDEP_TABLE(cortex_a57, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K); @@ -377,7 +388,8 @@ PMC_CLASS_TABLE_DESC(tsc, TSC, tsc, tsc); #if defined(__XSCALE__) PMC_CLASS_TABLE_DESC(xscale, XSCALE, xscale, xscale); #endif -PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7, armv7); +PMC_CLASS_TABLE_DESC(cortex_a8, ARMV7, cortex_a9, armv7); +PMC_CLASS_TABLE_DESC(cortex_a9, ARMV7, cortex_a9, armv7); #endif #if defined(__aarch64__) PMC_CLASS_TABLE_DESC(cortex_a53, ARMV8, cortex_a53, arm64); @@ -2436,12 +2448,20 @@ xscale_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, } #endif -static struct pmc_event_alias armv7_aliases[] = { +static struct pmc_event_alias cortex_a8_aliases[] = { EV_ALIAS("dc-misses", "L1_DCACHE_REFILL"), EV_ALIAS("ic-misses", "L1_ICACHE_REFILL"), EV_ALIAS("instructions", "INSTR_EXECUTED"), EV_ALIAS(NULL, NULL) }; + +static struct pmc_event_alias cortex_a9_aliases[] = { + EV_ALIAS("dc-misses", "L1_DCACHE_REFILL"), + EV_ALIAS("ic-misses", "L1_ICACHE_REFILL"), + EV_ALIAS("instructions", "INSTR_EXECUTED"), + EV_ALIAS(NULL, NULL) +}; + static int armv7_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, struct pmc_op_pmcallocate *pmc_config __unused) @@ -2981,8 +3001,17 @@ pmc_event_names_of_class(enum pmc_class cl, const char ***eventnames, count = PMC_EVENT_TABLE_SIZE(xscale); break; case PMC_CLASS_ARMV7: - ev = armv7_event_table; - count = PMC_EVENT_TABLE_SIZE(armv7); + switch (cpu_info.pm_cputype) { + default: + case PMC_CPU_ARMV7_CORTEX_A8: + ev = cortex_a8_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a8); + break; + case PMC_CPU_ARMV7_CORTEX_A9: + ev = cortex_a9_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a9); + break; + } break; case PMC_CLASS_ARMV8: switch (cpu_info.pm_cputype) { @@ -3289,9 +3318,13 @@ pmc_init(void) pmc_class_table[n] = &xscale_class_table_descr; break; #endif - case PMC_CPU_ARMV7: - PMC_MDEP_INIT(armv7); - pmc_class_table[n] = &armv7_class_table_descr; + case PMC_CPU_ARMV7_CORTEX_A8: + PMC_MDEP_INIT(cortex_a8); + pmc_class_table[n] = &cortex_a8_class_table_descr; + break; + case PMC_CPU_ARMV7_CORTEX_A9: + PMC_MDEP_INIT(cortex_a9); + pmc_class_table[n] = &cortex_a9_class_table_descr; break; #endif #if defined(__aarch64__) @@ -3515,8 +3548,18 @@ _pmc_name_of_event(enum pmc_event pe, enum pmc_cputype cpu) ev = xscale_event_table; evfence = xscale_event_table + PMC_EVENT_TABLE_SIZE(xscale); } else if (pe >= PMC_EV_ARMV7_FIRST && pe <= PMC_EV_ARMV7_LAST) { - ev = armv7_event_table; - evfence = armv7_event_table + PMC_EVENT_TABLE_SIZE(armv7); + switch (cpu) { + case PMC_CPU_ARMV7_CORTEX_A8: + ev = cortex_a8_event_table; + evfence = cortex_a8_event_table + PMC_EVENT_TABLE_SIZE(cortex_a8); + break; + case PMC_CPU_ARMV7_CORTEX_A9: + ev = cortex_a9_event_table; + evfence = cortex_a9_event_table + PMC_EVENT_TABLE_SIZE(cortex_a9); + break; + default: /* Unknown CPU type. */ + break; + } } else if (pe >= PMC_EV_ARMV8_FIRST && pe <= PMC_EV_ARMV8_LAST) { switch (cpu) { case PMC_CPU_ARMV8_CORTEX_A53: diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend index f86335a..feb045f 100644 --- a/lib/libproc/Makefile.depend +++ b/lib/libproc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend index 1808010..11ffd8d 100644 --- a/lib/libprocstat/Makefile.depend +++ b/lib/libprocstat/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 727419b..c292d5d 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -1235,7 +1235,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, struct vnode vnode; char tagstr[12]; void *vp; - int error, found; + int error; unsigned int i; assert(kd); @@ -1264,7 +1264,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, /* * Find appropriate handler. */ - for (i = 0, found = 0; i < NTYPES; i++) + for (i = 0; i < NTYPES; i++) if (!strcmp(fstypes[i].tag, tagstr)) { if (fstypes[i].handler(kd, &vnode, vn) != 0) { goto fail; diff --git a/lib/libprocstat/zfs/Makefile.depend b/lib/libprocstat/zfs/Makefile.depend index d26b6e7..fd3b785 100644 --- a/lib/libprocstat/zfs/Makefile.depend +++ b/lib/libprocstat/zfs/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libradius/Makefile.depend b/lib/libradius/Makefile.depend index 640beb9..f318cc1 100644 --- a/lib/libradius/Makefile.depend +++ b/lib/libradius/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -10,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend index 89fa5df..b376142 100644 --- a/lib/librpcsec_gss/Makefile.depend +++ b/lib/librpcsec_gss/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend index 5d080b0..e431374 100644 --- a/lib/librpcsvc/Makefile.depend +++ b/lib/librpcsvc/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend index fd5a535..0a2f351 100644 --- a/lib/librt/Makefile.depend +++ b/lib/librt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend index 23bc80e..fad79f2 100644 --- a/lib/librtld_db/Makefile.depend +++ b/lib/librtld_db/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile index 79d3fe9..98ceeb6 100644 --- a/lib/libsbuf/Makefile +++ b/lib/libsbuf/Makefile @@ -2,7 +2,7 @@ LIB= sbuf SHLIBDIR?= /lib -SRCS= subr_sbuf.c +SRCS= subr_prf.c subr_sbuf.c SHLIB_MAJOR = 6 diff --git a/lib/libsbuf/Makefile.depend b/lib/libsbuf/Makefile.depend index 8bbd7a2..9e2283a 100644 --- a/lib/libsbuf/Makefile.depend +++ b/lib/libsbuf/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsbuf/Symbol.map b/lib/libsbuf/Symbol.map index cf2508f..164b8f3 100644 --- a/lib/libsbuf/Symbol.map +++ b/lib/libsbuf/Symbol.map @@ -27,3 +27,7 @@ FBSD_1.3 { sbuf_start_section; sbuf_end_section; }; + +FBSD_1.4 { + sbuf_hexdump; +}; diff --git a/lib/libsbuf/Version.def b/lib/libsbuf/Version.def index fb0b3f6..fd5c6be 100644 --- a/lib/libsbuf/Version.def +++ b/lib/libsbuf/Version.def @@ -5,3 +5,6 @@ FBSD_1.2 { FBSD_1.3 { } FBSD_1.2; + +FBSD_1.4 { +} FBSD_1.3; diff --git a/lib/libsdp/Makefile.depend b/lib/libsdp/Makefile.depend index b4cc6bf..37f8632 100644 --- a/lib/libsdp/Makefile.depend +++ b/lib/libsdp/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsm/Makefile.depend b/lib/libsm/Makefile.depend index 27d4c25..2b8cf93 100644 --- a/lib/libsm/Makefile.depend +++ b/lib/libsm/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend index b370707..441168d 100644 --- a/lib/libsmb/Makefile.depend +++ b/lib/libsmb/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libsmdb/Makefile.depend b/lib/libsmdb/Makefile.depend index 5bc2c13..1ee0d0e 100644 --- a/lib/libsmdb/Makefile.depend +++ b/lib/libsmdb/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsmutil/Makefile.depend b/lib/libsmutil/Makefile.depend index be80602..d534e11 100644 --- a/lib/libsmutil/Makefile.depend +++ b/lib/libsmutil/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libsqlite3/Makefile.depend b/lib/libsqlite3/Makefile.depend index fd5a535..0a2f351 100644 --- a/lib/libsqlite3/Makefile.depend +++ b/lib/libsqlite3/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libstand/Makefile.depend b/lib/libstand/Makefile.depend index 34236cb..bb85bcd 100644 --- a/lib/libstand/Makefile.depend +++ b/lib/libstand/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libstdbuf/Makefile.depend +++ b/lib/libstdbuf/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libstdthreads/Makefile.depend b/lib/libstdthreads/Makefile.depend index 37acbe0..441e1ee 100644 --- a/lib/libstdthreads/Makefile.depend +++ b/lib/libstdthreads/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libtacplus/Makefile.depend b/lib/libtacplus/Makefile.depend index 9c2e453..6a2d406 100644 --- a/lib/libtacplus/Makefile.depend +++ b/lib/libtacplus/Makefile.depend @@ -1,7 +1,6 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ @@ -12,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libmd \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libtelnet/Makefile.depend b/lib/libtelnet/Makefile.depend index a055e3e..0edf350 100644 --- a/lib/libtelnet/Makefile.depend +++ b/lib/libtelnet/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend index 3e69552..9cb890b 100644 --- a/lib/libthr/Makefile.depend +++ b/lib/libthr/Makefile.depend @@ -1,14 +1,13 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libthread_db/Makefile.depend b/lib/libthread_db/Makefile.depend index 8bbd7a2..9e2283a 100644 --- a/lib/libthread_db/Makefile.depend +++ b/lib/libthread_db/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libucl/Makefile.depend b/lib/libucl/Makefile.depend index a83fb20..3dce64a 100644 --- a/lib/libucl/Makefile.depend +++ b/lib/libucl/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libufs/Makefile.depend b/lib/libufs/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libufs/Makefile.depend +++ b/lib/libufs/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libugidfw/Makefile.depend b/lib/libugidfw/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libugidfw/Makefile.depend +++ b/lib/libugidfw/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libugidfw/ugidfw.c b/lib/libugidfw/ugidfw.c index 0dc423d..479ab46 100644 --- a/lib/libugidfw/ugidfw.c +++ b/lib/libugidfw/ugidfw.c @@ -64,11 +64,10 @@ bsde_rule_to_string(struct mac_bsdextended_rule *rule, char *buf, size_t buflen) struct statfs *mntbuf; char *cur, type[sizeof(rule->mbr_object.mbo_type) * CHAR_BIT + 1]; size_t left, len; - int anymode, unknownmode, truncated, numfs, i, notdone; + int anymode, unknownmode, numfs, i, notdone; cur = buf; left = buflen; - truncated = 0; len = snprintf(cur, left, "subject "); if (len < 0 || len > left) @@ -1216,7 +1215,7 @@ bsde_delete_rule(int rulenum, size_t buflen, char *errstr) { struct mac_bsdextended_rule rule; int name[10]; - size_t len, size; + size_t len; int error; if (bsde_check_version(buflen, errstr) != 0) @@ -1233,8 +1232,7 @@ bsde_delete_rule(int rulenum, size_t buflen, char *errstr) name[len] = rulenum; len++; - size = sizeof(rule); - error = sysctl(name, len, NULL, NULL, &rule, 0); + error = sysctl(name, len, NULL, NULL, &rule, sizeof(rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); @@ -1249,7 +1247,7 @@ bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule, size_t buflen, char *errstr) { int name[10]; - size_t len, size; + size_t len; int error; if (bsde_check_version(buflen, errstr) != 0) @@ -1266,8 +1264,7 @@ bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule, size_t buflen, name[len] = rulenum; len++; - size = sizeof(*rule); - error = sysctl(name, len, NULL, NULL, rule, size); + error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rulenum, strerror(errno)); @@ -1283,7 +1280,7 @@ bsde_add_rule(int *rulenum, struct mac_bsdextended_rule *rule, size_t buflen, { char charstr[BUFSIZ]; int name[10]; - size_t len, size; + size_t len; int error, rule_slots; if (bsde_check_version(buflen, errstr) != 0) @@ -1307,8 +1304,7 @@ bsde_add_rule(int *rulenum, struct mac_bsdextended_rule *rule, size_t buflen, name[len] = rule_slots; len++; - size = sizeof(*rule); - error = sysctl(name, len, NULL, NULL, rule, size); + error = sysctl(name, len, NULL, NULL, rule, sizeof(*rule)); if (error) { len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", rule_slots, strerror(errno)); diff --git a/lib/libulog/Makefile.depend b/lib/libulog/Makefile.depend index da3a812..2e2a25e 100644 --- a/lib/libulog/Makefile.depend +++ b/lib/libulog/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend index 2dac9b8..45199c4 100644 --- a/lib/libunbound/Makefile.depend +++ b/lib/libunbound/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libusb/Makefile.depend b/lib/libusb/Makefile.depend index fd5a535..0a2f351 100644 --- a/lib/libusb/Makefile.depend +++ b/lib/libusb/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libusbhid/Makefile.depend b/lib/libusbhid/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libusbhid/Makefile.depend +++ b/lib/libusbhid/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 7e5f1a3..35d146a 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -9,8 +9,9 @@ LIB= util SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \ - hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \ - kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \ + hexdump.c humanize_number.c kinfo_getfile.c \ + kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \ + kinfo_getvmobject.c kld.c \ login_auth.c login_cap.c \ login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \ pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \ @@ -27,7 +28,8 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/ MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \ humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ - kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \ + kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \ + login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \ _secure_path.3 trimdomain.3 uucplock.3 pw_util.3 diff --git a/lib/libutil/Makefile.depend b/lib/libutil/Makefile.depend index bd8ae02..54c1f6f 100644 --- a/lib/libutil/Makefile.depend +++ b/lib/libutil/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -9,7 +10,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libutil/hexdump.3 b/lib/libutil/hexdump.3 index 8e997ac..9fa96f8 100644 --- a/lib/libutil/hexdump.3 +++ b/lib/libutil/hexdump.3 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2008 +.Dd May 8, 2014 .Dt HEXDUMP 3 .Os .Sh NAME @@ -36,8 +36,17 @@ .Nd "dump a block of bytes to standard out in hexadecimal form" .Sh SYNOPSIS .In libutil.h +.In sys/sbuf.h .Ft void .Fn hexdump "void *ptr" "int length" "const char *hdr" "int flags" +.Ft void +.Fo sbuf_hexdump +.Fa "struct sbuf *sb" +.Fa "void *ptr" +.Fa "int length" +.Fa "const char *hdr" +.Fa "int flags" +.Fc .Sh DESCRIPTION The .Fn hexdump @@ -50,6 +59,11 @@ output will start with an offset count, followed by 16 hexadecimal values, followed by 16 .Tn ASCII characters. +.Pp +The +.Fn sbuf_hexdump +function prints the hexdump to the supplied +.Xr sbuf 9 . .Bl -tag -width indent .It Fa ptr Pointer to the array of bytes to print. @@ -88,7 +102,8 @@ Do not print the character values on each line. .El .El .Sh SEE ALSO -.Xr ascii 7 +.Xr ascii 7 , +.Xr sbuf 9 .Sh AUTHORS This manual page was written by .An Scott Long . diff --git a/lib/libutil/kinfo_getallproc.3 b/lib/libutil/kinfo_getallproc.3 index 56d4ad6..7005d4f 100644 --- a/lib/libutil/kinfo_getallproc.3 +++ b/lib/libutil/kinfo_getallproc.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2009 +.Dd May 27, 2015 .Dt KINFO_GETALLPROC 3 .Os .Sh NAME @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_proc * .Fn kinfo_getallproc "int *cntp" diff --git a/lib/libutil/kinfo_getfile.3 b/lib/libutil/kinfo_getfile.3 index 1e0bab7..2a35687 100644 --- a/lib/libutil/kinfo_getfile.3 +++ b/lib/libutil/kinfo_getfile.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 6, 2008 +.Dd May 27, 2015 .Dt KINFO_GETFILE 3 .Os .Sh NAME @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_file * .Fn kinfo_getfile "pid_t pid" "int *cntp" diff --git a/lib/libutil/kinfo_getproc.3 b/lib/libutil/kinfo_getproc.3 index 804cb6c..f5ccbc5 100644 --- a/lib/libutil/kinfo_getproc.3 +++ b/lib/libutil/kinfo_getproc.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2013 +.Dd May 27, 2015 .Dt KINFO_GETPROC 3 .Os .Sh NAME @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_proc * .Fn kinfo_getproc "pid_t pid" diff --git a/lib/libutil/kinfo_getvmmap.3 b/lib/libutil/kinfo_getvmmap.3 index 165de60..c6a1370 100644 --- a/lib/libutil/kinfo_getvmmap.3 +++ b/lib/libutil/kinfo_getvmmap.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 6, 2008 +.Dd May 27, 2015 .Dt KINFO_GETVMMAP 3 .Os .Sh NAME @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_vmentry * .Fn kinfo_getvmmap "pid_t pid" "int *cntp" diff --git a/lib/libutil/kinfo_getvmobject.3 b/lib/libutil/kinfo_getvmobject.3 new file mode 100644 index 0000000..dc0edd2 --- /dev/null +++ b/lib/libutil/kinfo_getvmobject.3 @@ -0,0 +1,74 @@ +.\" +.\" Copyright (c) 2015 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 May 27, 2015 +.Dt KINFO_GETVMOBJECT 3 +.Os +.Sh NAME +.Nm kinfo_getvmobject +.Nd function for getting system-wide memory information +.Sh LIBRARY +.Lb libutil +.Sh SYNOPSIS +.In sys/types.h +.In sys/user.h +.In libutil.h +.Ft struct kinfo_vmobject * +.Fn kinfo_getvmobject "int *cntp" +.Sh DESCRIPTION +This function is used to obtain information about the objects using memory +in the system. +.Pp +The +.Ar cntp +argument allows the caller to know how many records are returned. +.Pp +This function is a wrapper around the +.Dq vm.objects +.Xr sysctl 3 +MIB. +While the kernel returns a packed structure, this function expands the +data into a fixed record format. +.Sh RETURN VALUES +On success the +.Fn kinfo_getvmobject +function returns a pointer to an array of +.Vt struct kinfo_vmobject +structures as defined by +.In sys/user.h . +The array is allocated by an internal call to +.Xr malloc 3 +and must be freed by the caller with a call to +.Xr free 3 . +On failure the +.Fn kinfo_getvmobject +function returns +.Dv NULL . +.Sh SEE ALSO +.Xr free 3 , +.Xr kinfo_getvmmap 3 , +.Xr malloc 3 diff --git a/lib/libutil/kinfo_getvmobject.c b/lib/libutil/kinfo_getvmobject.c new file mode 100644 index 0000000..7e031da --- /dev/null +++ b/lib/libutil/kinfo_getvmobject.c @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013 Hudson River Trading LLC + * Written by: 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/types.h> +#include <sys/sysctl.h> +#include <sys/user.h> +#include <stdlib.h> +#include <string.h> + +#include "libutil.h" + +struct kinfo_vmobject * +kinfo_getvmobject(int *cntp) +{ + char *buf, *bp, *ep; + struct kinfo_vmobject *kvo, *list, *kp; + size_t len; + int cnt, i; + + buf = NULL; + for (i = 0; i < 3; i++) { + if (sysctlbyname("vm.objects", NULL, &len, NULL, 0) < 0) + return (NULL); + buf = reallocf(buf, len); + if (buf == NULL) + return (NULL); + if (sysctlbyname("vm.objects", buf, &len, NULL, 0) == 0) + goto unpack; + if (errno != ENOMEM) { + free(buf); + return (NULL); + } + } + free(buf); + return (NULL); + +unpack: + /* Count items */ + cnt = 0; + bp = buf; + ep = buf + len; + while (bp < ep) { + kvo = (struct kinfo_vmobject *)(uintptr_t)bp; + bp += kvo->kvo_structsize; + cnt++; + } + + list = calloc(cnt, sizeof(*list)); + if (list == NULL) { + free(buf); + return (NULL); + } + + /* Unpack */ + bp = buf; + kp = list; + while (bp < ep) { + kvo = (struct kinfo_vmobject *)(uintptr_t)bp; + memcpy(kp, kvo, kvo->kvo_structsize); + bp += kvo->kvo_structsize; + kp->kvo_structsize = sizeof(*kp); + kp++; + } + free(buf); + *cntp = cnt; + return (list); +} diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h index b8b9836..b20ffa2 100644 --- a/lib/libutil/libutil.h +++ b/lib/libutil/libutil.h @@ -102,6 +102,8 @@ struct kinfo_file * kinfo_getfile(pid_t _pid, int *_cntp); struct kinfo_vmentry * kinfo_getvmmap(pid_t _pid, int *_cntp); +struct kinfo_vmobject * + kinfo_getvmobject(int *_cntp); struct kinfo_proc * kinfo_getallproc(int *_cntp); struct kinfo_proc * diff --git a/lib/libutil/pw_util.3 b/lib/libutil/pw_util.3 index 0d8c763..706368f 100644 --- a/lib/libutil/pw_util.3 +++ b/lib/libutil/pw_util.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 30, 2012 +.Dd June 06, 2015 .Dt PW_UTIL 3 .Os .Sh NAME @@ -222,7 +222,7 @@ and it is the caller's responsibility to free it with The .Fn pw_mkdb function regenerates the password database by running -.Xr pw_mkdb 8 . +.Xr pwd_mkdb 8 . If .Fa user only the record corresponding to that user will be updated. diff --git a/lib/libvgl/Makefile.depend b/lib/libvgl/Makefile.depend index 467741f..09164c1 100644 --- a/lib/libvgl/Makefile.depend +++ b/lib/libvgl/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend index 074ac81..a5c14b5 100644 --- a/lib/libvmmapi/Makefile.depend +++ b/lib/libvmmapi/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/libwrap/Makefile.depend b/lib/libwrap/Makefile.depend index bd8ae02..69d1724 100644 --- a/lib/libwrap/Makefile.depend +++ b/lib/libwrap/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libxo/Makefile.depend b/lib/libxo/Makefile.depend index 593d407..dde2d60 100644 --- a/lib/libxo/Makefile.depend +++ b/lib/libxo/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/liby/Makefile.depend b/lib/liby/Makefile.depend index 993ab06..79506ce 100644 --- a/lib/liby/Makefile.depend +++ b/lib/liby/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend index 6b4dcd4..8ee531b 100644 --- a/lib/libypclnt/Makefile.depend +++ b/lib/libypclnt/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ @@ -10,7 +11,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend index 8bbd7a2..3646e2e 100644 --- a/lib/libz/Makefile.depend +++ b/lib/libz/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend index 8bbd7a2..3646e2e 100644 --- a/lib/msun/Makefile.depend +++ b/lib/msun/Makefile.depend @@ -1,7 +1,7 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend index c3295ff..fc0fd0c 100644 --- a/lib/ncurses/form/Makefile.depend +++ b/lib/ncurses/form/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend index d56ffbb..04d041a4 100644 --- a/lib/ncurses/formw/Makefile.depend +++ b/lib/ncurses/formw/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend index 5c8368f..cb8d80b 100644 --- a/lib/ncurses/menu/Makefile.depend +++ b/lib/ncurses/menu/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend index 49f1882..771e004 100644 --- a/lib/ncurses/menuw/Makefile.depend +++ b/lib/ncurses/menuw/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend index 52197c8..4a07eb0 100644 --- a/lib/ncurses/ncurses/Makefile.depend +++ b/lib/ncurses/ncurses/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend index 045bbfc..1855faf 100644 --- a/lib/ncurses/ncursesw/Makefile.depend +++ b/lib/ncurses/ncursesw/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend index 2359930..3f7129c 100644 --- a/lib/ncurses/panel/Makefile.depend +++ b/lib/ncurses/panel/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend index 2ec6472..0e508be 100644 --- a/lib/ncurses/panelw/Makefile.depend +++ b/lib/ncurses/panelw/Makefile.depend @@ -1,3 +1,4 @@ +# $FreeBSD$ # Autogenerated - do NOT edit! DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} |
