提交 a66d1ced 编写于 作者: H horii

8165231: java.nio.Bits.unaligned() doesn't return true on ppc

Reviewed-by: simonis, coffeys
上级 11719aa5
/* /*
* 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -614,7 +614,8 @@ class Bits { // package-private ...@@ -614,7 +614,8 @@ class Bits { // package-private
String arch = AccessController.doPrivileged( String arch = AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("os.arch")); new sun.security.action.GetPropertyAction("os.arch"));
unaligned = arch.equals("i386") || arch.equals("x86") 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; unalignedKnown = true;
return unaligned; return unaligned;
} }
......
/* /*
* 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -94,7 +94,7 @@ final class ByteArrayAccess { ...@@ -94,7 +94,7 @@ final class ByteArrayAccess {
String arch = java.security.AccessController.doPrivileged String arch = java.security.AccessController.doPrivileged
(new sun.security.action.GetPropertyAction("os.arch", "")); (new sun.security.action.GetPropertyAction("os.arch", ""));
return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
|| arch.equals("x86_64"); || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le");
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册