Mercurial > hg > icedtea7-forest > jdk
changeset 9210:eeb56f4c36b1
8165231: java.nio.Bits.unaligned() doesn't return true on ppc
Reviewed-by: simonis, coffeys
author | horii |
---|---|
date | Wed, 14 Sep 2016 22:11:54 -0400 |
parents | aac0cba4d82e |
children | b765de0cf211 |
files | src/share/classes/java/nio/Bits.java src/share/classes/sun/security/provider/ByteArrayAccess.java |
diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/nio/Bits.java Thu Jul 13 05:15:10 2017 +0100 +++ b/src/share/classes/java/nio/Bits.java Wed Sep 14 22:11:54 2016 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -609,7 +609,8 @@ String arch = AccessController.doPrivileged( new sun.security.action.GetPropertyAction("os.arch")); unaligned = arch.equals("i386") || arch.equals("x86") - || arch.equals("amd64") || arch.equals("x86_64"); + || arch.equals("amd64") || arch.equals("x86_64") + || arch.equals("ppc64") || arch.equals("ppc64le"); unalignedKnown = true; return unaligned; }
--- a/src/share/classes/sun/security/provider/ByteArrayAccess.java Thu Jul 13 05:15:10 2017 +0100 +++ b/src/share/classes/sun/security/provider/ByteArrayAccess.java Wed Sep 14 22:11:54 2016 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, 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 @@ -94,7 +94,7 @@ String arch = java.security.AccessController.doPrivileged (new sun.security.action.GetPropertyAction("os.arch", "")); return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") - || arch.equals("x86_64"); + || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le"); } /**