From owner-svn-src-projects@freebsd.org Tue Jan 22 18:04:41 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C27E314AA315 for ; Tue, 22 Jan 2019 18:04:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6524A96B7A; Tue, 22 Jan 2019 18:04:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A795503F; Tue, 22 Jan 2019 18:04:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0MI4fVl063054; Tue, 22 Jan 2019 18:04:41 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0MI4eV7063051; Tue, 22 Jan 2019 18:04:40 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201901221804.x0MI4eV7063051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 22 Jan 2019 18:04:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r343308 - in projects/clang800-import: contrib/llvm/tools/lld/ELF usr.bin/clang/lld X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in projects/clang800-import: contrib/llvm/tools/lld/ELF usr.bin/clang/lld X-SVN-Commit-Revision: 343308 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6524A96B7A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2019 18:04:42 -0000 Author: dim Date: Tue Jan 22 18:04:40 2019 New Revision: 343308 URL: https://svnweb.freebsd.org/changeset/base/343308 Log: Remove customizations in #includes of Options.inc, and adjust lld Makefile to generate the file in the right place. Modified: projects/clang800-import/contrib/llvm/tools/lld/ELF/Driver.h projects/clang800-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp projects/clang800-import/usr.bin/clang/lld/Makefile Modified: projects/clang800-import/contrib/llvm/tools/lld/ELF/Driver.h ============================================================================== --- projects/clang800-import/contrib/llvm/tools/lld/ELF/Driver.h Tue Jan 22 18:03:45 2019 (r343307) +++ projects/clang800-import/contrib/llvm/tools/lld/ELF/Driver.h Tue Jan 22 18:04:40 2019 (r343308) @@ -56,7 +56,7 @@ class ELFOptTable : public llvm::opt::OptTable { (publ enum { OPT_INVALID = 0, #define OPTION(_1, _2, ID, _4, _5, _6, _7, _8, _9, _10, _11, _12) OPT_##ID, -#include "ELF/Options.inc" +#include "Options.inc" #undef OPTION }; Modified: projects/clang800-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp ============================================================================== --- projects/clang800-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp Tue Jan 22 18:03:45 2019 (r343307) +++ projects/clang800-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp Tue Jan 22 18:04:40 2019 (r343308) @@ -38,7 +38,7 @@ using namespace lld::elf; // Create prefix string literals used in Options.td #define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; -#include "ELF/Options.inc" +#include "Options.inc" #undef PREFIX // Create table mapping all options defined in Options.td @@ -46,7 +46,7 @@ static const opt::OptTable::Info OptInfo[] = { #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \ {X1, X2, X10, X11, OPT_##ID, opt::Option::KIND##Class, \ X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12}, -#include "ELF/Options.inc" +#include "Options.inc" #undef OPTION }; Modified: projects/clang800-import/usr.bin/clang/lld/Makefile ============================================================================== --- projects/clang800-import/usr.bin/clang/lld/Makefile Tue Jan 22 18:03:45 2019 (r343307) +++ projects/clang800-import/usr.bin/clang/lld/Makefile Tue Jan 22 18:04:40 2019 (r343308) @@ -85,12 +85,13 @@ LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor LLVM_TBLGEN?= llvm-tblgen -ELF/Options.inc: ${LLD_SRCS}/ELF/Options.td - ${LLVM_TBLGEN} -gen-opt-parser-defs \ - -I ${LLVM_SRCS}/include \ - -d ${.TARGET:C/$/.d/} -o ${.TARGET} \ - ${LLVM_SRCS}/tools/lld/ELF/Options.td -TGHDRS+= ELF/Options.inc +INCFILE= Options.inc +TDFILE= ${LLD_SRCS}/ELF/Options.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}