31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
Subject: Backport JDK-8340623 Remove outdated PROCESSOR_ARCHITECTURE_IA64 from Windows coding
|
|
|
|
---
|
|
src/java.base/windows/native/libjava/java_props_md.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/src/java.base/windows/native/libjava/java_props_md.c b/src/java.base/windows/native/libjava/java_props_md.c
|
|
index 2ff4c9e88..280747d0d 100644
|
|
--- a/src/java.base/windows/native/libjava/java_props_md.c
|
|
+++ b/src/java.base/windows/native/libjava/java_props_md.c
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
|
|
+ * Copyright (c) 1998, 2024, 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
|
|
@@ -263,9 +263,6 @@ cpu_isalist(void)
|
|
SYSTEM_INFO info;
|
|
GetSystemInfo(&info);
|
|
switch (info.wProcessorArchitecture) {
|
|
-#ifdef PROCESSOR_ARCHITECTURE_IA64
|
|
- case PROCESSOR_ARCHITECTURE_IA64: return "ia64";
|
|
-#endif
|
|
#ifdef PROCESSOR_ARCHITECTURE_AMD64
|
|
case PROCESSOR_ARCHITECTURE_AMD64: return "amd64";
|
|
#endif
|
|
--
|
|
2.33.0
|
|
|