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

8308270: ARM32 build broken after JDK-8304913

Browse Source 
Reviewed-by: stuefe, rriggs
This commit is contained in:
Boris Ulasevich 2023-05-18 03:14:38 +00:00
parent 902585bec1
commit 83c096d6e2
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ public enum Architecture {
X64, // Represents AMD64 and X86_64 X64, // Represents AMD64 and X86_64
X86, X86,
AARCH64, AARCH64,
ARM,
RISCV64, RISCV64,
S390, S390,
PPC64, PPC64,
@ -85,6 +86,14 @@ public enum Architecture {
return PlatformProps.TARGET_ARCH_IS_PPC64; return PlatformProps.TARGET_ARCH_IS_PPC64;
} }
/**
* {@return {@code true} if the current architecture is ARM}
*/
@ForceInline
public static boolean isARM() {
return PlatformProps.TARGET_ARCH_IS_ARM;
}
/** /**
* {@return {@code true} if the current architecture is AARCH64} * {@return {@code true} if the current architecture is AARCH64}
*/ */

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

@ -53,6 +53,7 @@ class PlatformProps {
static final boolean TARGET_ARCH_IS_X64 = "@@OPENJDK_TARGET_CPU@@" == "x64"; static final boolean TARGET_ARCH_IS_X64 = "@@OPENJDK_TARGET_CPU@@" == "x64";
static final boolean TARGET_ARCH_IS_X86 = "@@OPENJDK_TARGET_CPU@@" == "x86"; static final boolean TARGET_ARCH_IS_X86 = "@@OPENJDK_TARGET_CPU@@" == "x86";
static final boolean TARGET_ARCH_IS_AARCH64 = "@@OPENJDK_TARGET_CPU@@" == "aarch64"; static final boolean TARGET_ARCH_IS_AARCH64 = "@@OPENJDK_TARGET_CPU@@" == "aarch64";
static final boolean TARGET_ARCH_IS_ARM = "@@OPENJDK_TARGET_CPU@@" == "arm";
static final boolean TARGET_ARCH_IS_RISCV64 = "@@OPENJDK_TARGET_CPU@@" == "riscv64"; static final boolean TARGET_ARCH_IS_RISCV64 = "@@OPENJDK_TARGET_CPU@@" == "riscv64";
static final boolean TARGET_ARCH_IS_S390 = "@@OPENJDK_TARGET_CPU@@" == "s390"; static final boolean TARGET_ARCH_IS_S390 = "@@OPENJDK_TARGET_CPU@@" == "s390";
static final boolean TARGET_ARCH_IS_PPC64 = "@@OPENJDK_TARGET_CPU@@" == "ppc64"; static final boolean TARGET_ARCH_IS_PPC64 = "@@OPENJDK_TARGET_CPU@@" == "ppc64";

3
test/jdk/jdk/internal/util/ArchTest.java
View File

@ -28,6 +28,7 @@ import jdk.internal.misc.Unsafe;
import static jdk.internal.util.Architecture.OTHER; import static jdk.internal.util.Architecture.OTHER;
import static jdk.internal.util.Architecture.AARCH64; import static jdk.internal.util.Architecture.AARCH64;
import static jdk.internal.util.Architecture.ARM;
import static jdk.internal.util.Architecture.PPC64; import static jdk.internal.util.Architecture.PPC64;
import static jdk.internal.util.Architecture.RISCV64; import static jdk.internal.util.Architecture.RISCV64;
import static jdk.internal.util.Architecture.S390; import static jdk.internal.util.Architecture.S390;
@ -67,6 +68,7 @@ public class ArchTest {
case "x86_64", "amd64" -> X64; case "x86_64", "amd64" -> X64;
case "x86", "i386" -> X86; case "x86", "i386" -> X86;
case "aarch64" -> AARCH64; case "aarch64" -> AARCH64;
case "arm" -> ARM;
case "riscv64" -> RISCV64; case "riscv64" -> RISCV64;
case "s390x", "s390" -> S390; case "s390x", "s390" -> S390;
case "ppc64", "ppc64le" -> PPC64; case "ppc64", "ppc64le" -> PPC64;
@ -84,6 +86,7 @@ public class ArchTest {
Arguments.of(X64, Architecture.isX64()), Arguments.of(X64, Architecture.isX64()),
Arguments.of(X86, Architecture.isX86()), Arguments.of(X86, Architecture.isX86()),
Arguments.of(AARCH64, Architecture.isAARCH64()), Arguments.of(AARCH64, Architecture.isAARCH64()),
Arguments.of(ARM, Architecture.isARM()),
Arguments.of(RISCV64, Architecture.isRISCV64()), Arguments.of(RISCV64, Architecture.isRISCV64()),
Arguments.of(S390, Architecture.isS390()), Arguments.of(S390, Architecture.isS390()),
Arguments.of(PPC64, Architecture.isPPC64()) Arguments.of(PPC64, Architecture.isPPC64())