From dedbe13fda00253fe5d4f2fb812c909729ed5937 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 18 Jan 2021 14:58:41 -0800
Subject: [PATCH] libbacktrace: don't fail tests if dwz fails

	* Makefile.am (%_dwz): If dwz fails, use uncompressed debug info.
	* Makefile.in: Regenerate.
---
 Makefile.am | 10 +++++++---
 Makefile.in | 12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8ceabe4..166a058 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,9 +304,13 @@ if HAVE_DWZ
 	rm -f $@ $@_common.debug
 	cp $< $@_1
 	cp $< $@_2
-	$(DWZ) -m $@_common.debug $@_1 $@_2
-	rm -f $@_2
-	mv $@_1 $@
+	if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
+	  rm -f $@_2; \
+	  mv $@_1 $@; \
+	else \
+	  echo "Ignoring dwz errors, assuming that test passes"; \
+	  cp $< $@; \
+	fi
 
 TESTS += btest_dwz
 
diff --git a/Makefile.in b/Makefile.in
index 88b00ec..b6a57ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # Makefile.am -- Backtrace Makefile.
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -2459,9 +2459,13 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
 @HAVE_DWZ_TRUE@@NATIVE_TRUE@	rm -f $@ $@_common.debug
 @HAVE_DWZ_TRUE@@NATIVE_TRUE@	cp $< $@_1
 @HAVE_DWZ_TRUE@@NATIVE_TRUE@	cp $< $@_2
-@HAVE_DWZ_TRUE@@NATIVE_TRUE@	$(DWZ) -m $@_common.debug $@_1 $@_2
-@HAVE_DWZ_TRUE@@NATIVE_TRUE@	rm -f $@_2
-@HAVE_DWZ_TRUE@@NATIVE_TRUE@	mv $@_1 $@
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	  rm -f $@_2; \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	  mv $@_1 $@; \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	else \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	  echo "Ignoring dwz errors, assuming that test passes"; \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	  cp $< $@; \
+@HAVE_DWZ_TRUE@@NATIVE_TRUE@	fi
 
 @NATIVE_TRUE@edtest2_build.c: gen_edtest2_build; @true
 @NATIVE_TRUE@gen_edtest2_build: $(srcdir)/edtest2.c