Module Name: src Committed By: yamt Date: Thu May 22 16:14:36 UTC 2014
Modified Files: src/external/bsd/llvm/include [yamt-pagecache]: Makefile Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/external/bsd/llvm/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/llvm/include/Makefile diff -u src/external/bsd/llvm/include/Makefile:1.4.2.3 src/external/bsd/llvm/include/Makefile:1.4.2.4 --- src/external/bsd/llvm/include/Makefile:1.4.2.3 Wed Jan 16 05:27:58 2013 +++ src/external/bsd/llvm/include/Makefile Thu May 22 16:14:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.2.3 2013/01/16 05:27:58 yamt Exp $ +# $NetBSD: Makefile,v 1.4.2.4 2014/05/22 16:14:36 yamt Exp $ .include <bsd.init.mk> @@ -24,8 +24,12 @@ INCS= __wmmintrin_aes.h \ nmmintrin.h \ pmmintrin.h \ popcntintrin.h \ + prfchwintrin.h \ + rdseedintrin.h \ rtmintrin.h \ + shaintrin.h \ smmintrin.h \ + tbmintrin.h \ tmmintrin.h \ wmmintrin.h \ x86intrin.h \ @@ -46,31 +50,34 @@ HEADER= \ stdint.h \ tgmath.h -.PATH: ${LLVM_SRCDIR}/include/llvm \ +.PATH: ${LLVM_SRCDIR}/include/llvm/IR \ ${CLANG_SRCDIR}/include/clang/AST \ ${CLANG_SRCDIR}/include/clang/Basic \ ${CLANG_SRCDIR}/include/clang/Driver -TABLEGEN_SRC= Intrinsics.td +TABLEGEN_SRC= Intrinsics.td Options.td CC1AsOptions.td TABLEGEN_OUTPUT.Intrinsics.td= \ - llvm/Intrinsics.gen|-gen-intrinsic + llvm/IR/Intrinsics.gen|-gen-intrinsic CLANG_TABLEGEN_SRC= Attr.td CommentCommands.td CommentHTMLTags.td \ - CommentNodes.td DeclNodes.td StmtNodes.td \ - Diagnostic.td arm_neon.td Options.td \ - CC1AsOptions.td CC1Options.td + CommentNodes.td CommentHTMLNamedCharacterReferences.td DeclNodes.td \ + StmtNodes.td Diagnostic.td arm_neon.td CLANG_TABLEGEN_INCLUDES.Attr.td= -I${CLANG_SRCDIR}/include CLANG_TABLEGEN_OUTPUT.Attr.td= \ clang/AST/Attrs.inc|-gen-clang-attr-classes \ - clang/AST/AttrImpl.inc|-gen-clang-attr-impl \ + clang/AST/AttrDump.inc|-gen-clang-attr-dump \ + clang/AST/AttrImpl.inc|-gen-clang-attr-impl \ + clang/AST/AttrVisitor.inc|-gen-clang-attr-ast-visitor \ clang/Basic/AttrList.inc|-gen-clang-attr-list \ clang/Lex/AttrSpellings.inc|-gen-clang-attr-spelling-list \ - clang/Parse/AttrLateParsed.inc|-gen-clang-attr-late-parsed-list \ - clang/Sema/AttrTemplateInstantiate.inc|-gen-clang-attr-template-instantiate \ + clang/Parse/AttrParserStringSwitches.inc|-gen-clang-attr-parser-string-switches \ + clang/Sema/AttrParsedAttrImpl.inc|-gen-clang-attr-parsed-attr-impl \ clang/Sema/AttrParsedAttrKinds.inc|-gen-clang-attr-parsed-attr-kinds \ clang/Sema/AttrParsedAttrList.inc|-gen-clang-attr-parsed-attr-list \ + clang/Sema/AttrSpellingListIndex.inc|-gen-clang-attr-spelling-index \ + clang/Sema/AttrTemplateInstantiate.inc|-gen-clang-attr-template-instantiate \ clang/Serialization/AttrPCHRead.inc|-gen-clang-attr-pch-read \ clang/Serialization/AttrPCHWrite.inc|-gen-clang-attr-pch-write @@ -84,12 +91,16 @@ CLANG_TABLEGEN_OUTPUT.CommentNodes.td= \ clang/AST/CommentNodes.inc|-gen-clang-comment-nodes CLANG_TABLEGEN_OUTPUT.CommentCommands.td= \ - clang/AST/CommentCommandInfo.inc|-gen-clang-comment-command-info + clang/AST/CommentCommandInfo.inc|-gen-clang-comment-command-info \ + clang/AST/CommentCommandList.inc|-gen-clang-comment-command-list CLANG_TABLEGEN_OUTPUT.CommentHTMLTags.td= \ clang/AST/CommentHTMLTags.inc|-gen-clang-comment-html-tags \ clang/AST/CommentHTMLTagsProperties.inc|-gen-clang-comment-html-tags-properties +CLANG_TABLEGEN_OUTPUT.CommentHTMLNamedCharacterReferences.td= \ + clang/AST/CommentHTMLNamedCharacterReferences.inc|-gen-clang-comment-html-named-character-references + CLANG_TABLEGEN_INCLUDES.Diagnostic.td= -I${CLANG_SRCDIR}/include/clang/Basic CLANG_TABLEGEN_OUTPUT.Diagnostic.td= \ clang/Basic/DiagnosticAnalysisKinds.inc|-gen-clang-diags-defs^-clang-component=Analysis \ @@ -109,12 +120,12 @@ CLANG_TABLEGEN_OUTPUT.arm_neon.td= \ clang/Basic/arm_neon.inc|-gen-arm-neon-sema \ arm_neon.h.inc|-gen-arm-neon -CLANG_TABLEGEN_INCLUDES.Options.td= -I${CLANG_SRCDIR}/include/clang/Driver -CLANG_TABLEGEN_OUTPUT.Options.td= \ +TABLEGEN_INCLUDES.Options.td= -I${CLANG_SRCDIR}/include/clang/Driver +TABLEGEN_OUTPUT.Options.td= \ clang/Driver/Options.inc|-gen-opt-parser-defs -CLANG_TABLEGEN_INCLUDES.CC1AsOptions.td= -I${CLANG_SRCDIR}/include/clang/Driver -CLANG_TABLEGEN_OUTPUT.CC1AsOptions.td= \ +TABLEGEN_INCLUDES.CC1AsOptions.td= -I${CLANG_SRCDIR}/include/clang/Driver +TABLEGEN_OUTPUT.CC1AsOptions.td= \ clang/Driver/CC1AsOptions.inc|-gen-opt-parser-defs .include "${.PARSEDIR}/../tablegen.mk" @@ -137,8 +148,7 @@ CLEANFILES+= llvm/Config/config.h llvm/C llvm/Config/config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in mkdir -p ${.TARGET:H} ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \ - -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \ - -e /\#endif/d \ + -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \ < ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in \ > ${.TARGET}.tmp printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp @@ -151,8 +161,7 @@ llvm/Config/config.h: ${LLVM_TOPLEVEL}/M llvm/Config/llvm-config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in mkdir -p ${.TARGET:H} ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \ - -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \ - -e /\#endif/d \ + -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \ < ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in \ > ${.TARGET}.tmp printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp @@ -166,7 +175,7 @@ run-configure: mkdir -p tmp cd tmp && ${LLVM_SRCDIR}/configure ${LLVM_CONFIGURE_ARGS} \ CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:N-Werror:Q} \ - CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \ + CPPFLAGS=${CPPFLAGS:N-std=c++11:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \ ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_file=yes llvm_cv_c_printf_a=yes cp -r tmp/include/llvm/* ${LLVM_INCLUDE_CONFIG}/llvm/ mv ${LLVM_INCLUDE_CONFIG}/llvm/Config/config.h \