Date: Thu, 10 Jan 2013 16:34:44 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310189 - in head: devel/llvm lang/clang lang/clang/files Message-ID: <201301101634.r0AGYi8t055795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Jan 10 16:34:44 2013 New Revision: 310189 URL: http://svnweb.freebsd.org/changeset/ports/310189 Log: Upgrade llvm and clang to the 3.2 release. Added: head/lang/clang/files/patch-include_llvm_ADT_Triple.h (contents, props changed) Deleted: head/lang/clang/files/patch-tools_clang_lib_Sema_SemaDeclCXX.cpp Modified: head/devel/llvm/Makefile head/devel/llvm/distinfo head/devel/llvm/pkg-plist head/lang/clang/Makefile head/lang/clang/distinfo head/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h head/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp head/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp head/lang/clang/pkg-plist Modified: head/devel/llvm/Makefile ============================================================================== --- head/devel/llvm/Makefile Thu Jan 10 16:30:53 2013 (r310188) +++ head/devel/llvm/Makefile Thu Jan 10 16:34:44 2013 (r310189) @@ -6,7 +6,7 @@ # PORTNAME= llvm -PORTVERSION= 3.1 +PORTVERSION= 3.2 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -15,6 +15,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= Low Level Virtual Machine LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo +BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE) BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash .endif @@ -22,7 +23,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/b BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif -CONFLICTS= llvm-devel-[23]* llvm-etoile-2* +CONFLICTS= llvm-devel-[23]* llvm29-* llvm31-* GNU_CONFIGURE= yes USE_GCC= 4.2+ @@ -46,7 +47,7 @@ LTOPLUGIN_DESC= Build LTO plugin (requir MAN1= bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \ - llvm-dis.1 llvm-extract.1 llvm-ld.1 llvm-link.1 llvm-nm.1 \ + llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \ llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1 PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -95,25 +96,31 @@ CONFIGURE_ARGS+= --with-optimize-option= .endif post-patch: + ${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \ + ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \ ${WRKSRC}/Makefile.config.in ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ ${WRKSRC}/Makefile.config.in -.if empty(PORT_OPTIONS:MDOCS) post-build: - @cd ${WRKSRC}/docs/CommandGuide && ${GMAKE} ${MAN1} + @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man +.if ${PORT_OPTIONS:MDOCS} + @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html .endif post-install: ${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0 ${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME} -.if empty(PORT_OPTIONS:MDOCS) +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR}/html + find ${WRKSRC}/docs/_build/html -type f | \ + xargs -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/ +.endif .for man in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/docs/CommandGuide/${man} \ + @${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \ ${MANPREFIX}/man/man1/ .endfor -.endif TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)' regression-test: ${BUILD_COOKIE} Modified: head/devel/llvm/distinfo ============================================================================== --- head/devel/llvm/distinfo Thu Jan 10 16:30:53 2013 (r310188) +++ head/devel/llvm/distinfo Thu Jan 10 16:34:44 2013 (r310189) @@ -1,2 +1,2 @@ -SHA256 (llvm-3.1.src.tar.gz) = 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab -SIZE (llvm-3.1.src.tar.gz) = 11077429 +SHA256 (llvm-3.2.src.tar.gz) = 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 +SIZE (llvm-3.2.src.tar.gz) = 12275252 Modified: head/devel/llvm/pkg-plist ============================================================================== --- head/devel/llvm/pkg-plist Thu Jan 10 16:30:53 2013 (r310188) +++ head/devel/llvm/pkg-plist Thu Jan 10 16:34:44 2013 (r310189) @@ -10,9 +10,9 @@ bin/llvm-diff bin/llvm-dis bin/llvm-dwarfdump bin/llvm-extract -bin/llvm-ld bin/llvm-link bin/llvm-mc +bin/llvm-mcmarkup bin/llvm-nm bin/llvm-objdump bin/llvm-prof @@ -21,7 +21,6 @@ bin/llvm-readobj bin/llvm-rtdyld bin/llvm-size bin/llvm-stress -bin/llvm-stub bin/llvm-tblgen bin/macho-dump bin/opt @@ -34,6 +33,7 @@ include/llvm-c/EnhancedDisassembly.h include/llvm-c/ExecutionEngine.h include/llvm-c/Initialization.h include/llvm-c/LinkTimeOptimizer.h +include/llvm-c/Linker.h include/llvm-c/Object.h include/llvm-c/Target.h include/llvm-c/TargetMachine.h @@ -66,6 +66,7 @@ include/llvm/ADT/IndexedMap.h include/llvm/ADT/IntEqClasses.h include/llvm/ADT/IntervalMap.h include/llvm/ADT/IntrusiveRefCntPtr.h +include/llvm/ADT/MapVector.h include/llvm/ADT/NullablePtr.h include/llvm/ADT/Optional.h include/llvm/ADT/OwningPtr.h @@ -93,7 +94,6 @@ include/llvm/ADT/StringRef.h include/llvm/ADT/StringSet.h include/llvm/ADT/StringSwitch.h include/llvm/ADT/TinyPtrVector.h -include/llvm/ADT/Trie.h include/llvm/ADT/Triple.h include/llvm/ADT/Twine.h include/llvm/ADT/UniqueVector.h @@ -102,6 +102,7 @@ include/llvm/ADT/VariadicFunction.h include/llvm/ADT/edit_distance.h include/llvm/ADT/ilist.h include/llvm/ADT/ilist_node.h +include/llvm/AddressingMode.h include/llvm/Analysis/AliasAnalysis.h include/llvm/Analysis/AliasSetTracker.h include/llvm/Analysis/BlockFrequencyImpl.h @@ -113,9 +114,8 @@ include/llvm/Analysis/CaptureTracking.h include/llvm/Analysis/CodeMetrics.h include/llvm/Analysis/ConstantFolding.h include/llvm/Analysis/ConstantsScanner.h -include/llvm/Analysis/DIBuilder.h include/llvm/Analysis/DOTGraphTraitsPass.h -include/llvm/Analysis/DebugInfo.h +include/llvm/Analysis/DependenceAnalysis.h include/llvm/Analysis/DomPrinter.h include/llvm/Analysis/DominanceFrontier.h include/llvm/Analysis/DominatorInternals.h @@ -132,8 +132,8 @@ include/llvm/Analysis/LibCallAliasAnalys include/llvm/Analysis/LibCallSemantics.h include/llvm/Analysis/Lint.h include/llvm/Analysis/Loads.h -include/llvm/Analysis/LoopDependenceAnalysis.h include/llvm/Analysis/LoopInfo.h +include/llvm/Analysis/LoopInfoImpl.h include/llvm/Analysis/LoopIterator.h include/llvm/Analysis/LoopPass.h include/llvm/Analysis/MemoryBuiltins.h @@ -143,6 +143,8 @@ include/llvm/Analysis/Passes.h include/llvm/Analysis/PathNumbering.h include/llvm/Analysis/PathProfileInfo.h include/llvm/Analysis/PostDominators.h +include/llvm/Analysis/ProfileDataLoader.h +include/llvm/Analysis/ProfileDataTypes.h include/llvm/Analysis/ProfileInfo.h include/llvm/Analysis/ProfileInfoLoader.h include/llvm/Analysis/ProfileInfoTypes.h @@ -178,6 +180,7 @@ include/llvm/CodeGen/Analysis.h include/llvm/CodeGen/AsmPrinter.h include/llvm/CodeGen/CalcSpillWeights.h include/llvm/CodeGen/CallingConvLower.h +include/llvm/CodeGen/CommandFlags.h include/llvm/CodeGen/DFAPacketizer.h include/llvm/CodeGen/EdgeBundles.h include/llvm/CodeGen/FastISel.h @@ -221,6 +224,7 @@ include/llvm/CodeGen/MachineModuleInfo.h include/llvm/CodeGen/MachineModuleInfoImpls.h include/llvm/CodeGen/MachineOperand.h include/llvm/CodeGen/MachinePassRegistry.h +include/llvm/CodeGen/MachinePostDominators.h include/llvm/CodeGen/MachineRegisterInfo.h include/llvm/CodeGen/MachineRelocation.h include/llvm/CodeGen/MachineSSAUpdater.h @@ -232,14 +236,16 @@ include/llvm/CodeGen/PBQP/Heuristics/Bri include/llvm/CodeGen/PBQP/Math.h include/llvm/CodeGen/PBQP/Solution.h include/llvm/CodeGen/Passes.h -include/llvm/CodeGen/ProcessImplicitDefs.h include/llvm/CodeGen/PseudoSourceValue.h include/llvm/CodeGen/RegAllocPBQP.h include/llvm/CodeGen/RegAllocRegistry.h +include/llvm/CodeGen/RegisterClassInfo.h +include/llvm/CodeGen/RegisterPressure.h include/llvm/CodeGen/RegisterScavenging.h include/llvm/CodeGen/ResourcePriorityQueue.h include/llvm/CodeGen/RuntimeLibcalls.h include/llvm/CodeGen/ScheduleDAG.h +include/llvm/CodeGen/ScheduleDAGILP.h include/llvm/CodeGen/ScheduleDAGInstrs.h include/llvm/CodeGen/ScheduleHazardRecognizer.h include/llvm/CodeGen/SchedulerRegistry.h @@ -249,6 +255,7 @@ include/llvm/CodeGen/SelectionDAGISel.h include/llvm/CodeGen/SelectionDAGNodes.h include/llvm/CodeGen/SlotIndexes.h include/llvm/CodeGen/TargetLoweringObjectFileImpl.h +include/llvm/CodeGen/TargetSchedule.h include/llvm/CodeGen/ValueTypes.h include/llvm/CodeGen/ValueTypes.td include/llvm/Config/AsmParsers.def @@ -259,24 +266,29 @@ include/llvm/Config/config.h include/llvm/Config/llvm-config.h include/llvm/Constant.h include/llvm/Constants.h +include/llvm/DIBuilder.h +include/llvm/DataLayout.h +include/llvm/DebugInfo.h include/llvm/DebugInfo/DIContext.h include/llvm/DefaultPasses.h include/llvm/DerivedTypes.h include/llvm/ExecutionEngine/ExecutionEngine.h include/llvm/ExecutionEngine/GenericValue.h -include/llvm/ExecutionEngine/IntelJITEventsWrapper.h include/llvm/ExecutionEngine/Interpreter.h include/llvm/ExecutionEngine/JIT.h include/llvm/ExecutionEngine/JITEventListener.h include/llvm/ExecutionEngine/JITMemoryManager.h include/llvm/ExecutionEngine/MCJIT.h include/llvm/ExecutionEngine/OProfileWrapper.h +include/llvm/ExecutionEngine/ObjectBuffer.h +include/llvm/ExecutionEngine/ObjectImage.h include/llvm/ExecutionEngine/RuntimeDyld.h include/llvm/Function.h include/llvm/GVMaterializer.h include/llvm/GlobalAlias.h include/llvm/GlobalValue.h include/llvm/GlobalVariable.h +include/llvm/IRBuilder.h include/llvm/InitializePasses.h include/llvm/InlineAsm.h include/llvm/InstrTypes.h @@ -290,7 +302,8 @@ include/llvm/Intrinsics.td include/llvm/IntrinsicsARM.td include/llvm/IntrinsicsCellSPU.td include/llvm/IntrinsicsHexagon.td -include/llvm/IntrinsicsPTX.td +include/llvm/IntrinsicsMips.td +include/llvm/IntrinsicsNVVM.td include/llvm/IntrinsicsPowerPC.td include/llvm/IntrinsicsX86.td include/llvm/IntrinsicsXCore.td @@ -315,6 +328,7 @@ include/llvm/MC/MCDwarf.h include/llvm/MC/MCELFObjectWriter.h include/llvm/MC/MCELFSymbolFlags.h include/llvm/MC/MCExpr.h +include/llvm/MC/MCFixedLenDisassembler.h include/llvm/MC/MCFixup.h include/llvm/MC/MCFixupKindInfo.h include/llvm/MC/MCInst.h @@ -337,6 +351,7 @@ include/llvm/MC/MCParser/MCAsmParser.h include/llvm/MC/MCParser/MCAsmParserExtension.h include/llvm/MC/MCParser/MCParsedAsmOperand.h include/llvm/MC/MCRegisterInfo.h +include/llvm/MC/MCSchedule.h include/llvm/MC/MCSection.h include/llvm/MC/MCSectionCOFF.h include/llvm/MC/MCSectionELF.h @@ -352,6 +367,7 @@ include/llvm/MC/MCWinCOFFObjectWriter.h include/llvm/MC/MachineLocation.h include/llvm/MC/SectionKind.h include/llvm/MC/SubtargetFeature.h +include/llvm/MDBuilder.h include/llvm/Metadata.h include/llvm/Module.h include/llvm/Object/Archive.h @@ -363,6 +379,7 @@ include/llvm/Object/MachO.h include/llvm/Object/MachOFormat.h include/llvm/Object/MachOObject.h include/llvm/Object/ObjectFile.h +include/llvm/Object/RelocVisitor.h include/llvm/OperandTraits.h include/llvm/Operator.h include/llvm/Pass.h @@ -403,6 +420,7 @@ include/llvm/Support/Endian.h include/llvm/Support/Errno.h include/llvm/Support/ErrorHandling.h include/llvm/Support/FEnv.h +include/llvm/Support/FileOutputBuffer.h include/llvm/Support/FileSystem.h include/llvm/Support/FileUtilities.h include/llvm/Support/Format.h @@ -411,16 +429,17 @@ include/llvm/Support/GCOV.h include/llvm/Support/GetElementPtrTypeIterator.h include/llvm/Support/GraphWriter.h include/llvm/Support/Host.h -include/llvm/Support/IRBuilder.h include/llvm/Support/IRReader.h include/llvm/Support/IncludeFile.h include/llvm/Support/InstIterator.h include/llvm/Support/InstVisitor.h +include/llvm/Support/IntegersSubset.h +include/llvm/Support/IntegersSubsetMapping.h +include/llvm/Support/LEB128.h include/llvm/Support/LICENSE.TXT include/llvm/Support/LeakDetector.h include/llvm/Support/Locale.h include/llvm/Support/LockFileManager.h -include/llvm/Support/MDBuilder.h include/llvm/Support/MachO.h include/llvm/Support/ManagedStatic.h include/llvm/Support/MathExtras.h @@ -465,7 +484,6 @@ include/llvm/Support/Threading.h include/llvm/Support/TimeValue.h include/llvm/Support/Timer.h include/llvm/Support/ToolOutputFile.h -include/llvm/Support/TypeBuilder.h include/llvm/Support/Valgrind.h include/llvm/Support/ValueHandle.h include/llvm/Support/Win64EH.h @@ -479,17 +497,16 @@ include/llvm/SymbolTableListTraits.h include/llvm/TableGen/Error.h include/llvm/TableGen/Main.h include/llvm/TableGen/Record.h -include/llvm/TableGen/TableGenAction.h +include/llvm/TableGen/StringMatcher.h include/llvm/TableGen/TableGenBackend.h include/llvm/Target/Mangler.h include/llvm/Target/Target.td include/llvm/Target/TargetCallingConv.h include/llvm/Target/TargetCallingConv.td -include/llvm/Target/TargetData.h -include/llvm/Target/TargetELFWriterInfo.h include/llvm/Target/TargetFrameLowering.h include/llvm/Target/TargetInstrInfo.h include/llvm/Target/TargetIntrinsicInfo.h +include/llvm/Target/TargetItinerary.td include/llvm/Target/TargetJITInfo.h include/llvm/Target/TargetLibraryInfo.h include/llvm/Target/TargetLowering.h @@ -502,6 +519,8 @@ include/llvm/Target/TargetSchedule.td include/llvm/Target/TargetSelectionDAG.td include/llvm/Target/TargetSelectionDAGInfo.h include/llvm/Target/TargetSubtargetInfo.h +include/llvm/Target/TargetTransformImpl.h +include/llvm/TargetTransformInfo.h include/llvm/Transforms/IPO.h include/llvm/Transforms/IPO/InlinerPass.h include/llvm/Transforms/IPO/PassManagerBuilder.h @@ -510,20 +529,25 @@ include/llvm/Transforms/Scalar.h include/llvm/Transforms/Utils/AddrModeMatcher.h include/llvm/Transforms/Utils/BasicBlockUtils.h include/llvm/Transforms/Utils/BuildLibCalls.h +include/llvm/Transforms/Utils/BypassSlowDivision.h include/llvm/Transforms/Utils/Cloning.h include/llvm/Transforms/Utils/CmpInstAnalysis.h -include/llvm/Transforms/Utils/FunctionUtils.h +include/llvm/Transforms/Utils/CodeExtractor.h +include/llvm/Transforms/Utils/IntegerDivision.h include/llvm/Transforms/Utils/Local.h include/llvm/Transforms/Utils/ModuleUtils.h include/llvm/Transforms/Utils/PromoteMemToReg.h include/llvm/Transforms/Utils/SSAUpdater.h include/llvm/Transforms/Utils/SSAUpdaterImpl.h include/llvm/Transforms/Utils/SimplifyIndVar.h +include/llvm/Transforms/Utils/SimplifyLibCalls.h include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h include/llvm/Transforms/Utils/UnrollLoop.h include/llvm/Transforms/Utils/ValueMapper.h include/llvm/Transforms/Vectorize.h include/llvm/Type.h +include/llvm/TypeBuilder.h +include/llvm/TypeFinder.h include/llvm/Use.h include/llvm/User.h include/llvm/Value.h @@ -582,11 +606,11 @@ lib/libLLVMMipsCodeGen.a lib/libLLVMMipsDesc.a lib/libLLVMMipsDisassembler.a lib/libLLVMMipsInfo.a +lib/libLLVMNVPTXAsmPrinter.a +lib/libLLVMNVPTXCodeGen.a +lib/libLLVMNVPTXDesc.a +lib/libLLVMNVPTXInfo.a lib/libLLVMObject.a -lib/libLLVMPTXAsmPrinter.a -lib/libLLVMPTXCodeGen.a -lib/libLLVMPTXDesc.a -lib/libLLVMPTXInfo.a lib/libLLVMPowerPCAsmPrinter.a lib/libLLVMPowerPCCodeGen.a lib/libLLVMPowerPCDesc.a @@ -619,120 +643,193 @@ lib/libLTO.so lib/libprofile_rt.a lib/libprofile_rt.so %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz +%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html +%%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.txt %%PORTDOCS%%%%DOCSDIR%%/html/Atomics.html +%%PORTDOCS%%%%DOCSDIR%%/html/Atomics.txt %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html +%%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.txt %%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.html +%%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.txt %%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html +%%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.txt %%PORTDOCS%%%%DOCSDIR%%/html/CMake.html +%%PORTDOCS%%%%DOCSDIR%%/html/CMake.txt %%PORTDOCS%%%%DOCSDIR%%/html/CodeGenerator.html +%%PORTDOCS%%%%DOCSDIR%%/html/CodeGenerator.txt %%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/FileCheck.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/bugpoint.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/lit.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llc.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/lli.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ar.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-as.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-bcanalyzer.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-build.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-config.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-cov.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-diff.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-dis.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-extract.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ld.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-link.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-nm.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-prof.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ranlib.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-stress.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/manpage.css -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/opt.html -%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/tblgen.html +%%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.txt %%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.html +%%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.txt %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html +%%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.txt %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.html +%%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.txt %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html +%%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.txt %%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.html +%%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.txt %%PORTDOCS%%%%DOCSDIR%%/html/ExtendingLLVM.html +%%PORTDOCS%%%%DOCSDIR%%/html/ExtendingLLVM.txt %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html +%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.txt +%%PORTDOCS%%%%DOCSDIR%%/html/FileCheck.html +%%PORTDOCS%%%%DOCSDIR%%/html/FileCheck.txt %%PORTDOCS%%%%DOCSDIR%%/html/GCCFEBuildInstrs.html %%PORTDOCS%%%%DOCSDIR%%/html/GarbageCollection.html %%PORTDOCS%%%%DOCSDIR%%/html/GetElementPtr.html +%%PORTDOCS%%%%DOCSDIR%%/html/GetElementPtr.txt %%PORTDOCS%%%%DOCSDIR%%/html/GettingStarted.html +%%PORTDOCS%%%%DOCSDIR%%/html/GettingStarted.txt %%PORTDOCS%%%%DOCSDIR%%/html/GettingStartedVS.html +%%PORTDOCS%%%%DOCSDIR%%/html/GettingStartedVS.txt %%PORTDOCS%%%%DOCSDIR%%/html/GoldPlugin.html +%%PORTDOCS%%%%DOCSDIR%%/html/GoldPlugin.txt %%PORTDOCS%%%%DOCSDIR%%/html/HowToAddABuilder.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToAddABuilder.txt +%%PORTDOCS%%%%DOCSDIR%%/html/HowToBuildOnARM.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToBuildOnARM.txt %%PORTDOCS%%%%DOCSDIR%%/html/HowToReleaseLLVM.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToSetUpLLVMStyleRTTI.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToSetUpLLVMStyleRTTI.txt %%PORTDOCS%%%%DOCSDIR%%/html/HowToSubmitABug.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToSubmitABug.txt +%%PORTDOCS%%%%DOCSDIR%%/html/HowToUseInstrMappings.html +%%PORTDOCS%%%%DOCSDIR%%/html/HowToUseInstrMappings.txt %%PORTDOCS%%%%DOCSDIR%%/html/LLVMBuild.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl1.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl2.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl3.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl4.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl5-cfg.png +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl5.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl6.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl7.html +%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.html %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html %%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.html +%%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.txt %%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.html +%%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.txt %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.html +%%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.txt +%%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.html +%%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.txt +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl1.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl2.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl3.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl4.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl5.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl6.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl7.html +%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl8.html %%PORTDOCS%%%%DOCSDIR%%/html/Packaging.html +%%PORTDOCS%%%%DOCSDIR%%/html/Packaging.txt %%PORTDOCS%%%%DOCSDIR%%/html/Passes.html +%%PORTDOCS%%%%DOCSDIR%%/html/Phabricator.html +%%PORTDOCS%%%%DOCSDIR%%/html/Phabricator.txt %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersManual.html %%PORTDOCS%%%%DOCSDIR%%/html/Projects.html +%%PORTDOCS%%%%DOCSDIR%%/html/Projects.txt %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html %%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.html +%%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.txt %%PORTDOCS%%%%DOCSDIR%%/html/SourceLevelDebugging.html +%%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.html +%%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.txt %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html +%%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.txt %%PORTDOCS%%%%DOCSDIR%%/html/TestSuiteMakefileGuide.html %%PORTDOCS%%%%DOCSDIR%%/html/TestingGuide.html %%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMBackend.html %%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMPass.html +%%PORTDOCS%%%%DOCSDIR%%/html/ajax-loader.gif +%%PORTDOCS%%%%DOCSDIR%%/html/basic.css +%%PORTDOCS%%%%DOCSDIR%%/html/bugpoint.html +%%PORTDOCS%%%%DOCSDIR%%/html/bugpoint.txt +%%PORTDOCS%%%%DOCSDIR%%/html/comment-bright.png +%%PORTDOCS%%%%DOCSDIR%%/html/comment-close.png +%%PORTDOCS%%%%DOCSDIR%%/html/comment.png +%%PORTDOCS%%%%DOCSDIR%%/html/contents.png +%%PORTDOCS%%%%DOCSDIR%%/html/design_and_overview.html +%%PORTDOCS%%%%DOCSDIR%%/html/design_and_overview.txt +%%PORTDOCS%%%%DOCSDIR%%/html/development_process.html +%%PORTDOCS%%%%DOCSDIR%%/html/development_process.txt +%%PORTDOCS%%%%DOCSDIR%%/html/doctools.js +%%PORTDOCS%%%%DOCSDIR%%/html/down-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/down.png %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/html/img/Debugging.gif -%%PORTDOCS%%%%DOCSDIR%%/html/img/libdeps.gif -%%PORTDOCS%%%%DOCSDIR%%/html/img/lines.gif -%%PORTDOCS%%%%DOCSDIR%%/html/img/objdeps.gif -%%PORTDOCS%%%%DOCSDIR%%/html/img/venusflytrap.jpg +%%PORTDOCS%%%%DOCSDIR%%/html/file.png +%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.txt +%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/html/lines.gif +%%PORTDOCS%%%%DOCSDIR%%/html/lit.html +%%PORTDOCS%%%%DOCSDIR%%/html/lit.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llc.html +%%PORTDOCS%%%%DOCSDIR%%/html/llc.txt +%%PORTDOCS%%%%DOCSDIR%%/html/lli.html +%%PORTDOCS%%%%DOCSDIR%%/html/lli.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ar.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ar.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-as.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-as.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-bcanalyzer.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-bcanalyzer.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-build.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-build.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-config.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-config.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-cov.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-cov.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-diff.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-diff.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.html +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.txt +%%PORTDOCS%%%%DOCSDIR%%/html/llvm-theme.css %%PORTDOCS%%%%DOCSDIR%%/html/llvm.css -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl1.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl2.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl3.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl4.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl5-cfg.png -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl5.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl6.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl7.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl8.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl1.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl2.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl3.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl4.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl5.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl6.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl8.html -%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/index.html -%%PORTDOCS%%%%DOCSDIR%%/ps/FileCheck.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/bugpoint.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/lit.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llc.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/lli.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ar.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-as.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-bcanalyzer.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-build.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-config.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-cov.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-diff.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-dis.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-extract.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ld.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-link.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-nm.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-prof.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ranlib.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-stress.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/opt.ps -%%PORTDOCS%%%%DOCSDIR%%/ps/tblgen.ps +%%PORTDOCS%%%%DOCSDIR%%/html/logo.png +%%PORTDOCS%%%%DOCSDIR%%/html/mailing_lists.html +%%PORTDOCS%%%%DOCSDIR%%/html/mailing_lists.txt +%%PORTDOCS%%%%DOCSDIR%%/html/minus.png +%%PORTDOCS%%%%DOCSDIR%%/html/navigation.png +%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv +%%PORTDOCS%%%%DOCSDIR%%/html/opt.html +%%PORTDOCS%%%%DOCSDIR%%/html/opt.txt +%%PORTDOCS%%%%DOCSDIR%%/html/plus.png +%%PORTDOCS%%%%DOCSDIR%%/html/programming.html +%%PORTDOCS%%%%DOCSDIR%%/html/programming.txt +%%PORTDOCS%%%%DOCSDIR%%/html/pygments.css +%%PORTDOCS%%%%DOCSDIR%%/html/search.html +%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js +%%PORTDOCS%%%%DOCSDIR%%/html/searchtools.js +%%PORTDOCS%%%%DOCSDIR%%/html/subsystems.html +%%PORTDOCS%%%%DOCSDIR%%/html/subsystems.txt +%%PORTDOCS%%%%DOCSDIR%%/html/tblgen.html +%%PORTDOCS%%%%DOCSDIR%%/html/tblgen.txt +%%PORTDOCS%%%%DOCSDIR%%/html/underscore.js +%%PORTDOCS%%%%DOCSDIR%%/html/up-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/up.png +%%PORTDOCS%%%%DOCSDIR%%/html/userguides.html +%%PORTDOCS%%%%DOCSDIR%%/html/userguides.txt +%%PORTDOCS%%%%DOCSDIR%%/html/websupport.js +%%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.html +%%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.txt @dirrm include/llvm/Transforms/Utils @dirrm include/llvm/Transforms/IPO @dirrm include/llvm/Transforms @@ -755,9 +852,5 @@ lib/libprofile_rt.so @dirrm include/llvm-c/Transforms @dirrm include/llvm-c @dirrm include/llvm -%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tutorial -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/CommandGuide %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/lang/clang/Makefile ============================================================================== --- head/lang/clang/Makefile Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/Makefile Thu Jan 10 16:34:44 2013 (r310189) @@ -6,8 +6,7 @@ # PORTNAME= clang -PORTVERSION= 3.1 -PORTREVISION= 2 +PORTVERSION= 3.2 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -18,7 +17,7 @@ EXTRACT_ONLY= ${LLVM_SOURCE} MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and (alpha-quality) C++ compiler -CONFLICTS= clang-devel-[23]* +CONFLICTS= clang-devel-[23]* clang31-* CLANG_NAME= clang-${PORTVERSION}.src CLANG_SOURCE= ${CLANG_NAME}${EXTRACT_SUFX} @@ -93,6 +92,8 @@ post-extract: ${MV} ${CLANG_NAME} clang post-patch: + ${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \ + ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \ ${WRKSRC}/Makefile.config.in ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ @@ -113,10 +114,8 @@ pre-build: ${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ cd ${WRKSRC}/utils/unittest && ${GMAKE} -.if empty(PORT_OPTIONS:MDOCS) post-build: @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1 -.endif post-install: @${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \ @@ -133,12 +132,8 @@ post-install: @${MKDIR} ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR} -.if empty(PORT_OPTIONS:MDOCS) @${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${MANPREFIX}/man/man1/ -.else - @${RMDIR} ${DOCSDIR}/html/img -.endif TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)' regression-test: ${BUILD_COOKIE} Modified: head/lang/clang/distinfo ============================================================================== --- head/lang/clang/distinfo Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/distinfo Thu Jan 10 16:34:44 2013 (r310189) @@ -1,4 +1,4 @@ -SHA256 (clang-3.1.src.tar.gz) = ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786 -SIZE (clang-3.1.src.tar.gz) = 8158418 -SHA256 (llvm-3.1.src.tar.gz) = 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab -SIZE (llvm-3.1.src.tar.gz) = 11077429 +SHA256 (clang-3.2.src.tar.gz) = 2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658 +SIZE (clang-3.2.src.tar.gz) = 8805311 +SHA256 (llvm-3.2.src.tar.gz) = 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 +SIZE (llvm-3.2.src.tar.gz) = 12275252 Added: head/lang/clang/files/patch-include_llvm_ADT_Triple.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/clang/files/patch-include_llvm_ADT_Triple.h Thu Jan 10 16:34:44 2013 (r310189) @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- include/llvm/ADT/Triple.h.orig ++++ include/llvm/ADT/Triple.h +@@ -296,6 +296,11 @@ + return isMacOSX() || getOS() == Triple::IOS; + } + ++ /// isOSFreeBSD - Is this FreeBSD OS ++ bool isOSFreeBSD() const { ++ return getOS() == Triple::FreeBSD; ++ } ++ + /// \brief Tests for either Cygwin or MinGW OS + bool isOSCygMing() const { + return getOS() == Triple::Cygwin || getOS() == Triple::MinGW32; Modified: head/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h ============================================================================== --- head/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h Thu Jan 10 16:34:44 2013 (r310189) @@ -3,13 +3,21 @@ $FreeBSD$ --- tools/clang/include/clang/Analysis/Analyses/FormatString.h.orig +++ tools/clang/include/clang/Analysis/Analyses/FormatString.h -@@ -143,6 +143,10 @@ +@@ -117,7 +117,7 @@ + // C99 conversion specifiers. + cArg, + dArg, +- DArg, // Apple extension ++ DArg, // Apple and FreeBSD extension + iArg, + IntArgBeg = dArg, IntArgEnd = iArg, + +@@ -148,6 +148,9 @@ // ** Printf-specific ** + // FreeBSD specific specifiers + bArg, -+ DArg, + // Objective-C specific specifiers. ObjCObjArg, // '@' Modified: head/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp ============================================================================== --- head/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp Thu Jan 10 16:34:44 2013 (r310189) @@ -3,24 +3,46 @@ $FreeBSD$ --- tools/clang/lib/Analysis/PrintfFormatString.cpp.orig +++ tools/clang/lib/Analysis/PrintfFormatString.cpp -@@ -192,11 +192,20 @@ +@@ -198,9 +198,10 @@ case '@': k = ConversionSpecifier::ObjCObjArg; break; // Glibc specific. case 'm': k = ConversionSpecifier::PrintErrno; break; -+ // FreeBSD format extensions -+ case 'b': k = ConversionSpecifier::bArg; break; /* check for int and then char * */ -+ case 'r': k = ConversionSpecifier::xArg; break; -+ case 'y': k = ConversionSpecifier::iArg; break; -+ case 'D': k = ConversionSpecifier::DArg; break; /* check for u_char * pointer and a char * string */ +- // Apple-specific + ++ // Apple-specific (and one FreeBSD) + case 'D': +- if (Target.getTriple().isOSDarwin()) ++ if (Target.getTriple().isOSDarwin() || Target.getTriple().isOSFreeBSD()) + k = ConversionSpecifier::DArg; + break; + case 'O': +@@ -211,11 +212,29 @@ + if (Target.getTriple().isOSDarwin()) + k = ConversionSpecifier::UArg; + break; ++ ++ // FreeBSD-specific ++ case 'b': ++ if (Target.getTriple().isOSFreeBSD()) ++ k = ConversionSpecifier::bArg; ++ break; ++ case 'r': ++ if (Target.getTriple().isOSFreeBSD()) ++ k = ConversionSpecifier::xArg; ++ break; ++ case 'y': ++ if (Target.getTriple().isOSFreeBSD()) ++ k = ConversionSpecifier::iArg; ++ break; } PrintfConversionSpecifier CS(conversionPosition, k); FS.setConversionSpecifier(CS); if (CS.consumesDataArgument() && !FS.usesPositionalArg()) FS.setArgIndex(argIndex++); + // FreeBSD extension -+ if (k == ConversionSpecifier::bArg || k == ConversionSpecifier::DArg) -+ argIndex++; ++ if (Target.getTriple().isOSFreeBSD() && (k == ConversionSpecifier::bArg || ++ k == ConversionSpecifier::DArg)) ++ argIndex++; if (k == ConversionSpecifier::InvalidSpecifier) { // Assume the conversion takes one argument. Modified: head/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp ============================================================================== --- head/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/files/patch-tools_clang_lib_Sema_SemaChecking.cpp Thu Jan 10 16:34:44 2013 (r310189) @@ -16,8 +16,8 @@ $FreeBSD$ + // format specifier. + const Expr *Ex = getDataArg(argIndex); + QualType type = (CS.getKind() == ConversionSpecifier::bArg) ? S.Context.IntTy : S.Context.getPointerType(S.Context.UnsignedCharTy); -+ //const analyze_printf::ArgTypeResult &ATR = S.Context.IntTy; -+ const analyze_printf::ArgTypeResult &ATR = type; ++ //const analyze_printf::ArgType &ATR = S.Context.IntTy; ++ const analyze_printf::ArgType &ATR = type; + if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType())) + S.Diag(getLocationOfByte(CS.getStart()), + diag::warn_printf_conversion_argument_type_mismatch) @@ -28,7 +28,7 @@ $FreeBSD$ + // Now type check the data expression that matches the + // format specifier. + Ex = getDataArg(argIndex + 1); -+ const analyze_printf::ArgTypeResult &ATR2 = ArgTypeResult::CStrTy; ++ const analyze_printf::ArgType &ATR2 = ArgType::CStrTy; + if (ATR2.isValid() && !ATR2.matchesType(S.Context, Ex->getType())) + S.Diag(getLocationOfByte(CS.getStart()), + diag::warn_printf_conversion_argument_type_mismatch) Modified: head/lang/clang/pkg-plist ============================================================================== --- head/lang/clang/pkg-plist Thu Jan 10 16:30:53 2013 (r310188) +++ head/lang/clang/pkg-plist Thu Jan 10 16:34:44 2013 (r310189) @@ -6,7 +6,10 @@ bin/clang++ bin/clang-tblgen bin/scan-build bin/scan-view +include/clang-c/CXCompilationDatabase.h +include/clang-c/CXString.h include/clang-c/Index.h +include/clang-c/Platform.h include/clang/ARCMigrate/ARCMT.h include/clang/ARCMigrate/ARCMTActions.h include/clang/ARCMigrate/FileRemapper.h @@ -26,6 +29,18 @@ include/clang/AST/BuiltinTypes.def include/clang/AST/CXXInheritance.h include/clang/AST/CanonicalType.h include/clang/AST/CharUnits.h +include/clang/AST/Comment.h +include/clang/AST/CommentBriefParser.h +include/clang/AST/CommentCommandInfo.inc +include/clang/AST/CommentCommandTraits.h +include/clang/AST/CommentDiagnostic.h +include/clang/AST/CommentHTMLTags.inc +include/clang/AST/CommentHTMLTagsProperties.inc +include/clang/AST/CommentLexer.h +include/clang/AST/CommentNodes.inc +include/clang/AST/CommentParser.h +include/clang/AST/CommentSema.h +include/clang/AST/CommentVisitor.h include/clang/AST/Decl.h include/clang/AST/DeclAccessPair.h include/clang/AST/DeclBase.h @@ -53,6 +68,7 @@ include/clang/AST/NestedNameSpecifier.h include/clang/AST/OperationKinds.h include/clang/AST/ParentMap.h include/clang/AST/PrettyPrinter.h +include/clang/AST/RawCommentList.h include/clang/AST/RecordLayout.h include/clang/AST/RecursiveASTVisitor.h include/clang/AST/Redeclarable.h @@ -76,6 +92,11 @@ include/clang/AST/TypeVisitor.h include/clang/AST/UnresolvedSet.h include/clang/AST/VTTBuilder.h include/clang/AST/VTableBuilder.h +include/clang/ASTMatchers/ASTMatchFinder.h +include/clang/ASTMatchers/ASTMatchers.h +include/clang/ASTMatchers/ASTMatchersInternal.h +include/clang/ASTMatchers/ASTMatchersMacros.h +include/clang/ASTMatchers/ASTTypeTraits.h include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h include/clang/Analysis/Analyses/Dominators.h include/clang/Analysis/Analyses/FormatString.h @@ -91,6 +112,7 @@ include/clang/Analysis/CFG.h include/clang/Analysis/CFGStmtMap.h include/clang/Analysis/CallGraph.h include/clang/Analysis/DomainSpecific/CocoaConventions.h +include/clang/Analysis/DomainSpecific/ObjCNoReturn.h include/clang/Analysis/FlowSensitive/DataflowSolver.h include/clang/Analysis/FlowSensitive/DataflowValues.h include/clang/Analysis/ProgramPoint.h @@ -108,14 +130,16 @@ include/clang/Basic/Builtins.def include/clang/Basic/Builtins.h include/clang/Basic/BuiltinsARM.def include/clang/Basic/BuiltinsHexagon.def +include/clang/Basic/BuiltinsMips.def +include/clang/Basic/BuiltinsNVPTX.def include/clang/Basic/BuiltinsPPC.def -include/clang/Basic/BuiltinsPTX.def include/clang/Basic/BuiltinsX86.def include/clang/Basic/ConvertUTF.h include/clang/Basic/Diagnostic.h include/clang/Basic/DiagnosticASTKinds.inc include/clang/Basic/DiagnosticAnalysisKinds.inc include/clang/Basic/DiagnosticCategories.h +include/clang/Basic/DiagnosticCommentKinds.inc include/clang/Basic/DiagnosticCommonKinds.inc include/clang/Basic/DiagnosticDriverKinds.inc include/clang/Basic/DiagnosticFrontendKinds.inc @@ -123,6 +147,8 @@ include/clang/Basic/DiagnosticGroups.inc include/clang/Basic/DiagnosticIDs.h include/clang/Basic/DiagnosticIndexName.inc include/clang/Basic/DiagnosticLexKinds.inc +include/clang/Basic/DiagnosticOptions.def +include/clang/Basic/DiagnosticOptions.h include/clang/Basic/DiagnosticParseKinds.inc include/clang/Basic/DiagnosticSemaKinds.inc include/clang/Basic/DiagnosticSerializationKinds.inc @@ -139,6 +165,7 @@ include/clang/Basic/LangOptions.h include/clang/Basic/Linkage.h include/clang/Basic/MacroBuilder.h include/clang/Basic/Module.h +include/clang/Basic/ObjCRuntime.h include/clang/Basic/OnDiskHashTable.h include/clang/Basic/OpenCL.h include/clang/Basic/OpenCLExtensions.def @@ -146,6 +173,7 @@ include/clang/Basic/OperatorKinds.def include/clang/Basic/OperatorKinds.h include/clang/Basic/PartialDiagnostic.h include/clang/Basic/PrettyStackTrace.h +include/clang/Basic/Sanitizers.def include/clang/Basic/SourceLocation.h include/clang/Basic/SourceManager.h include/clang/Basic/SourceManagerInternals.h @@ -172,12 +200,10 @@ include/clang/Driver/ArgList.h include/clang/Driver/CC1AsOptions.h include/clang/Driver/CC1AsOptions.inc include/clang/Driver/CC1Options.h -include/clang/Driver/CC1Options.inc include/clang/Driver/Compilation.h include/clang/Driver/Driver.h include/clang/Driver/DriverDiagnostic.h include/clang/Driver/Job.h -include/clang/Driver/ObjCRuntime.h include/clang/Driver/OptSpecifier.h include/clang/Driver/OptTable.h include/clang/Driver/Option.h @@ -196,30 +222,26 @@ include/clang/Edit/FileOffset.h include/clang/Edit/Rewriters.h include/clang/Frontend/ASTConsumers.h include/clang/Frontend/ASTUnit.h -include/clang/Frontend/Analyses.def -include/clang/Frontend/AnalyzerOptions.h include/clang/Frontend/ChainedDiagnosticConsumer.h include/clang/Frontend/ChainedIncludesSource.h +include/clang/Frontend/CodeGenOptions.def include/clang/Frontend/CodeGenOptions.h include/clang/Frontend/CommandLineSourceLoc.h include/clang/Frontend/CompilerInstance.h include/clang/Frontend/CompilerInvocation.h include/clang/Frontend/DependencyOutputOptions.h -include/clang/Frontend/DiagnosticOptions.h include/clang/Frontend/DiagnosticRenderer.h include/clang/Frontend/FrontendAction.h include/clang/Frontend/FrontendActions.h include/clang/Frontend/FrontendDiagnostic.h include/clang/Frontend/FrontendOptions.h include/clang/Frontend/FrontendPluginRegistry.h -include/clang/Frontend/HeaderSearchOptions.h include/clang/Frontend/LangStandard.h include/clang/Frontend/LangStandards.def include/clang/Frontend/LayoutOverrideSource.h include/clang/Frontend/LogDiagnosticPrinter.h include/clang/Frontend/MigratorOptions.h include/clang/Frontend/MultiplexConsumer.h -include/clang/Frontend/PreprocessorOptions.h include/clang/Frontend/PreprocessorOutputOptions.h include/clang/Frontend/SerializedDiagnosticPrinter.h include/clang/Frontend/TextDiagnostic.h @@ -234,6 +256,7 @@ include/clang/Lex/DirectoryLookup.h include/clang/Lex/ExternalPreprocessorSource.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301101634.r0AGYi8t055795>