svn commit: r305072 - projects/clang390-import/contrib/llvm/tools/lld/ELF

[Ed Maste]

Author: emaste
Date: Tue Aug 30 16:49:09 2016
New Revision: 305072
URL: https://svnweb.freebsd.org/changeset/base/305072

Log:
  Include Options.inc using path from lld src top
  
  Otherwise we will encoutner conflicts with libllvm's Options.inc in the
  bmake lld build.

Modified:
  projects/clang390-import/contrib/llvm/tools/lld/ELF/Driver.h
  projects/clang390-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp

Modified: projects/clang390-import/contrib/llvm/tools/lld/ELF/Driver.h
==============================================================================
--- projects/clang390-import/contrib/llvm/tools/lld/ELF/Driver.h	Tue Aug 30 16:45:15 2016	(r305071)
+++ projects/clang390-import/contrib/llvm/tools/lld/ELF/Driver.h	Tue Aug 30 16:49:09 2016	(r305072)
@@ -65,7 +65,7 @@ private:
 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
 };
 

Modified: projects/clang390-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp
==============================================================================
--- projects/clang390-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp	Tue Aug 30 16:45:15 2016	(r305071)
+++ projects/clang390-import/contrib/llvm/tools/lld/ELF/DriverUtils.cpp	Tue Aug 30 16:49:09 2016	(r305072)
@@ -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
 };