--- old/src/hotspot/cpu/x86/stubRoutines_x86.hpp	2018-06-27 12:42:13.411189400 -0700
+++ new/src/hotspot/cpu/x86/stubRoutines_x86.hpp	2018-06-27 12:42:12.645112800 -0700
@@ -138,6 +138,14 @@
   static address _k512_W_addr;
   // byte flip mask for sha512
   static address _pshuffle_byte_flip_mask_addr_sha512;
+  // Masks for base64
+  static address _base64_charset;
+  static address _bswap_mask;
+  static address _gather_mask;
+  static address _right_shift_mask;
+  static address _left_shift_mask;
+  static address _and_mask;
+  static address _url_charset;
 #endif
   // byte flip mask for sha256
   static address _pshuffle_byte_flip_mask_addr;
@@ -198,6 +206,13 @@
   static address k256_W_addr()    { return _k256_W_adr; }
   static address k512_W_addr()    { return _k512_W_addr; }
   static address pshuffle_byte_flip_mask_addr_sha512() { return _pshuffle_byte_flip_mask_addr_sha512; }
+  static address base64_charset_addr() { return _base64_charset; }
+  static address base64url_charset_addr() { return _url_charset; }
+  static address base64_bswap_mask_addr() { return _bswap_mask; }
+  static address base64_gather_mask_addr() { return _gather_mask; }
+  static address base64_right_shift_mask_addr() { return _right_shift_mask; }
+  static address base64_left_shift_mask_addr() { return _left_shift_mask; }
+  static address base64_and_mask_addr() { return _and_mask; }
 #endif
   static address pshuffle_byte_flip_mask_addr() { return _pshuffle_byte_flip_mask_addr; }
   static void generate_CRC32C_table(bool is_pclmulqdq_supported);