--- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2017-07-14 18:05:31.510233010 +0200
+++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2017-07-14 18:05:31.366233015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -547,7 +547,7 @@
     return start;
   }
 
-  // Support for jint atomic::xchg(jint exchange_value, volatile jint* dest)
+  // Support for int32_t Atomic::specialized_xchg(int32_t exchange_value, volatile int32_t* dest)
   //
   // Arguments :
   //    c_rarg0: exchange_value
@@ -566,7 +566,7 @@
     return start;
   }
 
-  // Support for intptr_t atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest)
+  // Support for intptr_t Atomic::specialized_xchg(intptr_t exchange_value, volatile intptr_t* dest)
   //
   // Arguments :
   //    c_rarg0: exchange_value
@@ -585,8 +585,8 @@
     return start;
   }
 
-  // Support for jint atomic::atomic_cmpxchg(jint exchange_value, volatile jint* dest,
-  //                                         jint compare_value)
+  // Support for int32_t Atomic::specialized_cmpxchg(int32_t exchange_value, volatile int32_t* dest,
+  //                                                 int32_t compare_value)
   //
   // Arguments :
   //    c_rarg0: exchange_value
@@ -611,8 +611,8 @@
     return start;
   }
 
-  // Support for jbyte atomic::atomic_cmpxchg(jbyte exchange_value, volatile jbyte* dest,
-  //                                          jbyte compare_value)
+  // Support for int8_t Atomic::specialized_cmpxchg(int8_t exchange_value, volatile int8_t* dest,
+  //                                                int8_t compare_value)
   //
   // Arguments :
   //    c_rarg0: exchange_value
@@ -637,9 +637,9 @@
     return start;
   }
 
-  // Support for jlong atomic::atomic_cmpxchg(jlong exchange_value,
-  //                                          volatile jlong* dest,
-  //                                          jlong compare_value)
+  // Support for int64_t Atomic::specialized_cmpxchg(int64_t exchange_value,
+  //                                                 volatile int64_t* dest,
+  //                                                 int64_t compare_value)
   // Arguments :
   //    c_rarg0: exchange_value
   //    c_rarg1: dest
@@ -663,7 +663,7 @@
     return start;
   }
 
-  // Support for jint atomic::add(jint add_value, volatile jint* dest)
+  // Support for int32_t Atomic::specialized_add(int32_t add_value, volatile int32_t* dest)
   //
   // Arguments :
   //    c_rarg0: add_value
@@ -685,7 +685,7 @@
     return start;
   }
 
-  // Support for intptr_t atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest)
+  // Support for intptr_t Atomic::specialized_add(intptr_t add_value, volatile intptr_t* dest)
   //
   // Arguments :
   //    c_rarg0: add_value