Remove customizations in #includes of Options.inc, and adjust lld
Makefile to generate the file in the right place.
This commit is contained in:
parent
6e3f21a20c
commit
053d6b6842
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/clang800-import/; revision=343308
@ -56,7 +56,7 @@ class ELFOptTable : public llvm::opt::OptTable {
|
|||||||
enum {
|
enum {
|
||||||
OPT_INVALID = 0,
|
OPT_INVALID = 0,
|
||||||
#define OPTION(_1, _2, ID, _4, _5, _6, _7, _8, _9, _10, _11, _12) OPT_##ID,
|
#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
|
#undef OPTION
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ using namespace lld::elf;
|
|||||||
|
|
||||||
// Create prefix string literals used in Options.td
|
// Create prefix string literals used in Options.td
|
||||||
#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
|
#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
|
||||||
#include "ELF/Options.inc"
|
#include "Options.inc"
|
||||||
#undef PREFIX
|
#undef PREFIX
|
||||||
|
|
||||||
// Create table mapping all options defined in Options.td
|
// 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) \
|
#define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \
|
||||||
{X1, X2, X10, X11, OPT_##ID, opt::Option::KIND##Class, \
|
{X1, X2, X10, X11, OPT_##ID, opt::Option::KIND##Class, \
|
||||||
X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12},
|
X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12},
|
||||||
#include "ELF/Options.inc"
|
#include "Options.inc"
|
||||||
#undef OPTION
|
#undef OPTION
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -85,12 +85,13 @@ LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
|
|||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
LLVM_TBLGEN?= llvm-tblgen
|
LLVM_TBLGEN?= llvm-tblgen
|
||||||
ELF/Options.inc: ${LLD_SRCS}/ELF/Options.td
|
INCFILE= Options.inc
|
||||||
${LLVM_TBLGEN} -gen-opt-parser-defs \
|
TDFILE= ${LLD_SRCS}/ELF/Options.td
|
||||||
-I ${LLVM_SRCS}/include \
|
GENOPT= -gen-opt-parser-defs
|
||||||
-d ${.TARGET:C/$/.d/} -o ${.TARGET} \
|
${INCFILE}: ${TDFILE}
|
||||||
${LLVM_SRCS}/tools/lld/ELF/Options.td
|
${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
|
||||||
TGHDRS+= ELF/Options.inc
|
-o ${.TARGET} ${TDFILE}
|
||||||
|
TGHDRS+= ${INCFILE}
|
||||||
|
|
||||||
DPSRCS+= ${TGHDRS}
|
DPSRCS+= ${TGHDRS}
|
||||||
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/}
|
||||||
|
Loading…
Reference in New Issue
Block a user