Install: add arm_neon.h header back

I'd gone too far pruning aarch64_simd.h this time and took out one
instance of arm_neon.h. This should restore us to the status quo.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205111 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Headers/Makefile b/lib/Headers/Makefile
index acc2e4b88c80c3277b7c9b5940d6dbc9c3ee7c6b..42219c4082be839fb08817d107464d49d4778ddc 100644 (file)
--- a/lib/Headers/Makefile
+++ b/lib/Headers/Makefile
@@ -24,11 +24,11 @@ HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
 OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
 
 
-$(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir
+$(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir $(HeaderDir)/arm_neon.h
        $(Verb) cp $< $@
        $(Echo) Copying $(notdir $<) to build dir
 
-$(HeaderDir)/arm_neon.h: $(HeaderDir)/%: %.inc $(HeaderDir)/.dir
+$(HeaderDir)/arm_neon.h: $(BUILT_SOURCES) $(HeaderDir)/.dir
        $(Verb) cp $< $@
        $(Echo) Copying $(notdir $<) to build dir
 
@@ -61,5 +61,4 @@ install-local:: $(INSTHEADERS) $(PROJ_headers)/module.map
 
 $(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(CLANG_TBLGEN) $(ObjDir)/.dir
        $(Echo) "Building Clang arm_neon.h.inc with tblgen"
-       $(Verb) $(ClangTableGen) -gen-arm-neon -o $(call SYSPATH, $@) \
-         -I $(PROJ_SRC_DIR)/../../include $<
+       $(Verb) $(ClangTableGen) -gen-arm-neon -o $(call SYSPATH, $@) $<