*** old/test/compiler/intrinsics/bmi/TestLzcntL.java	Tue Dec  9 15:13:00 2014
--- new/test/compiler/intrinsics/bmi/TestLzcntL.java	Tue Dec  9 15:13:00 2014

*** 25,43 ****
--- 25,43 ----
  /**
   * @test
   * @bug 8031321
   * @summary Verify that results of computations are the same w/
   *          and w/o usage of intrinsic
!  * @library /testlibrary /testlibrary/whitebox
!  * @library /testlibrary /../../test/lib
   * @build TestLzcntL BMITestRunner Expr
!  * @run main ClassFileInstaller sun.hotspot.WhiteBox
!  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main ClassFileInstaller jdk.testlib.WhiteBox
!  *                              jdk.testlib.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI TestLzcntL
   */
  
! import sun.hotspot.cpuinfo.CPUInfo;
! import jdk.testlib.cpuinfo.CPUInfo;
  
  public class TestLzcntL {
  
      public static void main(String args[]) throws Throwable {
          if (!CPUInfo.hasFeature("lzcnt")) {