--- old/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp	2017-05-26 18:31:47.765215255 -0400
+++ new/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp	2017-05-26 18:31:47.649209414 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -35,7 +35,7 @@
   static bool register_code_area(char *low, char *high) { return true; }
 
   // Atomically copy 64 bits of data
-  static void atomic_copy64(volatile void *src, volatile void *dst) {
+  static void atomic_copy64(const volatile void *src, volatile void *dst) {
 #if defined(PPC32)
     double tmp;
     asm volatile ("lfd  %0, 0(%1)\n"
@@ -49,7 +49,7 @@
                   : "=r"(tmp)
                   : "a"(src), "a"(dst));
 #else
-    *(jlong *) dst = *(jlong *) src;
+    *(jlong *) dst = *(const jlong *) src;
 #endif
   }
 
--- old/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp	2017-05-26 18:31:48.297242057 -0400
+++ new/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp	2017-05-26 18:31:48.181236212 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,8 +38,8 @@
   static bool register_code_area(char *low, char *high) { return true; }
 
   // Atomically copy 64 bits of data
-  static void atomic_copy64(volatile void *src, volatile void *dst) {
-    *(jlong *) dst = *(jlong *) src;
+  static void atomic_copy64(const volatile void *src, volatile void *dst) {
+    *(jlong *) dst = *(const jlong *) src;
   }
 
 #endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
--- old/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	2017-05-26 18:31:48.829268857 -0400
+++ new/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	2017-05-26 18:31:48.709262808 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -35,7 +35,7 @@
   static bool register_code_area(char *low, char *high) { return true; }
 
   // Atomically copy 64 bits of data
-  static void atomic_copy64(volatile void *src, volatile void *dst) {
+  static void atomic_copy64(const volatile void *src, volatile void *dst) {
 #if defined(PPC32)
     double tmp;
     asm volatile ("lfd  %0, 0(%1)\n"
@@ -49,7 +49,7 @@
                   : "=r"(tmp)
                   : "a"(src), "a"(dst));
 #else
-    *(jlong *) dst = *(jlong *) src;
+    *(jlong *) dst = *(const jlong *) src;
 #endif
   }