| 1 |
# HG changeset patch |
| 2 |
# User horii |
| 3 |
# Date 1473905514 14400 |
| 4 |
# Wed Sep 14 22:11:54 2016 -0400 |
| 5 |
# Node ID 8d16f74380a78eb76cb33183a64440316393903e |
| 6 |
# Parent be698ac288484ab140715ee29ed9335e6ea8a33b |
| 7 |
8165231: java.nio.Bits.unaligned() doesn't return true on ppc |
| 8 |
Reviewed-by: simonis, coffeys |
| 9 |
|
| 10 |
diff --git a/src/share/classes/java/nio/Bits.java b/src/share/classes/java/nio/Bits.java |
| 11 |
--- openjdk/jdk/src/share/classes/java/nio/Bits.java |
| 12 |
+++ openjdk/jdk/src/share/classes/java/nio/Bits.java |
| 13 |
@@ -1,5 +1,5 @@ |
| 14 |
/* |
| 15 |
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. |
| 16 |
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. |
| 17 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 18 |
* |
| 19 |
* This code is free software; you can redistribute it and/or modify it |
| 20 |
@@ -614,7 +614,8 @@ |
| 21 |
String arch = AccessController.doPrivileged( |
| 22 |
new sun.security.action.GetPropertyAction("os.arch")); |
| 23 |
unaligned = arch.equals("i386") || arch.equals("x86") |
| 24 |
- || arch.equals("amd64") || arch.equals("x86_64"); |
| 25 |
+ || arch.equals("amd64") || arch.equals("x86_64") |
| 26 |
+ || arch.equals("ppc64") || arch.equals("ppc64le"); |
| 27 |
unalignedKnown = true; |
| 28 |
return unaligned; |
| 29 |
} |
| 30 |
diff --git a/src/share/classes/sun/security/provider/ByteArrayAccess.java b/src/share/classes/sun/security/provider/ByteArrayAccess.java |
| 31 |
--- openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java |
| 32 |
+++ openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java |
| 33 |
@@ -1,5 +1,5 @@ |
| 34 |
/* |
| 35 |
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
| 36 |
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. |
| 37 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 38 |
* |
| 39 |
* This code is free software; you can redistribute it and/or modify it |
| 40 |
@@ -94,7 +94,7 @@ |
| 41 |
String arch = java.security.AccessController.doPrivileged |
| 42 |
(new sun.security.action.GetPropertyAction("os.arch", "")); |
| 43 |
return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") |
| 44 |
- || arch.equals("x86_64"); |
| 45 |
+ || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le"); |
| 46 |
} |
| 47 |
|
| 48 |
/** |
Parent Directory
| 
Revision Log