From owner-svn-src-all@FreeBSD.ORG Sat Jun 14 18:48:13 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 773CA77B;
Sat, 14 Jun 2014 18:48:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6252125BA;
Sat, 14 Jun 2014 18:48:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5EImDXL023991;
Sat, 14 Jun 2014 18:48:13 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5EImD6H023990;
Sat, 14 Jun 2014 18:48:13 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201406141848.s5EImD6H023990@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 14 Jun 2014 18:48:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r267484 - stable/9/lib/clang
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jun 2014 18:48:13 -0000
Author: dim
Date: Sat Jun 14 18:48:12 2014
New Revision: 267484
URL: http://svnweb.freebsd.org/changeset/base/267484
Log:
MFC r267335:
In some scenarios, when generating llvm/clang .inc.h files, multiple
source files could be passed to tblgen or clang-tblgen, leading to a
"Too many positional arguments specified" error message. Fix this by
replacing the too-generic ${.ALLSRC} sources with explicit paths.
Reported by: rysto32@gmail.com, rodrigc
Approved by: re (gjb)
Modified:
stable/9/lib/clang/clang.build.mk
Directory Properties:
stable/9/lib/clang/ (props changed)
Modified: stable/9/lib/clang/clang.build.mk
==============================================================================
--- stable/9/lib/clang/clang.build.mk Sat Jun 14 18:45:40 2014 (r267483)
+++ stable/9/lib/clang/clang.build.mk Sat Jun 14 18:48:12 2014 (r267484)
@@ -70,149 +70,160 @@ ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM
Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-classes \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-dump \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrParsedAttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrParsedAttrKinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-read \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-pch-write \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
- ${.ALLSRC}
+ ${CLANG_SRCS}/include/clang/Basic/Attr.td
CommentCommandInfo.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
${CLANG_TBLGEN} -gen-clang-comment-command-info \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
CommentCommandList.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
${CLANG_TBLGEN} -gen-clang-comment-command-list \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
CommentHTMLNamedCharacterReferences.inc.h: \
${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
CommentHTMLTags.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
${CLANG_TBLGEN} -gen-clang-comment-html-tags \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
CommentHTMLTagsProperties.inc.h: \
${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
CommentNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
${CLANG_TBLGEN} -gen-clang-comment-nodes \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
DeclNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
${CLANG_TBLGEN} -gen-clang-decl-nodes \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
StmtNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
${CLANG_TBLGEN} -gen-clang-stmt-nodes \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
${CLANG_TBLGEN} -gen-arm-neon \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
arm_neon.inc.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
${CLANG_TBLGEN} -gen-arm-neon-sema \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
${CLANG_TBLGEN} -gen-clang-diag-groups \
-I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
- -o ${.TARGET} ${.ALLSRC}
+ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
DiagnosticIndexName.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
${CLANG_TBLGEN} -gen-clang-diags-index-name \
-I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
- -o ${.TARGET} ${.ALLSRC}
+ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
.for hdr in AST Analysis Comment Common Driver Frontend Lex Parse Sema Serialization
Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
-I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
- -o ${.TARGET} ${.ALLSRC}
+ -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
.endfor
Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
${TBLGEN} -gen-opt-parser-defs \
-I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Driver/Options.td
CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
${TBLGEN} -gen-opt-parser-defs \
-I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
- -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} ${.ALLSRC}
+ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+ ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
-Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td \
- ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/CheckerBase.td
+Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
${CLANG_TBLGEN} -gen-clang-sa-checkers \
-I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td