infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 02:00:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling

Browse Source 
Add ppc64le/jvm.cfg, check for the ppc64le in addition to ppc64 in tests

Co-authored-by: Andrew Hughes <gnu.andrew@redhat.com>
Reviewed-by: dholmes, ihse
This commit is contained in:
Alexander Smundak 2015-12-11 10:45:58 -08:00
parent 441b190d5c
commit 4cebcd8b2d
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jdk/src/java.base/unix/conf/ppc64le/jvm.cfg Normal file
View File

@ -0,0 +1,34 @@
# Copyright (c) 2011, 2015, 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# List of JVMs that can be used as an option to java, javac, etc.
# Order is important -- first in this list is the default JVM.
# NOTE that this both this file and its format are UNSUPPORTED and
# WILL GO AWAY in a future release.
#
# You may also select a JVM in an arbitrary location with the
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
# and may not be available in a future release.
#
-server KNOWN
-client IGNORE

1
jdk/test/sun/security/pkcs11/PKCS11Test.java
View File

@ -540,6 +540,7 @@ public abstract class PKCS11Test {
"/usr/lib/x86_64-linux-gnu/", "/usr/lib/x86_64-linux-gnu/nss/",
"/usr/lib64/"});
osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
osMap.put("Windows-x86-32", new String[]{
PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
osMap.put("Windows-amd64-64", new String[]{

2
jdk/test/tools/launcher/Settings.java
View File

@ -74,7 +74,7 @@ public class Settings extends TestHelper {
static void runTestOptionDefault() throws IOException {
String stackSize = "256"; // in kb
if (getArch().equals("ppc64")) {
if (getArch().equals("ppc64") || getArch().equals("ppc64le")) {
stackSize = "800";
}
TestResult tr = null;