Index: packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- packages/Python/lldbsuite/test/make/Makefile.rules
+++ packages/Python/lldbsuite/test/make/Makefile.rules
@@ -235,6 +235,22 @@
 	CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(ARCH_CFLAGS) $(CFLAGS_EXTRAS)
 endif
 
+ifneq (,$(wildcard $(LLVM_DWP)))
+  MAKE_DWP=YES
+  VALID_LLVM_DWP=YES
+endif
+
+ifeq "$(MAKE_DWP)" "YES"
+  MAKE_DWO=YES
+  ifndef LLVM_DWP
+    $(error llvm-dwp not found, please set LLVM_DWP.)
+  endif
+  ifneq "$(VALID_LLVM_DWP)" "YES"
+    $(error Invalid llvm-dwp, please set LLVM_DWP to a path that exists.)
+  endif
+endif
+
+
 ifeq "$(MAKE_DWO)" "YES"
 	CFLAGS += -gsplit-dwarf
 endif
@@ -508,6 +524,10 @@
 else
 $(EXE) : $(OBJECTS) $(ARCHIVE_NAME)
 	$(LD) $(OBJECTS) $(LDFLAGS) $(ARCHIVE_NAME) -o "$(EXE)"
+ifeq "$(MAKE_DWP)" "YES"
+	$(LLVM_DWP) -e "$(EXE)" -o "$(EXE).dwp"
+	rm -f $(OBJECTS:.o=.dwo)
+endif
 endif
 
 #----------------------------------------------------------------------