From 208ac3d6e5021dc516da786cf4076fbb1f0a5097 Mon Sep 17 00:00:00 2001
From: Shankar Easwaran <shankare@codeaurora.org>
Date: Fri, 20 Mar 2015 23:46:56 +0000
Subject: [PATCH] [ELF][X86_64] Remove relative references to include files

llvm-svn: 232862
---
 lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt                        | 2 ++
 .../ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.h  | 4 ++--
 .../ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp | 2 +-
 .../ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h   | 2 +-
 lld/lib/ReaderWriter/ELF/X86_64/Makefile                              | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt b/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
index 67779fb..13a667d 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
+++ b/lld/lib/ReaderWriter/ELF/X86_64/CMakeLists.txt
@@ -10,4 +10,6 @@ add_llvm_library(lldX86_64ELFTarget
     LLVMSupport
   )
 
+include_directories(.)
+
 add_subdirectory(ExampleSubTarget)
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.h b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.h
index d5c827e..5bb11cd 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.h
@@ -10,8 +10,8 @@
 #ifndef LLD_READER_WRITER_ELF_X86_64_EXAMPLE_TARGET_EXAMPLE_LINKING_CONTEXT
 #define LLD_READER_WRITER_ELF_X86_64_EXAMPLE_TARGET_EXAMPLE_LINKING_CONTEXT
 
-#include "../X86_64LinkingContext.h"
-#include "../X86_64TargetHandler.h"
+#include "X86_64LinkingContext.h"
+#include "X86_64TargetHandler.h"
 
 namespace lld {
 namespace elf {
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp
index d7dcf35..b66b0d9 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExampleTargetHandler.h"
-#include "../X86_64ExecutableWriter.h"
+#include "X86_64ExecutableWriter.h"
 #include "ExampleLinkingContext.h"
 
 using namespace lld;
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h
index b52408a..19a6421 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleTargetHandler.h
@@ -10,7 +10,7 @@
 #ifndef LLD_READER_WRITER_ELF_X86_64_EXAMPLE_TARGET_EXAMPLE_TARGET_HANDLER_H
 #define LLD_READER_WRITER_ELF_X86_64_EXAMPLE_TARGET_EXAMPLE_TARGET_HANDLER_H
 
-#include "../X86_64TargetHandler.h"
+#include "X86_64TargetHandler.h"
 
 namespace lld {
 namespace elf {
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/Makefile b/lld/lib/ReaderWriter/ELF/X86_64/Makefile
index 5276e4e..dbeb4d2 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/Makefile
+++ b/lld/lib/ReaderWriter/ELF/X86_64/Makefile
@@ -10,7 +10,9 @@
 LLD_LEVEL := ../../../..
 LIBRARYNAME := lldX86_64ELFTarget
 USEDLIBS = lldCore.a
+
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLD_LEVEL)/lib/ReaderWriter/ELF
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLD_LEVEL)/lib/ReaderWriter/ELF/X86_64/
 
 PARALLEL_DIRS := ExampleSubTarget
 
-- 
2.7.4