*** old/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java	Mon Aug 28 14:09:35 2017
--- new/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java	Mon Aug 28 14:09:35 2017

*** 185,198 ****
--- 185,197 ----
          {"StubRoutines::_arrayof_jint_disjoint_arraycopy", "_aot_stub_routines_arrayof_jint_disjoint_arraycopy"},
          {"StubRoutines::_arrayof_jlong_disjoint_arraycopy", "_aot_stub_routines_arrayof_jlong_disjoint_arraycopy"},
          {"StubRoutines::_arrayof_oop_disjoint_arraycopy", "_aot_stub_routines_arrayof_oop_disjoint_arraycopy"},
          {"StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit", "_aot_stub_routines_arrayof_oop_disjoint_arraycopy_uninit"},
  
!         {"StubRoutines::_checkcast_arraycopy", "_aot_stub_routines_checkcast_arraycopy"},
  
  
!         {"StubRoutines::_unsafe_arraycopy", "_aot_stub_routines_unsafe_arraycopy"},
  
+         {"StubRoutines::_checkcast_arraycopy", "_aot_stub_routines_checkcast_arraycopy"},
  
          {"StubRoutines::_aescrypt_encryptBlock", "_aot_stub_routines_aescrypt_encryptBlock"},
          {"StubRoutines::_aescrypt_decryptBlock", "_aot_stub_routines_aescrypt_decryptBlock"},
          {"StubRoutines::_cipherBlockChaining_encryptAESCrypt", "_aot_stub_routines_cipherBlockChaining_encryptAESCrypt"},
          {"StubRoutines::_cipherBlockChaining_decryptAESCrypt", "_aot_stub_routines_cipherBlockChaining_decryptAESCrypt"},

*** 476,487 ****
--- 475,486 ----
              createGotSymbol(entry.getValue());
          }
      }
  
      /**
!      * Creates a global symbol of the form {@code "A" + container name}. Note, linker on Windows
-      * Note, linker on Windows does not allow names which start with '.'
       *
       * @param container container to create a symbol for
       */
      private static void createContainerSymbol(ByteContainer container) {
          container.createSymbol(0, Kind.OBJECT, Binding.GLOBAL, 0, "A" + container.getContainerName());

*** 683,693 ****
--- 682,693 ----
              throw new InternalError("Failed to append bytes to stubs sections", e);
          }
      }
  
      /**
-      * Add oop symbol by as follows. Extend the oop.got section with another slot for the VM to patch.
+      * patch.
       *
       * @param oopName name of the oop symbol
       */
      public Integer addOopSymbol(String oopName) {
          Integer oopGotOffset = getStringOffset(oopName);

*** 726,739 ****
--- 726,738 ----
          assert name.startsWith("got.");
          return symbolTable.get(name);
      }
  
      /**
!      * Add klass symbol by as follows. - Adding the symbol name to the metaspace.names section - Add
       *   - Adding the symbol name to the metaspace.names section
       *   - Add the offset of the name in metaspace.names to metaspace.offsets
       *   - Extend the klasses.got section with another slot for the VM to patch
+      * the offset of the name in metaspace.names to metaspace.offsets - Extend the klasses.got
+      * section with another slot for the VM to patch
       *
       * @param klassName name of the metaspace symbol
       * @return the got offset in the klasses.got of the metaspace symbol
       */
      public int addTwoSlotKlassSymbol(String klassName) {