--- old/./.hgignore	2015-11-23 21:00:40.378079000 -0800
+++ new/./.hgignore	2015-11-23 21:00:39.911032300 -0800
@@ -2,6 +2,7 @@
 ^dist/
 ^webrev
 ^testoutput/
+^src/java.desktop/share/native/libfontmanager/freetypeScaler.c
 /nbproject/private/
 ^make/netbeans/.*/build/
 ^make/netbeans/.*/dist/
--- old/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java	2015-11-23 21:00:42.917332900 -0800
+++ new/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java	2015-11-23 21:00:42.446285800 -0800
@@ -27,6 +27,7 @@
 
 import java.security.InvalidKeyException;
 
+import jdk.internal.HotSpotIntrinsicCandidate;
 
 /**
  * This class represents ciphers in counter (CTR) mode.
@@ -169,6 +170,7 @@
      * keystream generated by encrypting the counter values. Counter values
      * are encrypted on demand.
      */
+    @HotSpotIntrinsicCandidate
     private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
         int result = len;
         while (len-- > 0) {