diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 5672464a921..ef0bc3e1e78 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -390,7 +390,9 @@ SRCS+=		Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
 SRCS+=		Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp
 SRCS+=		Plugins/Language/ClangCommon/ClangHighlighter.cpp
 SRCS+=		Plugins/Language/ObjC/CF.cpp
+SRCS+=		Plugins/Language/ObjC/CFBasicHash.cpp
 SRCS+=		Plugins/Language/ObjC/Cocoa.cpp
+SRCS+=		Plugins/Language/ObjC/CoreMedia.cpp
 SRCS+=		Plugins/Language/ObjC/NSArray.cpp
 SRCS+=		Plugins/Language/ObjC/NSDictionary.cpp
 SRCS+=		Plugins/Language/ObjC/NSError.cpp
@@ -407,6 +409,7 @@ SRCS+=		Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThrough
 SRCS+=		Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp
 SRCS+=		Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
 SRCS+=		Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+SRCS+=		Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptx86ABIFixups.cpp
 SRCS+=		Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
 SRCS+=		Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
 SRCS+=		Plugins/ObjectFile/Breakpad/BreakpadRecords.cpp
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 5aa7a6a4563..d0c4770692d 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -282,7 +282,7 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF LLVM_TARGET_MIPS
 
 .include <bsd.compiler.mk>
 
-.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386"
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*}
 __DEFAULT_YES_OPTIONS+=LLDB
 .else
 __DEFAULT_NO_OPTIONS+=LLDB