logan added a comment. Hi @rengolin: Yeah. It is a kind of similar. Another route is to move the code from `<libunwind>/include/unwind.h` to `<clang>/lib/Headers` and then ship a shim layer with `libc++abi` and/or `libunwind` for old clang. https://reviews.llvm.org/D24084