--- old/src/java.base/unix/native/libjli/java_md_solinux.h	2020-05-20 18:01:18.927589251 -0700
+++ new/src/java.base/unix/native/libjli/java_md_solinux.h	2020-05-20 18:01:18.591582799 -0700
@@ -27,16 +27,8 @@
 #define JAVA_MD_SOLINUX_H
 
 #include <sys/time.h>
-#ifdef __solaris__
-/*
- * Support for doing cheap, accurate interval timing.
- */
-#define CounterGet()              (gethrtime()/1000)
-#define Counter2Micros(counts)    (counts)
-#else  /* ! __solaris__ */
 uint64_t CounterGet(void);
 #define Counter2Micros(counts)    (counts)
-#endif /* __solaris__ */
 
 /* pointer to environment */
 extern char **environ;
@@ -45,17 +37,9 @@
  *      A collection of useful strings. One should think of these as #define
  *      entries, but actual strings can be more efficient (with many compilers).
  */
-#ifdef __solaris__
-static const char *user_dir     = "/jdk";
-#else /* !__solaris__, i.e. Linux, AIX,.. */
-static const char *user_dir     = "/java";
-#endif
+static const char *user_dir = "/java";
 
 #include <dlfcn.h>
-#ifdef __solaris__
-#include <thread.h>
-#else
 #include <pthread.h>
-#endif
 
 #endif /* JAVA_MD_SOLINUX_H */