Bug 572844 - [Mac aarch64] Validation error when launching new Eclipse configuration Add new constant ARCH_AARCH64 for aarch64 and add to ARCH_LIST Change-Id: I1aa7244204d4cbbebc93016a29a94e90fbcfebae Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.runtime/+/179955 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Lakshmi P Shanmugam <lshanmug@in.ibm.com>
diff --git a/bundles/org.eclipse.core.runtime/.settings/.api_filters b/bundles/org.eclipse.core.runtime/.settings/.api_filters index ab3927f..bbc0a47 100644 --- a/bundles/org.eclipse.core.runtime/.settings/.api_filters +++ b/bundles/org.eclipse.core.runtime/.settings/.api_filters
@@ -1,42 +1,42 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.core.runtime" version="2"> <resource path="META-INF/MANIFEST.MF"> - <filter comment="Planned_deletion-we-increase the minor version" id="926941240"> + <filter comment="Bug 572013-Planned deletion-we-increase the minor version" id="932184123"> <message_arguments> - <message_argument value="3.21.0"/> + <message_argument value="3.22.0"/> <message_argument value="3.20.100"/> </message_arguments> </filter> </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.ILibrary"> - <filter comment="Planned deletion" id="305324134"> + <filter comment="Bug 572013-Planned deletion" id="305324134"> <message_arguments> <message_argument value="org.eclipse.core.runtime.ILibrary"/> - <message_argument value="org.eclipse.core.runtime_3.21.0"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPlatformRunnable"> - <filter comment="Planned-Deletion" id="305324134"> + <filter comment="Bug 572013-Planned deletion" id="305324134"> <message_arguments> <message_argument value="org.eclipse.core.runtime.IPlatformRunnable"/> - <message_argument value="org.eclipse.core.runtime_3.21.0"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginPrerequisite"> - <filter comment="Planned deletion" id="305324134"> + <filter comment="Bug 572013-Planned deletion" id="305324134"> <message_arguments> <message_argument value="org.eclipse.core.runtime.IPluginPrerequisite"/> - <message_argument value="org.eclipse.core.runtime_3.21.0"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginRegistry"> - <filter comment="Planned deletion" id="305324134"> + <filter comment="Bug 572013-Planned deletion" id="305324134"> <message_arguments> <message_argument value="org.eclipse.core.runtime.IPluginRegistry"/> - <message_argument value="org.eclipse.core.runtime_3.21.0"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource>
diff --git a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF index 694f918..ee77f45 100644 --- a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-Version: 3.21.0.qualifier +Bundle-Version: 3.22.0.qualifier Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator
diff --git a/bundles/org.eclipse.core.runtime/pom.xml b/bundles/org.eclipse.core.runtime/pom.xml index 158b6fd..78a8ca1 100644 --- a/bundles/org.eclipse.core.runtime/pom.xml +++ b/bundles/org.eclipse.core.runtime/pom.xml
@@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> - <version>3.21.0-SNAPSHOT</version> + <version>3.22.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java index 336685d..561f15d 100644 --- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java +++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
@@ -49,7 +49,7 @@ */ public final class InternalPlatform { - private static final String[] ARCH_LIST = { Platform.ARCH_X86, Platform.ARCH_X86_64 }; + private static final String[] ARCH_LIST = { Platform.ARCH_AARCH64, Platform.ARCH_X86, Platform.ARCH_X86_64 }; // debug support: set in loadOptions() public static boolean DEBUG = false;
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java index 0ce294d..af0c28e 100644 --- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java +++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
@@ -349,6 +349,14 @@ public static final String ARCH_X86_64 = "x86_64";//$NON-NLS-1$ /** + * Constant string (value "aarch64") indicating the platform is running on an + * AARCH64bit-based architecture. + * + * @since 3.22 + */ + public static final String ARCH_AARCH64 = "aarch64";//$NON-NLS-1$ + + /** * Constant string (value "amd64") indicating the platform is running on an * AMD64-based architecture. *