diff -r 7743e6943cdf -r d869c505b624 hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Wed Mar 18 16:16:30 2015 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Mon Aug 03 09:39:29 2015 +0200
@@ -855,6 +855,9 @@
   product(bool, UseCRC32CIntrinsics, false,                                 \
           "use intrinsics for java.util.zip.CRC32C")                        \
                                                                             \
+  diagnostic(ccstrlist, DisableIntrinsic, "",                               \
+         "do not expand intrinsics whose (internal) names appear here")     \
+                                                                            \
   develop(bool, TraceCallFixup, false,                                      \
           "Trace all call fixups")                                          \
                                                                             \