From owner-svn-src-projects@freebsd.org Tue Aug 30 16:49:11 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09893BC8451 for ; Tue, 30 Aug 2016 16:49:11 +0000 (UTC) (envelope-from emaste@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 mx1.freebsd.org (Postfix) with ESMTPS id B3486C60; Tue, 30 Aug 2016 16:49:10 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7UGn9AE059406; Tue, 30 Aug 2016 16:49:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7UGn9H1059404; Tue, 30 Aug 2016 16:49:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201608301649.u7UGn9H1059404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 30 Aug 2016 16:49:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305072 - projects/clang390-import/contrib/llvm/tools/lld/ELF X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 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, 30 Aug 2016 16:49:11 -0000 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 };