stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8315578: PPC builds are broken after JDK-8304913

Browse Source 
Reviewed-by: mdoerr, rriggs
This commit is contained in:
Aleksey Shipilev 2023-09-08 15:11:17 +00:00
parent e409d07ae8
commit 9559e035d2
3 changed files with 12 additions and 0 deletions
src/java.base/share/classes/jdk/internal/util
Architecture.javaPlatformProps.java.template
test/jdk/jdk/internal/util
ArchTest.java

9
src/java.base/share/classes/jdk/internal/util/Architecture.java

@ -49,6 +49,7 @@ public enum Architecture {
RISCV64(64, ByteOrder.LITTLE_ENDIAN),
LOONGARCH64(64, ByteOrder.LITTLE_ENDIAN),
S390(64, ByteOrder.BIG_ENDIAN),
PPC(32, ByteOrder.BIG_ENDIAN),
PPC64(64, ByteOrder.BIG_ENDIAN),
PPC64LE(64, ByteOrder.LITTLE_ENDIAN),
MIPSEL(32, ByteOrder.LITTLE_ENDIAN),
@ -155,6 +156,14 @@ public enum Architecture {
return PlatformProps.TARGET_ARCH_IS_S390;
}
/**
* {@return {@code true} if the current architecture is PPC, big-endian}
*/
@ForceInline
public static boolean isPPC() {
return PlatformProps.TARGET_ARCH_IS_PPC;
}
/**
* {@return {@code true} if the current architecture is PPC64, big-endian}
*/

1
src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template

@ -59,6 +59,7 @@ class PlatformProps {
static final boolean TARGET_ARCH_IS_RISCV64 = "@@OPENJDK_TARGET_CPU@@" == "riscv64";
static final boolean TARGET_ARCH_IS_LOONGARCH64 = "@@OPENJDK_TARGET_CPU@@" == "loongarch64";
static final boolean TARGET_ARCH_IS_S390 = "@@OPENJDK_TARGET_CPU@@" == "s390";
static final boolean TARGET_ARCH_IS_PPC = "@@OPENJDK_TARGET_CPU@@" == "ppc";
static final boolean TARGET_ARCH_IS_PPC64 = "@@OPENJDK_TARGET_CPU@@" == "ppc64";
static final boolean TARGET_ARCH_IS_PPC64LE = "@@OPENJDK_TARGET_CPU@@" == "ppc64le";
static final boolean TARGET_ARCH_IS_MIPSEL = "@@OPENJDK_TARGET_CPU@@" == "mipsel";

2
test/jdk/jdk/internal/util/ArchTest.java

@ -30,6 +30,7 @@ import jdk.internal.misc.Unsafe;
import static jdk.internal.util.Architecture.AARCH64;
import static jdk.internal.util.Architecture.ARM;
import static jdk.internal.util.Architecture.PPC;
import static jdk.internal.util.Architecture.PPC64;
import static jdk.internal.util.Architecture.PPC64LE;
import static jdk.internal.util.Architecture.RISCV64;
@ -81,6 +82,7 @@ public class ArchTest {
Arguments.of("loongarch64", LOONGARCH64, 64, ByteOrder.LITTLE_ENDIAN, Architecture.isLOONGARCH64()),
Arguments.of("mips64el", MIPS64EL, 64, ByteOrder.LITTLE_ENDIAN, Architecture.isMIPS64EL()),
Arguments.of("mipsel", MIPSEL, 32, ByteOrder.LITTLE_ENDIAN, Architecture.isMIPSEL()),
Arguments.of("ppc", PPC, 32, ByteOrder.BIG_ENDIAN, Architecture.isPPC()),
Arguments.of("ppc64", PPC64, 64, ByteOrder.BIG_ENDIAN, Architecture.isPPC64()),
Arguments.of("ppc64le", PPC64LE, 64, ByteOrder.LITTLE_ENDIAN, Architecture.isPPC64LE()),
Arguments.of("riscv64", RISCV64, 64, ByteOrder.LITTLE_ENDIAN, Architecture.isRISCV64()),