--- old/src/hotspot/share/utilities/count_trailing_zeros.hpp	2020-05-01 02:26:25.136603799 -0700
+++ new/src/hotspot/share/utilities/count_trailing_zeros.hpp	2020-05-01 02:26:24.808597490 -0700
@@ -87,17 +87,6 @@
 }
 
 /*****************************************************************************
- * Oracle Studio
- *****************************************************************************/
-#elif defined(TARGET_COMPILER_solstudio)
-
-// No compiler built-in / intrinsic, so use inline assembler.
-
-#include "utilities/macros.hpp"
-
-#include OS_CPU_HEADER(count_trailing_zeros)
-
-/*****************************************************************************
  * Unknown toolchain
  *****************************************************************************/
 #else