Merge branch 'addmainunit3-altlink-sharedstmt-dieref-dwz3' into addmainunit3-altlink...

diff --cc lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index d95290e,374dd68..cea2a75
--- 1/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
--- 2/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@@ -26,12 -26,6 +26,7 @@@
  # SPLIT_DEBUG_SYMBOLS := YES
  # CROSS_COMPILE :=
  # USE_PRIVATE_MODULE_CACHE := YES
- #
- # And test/functionalities/archives/Makefile:
- # MAKE_DSYM := NO
- # ARCHIVE_NAME := libfoo.a
- # ARCHIVE_C_SOURCES := a.c b.c
 +# DWZ := YES
  
  # Uncomment line below for debugging shell commands
  # SHELL = /bin/sh -x
@@@ -573,9 -496,8 +521,9 @@@ endi
  #----------------------------------------------------------------------
  ifneq "$(DYLIB_NAME)" ""
  ifeq "$(DYLIB_ONLY)" ""
- $(EXE) : $(OBJECTS) $(ARCHIVE_NAME) $(DYLIB_FILENAME)
-       $(LD) $(OBJECTS) $(ARCHIVE_NAME) -L. -l$(DYLIB_NAME) $(LDFLAGS) -o "$(EXE)"
+ $(EXE) : $(OBJECTS) $(DYLIB_FILENAME)
+       $(LD) $(OBJECTS) -L. -l$(DYLIB_NAME) $(LDFLAGS) -o "$(EXE)"
 +      $(call dwz_strip,$(EXE))
  ifneq "$(CODESIGN)" ""
        $(CODESIGN) -s - "$(EXE)"
  endif
@@@ -583,9 -505,8 +531,9 @@@ els
  EXE = $(DYLIB_FILENAME)
  endif
  else
- $(EXE) : $(OBJECTS) $(ARCHIVE_NAME)
-       $(LD) $(OBJECTS) $(LDFLAGS) $(ARCHIVE_NAME) -o "$(EXE)"
+ $(EXE) : $(OBJECTS)
+       $(LD) $(OBJECTS) $(LDFLAGS) -o "$(EXE)"
 +      $(call dwz_strip,$(EXE))
  ifneq "$(CODESIGN)" ""
        $(CODESIGN) -s - "$(EXE)"
  endif