aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-01-07 19:06:27 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-01-07 19:06:27 +0000
commit47a80b9264fb34ce715ebfdcf45357e5f753a5fe (patch)
tree92e62f9b8ac3444c837b52deb7c823149d5b1727
parent12940e3dc3e62320d7db389719aa694903deed79 (diff)
downloadsrc-47a80b9264fb34ce715ebfdcf45357e5f753a5fe.tar.gz
src-47a80b9264fb34ce715ebfdcf45357e5f753a5fe.zip
Notes
-rw-r--r--lib/clang/Makefile7
-rw-r--r--lib/clang/clang.build.mk6
-rw-r--r--lib/clang/include/AArch64GenAsmMatcher.inc2
-rw-r--r--lib/clang/include/AArch64GenAsmWriter.inc2
-rw-r--r--lib/clang/include/AArch64GenAsmWriter1.inc2
-rw-r--r--lib/clang/include/AArch64GenCallingConv.inc2
-rw-r--r--lib/clang/include/AArch64GenDAGISel.inc2
-rw-r--r--lib/clang/include/AArch64GenDisassemblerTables.inc2
-rw-r--r--lib/clang/include/AArch64GenFastISel.inc2
-rw-r--r--lib/clang/include/AArch64GenInstrInfo.inc2
-rw-r--r--lib/clang/include/AArch64GenMCCodeEmitter.inc2
-rw-r--r--lib/clang/include/AArch64GenMCPseudoLowering.inc2
-rw-r--r--lib/clang/include/AArch64GenRegisterInfo.inc2
-rw-r--r--lib/clang/include/AArch64GenSubtargetInfo.inc2
-rw-r--r--lib/clang/include/llvm/Config/AsmParsers.def1
-rw-r--r--lib/clang/include/llvm/Config/AsmPrinters.def1
-rw-r--r--lib/clang/include/llvm/Config/Disassemblers.def1
-rw-r--r--lib/clang/include/llvm/Config/Targets.def1
-rw-r--r--lib/clang/libllvmaarch64asmparser/Makefile16
-rw-r--r--lib/clang/libllvmaarch64codegen/Makefile42
-rw-r--r--lib/clang/libllvmaarch64desc/Makefile24
-rw-r--r--lib/clang/libllvmaarch64disassembler/Makefile20
-rw-r--r--lib/clang/libllvmaarch64info/Makefile15
-rw-r--r--lib/clang/libllvmaarch64instprinter/Makefile17
-rw-r--r--lib/clang/libllvmaarch64utils/Makefile15
-rw-r--r--usr.bin/clang/clang/Makefile7
-rw-r--r--usr.bin/clang/llc/Makefile7
-rw-r--r--usr.bin/clang/lldb/Makefile80
-rw-r--r--usr.bin/clang/llvm-ar/Makefile9
-rw-r--r--usr.bin/clang/llvm-mc/Makefile7
-rw-r--r--usr.bin/clang/llvm-nm/Makefile9
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile7
-rw-r--r--usr.bin/clang/llvm-rtdyld/Makefile7
-rw-r--r--usr.bin/clang/opt/Makefile9
34 files changed, 289 insertions, 43 deletions
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index e31969d0cdd5..dbf6c4d235d7 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -56,6 +56,13 @@ SUBDIR= libclanganalysis \
libllvmtransformutils \
libllvmvectorize \
\
+ libllvmaarch64asmparser \
+ libllvmaarch64codegen \
+ libllvmaarch64desc \
+ libllvmaarch64disassembler \
+ libllvmaarch64info \
+ libllvmaarch64instprinter \
+ libllvmaarch64utils \
libllvmarmasmparser \
libllvmarmcodegen \
libllvmarmdesc \
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 999b41ba0d36..926c81f35305 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -29,8 +29,8 @@ TARGET_ABI= gnueabi
TARGET_ABI= unknown
.endif
-TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-${TARGET_ABI}-freebsd11.0
-BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-unknown-freebsd11.0
+TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/:C/arm64/aarch64/}-${TARGET_ABI}-freebsd11.0
+BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/:C/arm64/aarch64/}-unknown-freebsd11.0
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
@@ -46,7 +46,7 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
-I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
.for arch in \
- ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
+ AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
. for hdr in \
AsmMatcher/-gen-asm-matcher \
AsmWriter1/-gen-asm-writer,-asmwriternum=1 \
diff --git a/lib/clang/include/AArch64GenAsmMatcher.inc b/lib/clang/include/AArch64GenAsmMatcher.inc
new file mode 100644
index 000000000000..0b1e0a9b8ffa
--- /dev/null
+++ b/lib/clang/include/AArch64GenAsmMatcher.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenAsmMatcher.inc.h"
diff --git a/lib/clang/include/AArch64GenAsmWriter.inc b/lib/clang/include/AArch64GenAsmWriter.inc
new file mode 100644
index 000000000000..20b130b203bb
--- /dev/null
+++ b/lib/clang/include/AArch64GenAsmWriter.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenAsmWriter.inc.h"
diff --git a/lib/clang/include/AArch64GenAsmWriter1.inc b/lib/clang/include/AArch64GenAsmWriter1.inc
new file mode 100644
index 000000000000..caf7812fed38
--- /dev/null
+++ b/lib/clang/include/AArch64GenAsmWriter1.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenAsmWriter1.inc.h"
diff --git a/lib/clang/include/AArch64GenCallingConv.inc b/lib/clang/include/AArch64GenCallingConv.inc
new file mode 100644
index 000000000000..75bfa38224f8
--- /dev/null
+++ b/lib/clang/include/AArch64GenCallingConv.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenCallingConv.inc.h"
diff --git a/lib/clang/include/AArch64GenDAGISel.inc b/lib/clang/include/AArch64GenDAGISel.inc
new file mode 100644
index 000000000000..39bb08455767
--- /dev/null
+++ b/lib/clang/include/AArch64GenDAGISel.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenDAGISel.inc.h"
diff --git a/lib/clang/include/AArch64GenDisassemblerTables.inc b/lib/clang/include/AArch64GenDisassemblerTables.inc
new file mode 100644
index 000000000000..3b2633601979
--- /dev/null
+++ b/lib/clang/include/AArch64GenDisassemblerTables.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/AArch64GenFastISel.inc b/lib/clang/include/AArch64GenFastISel.inc
new file mode 100644
index 000000000000..ebc2ad2d14b8
--- /dev/null
+++ b/lib/clang/include/AArch64GenFastISel.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenFastISel.inc.h"
diff --git a/lib/clang/include/AArch64GenInstrInfo.inc b/lib/clang/include/AArch64GenInstrInfo.inc
new file mode 100644
index 000000000000..12e60a92ab24
--- /dev/null
+++ b/lib/clang/include/AArch64GenInstrInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenInstrInfo.inc.h"
diff --git a/lib/clang/include/AArch64GenMCCodeEmitter.inc b/lib/clang/include/AArch64GenMCCodeEmitter.inc
new file mode 100644
index 000000000000..e3515f5cda49
--- /dev/null
+++ b/lib/clang/include/AArch64GenMCCodeEmitter.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/AArch64GenMCPseudoLowering.inc b/lib/clang/include/AArch64GenMCPseudoLowering.inc
new file mode 100644
index 000000000000..93f3f3a20a2b
--- /dev/null
+++ b/lib/clang/include/AArch64GenMCPseudoLowering.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenMCPseudoLowering.inc.h"
diff --git a/lib/clang/include/AArch64GenRegisterInfo.inc b/lib/clang/include/AArch64GenRegisterInfo.inc
new file mode 100644
index 000000000000..a6a9647a14cf
--- /dev/null
+++ b/lib/clang/include/AArch64GenRegisterInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenRegisterInfo.inc.h"
diff --git a/lib/clang/include/AArch64GenSubtargetInfo.inc b/lib/clang/include/AArch64GenSubtargetInfo.inc
new file mode 100644
index 000000000000..8674332a2012
--- /dev/null
+++ b/lib/clang/include/AArch64GenSubtargetInfo.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AArch64GenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/llvm/Config/AsmParsers.def b/lib/clang/include/llvm/Config/AsmParsers.def
index e0165f0c28e6..3be6e385415c 100644
--- a/lib/clang/include/llvm/Config/AsmParsers.def
+++ b/lib/clang/include/llvm/Config/AsmParsers.def
@@ -1,5 +1,6 @@
/* $FreeBSD$ */
+LLVM_ASM_PARSER(AArch64)
LLVM_ASM_PARSER(ARM)
LLVM_ASM_PARSER(Mips)
LLVM_ASM_PARSER(PowerPC)
diff --git a/lib/clang/include/llvm/Config/AsmPrinters.def b/lib/clang/include/llvm/Config/AsmPrinters.def
index 97ca9521aa02..9ed021771d62 100644
--- a/lib/clang/include/llvm/Config/AsmPrinters.def
+++ b/lib/clang/include/llvm/Config/AsmPrinters.def
@@ -1,5 +1,6 @@
/* $FreeBSD$ */
+LLVM_ASM_PRINTER(AArch64)
LLVM_ASM_PRINTER(ARM)
LLVM_ASM_PRINTER(Mips)
LLVM_ASM_PRINTER(PowerPC)
diff --git a/lib/clang/include/llvm/Config/Disassemblers.def b/lib/clang/include/llvm/Config/Disassemblers.def
index 1d31d247f239..44fc7ef54708 100644
--- a/lib/clang/include/llvm/Config/Disassemblers.def
+++ b/lib/clang/include/llvm/Config/Disassemblers.def
@@ -1,5 +1,6 @@
/* $FreeBSD$ */
+LLVM_DISASSEMBLER(AArch64)
LLVM_DISASSEMBLER(ARM)
LLVM_DISASSEMBLER(Mips)
LLVM_DISASSEMBLER(PowerPC)
diff --git a/lib/clang/include/llvm/Config/Targets.def b/lib/clang/include/llvm/Config/Targets.def
index e51e06a0de2b..96b60d9b5101 100644
--- a/lib/clang/include/llvm/Config/Targets.def
+++ b/lib/clang/include/llvm/Config/Targets.def
@@ -1,5 +1,6 @@
/* $FreeBSD$ */
+LLVM_TARGET(AArch64)
LLVM_TARGET(ARM)
LLVM_TARGET(Mips)
LLVM_TARGET(PowerPC)
diff --git a/lib/clang/libllvmaarch64asmparser/Makefile b/lib/clang/libllvmaarch64asmparser/Makefile
new file mode 100644
index 000000000000..d93fb9ae2ac5
--- /dev/null
+++ b/lib/clang/libllvmaarch64asmparser/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64asmparser
+
+SRCDIR= lib/Target/AArch64/AsmParser
+INCDIR= lib/Target/AArch64
+SRCS= AArch64AsmParser.cpp
+
+TGHDRS= AArch64GenAsmMatcher \
+ AArch64GenInstrInfo \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64codegen/Makefile b/lib/clang/libllvmaarch64codegen/Makefile
new file mode 100644
index 000000000000..8a2563019501
--- /dev/null
+++ b/lib/clang/libllvmaarch64codegen/Makefile
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64codegen
+
+SRCDIR= lib/Target/AArch64
+SRCS= AArch64AddressTypePromotion.cpp \
+ AArch64AdvSIMDScalarPass.cpp \
+ AArch64AsmPrinter.cpp \
+ AArch64BranchRelaxation.cpp \
+ AArch64CleanupLocalDynamicTLSPass.cpp \
+ AArch64CollectLOH.cpp \
+ AArch64ConditionalCompares.cpp \
+ AArch64DeadRegisterDefinitionsPass.cpp \
+ AArch64ExpandPseudoInsts.cpp \
+ AArch64FastISel.cpp \
+ AArch64FrameLowering.cpp \
+ AArch64ISelDAGToDAG.cpp \
+ AArch64ISelLowering.cpp \
+ AArch64InstrInfo.cpp \
+ AArch64LoadStoreOptimizer.cpp \
+ AArch64MCInstLower.cpp \
+ AArch64PromoteConstant.cpp \
+ AArch64RegisterInfo.cpp \
+ AArch64SelectionDAGInfo.cpp \
+ AArch64StorePairSuppress.cpp \
+ AArch64Subtarget.cpp \
+ AArch64TargetMachine.cpp \
+ AArch64TargetObjectFile.cpp \
+ AArch64TargetTransformInfo.cpp
+
+TGHDRS= AArch64GenCallingConv \
+ AArch64GenDAGISel \
+ AArch64GenFastISel \
+ AArch64GenInstrInfo \
+ AArch64GenMCPseudoLowering \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo \
+ Intrinsics
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64desc/Makefile b/lib/clang/libllvmaarch64desc/Makefile
new file mode 100644
index 000000000000..041fbf21db61
--- /dev/null
+++ b/lib/clang/libllvmaarch64desc/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64desc
+
+SRCDIR= lib/Target/AArch64/MCTargetDesc
+SRCS= AArch64AsmBackend.cpp \
+ AArch64ELFObjectWriter.cpp \
+ AArch64ELFStreamer.cpp \
+ AArch64MCAsmInfo.cpp \
+ AArch64MCCodeEmitter.cpp \
+ AArch64MCExpr.cpp \
+ AArch64MCTargetDesc.cpp \
+ AArch64MachObjectWriter.cpp \
+ AArch64TargetStreamer.cpp
+CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
+
+TGHDRS= AArch64GenInstrInfo \
+ AArch64GenMCCodeEmitter \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile
new file mode 100644
index 000000000000..5b23c0f77536
--- /dev/null
+++ b/lib/clang/libllvmaarch64disassembler/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+LIB= llvmaarch64disassembler
+
+SRCDIR= lib/Target/AArch64/Disassembler
+INCDIR= lib/Target/AArch64
+SRCS= AArch64Disassembler.cpp
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= AArch64ExternalSymbolizer.cpp
+.endif
+
+TGHDRS= AArch64GenDisassemblerTables \
+ AArch64GenInstrInfo \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64info/Makefile b/lib/clang/libllvmaarch64info/Makefile
new file mode 100644
index 000000000000..c62a6e15316b
--- /dev/null
+++ b/lib/clang/libllvmaarch64info/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64info
+
+SRCDIR= lib/Target/AArch64/TargetInfo
+INCDIR= lib/Target/AArch64
+SRCS= AArch64TargetInfo.cpp
+
+TGHDRS= AArch64GenInstrInfo \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64instprinter/Makefile b/lib/clang/libllvmaarch64instprinter/Makefile
new file mode 100644
index 000000000000..c037dc8854f6
--- /dev/null
+++ b/lib/clang/libllvmaarch64instprinter/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64instprinter
+
+SRCDIR= lib/Target/AArch64/InstPrinter
+INCDIR= lib/Target/AArch64
+SRCS= AArch64InstPrinter.cpp
+
+TGHDRS= AArch64GenAsmWriter \
+ AArch64GenAsmWriter1 \
+ AArch64GenInstrInfo \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64utils/Makefile b/lib/clang/libllvmaarch64utils/Makefile
new file mode 100644
index 000000000000..d9459272e01b
--- /dev/null
+++ b/lib/clang/libllvmaarch64utils/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= llvmaarch64utils
+
+SRCDIR= lib/Target/AArch64/Utils
+INCDIR= lib/Target/AArch64
+SRCS= AArch64BaseInfo.cpp
+
+TGHDRS= AArch64GenInstrInfo \
+ AArch64GenRegisterInfo \
+ AArch64GenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 0ba9886f5e99..dc17d82c3650 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -70,6 +70,13 @@ LIBDEPS=clangfrontendtool \
llvminstrumentation \
llvmbitwriter \
llvmasmparser \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index 7d92f7fa3fda..250769ca7a1d 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -9,6 +9,13 @@ SRCS= llc.cpp
LIBDEPS=llvmirreader \
llvmasmparser \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 5e8ca5c1ec2e..0fc878fc2c5b 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -82,67 +82,73 @@ LIBDEPS=\
clangbasic \
clanglex \
\
+ llvmmcdisassembler \
+ llvmobjcarcopts \
+ llvmprofiledata \
llvmoption \
- llvmarmasmparser \
- llvmarmcodegen \
- llvminstrumentation \
- llvmirreader \
llvmlinker \
- llvmmipsasmparser \
- llvmmipscodegen \
- llvmmipsdisassembler \
- llvmobjcarcopts \
- llvmpowerpccodegen \
- llvmx86asmparser \
- llvmx86codegen \
- llvmx86disassembler \
llvmmcjit \
- llvmmcdisassembler \
- llvmarmdisassembler \
- llvmselectiondag \
+ llvmruntimedyld \
+ llvmjit \
+ llvmexecutionengine \
+ llvmirreader \
llvmipo \
+ llvmvectorize \
+ llvminstrumentation \
llvmbitwriter \
llvmasmparser \
- llvminterpreter \
- llvmjit \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
+ llvmarmdisassembler \
+ llvmarmcodegen \
+ llvmarmasmparser \
llvmarmdesc \
- llvmasmprinter \
+ llvmarminfo \
+ llvmarminstprinter \
+ llvmmipsdisassembler \
+ llvmmipscodegen \
+ llvmmipsasmparser \
llvmmipsdesc \
+ llvmmipsinfo \
llvmmipsinstprinter \
+ llvmpowerpcdisassembler \
+ llvmpowerpccodegen \
+ llvmpowerpcasmparser \
llvmpowerpcdesc \
+ llvmpowerpcinfo \
llvmpowerpcinstprinter \
- llvmpowerpcasmparser \
- llvmpowerpcdisassembler \
- llvmprofiledata \
- llvmruntimedyld \
- llvmvectorize \
- llvmx86desc \
- llvmx86instprinter \
- llvmexecutionengine \
- llvmcodegen \
- llvmscalaropts \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
llvmsparcinstprinter \
- llvmarminfo \
- llvmarminstprinter \
- llvmmcparser \
- llvmmipsinfo \
- llvmpowerpcinfo \
- llvmx86info \
- llvmx86utils \
- llvmobject \
- llvmbitreader \
+ llvmx86disassembler \
+ llvmx86asmparser \
+ llvmx86codegen \
+ llvmselectiondag \
+ llvmasmprinter \
+ llvmcodegen \
+ llvmscalaropts \
llvminstcombine \
llvmtransformutils \
llvmipa \
llvmanalysis \
llvmtarget \
+ llvmx86desc \
+ llvmobject \
+ llvmmcparser \
+ llvmbitreader \
llvmcore \
+ llvmx86info \
+ llvmx86instprinter \
llvmmc \
+ llvmx86utils \
llvmsupport
.include "../clang.prog.mk"
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 0c4a5126b778..a04ab1048b1e 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -7,7 +7,14 @@ PROG_CXX=llvm-ar
SRCDIR= tools/llvm-ar
SRCS= llvm-ar.cpp
-LIBDEPS=llvmarmdisassembler \
+LIBDEPS=llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
+ llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index dd743df648fa..c9c667cdf001 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -10,6 +10,13 @@ SRCS= llvm-mc.cpp \
Disassembler.cpp
LIBDEPS=llvmmcdisassembler \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index c75eb7fb62d5..753cfdc6306a 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -7,7 +7,14 @@ PROG_CXX=llvm-nm
SRCDIR= tools/llvm-nm
SRCS= llvm-nm.cpp
-LIBDEPS=llvmarmdisassembler \
+LIBDEPS=llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
+ llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 22ffd843ff3c..c73f02b49390 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -16,6 +16,13 @@ SRCS= llvm-objdump.cpp \
LIBDEPS=llvmmcdisassembler \
llvmmcanalysis \
llvmdebuginfo \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index ba741718f11c..8bfcc53ea070 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -14,6 +14,13 @@ LIBDEPS=llvmdebuginfo \
llvmjit \
llvmexecutionengine \
llvmruntimedyld \
+ llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 8010deb630e3..52cdfda47319 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -15,7 +15,14 @@ SRCS= AnalysisWrappers.cpp \
opt.cpp
TGHDRS= Intrinsics
-LIBDEPS=llvmarmdisassembler \
+LIBDEPS=llvmaarch64disassembler \
+ llvmaarch64codegen \
+ llvmaarch64asmparser \
+ llvmaarch64desc \
+ llvmaarch64info \
+ llvmaarch64instprinter \
+ llvmaarch64utils \
+ llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \