From 0328886450a4978f1edbe06a59d2ab8f733d19a9 Mon Sep 17 00:00:00 2001
From: Andreas Steiner <a.steiner@sap.com>
Date: Mon, 24 Jul 2023 06:24:00 +0000
Subject: [PATCH] 8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 /
 clang on AIX

Reviewed-by: stuefe, mbaesken, clanger, vtewari
---
 make/autoconf/toolchain.m4 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index c89aab11d4b..289eec3356b 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -804,7 +804,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
 
   case $TOOLCHAIN_TYPE in
     gcc|clang)
-      UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+      if test "x$OPENJDK_TARGET_OS" = xaix; then
+        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, ibm-llvm-cxxfilt)
+      else
+        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+      fi
       ;;
   esac
 ])