--- old/make/autoconf/toolchain.m4	2018-02-20 18:43:49.820552965 +0100
+++ new/make/autoconf/toolchain.m4	2018-02-20 18:43:49.512542009 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -720,12 +720,18 @@
     fi
   fi
 
-  BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
-  if test "x$OBJDUMP" != x; then
-    # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE
-    # bails if argument is missing.
-    BASIC_FIXUP_EXECUTABLE(OBJDUMP)
-  fi
+  case $TOOLCHAIN_TYPE in
+    gcc|clang|solstudio)
+      BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+      BASIC_FIXUP_EXECUTABLE(OBJDUMP)
+      ;;
+  esac
+  case $TOOLCHAIN_TYPE in
+    gcc|clang)
+      BASIC_CHECK_TOOLS(CXXFILT, [c++filt])
+      BASIC_FIXUP_EXECUTABLE(CXXFILT)
+      ;;
+  esac
 ])
 
 # Setup the build tools (i.e, the compiler and linker used to build programs