Date: Tue, 22 Jan 2019 18:04:40 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <201901221804.x0MI4eV7063051@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901221804.x0MI4eV7063051>