--- old/src/hotspot/share/utilities/dtrace.hpp	2020-05-06 16:17:50.704021754 -0700
+++ new/src/hotspot/share/utilities/dtrace.hpp	2020-05-06 16:17:50.324014469 -0700
@@ -29,19 +29,11 @@
 #if defined(DTRACE_ENABLED)
 
 #include <sys/sdt.h>
+#include <sys/types.h>
 
 #define DTRACE_ONLY(x) x
 #define NOT_DTRACE(x)
 
-#if defined(LINUX)
-#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
-#elif defined(__APPLE__)
-#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
-#include <sys/types.h>
-#else
-#error "dtrace enabled for unknown os"
-#endif /* defined(LINUX) */
-
 #include "dtracefiles/hotspot.h"
 #include "dtracefiles/hotspot_jni.h"
 #include "dtracefiles/hs_private.h"
@@ -51,8 +43,6 @@
 #define DTRACE_ONLY(x)
 #define NOT_DTRACE(x) x
 
-#define HS_DTRACE_WORKAROUND_TAIL_CALL_BUG()
-
 #include "dtrace_disabled.hpp"
 
 #endif /* defined(DTRACE_ENABLED) */