[PATCH 8/9] add "stack-unwind-with-libunwind" and "stack-unwind-with-libdw" as features

[Masatake YAMATO]

* strace.c (features): Split "stack-unwind" feature
into two optional features representing unwinder implementations.
* tests/strace-V.test: Split "option_unwind" variable
into two variables representing unwinder implementations.

Signed-off-by: Masatake YAMATO <yamato at redhat.com>
---
 strace.c            | 9 ++++++---
 tests/strace-V.test | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/strace.c b/strace.c
index c12b1a40..ed1dd0a5 100644
--- a/strace.c
+++ b/strace.c
@@ -203,9 +203,12 @@ static void
 print_version(void)
 {
 	static const char features[] =
-#ifdef CAN_UNWIND
-		" stack-unwind"
-#endif /* CAN_UNWIND */
+#ifdef USE_LIBUNWIND
+		" stack-unwind-with-libunwind"
+#endif /* USE_LIBUNWIND */
+#ifdef USE_LIBDW
+		" stack-unwind-with-libdw"
+#endif /* USE_LIBDW */
 #ifdef USE_DEMANGLE
 		" stack-demangle"
 #endif /* USE_DEMANGLE */
diff --git a/tests/strace-V.test b/tests/strace-V.test
index eb05e865..f396006e 100755
--- a/tests/strace-V.test
+++ b/tests/strace-V.test
@@ -38,7 +38,8 @@ config_year=$(getstr COPYRIGHT_YEAR)
 	exit 1
 }
 
-option_unwind=$(getoption USE_LIBUNWIND " stack-unwind")
+option_unwind_with_libunwind=$(getoption USE_LIBUNWIND " stack-unwind-with-libunwind")
+option_unwind_with_libdw=$(getoption USE_LIBDW " stack-unwind-with-libdw")
 option_demangle=$(getoption USE_DEMANGLE " stack-demangle")
 
 option_m32=
@@ -53,7 +54,7 @@ aarch64|powerpc64|riscv|s390x|sparc64|tile|x32)
 	;;
 esac
 
-features="${option_unwind}${option_demangle}${option_m32}${option_mx32}"
+features="${option_unwind_with_libunwind}${option_unwind_with_libdw}${option_demangle}${option_m32}${option_mx32}"
 [ -n "$features" ] || features=" (none)"
 
 cat > "$EXP" << __EOF__
-- 
2.14.3