Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend
@ 2021-12-20 14:34 Aloz1
  2021-12-20 14:45 ` Aloz1
                   ` (25 more replies)
  0 siblings, 26 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 14:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 592 bytes --]

There is a new pull request by Aloz1 against master on the void-packages repository

https://github.com/Aloz1/void-packages ghdl-enable-backtrace
https://github.com/void-linux/void-packages/pull/34626

[WIP]ghdl: add libbacktrace for llvm backend
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34626.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-enable-backtrace-34626.patch --]
[-- Type: text/x-diff, Size: 2319 bytes --]

From e3c7e63801b0281ea91f7a7683d38d6716d69a5f Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Tue, 21 Dec 2021 01:28:34 +1100
Subject: [PATCH] ghdl: add libbacktrace for llvm backend

---
 srcpkgs/gcc/template  |  6 +++++-
 srcpkgs/ghdl/template | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb2..10f7a9d96ca5 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -7,7 +7,7 @@ pkgname=gcc
 # to get regression fixes not yet incorporate into a stable release
 # it should be possible to switch back to stable with 10.3 or 11
 version=10.2.1pre1
-revision=3
+revision=4
 _patchver="${version%pre*}"
 _minorver="${_patchver%.*}"
 _majorver="${_minorver%.*}"
@@ -353,6 +353,10 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
 		${DESTDIR}/usr/include/c++/${_patchver}
 
+	# Install libbacktrace. (it's not installed by makefiles)
+	vinstall libbacktrace/.libs/libbacktrace.a \
+		644 usr/lib/gcc/${_triplet}/${_minorver}
+
 	# cc symlink
 	ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
 	# rpcgen wants /lib/cpp, make a symlink
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..bb3d77a1a1fc 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=1.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
@@ -51,7 +51,7 @@ fi
 
 if [ "$build_option_llvm" ]; then
 	subpackages+=" ghdl-llvm"
-	makedepends+=" llvm12"
+	makedepends+=" llvm12 libgcc-devel"
 fi
 
 do_configure() {
@@ -63,9 +63,15 @@ do_configure() {
 		cd ..
 	fi
 	if [ "$build_option_llvm" ]; then
+		# FIXME: This is a bit hacky. This should be replaced by the path within the gcc
+		# source tree for libbacktrace when building the gcc backend has been added.
+		gcc_dir=$(gcc --print-search-dirs | awk '{ if ($1 == "install:") print $2 }')
+
 		mkdir -p build_llvm
 		cd build_llvm
-		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+		../configure --libdir=lib/ghdl/llvm \
+			--with-llvm-config \
+			--with-backtrace-lib="${XBPS_MASTERDIR}${gcc_dir}/libbacktrace.a" \
 			${configure_args}
 		cd ..
 	fi

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
@ 2021-12-20 14:45 ` Aloz1
  2021-12-20 15:05 ` [PR REVIEW] " ericonr
                   ` (24 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 14:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-997987451

Comment:
Would like some feedback on how I've implemented this.

At present, I've added libbacktrace.a to libgcc-devel, and ghdl uses that for the llvm backend (it just copies it). It irks me a bit that it copies libbacktrace, and I'm also not happy with the way I've got the template detecting where to find libbacktrace.a

A few possible solutions:
1) Fix detection of /usr/lib/gcc/<target>/<minver> for cross builds, maybe update the libbacktrace copy to a symlink while we're at it.
2) Use [ianlancetaylor/libbacktrace](/ianlancetaylor/libbacktrace) instead (they unfortunately don't seem to do any versioning at all).
3) Download gcc source and build libbacktrace from that (gcc source will eventually be needed anyway for building ghdl-gcc)

Any thoughts?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
  2021-12-20 14:45 ` Aloz1
@ 2021-12-20 15:05 ` ericonr
  2021-12-20 15:05 ` ericonr
                   ` (23 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-20 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772438819

Comment:
masterdir doesn't fit here.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
  2021-12-20 14:45 ` Aloz1
  2021-12-20 15:05 ` [PR REVIEW] " ericonr
@ 2021-12-20 15:05 ` ericonr
  2021-12-20 15:05 ` ericonr
                   ` (22 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-20 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772436598

Comment:
This should be its own commit.

I am not enthused about installing something that comes from a `.libs` directory into the package. Are there even headers for this?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (2 preceding siblings ...)
  2021-12-20 15:05 ` ericonr
@ 2021-12-20 15:05 ` ericonr
  2021-12-20 15:32 ` Aloz1
                   ` (21 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-20 15:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772438669

Comment:
Doing this like we do in `python3-pyside` is better. You can just build the library path yourself.

`		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"`

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (3 preceding siblings ...)
  2021-12-20 15:05 ` ericonr
@ 2021-12-20 15:32 ` Aloz1
  2021-12-20 15:33 ` Aloz1
                   ` (20 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 15:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

New review comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772460387

Comment:
Well, not even sure if this is the route I want to take. I'd much prefer upstream libbacktrace, but upstream doesn't do versioning (no tags, no releases, just a master branch on a git repo).

Yep, I know, but the gcc source doesn't install libbacktrace at all. This is inspired by how Debian handle libbacktrace. 

Yes, headers are available...sorry, my bad. Will include them.

Any thoughts regarding my request for feedback?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (4 preceding siblings ...)
  2021-12-20 15:32 ` Aloz1
@ 2021-12-20 15:33 ` Aloz1
  2021-12-20 15:44 ` [PR PATCH] [Updated] " Aloz1
                   ` (19 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 15:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772461750

Comment:
Ah neat. Thanks for that.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (5 preceding siblings ...)
  2021-12-20 15:33 ` Aloz1
@ 2021-12-20 15:44 ` Aloz1
  2021-12-20 15:44 ` [PR REVIEW] " Aloz1
                   ` (18 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 15:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

There is an updated pull request by Aloz1 against master on the void-packages repository

https://github.com/Aloz1/void-packages ghdl-enable-backtrace
https://github.com/void-linux/void-packages/pull/34626

[WIP]ghdl: add libbacktrace for llvm backend
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34626.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-enable-backtrace-34626.patch --]
[-- Type: text/x-diff, Size: 2496 bytes --]

From 9353565e84a0e65c2246e2c5790e9a9b14c63000 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Tue, 21 Dec 2021 01:28:34 +1100
Subject: [PATCH] ghdl: add libbacktrace for llvm backend

---
 srcpkgs/gcc/template  | 10 +++++++++-
 srcpkgs/ghdl/template | 12 +++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb2..15b920c76af2 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -7,7 +7,7 @@ pkgname=gcc
 # to get regression fixes not yet incorporate into a stable release
 # it should be possible to switch back to stable with 10.3 or 11
 version=10.2.1pre1
-revision=3
+revision=4
 _patchver="${version%pre*}"
 _minorver="${_patchver%.*}"
 _majorver="${_minorver%.*}"
@@ -353,6 +353,14 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
 		${DESTDIR}/usr/include/c++/${_patchver}
 
+	# Install libbacktrace. (it's not installed by makefiles)
+	vinstall libbacktrace/.libs/libbacktrace.a \
+		644 usr/lib/gcc/${_triplet}/${_minorver}
+	vinstall libbacktrace/backtrace-support.h \
+		644 usr/lib/gcc/${_triplet}/${_minorver}
+	vinstall ../libbacktrace/backtrace.h \
+		644 usr/lib/gcc/${_triplet}/${_minorver}
+
 	# cc symlink
 	ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
 	# rpcgen wants /lib/cpp, make a symlink
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..ef8864ee6708 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=1.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
@@ -51,7 +51,7 @@ fi
 
 if [ "$build_option_llvm" ]; then
 	subpackages+=" ghdl-llvm"
-	makedepends+=" llvm12"
+	makedepends+=" llvm12 libgcc-devel"
 fi
 
 do_configure() {
@@ -63,9 +63,15 @@ do_configure() {
 		cd ..
 	fi
 	if [ "$build_option_llvm" ]; then
+		# FIXME: This is a bit hacky. This should be replaced by the path within the gcc
+		# source tree for libbacktrace when building the gcc backend has been added.
+		local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+
 		mkdir -p build_llvm
 		cd build_llvm
-		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+		../configure --libdir=lib/ghdl/llvm \
+			--with-llvm-config \
+			--with-backtrace-lib="/usr/lib/gcc/${XBPS_CROSS_TRIPLET}/${gcc_ver}/libbacktrace.a" \
 			${configure_args}
 		cd ..
 	fi

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (6 preceding siblings ...)
  2021-12-20 15:44 ` [PR PATCH] [Updated] " Aloz1
@ 2021-12-20 15:44 ` Aloz1
  2021-12-21  3:37 ` ericonr
                   ` (17 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-20 15:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#discussion_r772470980

Comment:
Ah yep, fixed.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (7 preceding siblings ...)
  2021-12-20 15:44 ` [PR REVIEW] " Aloz1
@ 2021-12-21  3:37 ` ericonr
  2021-12-21  6:16 ` Aloz1
                   ` (16 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-21  3:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-998444282

Comment:
What does ghdl use libbacktrace for, specifically?

> Use ianlancetaylor/libbacktrace instead (they unfortunately don't seem to do any versioning at all).

I think using GCC's, since it's already there, is "reasonable". But it should be its own subpackage, the ugliness should be opt-in.

> Download gcc source and build libbacktrace from that (gcc source will eventually be needed anyway for building ghdl-gcc)

What does it need GCC for?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (8 preceding siblings ...)
  2021-12-21  3:37 ` ericonr
@ 2021-12-21  6:16 ` Aloz1
  2021-12-21 19:04 ` ericonr
                   ` (15 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-21  6:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-998504201

Comment:
> What does ghdl use libbacktrace for, specifically?

GHDL is a VHDL simulator (well, more like an ahead of time compiler nowadays). It links in libbacktrace to elaborated (compiled) VHDL designs. When an error or warning occurs, a backtrace is generated by the program. It actually only needs libbacktrace for the llvm backend (libbacktrace is already linked into libgcc).

> > Use ianlancetaylor/libbacktrace instead (they unfortunately don't seem to do any versioning at all).
> 
> I think using GCC's, since it's already there, is "reasonable". But it should be its own subpackage, the ugliness should be opt-in.

OK, cool. Makes total sense

> > Download gcc source and build libbacktrace from that (gcc source will eventually be needed anyway for building ghdl-gcc)
> 
> What does it need GCC for?

Because GHDL is essentially a compiler for VHDL, it generates machine code using one of 3 backends (mcode, llvm, or gcc).
In other words, GHDL is essentially a VHDL fronted for LLVM or GCC.

At the moment, only the LLVM and mcode variants of GHDL are being built. To build the GCC variant, it requires a source distribution of GCC (which, AFAIK, is the same as for any other custom language frontend for GCC).

So the rationale here is that, if we build ghdl-gcc, then llvm could use the libbacktrace that gets built as part of the gcc source distribution instead of packaging the one that gets built as part of the gcc package.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (9 preceding siblings ...)
  2021-12-21  6:16 ` Aloz1
@ 2021-12-21 19:04 ` ericonr
  2021-12-22  0:26 ` Aloz1
                   ` (14 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-21 19:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-999022929

Comment:
> When an error or warning occurs, a backtrace is generated by the program. It actually only needs libbacktrace for the llvm backend (libbacktrace is already linked into libgcc).

What isn't clear to me is: does the current version not work at all, or is it simply missing the generated backtraces?

> At the moment, only the LLVM and mcode variants of GHDL are being built. To build the GCC variant, it requires a source distribution of GCC (which, AFAIK, is the same as for any other custom language frontend for GCC).

Unless it provides specific functionality, I'd rather avoid that extra backend :P 

> So the rationale here is that, if we build ghdl-gcc, then llvm could use the libbacktrace that gets built as part of the gcc source distribution instead of packaging the one that gets built as part of the gcc package.

That sounds messy but workable, I suppose. This whole thing seems kinda wild tbh ;-;

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (10 preceding siblings ...)
  2021-12-21 19:04 ` ericonr
@ 2021-12-22  0:26 ` Aloz1
  2021-12-23  4:45 ` ericonr
                   ` (13 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-22  0:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-999186209

Comment:
> What isn't clear to me is: does the current version not work at all, or is it simply missing the generated backtraces?

Oh, the current llvm backend works fine, it just doesn't produce backtraces, which makes debugging VHDL code quite difficult.

> Unless it provides specific functionality, I'd rather avoid that extra backend :P

As far as I can tell, the only feature that ghdl-gcc offers that other backends do not is code coverage (which is done via gcov). After mulling over this for a bit, its unimportant enough that I think dealing with the ghdl-gcc mess can be done later if absolutely necessary. I'm just using ghdl for some personal VHDL projects, so don't need code coverage.

> That sounds messy but workable, I suppose. This whole thing seems kinda wild tbh ;-;

Yeah, the whole method of using gcc as an intermediary for generating binaries is a lot more of a dogs breakfast than with llvm.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (11 preceding siblings ...)
  2021-12-22  0:26 ` Aloz1
@ 2021-12-23  4:45 ` ericonr
  2021-12-23 12:47 ` [PR PATCH] [Updated] " Aloz1
                   ` (12 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-23  4:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000039911

Comment:
> Oh, the current llvm backend works fine, it just doesn't produce backtraces, which makes debugging VHDL code quite difficult.

Understandable. How stable of an interface is `libbacktrace` inside of GCC? I'm weary about creating this dependency.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (12 preceding siblings ...)
  2021-12-23  4:45 ` ericonr
@ 2021-12-23 12:47 ` Aloz1
  2021-12-23 12:52 ` Aloz1
                   ` (11 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 12:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

There is an updated pull request by Aloz1 against master on the void-packages repository

https://github.com/Aloz1/void-packages ghdl-enable-backtrace
https://github.com/void-linux/void-packages/pull/34626

[WIP]ghdl: add libbacktrace for llvm backend
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34626.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-enable-backtrace-34626.patch --]
[-- Type: text/x-diff, Size: 45083 bytes --]

From c95616b13648dbaf3759d0f8731ae6c5ee1c9eb6 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 22:59:22 +1100
Subject: [PATCH 1/2] gcc: add libbacktrace subpackage

---
 .../patches/fix-libbacktrace-install.patch    | 1043 +++++++++++++++++
 srcpkgs/gcc/template                          |   12 +-
 srcpkgs/libbacktrace-devel                    |    1 +
 3 files changed, 1054 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gcc/patches/fix-libbacktrace-install.patch
 create mode 120000 srcpkgs/libbacktrace-devel

diff --git a/srcpkgs/gcc/patches/fix-libbacktrace-install.patch b/srcpkgs/gcc/patches/fix-libbacktrace-install.patch
new file mode 100644
index 000000000000..3048678dc418
--- /dev/null
+++ b/srcpkgs/gcc/patches/fix-libbacktrace-install.patch
@@ -0,0 +1,1043 @@
+diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am
+index c73f6633a76..4c556271679 100644
+--- a/libbacktrace/Makefile.am
++++ b/libbacktrace/Makefile.am
+@@ -36,7 +36,9 @@ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+ 
+ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
+ 
+-noinst_LTLIBRARIES = libbacktrace.la
++include_HEADERS = backtrace.h backtrace-supported.h
++
++lib_LTLIBRARIES = libbacktrace.la
+ 
+ libbacktrace_la_SOURCES = \
+ 	backtrace.h \
+diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
+index 1178ac4cc23..64fbf6aa981 100644
+--- a/libbacktrace/Makefile.in
++++ b/libbacktrace/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.15.1 from Makefile.am.
++# Makefile.in generated by automake 1.16.5 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
++# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -45,6 +45,7 @@
+ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
++
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \
+@@ -165,7 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/cet.m4 \
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+-	$(am__configure_deps)
++	$(am__configure_deps) $(include_HEADERS)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+@@ -173,7 +174,61 @@ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = backtrace-supported.h \
+ 	install-debuginfo-for-buildid.sh
+ CONFIG_CLEAN_VPATH_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
++@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
++@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
++@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
++@NATIVE_TRUE@	test_xcoff_32$(EXEEXT) test_xcoff_64$(EXEEXT) \
++@NATIVE_TRUE@	test_pecoff$(EXEEXT) test_unknown$(EXEEXT) \
++@NATIVE_TRUE@	unittest$(EXEEXT) unittest_alloc$(EXEEXT) \
++@NATIVE_TRUE@	btest$(EXEEXT)
++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
++@NATIVE_TRUE@	stest_alloc$(EXEEXT)
++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
++@HAVE_ELF_TRUE@@NATIVE_TRUE@	ztest_alloc$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest_alloc$(EXEEXT)
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 =  \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg_alloc$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta_alloc$(EXEEXT)
++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@	dwarf5_alloc$(EXEEXT)
++am__EXEEXT_12 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
++	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
++	$(am__EXEEXT_10) $(am__EXEEXT_11)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
+ 	print.lo sort.lo state.lo
+@@ -204,32 +259,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS =  \
+ libbacktrace_noformat_la_OBJECTS =  \
+ 	$(am_libbacktrace_noformat_la_OBJECTS)
+ @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath =
+-@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
+-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
+-@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
+-@NATIVE_TRUE@	test_xcoff_32$(EXEEXT) test_xcoff_64$(EXEEXT) \
+-@NATIVE_TRUE@	test_pecoff$(EXEEXT) test_unknown$(EXEEXT) \
+-@NATIVE_TRUE@	unittest$(EXEEXT) unittest_alloc$(EXEEXT) \
+-@NATIVE_TRUE@	btest$(EXEEXT)
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
+-@NATIVE_TRUE@	stest_alloc$(EXEEXT)
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@	ztest_alloc$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
+-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
+-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest_alloc$(EXEEXT)
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 =  \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg_alloc$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta_alloc$(EXEEXT)
+-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
+-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@	dwarf5_alloc$(EXEEXT)
+-am__EXEEXT_12 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+-	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+-	$(am__EXEEXT_10) $(am__EXEEXT_11)
+ @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \
+ @NATIVE_TRUE@	allocfail-testlib.$(OBJEXT)
+ allocfail_OBJECTS = $(am_allocfail_OBJECTS)
+@@ -485,7 +514,7 @@ am__v_at_0 = @
+ am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp =
+-am__depfiles_maybe =
++am__maybe_remake_depfiles =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -527,8 +556,9 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+-	$(LISP)config.h.in
++HEADERS = $(include_HEADERS)
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
++	config.h.in
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates.  Input order is
+ # *not* preserved.
+@@ -545,9 +575,6 @@ am__define_uniq_tagged_files = \
+   unique=`for i in $$list; do \
+     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+   done | $(am__uniquify_input)`
+-ETAGS = etags
+-CTAGS = ctags
+-CSCOPE = cscope
+ AM_RECURSIVE_TARGETS = cscope check recheck
+ am__tty_colors_dummy = \
+   mgn= red= grn= lgn= blu= brg= std=; \
+@@ -571,33 +598,6 @@ am__tty_colors = { \
+     std='^[[m'; \
+   fi; \
+ }
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+-  test -z "$$files" \
+-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+-         $(am__cd) "$$dir" && rm -f $$files; }; \
+-  }
+ am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+ am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+ am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+@@ -731,6 +731,7 @@ am__set_TESTS_bases = \
+   bases='$(TEST_LOGS)'; \
+   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+   bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ TEST_SUITE_LOG = test-suite.log
+ TEST_EXTENSIONS = @EXEEXT@ .test
+@@ -771,6 +772,8 @@ CFLAGS = @CFLAGS@
+ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CSCOPE = @CSCOPE@
++CTAGS = @CTAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -780,6 +783,7 @@ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ETAGS = @ETAGS@
+ EXEEXT = @EXEEXT@
+ EXTRA_FLAGS = @EXTRA_FLAGS@
+ FGREP = @FGREP@
+@@ -887,7 +891,8 @@ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+ 	-I ../libgcc
+ 
+ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
+-noinst_LTLIBRARIES = libbacktrace.la
++include_HEADERS = backtrace.h backtrace-supported.h
++lib_LTLIBRARIES = libbacktrace.la
+ libbacktrace_la_SOURCES = \
+ 	backtrace.h \
+ 	atomic.c \
+@@ -1100,8 +1105,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	    echo ' $(SHELL) ./config.status'; \
+ 	    $(SHELL) ./config.status;; \
+ 	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+ 	esac;
+ $(top_srcdir)/../multilib.am $(am__empty):
+ 
+@@ -1133,6 +1138,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support
+ install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ 
++clean-checkPROGRAMS:
++	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
++	echo " rm -f" $$list; \
++	rm -f $$list || exit $$?; \
++	test -n "$(EXEEXT)" || exit 0; \
++	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++	echo " rm -f" $$list; \
++	rm -f $$list
++
+ clean-checkLTLIBRARIES:
+ 	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
+ 	@list='$(check_LTLIBRARIES)'; \
+@@ -1144,9 +1158,33 @@ clean-checkLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-clean-noinstLTLIBRARIES:
+-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-	@list='$(noinst_LTLIBRARIES)'; \
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++	list2=; for p in $$list; do \
++	  if test -f $$p; then \
++	    list2="$$list2 $$p"; \
++	  else :; fi; \
++	done; \
++	test -z "$$list2" || { \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
++	}
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++	for p in $$list; do \
++	  $(am__strip_dir) \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
++	done
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; \
+ 	locs=`for p in $$list; do echo $$p; done | \
+ 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ 	      sort -u`; \
+@@ -1156,7 +1194,7 @@ clean-noinstLTLIBRARIES:
+ 	}
+ 
+ libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(LINK)  $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
+ 
+ libbacktrace_alloc.la: $(libbacktrace_alloc_la_OBJECTS) $(libbacktrace_alloc_la_DEPENDENCIES) $(EXTRA_libbacktrace_alloc_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(LINK) $(am_libbacktrace_alloc_la_rpath) $(libbacktrace_alloc_la_OBJECTS) $(libbacktrace_alloc_la_LIBADD) $(LIBS)
+@@ -1170,15 +1208,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS
+ libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS)
+ 
+-clean-checkPROGRAMS:
+-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list || exit $$?; \
+-	test -n "$(EXEEXT)" || exit 0; \
+-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list
+-
+ allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES) 
+ 	@rm -f allocfail$(EXEEXT)
+ 	$(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS)
+@@ -1650,6 +1679,27 @@ clean-libtool:
+ 
+ distclean-libtool:
+ 	-rm -f libtool config.lt
++install-includeHEADERS: $(include_HEADERS)
++	@$(NORMAL_INSTALL)
++	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
++	if test -n "$$list"; then \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
++	fi; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
++	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
++	done
++
++uninstall-includeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
++	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+ 
+ ID: $(am__tagged_files)
+ 	$(am__define_uniq_tagged_files); mkid -fID $$unique
+@@ -1817,7 +1867,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+ 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+ 	fi;								\
+ 	echo "$${col}$$br$${std}"; 					\
+-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
++	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+ 	echo "$${col}$$br$${std}"; 					\
+ 	create_testsuite_report --maybe-color;				\
+ 	echo "$$col$$br$$std";						\
+@@ -1830,7 +1880,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+ 	fi;								\
+ 	$$success || exit 1
+ 
+-check-TESTS:
++check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+ 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+@@ -1840,7 +1890,7 @@ check-TESTS:
+ 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ 	exit $$?;
+-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS)
++recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ 	@set +e; $(am__set_TESTS_bases); \
+ 	bases=`for i in $$bases; do echo $$i; done \
+@@ -2083,11 +2133,18 @@ dwarf5_alloc.log: dwarf5_alloc$(EXEEXT)
+ @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ check-am: all-am
+-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
++	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) config.h all-local
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-local
++install-checkPROGRAMS: install-libLTLIBRARIES
++
++install-checkLTLIBRARIES: install-libLTLIBRARIES
++
+ installdirs:
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -2125,8 +2182,7 @@ maintainer-clean-generic:
+ clean: clean-am
+ 
+ clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+-	clean-libtool clean-local clean-noinstLTLIBRARIES \
+-	mostlyclean-am
++	clean-libLTLIBRARIES clean-libtool clean-local mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+@@ -2146,13 +2202,13 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am:
++install-data-am: install-includeHEADERS
+ 
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am: install-exec-local install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
+@@ -2194,26 +2250,29 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am:
++uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+ 
+ .MAKE: all check-am install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
+ 	check-TESTS check-am clean clean-checkLTLIBRARIES \
+-	clean-checkPROGRAMS clean-cscope clean-generic clean-libtool \
+-	clean-local clean-noinstLTLIBRARIES cscope cscopelist-am ctags \
+-	ctags-am distclean distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-local distclean-tags \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-dvi install-dvi-am \
+-	install-exec install-exec-am install-exec-local install-html \
+-	install-html-am install-info install-info-am install-man \
+-	install-pdf install-pdf-am install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-local mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
++	clean-checkPROGRAMS clean-cscope clean-generic \
++	clean-libLTLIBRARIES clean-libtool clean-local cscope \
++	cscopelist-am ctags ctags-am distclean distclean-compile \
++	distclean-generic distclean-hdr distclean-libtool \
++	distclean-local distclean-tags dvi dvi-am html html-am info \
++	info-am install install-am install-data install-data-am \
++	install-dvi install-dvi-am install-exec install-exec-am \
++	install-exec-local install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic maintainer-clean-local mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
++	uninstall uninstall-am uninstall-includeHEADERS \
++	uninstall-libLTLIBRARIES
+ 
+ .PRECIOUS: Makefile
+ 
+diff --git a/libbacktrace/aclocal.m4 b/libbacktrace/aclocal.m4
+index 528e6173930..d88a5ec84f2 100644
+--- a/libbacktrace/aclocal.m4
++++ b/libbacktrace/aclocal.m4
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ 
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+ 
+-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
++# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.15'
++[am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.15.1], [],
++m4_if([$1], [1.16.5], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.15.1])dnl
++[AM_AUTOMAKE_VERSION([1.16.5])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -143,7 +143,7 @@ fi])])
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -171,6 +171,10 @@ m4_defn([AC_PROG_CC])
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+ [AC_PREREQ([2.65])dnl
++m4_ifdef([_$0_ALREADY_INIT],
++  [m4_fatal([$0 expanded multiple times
++]m4_defn([_$0_ALREADY_INIT]))],
++  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+@@ -207,7 +211,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+ m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+   [ok:ok],,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+@@ -230,8 +234,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # For better backward compatibility.  To be removed once Automake 1.9.x
+ # dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+ # We need awk for the "check" target (and possibly the TAP driver).  The
+ # system "awk" is bad on some platforms.
+@@ -259,6 +263,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ 		  [m4_define([AC_PROG_OBJCXX],
+ 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+ ])
++# Variables for tags utilities; see am/tags.am
++if test -z "$CTAGS"; then
++  CTAGS=ctags
++fi
++AC_SUBST([CTAGS])
++if test -z "$ETAGS"; then
++  ETAGS=etags
++fi
++AC_SUBST([ETAGS])
++if test -z "$CSCOPE"; then
++  CSCOPE=cscope
++fi
++AC_SUBST([CSCOPE])
++
+ AC_REQUIRE([AM_SILENT_RULES])dnl
+ dnl The testsuite driver may need to know about EXEEXT, so add the
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+@@ -298,7 +316,7 @@ END
+ Aborting the configuration process, to ensure you take notice of the issue.
+ 
+ You can download and install GNU coreutils to get an 'rm' implementation
+-that behaves properly: <http://www.gnu.org/software/coreutils/>.
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
+ 
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+@@ -340,7 +358,7 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -364,7 +382,7 @@ AC_SUBST([install_sh])])
+ # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+ # From Jim Meyering
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -399,7 +417,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ 
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -420,12 +438,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
++  MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -438,7 +451,7 @@ fi
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -467,7 +480,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
++# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -514,7 +527,7 @@ AC_LANG_POP([C])])
+ # For backward compatibility.
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -533,7 +546,7 @@ AC_DEFUN([AM_RUN_LOG],
+ 
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -614,7 +627,7 @@ AC_CONFIG_COMMANDS_PRE(
+ rm -f conftest.file
+ ])
+ 
+-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
++# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -674,7 +687,7 @@ AC_SUBST([AM_BACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+ ])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -702,7 +715,7 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
++# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -721,7 +734,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
++# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+diff --git a/libbacktrace/configure b/libbacktrace/configure
+index 28b9593342a..99a16352ea2 100755
+--- a/libbacktrace/configure
++++ b/libbacktrace/configure
+@@ -688,6 +688,9 @@ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V
+ AM_V
++CSCOPE
++ETAGS
++CTAGS
+ am__untar
+ am__tar
+ AMTAR
+@@ -777,11 +780,11 @@ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+ enable_multilib
++enable_shared
++enable_static
+ enable_silent_rules
+ enable_maintainer_mode
+ with_target_subdir
+-enable_shared
+-enable_static
+ with_pic
+ enable_fast_install
+ with_gnu_ld
+@@ -1421,13 +1424,13 @@ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --enable-multilib       build many library versions (default)
++  --enable-shared[=PKGS]  build shared libraries [default=no]
++  --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-silent-rules   less verbose build output (undo: "make V=1")
+   --disable-silent-rules  verbose build output (undo: "make V=0")
+   --enable-maintainer-mode
+                           enable make rules and dependencies not useful (and
+                           sometimes confusing) to the casual installer
+-  --enable-shared[=PKGS]  build shared libraries [default=yes]
+-  --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+@@ -4017,6 +4020,74 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ 
+ 
+ 
++# Force disable shared library builds
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++  enableval=$enable_shared; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_shared=no
++fi
++
++
++
++
++
++
++
++
++
++enable_shared=no
++
++# Force enable static library builds
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then :
++  enableval=$enable_static; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_static=yes
++fi
++
++
++
++
++
++
++
++
++
++enable_static=yes
++
+ libtool_VERSION=1:0:0
+ 
+ 
+@@ -4029,7 +4100,7 @@ libtool_VERSION=1:0:0
+ # -Wall: Issue all automake warnings.
+ # -Wno-portability: Don't warn about constructs supported by GNU make.
+ #    (because GCC requires GNU make anyhow).
+-am__api_version='1.15'
++am__api_version='1.16'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -4202,12 +4273,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+ 
+ if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
++  MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -4533,8 +4599,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+ # For better backward compatibility.  To be removed once Automake 1.9.x
+ # dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
+ 
+ # We need awk for the "check" target (and possibly the TAP driver).  The
+@@ -4553,6 +4619,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
++# Variables for tags utilities; see am/tags.am
++if test -z "$CTAGS"; then
++  CTAGS=ctags
++fi
++
++if test -z "$ETAGS"; then
++  ETAGS=etags
++fi
++
++if test -z "$CSCOPE"; then
++  CSCOPE=cscope
++fi
++
++
+ 
+ # POSIX will say in a future version that running "rm -f" with no argument
+ # is OK; and we want to be able to make that assumption in our Makefile
+@@ -4585,7 +4665,7 @@ END
+ Aborting the configuration process, to ensure you take notice of the issue.
+ 
+ You can download and install GNU coreutils to get an 'rm' implementation
+-that behaves properly: <http://www.gnu.org/software/coreutils/>.
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
+ 
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+@@ -8030,66 +8110,6 @@ done
+   enable_win32_dll=no
+ 
+ 
+-            # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then :
+-  enableval=$enable_shared; p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_shared=yes
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-  # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then :
+-  enableval=$enable_static; p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_static=yes
+-fi
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+ 
+@@ -11499,7 +11519,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11502 "configure"
++#line 11522 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11605,7 +11625,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11608 "configure"
++#line 11628 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14330,10 +14350,10 @@ GDC="$GDC"
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+@@ -15277,16 +15297,16 @@ available_tags=""
+ 
+ # ### BEGIN LIBTOOL CONFIG
+ 
+-# Which release of libtool.m4 was used?
+-macro_version=$macro_version
+-macro_revision=$macro_revision
+-
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+ 
+ # Whether or not to build static libraries.
+ build_old_libs=$enable_static
+ 
++# Which release of libtool.m4 was used?
++macro_version=$macro_version
++macro_revision=$macro_revision
++
+ # What type of objects to build.
+ pic_mode=$pic_mode
+ 
+diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac
+index afdd30774d0..8757dfeb1eb 100644
+--- a/libbacktrace/configure.ac
++++ b/libbacktrace/configure.ac
+@@ -42,6 +42,14 @@ target_alias=${target_alias-$host_alias}
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ 
++# Force disable shared library builds
++AC_DISABLE_SHARED
++enable_shared=no
++
++# Force enable static library builds
++AC_ENABLE_STATIC
++enable_static=yes
++
+ libtool_VERSION=1:0:0
+ AC_SUBST(libtool_VERSION)
+ 
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb2..483be0f3d6f9 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -7,7 +7,7 @@ pkgname=gcc
 # to get regression fixes not yet incorporate into a stable release
 # it should be possible to switch back to stable with 10.3 or 11
 version=10.2.1pre1
-revision=3
+revision=4
 _patchver="${version%pre*}"
 _minorver="${_patchver%.*}"
 _majorver="${_minorver%.*}"
@@ -58,7 +58,7 @@ depends="binutils libgcc-devel-${version}_${revision}
  libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
 checkdepends="dejagnu"
 
-subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
+subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel libbacktrace-devel"
 subpackages+=" libssp libssp-devel"
 
 build_options="ada gnatboot"
@@ -721,3 +721,11 @@ libstdc++_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
+libbacktrace-devel_package() {
+	short_desc+=" - Backtrace generation library - development files"
+	pkg_install() {
+		vmove "usr/lib/libbacktrace.a"
+		vmove usr/include/backtrace*.h
+	}
+}
diff --git a/srcpkgs/libbacktrace-devel b/srcpkgs/libbacktrace-devel
new file mode 120000
index 000000000000..b08d5af5795c
--- /dev/null
+++ b/srcpkgs/libbacktrace-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file

From 7fa56cce7d626f797be355f3f339c830be87c0c2 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 23:42:28 +1100
Subject: [PATCH 2/2] ghdl: use libbacktrace in llvm backend

---
 srcpkgs/ghdl/patches/ln-libbacktrace.patch | 13 +++++++++++++
 srcpkgs/ghdl/template                      |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ghdl/patches/ln-libbacktrace.patch

diff --git a/srcpkgs/ghdl/patches/ln-libbacktrace.patch b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
new file mode 100644
index 000000000000..fcc8a876f273
--- /dev/null
+++ b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index d8015791..3722901d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -497,7 +497,7 @@ install.grt: \
+ 	$(INSTALL_DATA) $(libdirsuffix)/grt-shared.lst $(DESTDIR)$(VHDL_LIB_DIR)/grt-shared.lst
+ 	$(INSTALL_DATA) $(GRTSRCDIR)/grt.ver $(DESTDIR)$(VHDL_LIB_DIR)/grt.ver
+ 	test "x$(LIBBACKTRACE)" = x || test "x$(backend)" = xgcc || \
+-	  $(INSTALL_DATA) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
++	  $(LN) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
+ 
+ uninstall.grt:
+ 	$(RM) $(DESTDIR)$(VHDL_LIB_DIR)/libgrt.a
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..99c8f403bc99 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=1.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
@@ -51,7 +51,8 @@ fi
 
 if [ "$build_option_llvm" ]; then
 	subpackages+=" ghdl-llvm"
-	makedepends+=" llvm12"
+	makedepends+=" llvm12 libbacktrace-devel"
+	depends+=" libbacktrace-devel"
 fi
 
 do_configure() {
@@ -65,7 +66,9 @@ do_configure() {
 	if [ "$build_option_llvm" ]; then
 		mkdir -p build_llvm
 		cd build_llvm
-		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+		../configure --libdir=lib/ghdl/llvm \
+			--with-llvm-config \
+			--with-backtrace-lib="/usr/lib/libbacktrace.a" \
 			${configure_args}
 		cd ..
 	fi

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (13 preceding siblings ...)
  2021-12-23 12:47 ` [PR PATCH] [Updated] " Aloz1
@ 2021-12-23 12:52 ` Aloz1
  2021-12-23 12:57 ` Aloz1
                   ` (10 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 12:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

There is an updated pull request by Aloz1 against master on the void-packages repository

https://github.com/Aloz1/void-packages ghdl-enable-backtrace
https://github.com/void-linux/void-packages/pull/34626

[WIP]ghdl: add libbacktrace for llvm backend
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34626.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-enable-backtrace-34626.patch --]
[-- Type: text/x-diff, Size: 45255 bytes --]

From c95616b13648dbaf3759d0f8731ae6c5ee1c9eb6 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 22:59:22 +1100
Subject: [PATCH 1/2] gcc: add libbacktrace subpackage

---
 .../patches/fix-libbacktrace-install.patch    | 1043 +++++++++++++++++
 srcpkgs/gcc/template                          |   12 +-
 srcpkgs/libbacktrace-devel                    |    1 +
 3 files changed, 1054 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gcc/patches/fix-libbacktrace-install.patch
 create mode 120000 srcpkgs/libbacktrace-devel

diff --git a/srcpkgs/gcc/patches/fix-libbacktrace-install.patch b/srcpkgs/gcc/patches/fix-libbacktrace-install.patch
new file mode 100644
index 000000000000..3048678dc418
--- /dev/null
+++ b/srcpkgs/gcc/patches/fix-libbacktrace-install.patch
@@ -0,0 +1,1043 @@
+diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am
+index c73f6633a76..4c556271679 100644
+--- a/libbacktrace/Makefile.am
++++ b/libbacktrace/Makefile.am
+@@ -36,7 +36,9 @@ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+ 
+ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
+ 
+-noinst_LTLIBRARIES = libbacktrace.la
++include_HEADERS = backtrace.h backtrace-supported.h
++
++lib_LTLIBRARIES = libbacktrace.la
+ 
+ libbacktrace_la_SOURCES = \
+ 	backtrace.h \
+diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
+index 1178ac4cc23..64fbf6aa981 100644
+--- a/libbacktrace/Makefile.in
++++ b/libbacktrace/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.15.1 from Makefile.am.
++# Makefile.in generated by automake 1.16.5 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
++# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -45,6 +45,7 @@
+ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
++
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \
+@@ -165,7 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/cet.m4 \
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+-	$(am__configure_deps)
++	$(am__configure_deps) $(include_HEADERS)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+@@ -173,7 +174,61 @@ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = backtrace-supported.h \
+ 	install-debuginfo-for-buildid.sh
+ CONFIG_CLEAN_VPATH_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
++@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
++@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
++@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
++@NATIVE_TRUE@	test_xcoff_32$(EXEEXT) test_xcoff_64$(EXEEXT) \
++@NATIVE_TRUE@	test_pecoff$(EXEEXT) test_unknown$(EXEEXT) \
++@NATIVE_TRUE@	unittest$(EXEEXT) unittest_alloc$(EXEEXT) \
++@NATIVE_TRUE@	btest$(EXEEXT)
++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
++@NATIVE_TRUE@	stest_alloc$(EXEEXT)
++@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
++@HAVE_ELF_TRUE@@NATIVE_TRUE@	ztest_alloc$(EXEEXT)
++@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
++@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest_alloc$(EXEEXT)
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 =  \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg_alloc$(EXEEXT) \
++@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta_alloc$(EXEEXT)
++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
++@HAVE_DWARF5_TRUE@@NATIVE_TRUE@	dwarf5_alloc$(EXEEXT)
++am__EXEEXT_12 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
++	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
++	$(am__EXEEXT_10) $(am__EXEEXT_11)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ am_libbacktrace_la_OBJECTS = atomic.lo dwarf.lo fileline.lo posix.lo \
+ 	print.lo sort.lo state.lo
+@@ -204,32 +259,6 @@ libbacktrace_instrumented_alloc_la_OBJECTS =  \
+ libbacktrace_noformat_la_OBJECTS =  \
+ 	$(am_libbacktrace_noformat_la_OBJECTS)
+ @NATIVE_TRUE@am_libbacktrace_noformat_la_rpath =
+-@NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT)
+-@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT)
+-@HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \
+-@NATIVE_TRUE@	test_xcoff_32$(EXEEXT) test_xcoff_64$(EXEEXT) \
+-@NATIVE_TRUE@	test_pecoff$(EXEEXT) test_unknown$(EXEEXT) \
+-@NATIVE_TRUE@	unittest$(EXEEXT) unittest_alloc$(EXEEXT) \
+-@NATIVE_TRUE@	btest$(EXEEXT)
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \
+-@NATIVE_TRUE@	stest_alloc$(EXEEXT)
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_7 = ztest$(EXEEXT) \
+-@HAVE_ELF_TRUE@@NATIVE_TRUE@	ztest_alloc$(EXEEXT)
+-@NATIVE_TRUE@am__EXEEXT_8 = edtest$(EXEEXT) edtest_alloc$(EXEEXT)
+-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@am__EXEEXT_9 = ttest$(EXEEXT) \
+-@HAVE_PTHREAD_TRUE@@NATIVE_TRUE@	ttest_alloc$(EXEEXT)
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@am__EXEEXT_10 =  \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctestg_alloc$(EXEEXT) \
+-@HAVE_COMPRESSED_DEBUG_TRUE@@NATIVE_TRUE@	ctesta_alloc$(EXEEXT)
+-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@am__EXEEXT_11 = dwarf5$(EXEEXT) \
+-@HAVE_DWARF5_TRUE@@NATIVE_TRUE@	dwarf5_alloc$(EXEEXT)
+-am__EXEEXT_12 = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+-	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+-	$(am__EXEEXT_10) $(am__EXEEXT_11)
+ @NATIVE_TRUE@am_allocfail_OBJECTS = allocfail-allocfail.$(OBJEXT) \
+ @NATIVE_TRUE@	allocfail-testlib.$(OBJEXT)
+ allocfail_OBJECTS = $(am_allocfail_OBJECTS)
+@@ -485,7 +514,7 @@ am__v_at_0 = @
+ am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp =
+-am__depfiles_maybe =
++am__maybe_remake_depfiles =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -527,8 +556,9 @@ am__can_run_installinfo = \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+-	$(LISP)config.h.in
++HEADERS = $(include_HEADERS)
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
++	config.h.in
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates.  Input order is
+ # *not* preserved.
+@@ -545,9 +575,6 @@ am__define_uniq_tagged_files = \
+   unique=`for i in $$list; do \
+     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+   done | $(am__uniquify_input)`
+-ETAGS = etags
+-CTAGS = ctags
+-CSCOPE = cscope
+ AM_RECURSIVE_TARGETS = cscope check recheck
+ am__tty_colors_dummy = \
+   mgn= red= grn= lgn= blu= brg= std=; \
+@@ -571,33 +598,6 @@ am__tty_colors = { \
+     std='^[[m'; \
+   fi; \
+ }
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+-  test -z "$$files" \
+-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+-         $(am__cd) "$$dir" && rm -f $$files; }; \
+-  }
+ am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+ am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+ am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+@@ -731,6 +731,7 @@ am__set_TESTS_bases = \
+   bases='$(TEST_LOGS)'; \
+   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+   bases=`echo $$bases`
++AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
+ RECHECK_LOGS = $(TEST_LOGS)
+ TEST_SUITE_LOG = test-suite.log
+ TEST_EXTENSIONS = @EXEEXT@ .test
+@@ -771,6 +772,8 @@ CFLAGS = @CFLAGS@
+ CLOCK_GETTIME_LINK = @CLOCK_GETTIME_LINK@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CSCOPE = @CSCOPE@
++CTAGS = @CTAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -780,6 +783,7 @@ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ETAGS = @ETAGS@
+ EXEEXT = @EXEEXT@
+ EXTRA_FLAGS = @EXTRA_FLAGS@
+ FGREP = @FGREP@
+@@ -887,7 +891,8 @@ AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \
+ 	-I ../libgcc
+ 
+ AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG)
+-noinst_LTLIBRARIES = libbacktrace.la
++include_HEADERS = backtrace.h backtrace-supported.h
++lib_LTLIBRARIES = libbacktrace.la
+ libbacktrace_la_SOURCES = \
+ 	backtrace.h \
+ 	atomic.c \
+@@ -1100,8 +1105,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	    echo ' $(SHELL) ./config.status'; \
+ 	    $(SHELL) ./config.status;; \
+ 	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+ 	esac;
+ $(top_srcdir)/../multilib.am $(am__empty):
+ 
+@@ -1133,6 +1138,15 @@ backtrace-supported.h: $(top_builddir)/config.status $(srcdir)/backtrace-support
+ install-debuginfo-for-buildid.sh: $(top_builddir)/config.status $(srcdir)/install-debuginfo-for-buildid.sh.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ 
++clean-checkPROGRAMS:
++	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
++	echo " rm -f" $$list; \
++	rm -f $$list || exit $$?; \
++	test -n "$(EXEEXT)" || exit 0; \
++	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++	echo " rm -f" $$list; \
++	rm -f $$list
++
+ clean-checkLTLIBRARIES:
+ 	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
+ 	@list='$(check_LTLIBRARIES)'; \
+@@ -1144,9 +1158,33 @@ clean-checkLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-clean-noinstLTLIBRARIES:
+-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-	@list='$(noinst_LTLIBRARIES)'; \
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++	list2=; for p in $$list; do \
++	  if test -f $$p; then \
++	    list2="$$list2 $$p"; \
++	  else :; fi; \
++	done; \
++	test -z "$$list2" || { \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
++	}
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
++	for p in $$list; do \
++	  $(am__strip_dir) \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
++	done
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; \
+ 	locs=`for p in $$list; do echo $$p; done | \
+ 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ 	      sort -u`; \
+@@ -1156,7 +1194,7 @@ clean-noinstLTLIBRARIES:
+ 	}
+ 
+ libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(LINK)  $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)
+ 
+ libbacktrace_alloc.la: $(libbacktrace_alloc_la_OBJECTS) $(libbacktrace_alloc_la_DEPENDENCIES) $(EXTRA_libbacktrace_alloc_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(LINK) $(am_libbacktrace_alloc_la_rpath) $(libbacktrace_alloc_la_OBJECTS) $(libbacktrace_alloc_la_LIBADD) $(LIBS)
+@@ -1170,15 +1208,6 @@ libbacktrace_instrumented_alloc.la: $(libbacktrace_instrumented_alloc_la_OBJECTS
+ libbacktrace_noformat.la: $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_DEPENDENCIES) $(EXTRA_libbacktrace_noformat_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(LINK) $(am_libbacktrace_noformat_la_rpath) $(libbacktrace_noformat_la_OBJECTS) $(libbacktrace_noformat_la_LIBADD) $(LIBS)
+ 
+-clean-checkPROGRAMS:
+-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list || exit $$?; \
+-	test -n "$(EXEEXT)" || exit 0; \
+-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list
+-
+ allocfail$(EXEEXT): $(allocfail_OBJECTS) $(allocfail_DEPENDENCIES) $(EXTRA_allocfail_DEPENDENCIES) 
+ 	@rm -f allocfail$(EXEEXT)
+ 	$(AM_V_CCLD)$(allocfail_LINK) $(allocfail_OBJECTS) $(allocfail_LDADD) $(LIBS)
+@@ -1650,6 +1679,27 @@ clean-libtool:
+ 
+ distclean-libtool:
+ 	-rm -f libtool config.lt
++install-includeHEADERS: $(include_HEADERS)
++	@$(NORMAL_INSTALL)
++	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
++	if test -n "$$list"; then \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
++	fi; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
++	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
++	done
++
++uninstall-includeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
++	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+ 
+ ID: $(am__tagged_files)
+ 	$(am__define_uniq_tagged_files); mkid -fID $$unique
+@@ -1817,7 +1867,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+ 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+ 	fi;								\
+ 	echo "$${col}$$br$${std}"; 					\
+-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
++	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+ 	echo "$${col}$$br$${std}"; 					\
+ 	create_testsuite_report --maybe-color;				\
+ 	echo "$$col$$br$$std";						\
+@@ -1830,7 +1880,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
+ 	fi;								\
+ 	$$success || exit 1
+ 
+-check-TESTS:
++check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+ 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+@@ -1840,7 +1890,7 @@ check-TESTS:
+ 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ 	exit $$?;
+-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS)
++recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ 	@set +e; $(am__set_TESTS_bases); \
+ 	bases=`for i in $$bases; do echo $$i; done \
+@@ -2083,11 +2133,18 @@ dwarf5_alloc.log: dwarf5_alloc$(EXEEXT)
+ @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ check-am: all-am
+-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
++	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) config.h all-local
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-local
++install-checkPROGRAMS: install-libLTLIBRARIES
++
++install-checkLTLIBRARIES: install-libLTLIBRARIES
++
+ installdirs:
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++	done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -2125,8 +2182,7 @@ maintainer-clean-generic:
+ clean: clean-am
+ 
+ clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+-	clean-libtool clean-local clean-noinstLTLIBRARIES \
+-	mostlyclean-am
++	clean-libLTLIBRARIES clean-libtool clean-local mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+@@ -2146,13 +2202,13 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am:
++install-data-am: install-includeHEADERS
+ 
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am: install-exec-local install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
+@@ -2194,26 +2250,29 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am:
++uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+ 
+ .MAKE: all check-am install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
+ 	check-TESTS check-am clean clean-checkLTLIBRARIES \
+-	clean-checkPROGRAMS clean-cscope clean-generic clean-libtool \
+-	clean-local clean-noinstLTLIBRARIES cscope cscopelist-am ctags \
+-	ctags-am distclean distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-local distclean-tags \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-dvi install-dvi-am \
+-	install-exec install-exec-am install-exec-local install-html \
+-	install-html-am install-info install-info-am install-man \
+-	install-pdf install-pdf-am install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-local mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+-	pdf-am ps ps-am recheck tags tags-am uninstall uninstall-am
++	clean-checkPROGRAMS clean-cscope clean-generic \
++	clean-libLTLIBRARIES clean-libtool clean-local cscope \
++	cscopelist-am ctags ctags-am distclean distclean-compile \
++	distclean-generic distclean-hdr distclean-libtool \
++	distclean-local distclean-tags dvi dvi-am html html-am info \
++	info-am install install-am install-data install-data-am \
++	install-dvi install-dvi-am install-exec install-exec-am \
++	install-exec-local install-html install-html-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic maintainer-clean-local mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-local pdf pdf-am ps ps-am recheck tags tags-am \
++	uninstall uninstall-am uninstall-includeHEADERS \
++	uninstall-libLTLIBRARIES
+ 
+ .PRECIOUS: Makefile
+ 
+diff --git a/libbacktrace/aclocal.m4 b/libbacktrace/aclocal.m4
+index 528e6173930..d88a5ec84f2 100644
+--- a/libbacktrace/aclocal.m4
++++ b/libbacktrace/aclocal.m4
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ 
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+ 
+-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
++# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.15'
++[am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.15.1], [],
++m4_if([$1], [1.16.5], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.15.1])dnl
++[AM_AUTOMAKE_VERSION([1.16.5])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -143,7 +143,7 @@ fi])])
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -171,6 +171,10 @@ m4_defn([AC_PROG_CC])
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+ [AC_PREREQ([2.65])dnl
++m4_ifdef([_$0_ALREADY_INIT],
++  [m4_fatal([$0 expanded multiple times
++]m4_defn([_$0_ALREADY_INIT]))],
++  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+@@ -207,7 +211,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+ m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+   [ok:ok],,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+@@ -230,8 +234,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # For better backward compatibility.  To be removed once Automake 1.9.x
+ # dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+ # We need awk for the "check" target (and possibly the TAP driver).  The
+ # system "awk" is bad on some platforms.
+@@ -259,6 +263,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ 		  [m4_define([AC_PROG_OBJCXX],
+ 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+ ])
++# Variables for tags utilities; see am/tags.am
++if test -z "$CTAGS"; then
++  CTAGS=ctags
++fi
++AC_SUBST([CTAGS])
++if test -z "$ETAGS"; then
++  ETAGS=etags
++fi
++AC_SUBST([ETAGS])
++if test -z "$CSCOPE"; then
++  CSCOPE=cscope
++fi
++AC_SUBST([CSCOPE])
++
+ AC_REQUIRE([AM_SILENT_RULES])dnl
+ dnl The testsuite driver may need to know about EXEEXT, so add the
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+@@ -298,7 +316,7 @@ END
+ Aborting the configuration process, to ensure you take notice of the issue.
+ 
+ You can download and install GNU coreutils to get an 'rm' implementation
+-that behaves properly: <http://www.gnu.org/software/coreutils/>.
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
+ 
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+@@ -340,7 +358,7 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -364,7 +382,7 @@ AC_SUBST([install_sh])])
+ # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+ # From Jim Meyering
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -399,7 +417,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ 
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -420,12 +438,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
++  MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -438,7 +451,7 @@ fi
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -467,7 +480,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
++# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -514,7 +527,7 @@ AC_LANG_POP([C])])
+ # For backward compatibility.
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -533,7 +546,7 @@ AC_DEFUN([AM_RUN_LOG],
+ 
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -614,7 +627,7 @@ AC_CONFIG_COMMANDS_PRE(
+ rm -f conftest.file
+ ])
+ 
+-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
++# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -674,7 +687,7 @@ AC_SUBST([AM_BACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+ ])
+ 
+-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -702,7 +715,7 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
++# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -721,7 +734,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
++# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+diff --git a/libbacktrace/configure b/libbacktrace/configure
+index 28b9593342a..99a16352ea2 100755
+--- a/libbacktrace/configure
++++ b/libbacktrace/configure
+@@ -688,6 +688,9 @@ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V
+ AM_V
++CSCOPE
++ETAGS
++CTAGS
+ am__untar
+ am__tar
+ AMTAR
+@@ -777,11 +780,11 @@ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+ enable_multilib
++enable_shared
++enable_static
+ enable_silent_rules
+ enable_maintainer_mode
+ with_target_subdir
+-enable_shared
+-enable_static
+ with_pic
+ enable_fast_install
+ with_gnu_ld
+@@ -1421,13 +1424,13 @@ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --enable-multilib       build many library versions (default)
++  --enable-shared[=PKGS]  build shared libraries [default=no]
++  --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-silent-rules   less verbose build output (undo: "make V=1")
+   --disable-silent-rules  verbose build output (undo: "make V=0")
+   --enable-maintainer-mode
+                           enable make rules and dependencies not useful (and
+                           sometimes confusing) to the casual installer
+-  --enable-shared[=PKGS]  build shared libraries [default=yes]
+-  --enable-static[=PKGS]  build static libraries [default=yes]
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+@@ -4017,6 +4020,74 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ 
+ 
+ 
++# Force disable shared library builds
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++  enableval=$enable_shared; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_shared=no
++fi
++
++
++
++
++
++
++
++
++
++enable_shared=no
++
++# Force enable static library builds
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then :
++  enableval=$enable_static; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_static=yes
++fi
++
++
++
++
++
++
++
++
++
++enable_static=yes
++
+ libtool_VERSION=1:0:0
+ 
+ 
+@@ -4029,7 +4100,7 @@ libtool_VERSION=1:0:0
+ # -Wall: Issue all automake warnings.
+ # -Wno-portability: Don't warn about constructs supported by GNU make.
+ #    (because GCC requires GNU make anyhow).
+-am__api_version='1.15'
++am__api_version='1.16'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -4202,12 +4273,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+ 
+ if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
++  MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -4533,8 +4599,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+ # For better backward compatibility.  To be removed once Automake 1.9.x
+ # dies out for good.  For more background, see:
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
+ 
+ # We need awk for the "check" target (and possibly the TAP driver).  The
+@@ -4553,6 +4619,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
++# Variables for tags utilities; see am/tags.am
++if test -z "$CTAGS"; then
++  CTAGS=ctags
++fi
++
++if test -z "$ETAGS"; then
++  ETAGS=etags
++fi
++
++if test -z "$CSCOPE"; then
++  CSCOPE=cscope
++fi
++
++
+ 
+ # POSIX will say in a future version that running "rm -f" with no argument
+ # is OK; and we want to be able to make that assumption in our Makefile
+@@ -4585,7 +4665,7 @@ END
+ Aborting the configuration process, to ensure you take notice of the issue.
+ 
+ You can download and install GNU coreutils to get an 'rm' implementation
+-that behaves properly: <http://www.gnu.org/software/coreutils/>.
++that behaves properly: <https://www.gnu.org/software/coreutils/>.
+ 
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+@@ -8030,66 +8110,6 @@ done
+   enable_win32_dll=no
+ 
+ 
+-            # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then :
+-  enableval=$enable_shared; p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_shared=yes
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-  # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then :
+-  enableval=$enable_static; p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_static=yes
+-fi
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
+ 
+@@ -11499,7 +11519,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11502 "configure"
++#line 11522 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11605,7 +11625,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11608 "configure"
++#line 11628 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14330,10 +14350,10 @@ GDC="$GDC"
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+@@ -15277,16 +15297,16 @@ available_tags=""
+ 
+ # ### BEGIN LIBTOOL CONFIG
+ 
+-# Which release of libtool.m4 was used?
+-macro_version=$macro_version
+-macro_revision=$macro_revision
+-
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+ 
+ # Whether or not to build static libraries.
+ build_old_libs=$enable_static
+ 
++# Which release of libtool.m4 was used?
++macro_version=$macro_version
++macro_revision=$macro_revision
++
+ # What type of objects to build.
+ pic_mode=$pic_mode
+ 
+diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac
+index afdd30774d0..8757dfeb1eb 100644
+--- a/libbacktrace/configure.ac
++++ b/libbacktrace/configure.ac
+@@ -42,6 +42,14 @@ target_alias=${target_alias-$host_alias}
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ 
++# Force disable shared library builds
++AC_DISABLE_SHARED
++enable_shared=no
++
++# Force enable static library builds
++AC_ENABLE_STATIC
++enable_static=yes
++
+ libtool_VERSION=1:0:0
+ AC_SUBST(libtool_VERSION)
+ 
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb2..483be0f3d6f9 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -7,7 +7,7 @@ pkgname=gcc
 # to get regression fixes not yet incorporate into a stable release
 # it should be possible to switch back to stable with 10.3 or 11
 version=10.2.1pre1
-revision=3
+revision=4
 _patchver="${version%pre*}"
 _minorver="${_patchver%.*}"
 _majorver="${_minorver%.*}"
@@ -58,7 +58,7 @@ depends="binutils libgcc-devel-${version}_${revision}
  libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
 checkdepends="dejagnu"
 
-subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
+subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel libbacktrace-devel"
 subpackages+=" libssp libssp-devel"
 
 build_options="ada gnatboot"
@@ -721,3 +721,11 @@ libstdc++_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
+libbacktrace-devel_package() {
+	short_desc+=" - Backtrace generation library - development files"
+	pkg_install() {
+		vmove "usr/lib/libbacktrace.a"
+		vmove usr/include/backtrace*.h
+	}
+}
diff --git a/srcpkgs/libbacktrace-devel b/srcpkgs/libbacktrace-devel
new file mode 120000
index 000000000000..b08d5af5795c
--- /dev/null
+++ b/srcpkgs/libbacktrace-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file

From 01c52dd8b460ddc466b6a574497553ff100ee94d Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 23:42:28 +1100
Subject: [PATCH 2/2] ghdl: use libbacktrace in llvm backend

---
 srcpkgs/ghdl/patches/ln-libbacktrace.patch | 13 +++++++++++++
 srcpkgs/ghdl/template                      |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ghdl/patches/ln-libbacktrace.patch

diff --git a/srcpkgs/ghdl/patches/ln-libbacktrace.patch b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
new file mode 100644
index 000000000000..fcc8a876f273
--- /dev/null
+++ b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index d8015791..3722901d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -497,7 +497,7 @@ install.grt: \
+ 	$(INSTALL_DATA) $(libdirsuffix)/grt-shared.lst $(DESTDIR)$(VHDL_LIB_DIR)/grt-shared.lst
+ 	$(INSTALL_DATA) $(GRTSRCDIR)/grt.ver $(DESTDIR)$(VHDL_LIB_DIR)/grt.ver
+ 	test "x$(LIBBACKTRACE)" = x || test "x$(backend)" = xgcc || \
+-	  $(INSTALL_DATA) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
++	  $(LN) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
+ 
+ uninstall.grt:
+ 	$(RM) $(DESTDIR)$(VHDL_LIB_DIR)/libgrt.a
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..fb70573e4726 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=1.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
@@ -51,7 +51,7 @@ fi
 
 if [ "$build_option_llvm" ]; then
 	subpackages+=" ghdl-llvm"
-	makedepends+=" llvm12"
+	makedepends+=" llvm12 libbacktrace-devel"
 fi
 
 do_configure() {
@@ -65,7 +65,9 @@ do_configure() {
 	if [ "$build_option_llvm" ]; then
 		mkdir -p build_llvm
 		cd build_llvm
-		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+		../configure --libdir=lib/ghdl/llvm \
+			--with-llvm-config \
+			--with-backtrace-lib="/usr/lib/libbacktrace.a" \
 			${configure_args}
 		cd ..
 	fi
@@ -130,6 +132,7 @@ ghdl-mcode_package() {
 
 ghdl-llvm_package() {
 	short_desc+=" - LLVM backend"
+	depends+=" libbacktrace-devel"
 	pkg_install() {
 		vmove usr/bin/ghdl-llvm
 		vmove usr/lib/ghdl/llvm

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (14 preceding siblings ...)
  2021-12-23 12:52 ` Aloz1
@ 2021-12-23 12:57 ` Aloz1
  2021-12-23 13:03 ` Aloz1
                   ` (9 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 12:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000285935

Comment:
> Understandable. How stable of an interface is `libbacktrace` inside of GCC? I'm weary about creating this dependency.

Looking at git history for libbacktrace, it seems to be fairly stable. There are very few commits, and there seems to be only 1 (albeit fairly recent) breaking change in backtrace.h. It also seems that the gcc source libbacktrace and the upstream [ianlancetaylor/libbacktrace](/ianlancetaylor/libbacktrace) are kept relatively in-sync with each other.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (15 preceding siblings ...)
  2021-12-23 12:57 ` Aloz1
@ 2021-12-23 13:03 ` Aloz1
  2021-12-23 14:07 ` ericonr
                   ` (8 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 13:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000289595

Comment:
> I am not enthused about installing something that comes from a .libs directory into the package.

I've now added a patch for configure.ac and Makefile.am (as well as re-genned configure and Makefile.in) so that the gcc build system is doing the heavy lifting. These changes mostly came from looking at a diff between gcc/libbacktrace and ianlancetaylor/libbacktrace.

> I think using GCC's, since it's already there, is "reasonable". But it should be its own subpackage, the ugliness should be opt-in.

libbacktrace from gcc now split into its own subpackage, and I've made it a separate commit as requested in one of your review comments.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (16 preceding siblings ...)
  2021-12-23 13:03 ` Aloz1
@ 2021-12-23 14:07 ` ericonr
  2021-12-23 21:07 ` Aloz1
                   ` (7 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-12-23 14:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000328628

Comment:
> I've now added a patch for configure.ac and Makefile.am (as well as re-genned configure and Makefile.in) so that the gcc build system is doing the heavy lifting. These changes mostly came from looking at a diff between gcc/libbacktrace and ianlancetaylor/libbacktrace.

The upstream build still puts it inside `.libs`, this doesn't change that. A 1k GCC patch is not the solution here, please revert to the version with the manual install commands.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (17 preceding siblings ...)
  2021-12-23 14:07 ` ericonr
@ 2021-12-23 21:07 ` Aloz1
  2021-12-23 21:07 ` Aloz1
                   ` (6 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 21:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000523822

Comment:
> The upstream build still puts it inside `.libs`, this doesn't change that. A 1k GCC patch is not the solution here, please revert to the version with the manual install commands.

You're not wrong, but that's fundamentally how building with autotools/libtools works. Libraries that are built with libtool are always placed in a '.libs/' directory. The changes in the patch (6 lines of which are actual changes, the rest being autogenn'ed using autoreconf) simply defer installation back to autotools, which is consistent with other public-ally exposed libtools libraries in the gcc source distribution.

I'm also not happy with the 1k patch, but I'd done it that way because I had thought that calling autoreconf within do_preconfigure() would require adding a new hostmakedepends dependency. But I've just had a look, and it seems that all of autotools is depended on by base-devel anyway. So I can reduce the patch down to only 34 lines.

Having said that, if you're more happy with the manual vinstall from .libs (as was done previously), I'm happy to revert it back to that.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (18 preceding siblings ...)
  2021-12-23 21:07 ` Aloz1
@ 2021-12-23 21:07 ` Aloz1
  2021-12-23 21:16 ` Aloz1
                   ` (5 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 21:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000523822

Comment:
> The upstream build still puts it inside `.libs`, this doesn't change that. A 1k GCC patch is not the solution here, please revert to the version with the manual install commands.

You're not wrong, but that's fundamentally how building with autotools/libtools works. Libraries that are built with libtool are always placed in a '.libs/' directory. The changes in the patch (8 lines of which are actual changes, the rest being autogenn'ed using autoreconf) simply defer installation back to autotools, which is consistent with other public-ally exposed libtools libraries in the gcc source distribution.

I'm also not happy with the 1k patch, but I'd done it that way because I had thought that calling autoreconf within do_preconfigure() would require adding a new hostmakedepends dependency. But I've just had a look, and it seems that all of autotools is depended on by base-devel anyway. So I can reduce the patch down to only 34 lines.

Having said that, if you're more happy with the manual vinstall from .libs (as was done previously), I'm happy to revert it back to that.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (19 preceding siblings ...)
  2021-12-23 21:07 ` Aloz1
@ 2021-12-23 21:16 ` Aloz1
  2021-12-23 22:33 ` Aloz1
                   ` (4 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 21:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000523822

Comment:
> The upstream build still puts it inside `.libs`, this doesn't change that. A 1k GCC patch is not the solution here, please revert to the version with the manual install commands.

You're not wrong, but that's fundamentally how building with autotools/libtools works. Libraries that are built with libtool are always placed in a '.libs/' directory. The changes in the patch (8 lines of which are actual changes, the rest being autogenn'ed using autoreconf) simply defer installation back to autotools, which is consistent with other public-ally exposed libtools libraries in the gcc source distribution.

I'm also not happy with the 1k patch, but I'd done it that way because calling autoreconf within do_preconfigure() would require adding a new hostmakedepends dependency for automake.

Having said that, if you're more happy with the manual vinstall from .libs (as was done previously), I'm happy to revert it back to that.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (20 preceding siblings ...)
  2021-12-23 21:16 ` Aloz1
@ 2021-12-23 22:33 ` Aloz1
  2021-12-23 22:58 ` [PR PATCH] [Updated] " Aloz1
                   ` (3 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 22:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1000523822

Comment:
> The upstream build still puts it inside `.libs`, this doesn't change that. A 1k GCC patch is not the solution here, please revert to the version with the manual install commands.

Sure, but that's just how building libraries with autotools/libtool works. Libraries that are built with libtool are always placed in a '.libs/' directory. The only ways to avoid the .libs directory are to either let automake generate the libtool specific install targets (what the patch does), or to remove libtool usage from Makefile.am all together, (which would result in an even bigger patch).

I'm also not happy with the 1k patch, and I really don't want to add an additional dependency on automake within the gcc template, just for the sake of libbacktrace; so I'll revert it to using vinstall on .libs/libbacktrace.a

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP]ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (21 preceding siblings ...)
  2021-12-23 22:33 ` Aloz1
@ 2021-12-23 22:58 ` Aloz1
  2022-01-18 11:45 ` ghdl: " Aloz1
                   ` (2 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2021-12-23 22:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

There is an updated pull request by Aloz1 against master on the void-packages repository

https://github.com/Aloz1/void-packages ghdl-enable-backtrace
https://github.com/void-linux/void-packages/pull/34626

[WIP]ghdl: add libbacktrace for llvm backend
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


A patch file from https://github.com/void-linux/void-packages/pull/34626.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-enable-backtrace-34626.patch --]
[-- Type: text/x-diff, Size: 4674 bytes --]

From eabbccaa8ddb647e2a732d0733828bb81952b9f3 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 22:59:22 +1100
Subject: [PATCH 1/2] gcc: add libbacktrace subpackage

---
 srcpkgs/gcc/template       | 22 ++++++++++++++++++++--
 srcpkgs/libbacktrace-devel |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libbacktrace-devel

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 09727ef34fb2..3bbb86d9bd1d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -7,7 +7,7 @@ pkgname=gcc
 # to get regression fixes not yet incorporate into a stable release
 # it should be possible to switch back to stable with 10.3 or 11
 version=10.2.1pre1
-revision=3
+revision=4
 _patchver="${version%pre*}"
 _minorver="${_patchver%.*}"
 _majorver="${_minorver%.*}"
@@ -58,7 +58,7 @@ depends="binutils libgcc-devel-${version}_${revision}
  libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
 checkdepends="dejagnu"
 
-subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
+subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel libbacktrace-devel"
 subpackages+=" libssp libssp-devel"
 
 build_options="ada gnatboot"
@@ -353,6 +353,16 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
 		${DESTDIR}/usr/include/c++/${_patchver}
 
+	# Install libbacktrace libraries (gcc source makefile doesn't do
+	# this for us)
+	vmkdir usr/include/backtrace
+	vinstall libbacktrace/.libs/libbacktrace.a \
+		644 usr/lib
+	vinstall libbacktrace/backtrace-supported.h \
+		644 usr/include/backtrace
+	vinstall ../libbacktrace/backtrace.h \
+		644 usr/include/backtrace
+
 	# cc symlink
 	ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
 	# rpcgen wants /lib/cpp, make a symlink
@@ -721,3 +731,11 @@ libstdc++_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
+libbacktrace-devel_package() {
+	short_desc+=" - Backtrace generation library - development files"
+	pkg_install() {
+		vmove "usr/lib/libbacktrace.a"
+		vmove usr/include/backtrace
+	}
+}
diff --git a/srcpkgs/libbacktrace-devel b/srcpkgs/libbacktrace-devel
new file mode 120000
index 000000000000..b08d5af5795c
--- /dev/null
+++ b/srcpkgs/libbacktrace-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file

From 7dd3052fafce142b6093d6a24d0a49121886ba62 Mon Sep 17 00:00:00 2001
From: Aloz1 <kno0001@gmail.com>
Date: Thu, 23 Dec 2021 23:42:28 +1100
Subject: [PATCH 2/2] ghdl: use libbacktrace in llvm backend

---
 srcpkgs/ghdl/patches/ln-libbacktrace.patch | 13 +++++++++++++
 srcpkgs/ghdl/template                      |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ghdl/patches/ln-libbacktrace.patch

diff --git a/srcpkgs/ghdl/patches/ln-libbacktrace.patch b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
new file mode 100644
index 000000000000..fcc8a876f273
--- /dev/null
+++ b/srcpkgs/ghdl/patches/ln-libbacktrace.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index d8015791..3722901d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -497,7 +497,7 @@ install.grt: \
+ 	$(INSTALL_DATA) $(libdirsuffix)/grt-shared.lst $(DESTDIR)$(VHDL_LIB_DIR)/grt-shared.lst
+ 	$(INSTALL_DATA) $(GRTSRCDIR)/grt.ver $(DESTDIR)$(VHDL_LIB_DIR)/grt.ver
+ 	test "x$(LIBBACKTRACE)" = x || test "x$(backend)" = xgcc || \
+-	  $(INSTALL_DATA) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
++	  $(LN) $(LIBBACKTRACE) $(DESTDIR)$(VHDL_LIB_DIR)/libbacktrace.a
+ 
+ uninstall.grt:
+ 	$(RM) $(DESTDIR)$(VHDL_LIB_DIR)/libgrt.a
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..fb70573e4726 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
 pkgname=ghdl
 reverts="20181129_1"
 version=1.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
 makedepends="zlib-devel"
@@ -51,7 +51,7 @@ fi
 
 if [ "$build_option_llvm" ]; then
 	subpackages+=" ghdl-llvm"
-	makedepends+=" llvm12"
+	makedepends+=" llvm12 libbacktrace-devel"
 fi
 
 do_configure() {
@@ -65,7 +65,9 @@ do_configure() {
 	if [ "$build_option_llvm" ]; then
 		mkdir -p build_llvm
 		cd build_llvm
-		../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+		../configure --libdir=lib/ghdl/llvm \
+			--with-llvm-config \
+			--with-backtrace-lib="/usr/lib/libbacktrace.a" \
 			${configure_args}
 		cd ..
 	fi
@@ -130,6 +132,7 @@ ghdl-mcode_package() {
 
 ghdl-llvm_package() {
 	short_desc+=" - LLVM backend"
+	depends+=" libbacktrace-devel"
 	pkg_install() {
 		vmove usr/bin/ghdl-llvm
 		vmove usr/lib/ghdl/llvm

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (22 preceding siblings ...)
  2021-12-23 22:58 ` [PR PATCH] [Updated] " Aloz1
@ 2022-01-18 11:45 ` Aloz1
  2022-06-19  2:16 ` github-actions
  2022-07-04  2:15 ` [PR PATCH] [Closed]: " github-actions
  25 siblings, 0 replies; 27+ messages in thread
From: Aloz1 @ 2022-01-18 11:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by Aloz1 on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1015332943

Comment:
Any further advice/comments thoughts on this one?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (23 preceding siblings ...)
  2022-01-18 11:45 ` ghdl: " Aloz1
@ 2022-06-19  2:16 ` github-actions
  2022-07-04  2:15 ` [PR PATCH] [Closed]: " github-actions
  25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-06-19  2:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/34626#issuecomment-1159601743

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Closed]: ghdl: add libbacktrace for llvm backend
  2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
                   ` (24 preceding siblings ...)
  2022-06-19  2:16 ` github-actions
@ 2022-07-04  2:15 ` github-actions
  25 siblings, 0 replies; 27+ messages in thread
From: github-actions @ 2022-07-04  2:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

There's a closed pull request on the void-packages repository

ghdl: add libbacktrace for llvm backend
https://github.com/void-linux/void-packages/pull/34626

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)


^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2022-07-04  2:15 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-20 14:34 [PR PATCH] [WIP]ghdl: add libbacktrace for llvm backend Aloz1
2021-12-20 14:45 ` Aloz1
2021-12-20 15:05 ` [PR REVIEW] " ericonr
2021-12-20 15:05 ` ericonr
2021-12-20 15:05 ` ericonr
2021-12-20 15:32 ` Aloz1
2021-12-20 15:33 ` Aloz1
2021-12-20 15:44 ` [PR PATCH] [Updated] " Aloz1
2021-12-20 15:44 ` [PR REVIEW] " Aloz1
2021-12-21  3:37 ` ericonr
2021-12-21  6:16 ` Aloz1
2021-12-21 19:04 ` ericonr
2021-12-22  0:26 ` Aloz1
2021-12-23  4:45 ` ericonr
2021-12-23 12:47 ` [PR PATCH] [Updated] " Aloz1
2021-12-23 12:52 ` Aloz1
2021-12-23 12:57 ` Aloz1
2021-12-23 13:03 ` Aloz1
2021-12-23 14:07 ` ericonr
2021-12-23 21:07 ` Aloz1
2021-12-23 21:07 ` Aloz1
2021-12-23 21:16 ` Aloz1
2021-12-23 22:33 ` Aloz1
2021-12-23 22:58 ` [PR PATCH] [Updated] " Aloz1
2022-01-18 11:45 ` ghdl: " Aloz1
2022-06-19  2:16 ` github-actions
2022-07-04  2:15 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).