d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include Options.inc using path from lld src top

Browse Source 
Otherwise we will encoutner conflicts with libllvm's Options.inc in the
bmake lld build.
This commit is contained in:
Ed Maste 2016-08-30 16:49:09 +00:00
parent 4cb4d1d8cf
commit cc5e1c7d54
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/llvm/tools/lld/ELF/Driver.h
View File

@ -65,7 +65,7 @@ class ELFOptTable : public llvm::opt::OptTable {
enum {
OPT_INVALID = 0,
#define OPTION(_1, _2, ID, _4, _5, _6, _7, _8, _9, _10, _11) OPT_##ID,
#include "Options.inc"
#include "ELF/Options.inc"
#undef OPTION
};

4
contrib/llvm/tools/lld/ELF/DriverUtils.cpp
View File

@ -34,7 +34,7 @@ using namespace lld::elf;
// Create prefix string literals used in Options.td
#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
#include "Options.inc"
#include "ELF/Options.inc"
#undef PREFIX
// Create table mapping all options defined in Options.td
@ -44,7 +44,7 @@ static const opt::OptTable::Info OptInfo[] = {
X1, X2, X9, X10, OPT_##ID, opt::Option::KIND##Class, X8, X7, OPT_##GROUP, \
OPT_##ALIAS, X6 \
},
#include "Options.inc"
#include "ELF/Options.inc"
#undef OPTION
};