--- old/src/hotspot/share/utilities/count_trailing_zeros.hpp	2020-05-20 18:00:40.778856767 -0700
+++ new/src/hotspot/share/utilities/count_trailing_zeros.hpp	2020-05-20 18:00:40.442850315 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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
@@ -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