Update llvm and clang library and binary Makefiles for 3.6.0 rc1.

11 files changed, 40 insertions, 21 deletions

diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index 0e1ed0e..a8b34c3 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -20,11 +20,14 @@ LIBDEPS=llvmcodegen \
 	llvmobjcarcopts \
 	llvmirreader \
 	llvmbitwriter \
-	llvmbitreader \
 	llvmlinker \
 	llvmipo \
 	llvmvectorize \
 	llvmscalaropts \
+	llvmprofiledata \
+	llvmobject \
+	llvmmcparser \
+	llvmbitreader \
 	llvminstcombine \
 	llvminstrumentation \
 	llvmtransformutils \
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index dc17d82..201e494 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -60,7 +60,6 @@ LIBDEPS=clangfrontendtool \
 	clangast \
 	clanglex \
 	clangbasic \
-	llvmprofiledata \
 	llvmoption \
 	llvmobjcarcopts \
 	llvmlinker \
@@ -108,6 +107,7 @@ LIBDEPS=clangfrontendtool \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -117,11 +117,12 @@ LIBDEPS=clangfrontendtool \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index 250769c..eef537e 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -47,6 +47,7 @@ LIBDEPS=llvmirreader \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -56,11 +57,12 @@ LIBDEPS=llvmirreader \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index 762c578..b672acf 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -17,26 +17,27 @@ LIBDEPS=llvmx86disassembler \
 	llvmx86codegen \
 	llvmx86desc \
 	llvmx86info \
+	llvmmcdisassembler \
 	llvmx86instprinter \
 	llvmx86utils \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvminterpreter \
-	llvminstrumentation \
-	llvmjit \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
 	llvmmcjit \
 	llvmtarget \
 	llvmruntimedyld \
+	llvmexecutionengine \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmexecutionengine \
 	llvmmc \
 	llvmcore \
 	llvmsupport
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index a04ab10..44586dc 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -45,6 +45,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -54,11 +55,12 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index ee686c4..8456a0f 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -10,10 +10,13 @@ SRCS=	llvm-extract.cpp
 LIBDEPS=llvmirreader \
 	llvmasmparser \
 	llvmbitwriter \
-	llvmbitreader \
 	llvmipo \
 	llvmvectorize \
 	llvmscalaropts \
+	llvmprofiledata \
+	llvmobject \
+	llvmmcparser \
+	llvmbitreader \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index c9c667c..6e85993 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -9,8 +9,7 @@ SRCDIR=	tools/llvm-mc
 SRCS=	llvm-mc.cpp \
 	Disassembler.cpp
 
-LIBDEPS=llvmmcdisassembler \
-	llvmaarch64disassembler \
+LIBDEPS=llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -48,6 +47,7 @@ LIBDEPS=llvmmcdisassembler \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -57,11 +57,12 @@ LIBDEPS=llvmmcdisassembler \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 753cfdc63..79afa5a 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -45,6 +45,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -54,11 +55,12 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index bfd195b..ccb7ed9 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -11,9 +11,7 @@ SRCS=	llvm-objdump.cpp \
 	ELFDump.cpp \
 	MachODump.cpp
 
-LIBDEPS=llvmmcdisassembler \
-	llvmmcanalysis \
-	llvmdebuginfo \
+LIBDEPS=llvmdebuginfo \
 	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
@@ -52,6 +50,7 @@ LIBDEPS=llvmmcdisassembler \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -61,11 +60,12 @@ LIBDEPS=llvmmcdisassembler \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index 26c8d54..df74a5b 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -9,7 +9,7 @@ SRCDIR=	tools/llvm-rtdyld
 SRCS=	llvm-rtdyld.cpp
 
 LIBDEPS=llvmdebuginfo \
-	llvmjit \
+	llvmmcjit \
 	llvmexecutionengine \
 	llvmruntimedyld \
 	llvmaarch64disassembler \
@@ -50,6 +50,7 @@ LIBDEPS=llvmdebuginfo \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
@@ -59,11 +60,12 @@ LIBDEPS=llvmdebuginfo \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 52cdfda..075a7bd 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -53,8 +53,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmasmprinter \
 	llvmcodegen \
 	llvmx86desc \
-	llvmobject \
-	llvmmcparser \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmx86utils \
@@ -62,6 +61,9 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmvectorize \
 	llvmobjcarcopts \
 	llvmscalaropts \
+	llvmprofiledata \
+	llvmobject \
+	llvmmcparser \
 	llvminstcombine \
 	llvminstrumentation \
 	llvmtransformutils \