diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-01-18 14:45:57 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-01-18 14:45:57 -0800 |
| commit | bfde774667fbce6d7d326c8a36a098138e224a95 (patch) | |
| tree | 223c3b15e82af241d8e51b489165d8c21d849525 | |
| parent | 325e70b47c6c321710c7b9c792b8fbee95cecd63 (diff) | |
| download | gcc-bfde774667fbce6d7d326c8a36a098138e224a95.zip gcc-bfde774667fbce6d7d326c8a36a098138e224a95.tar.gz gcc-bfde774667fbce6d7d326c8a36a098138e224a95.tar.bz2 | |
libbacktrace: don't fail tests if dwz fails
* Makefile.am (%_dwz): If dwz fails, use uncompressed debug info.
* Makefile.in: Regenerate.
* configure: Regenerate.
| -rw-r--r-- | libbacktrace/Makefile.am | 10 | ||||
| -rw-r--r-- | libbacktrace/Makefile.in | 12 | ||||
| -rwxr-xr-x | libbacktrace/configure | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am index e1e5500..8874f41 100644 --- a/libbacktrace/Makefile.am +++ b/libbacktrace/Makefile.am @@ -303,9 +303,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/libbacktrace/Makefile.in b/libbacktrace/Makefile.in index 2f5fdb1..2ba8dfa 100644 --- a/libbacktrace/Makefile.in +++ b/libbacktrace/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 @@ -2433,9 +2433,13 @@ uninstall-am: @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 diff --git a/libbacktrace/configure b/libbacktrace/configure index 86e387f..1c189b2 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -11509,7 +11509,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11522 "configure" +#line 11512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11615,7 +11615,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11628 "configure" +#line 11618 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |