[GR-32560] IOS simulator target.

PullRequest: graal/9329
CAFxX · Jul 20, 2021 · a5ace85 · a5ace85
2 parents 64bff77 + 447b5ed
commit a5ace85
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest
@@ -219,6 +219,7 @@ innr public final static DARWIN_AARCH64
 innr public final static DARWIN_AMD64
 innr public final static HOSTED_ONLY
 innr public final static IOS_AARCH64
+innr public final static IOS_AMD64
 innr public final static LINUX_AARCH64
 innr public final static WINDOWS_AMD64
 innr public static LINUX_AMD64
@@ -284,6 +285,13 @@ intf org.graalvm.nativeimage.Platform$AARCH64
 intf org.graalvm.nativeimage.Platform$IOS
 supr java.lang.Object
 
+CLSS public final static org.graalvm.nativeimage.Platform$IOS_AMD64
+ outer org.graalvm.nativeimage.Platform
+cons public init()
+intf org.graalvm.nativeimage.Platform$AMD64
+intf org.graalvm.nativeimage.Platform$IOS
+supr java.lang.Object
+
 CLSS public abstract interface static org.graalvm.nativeimage.Platform$LINUX
  outer org.graalvm.nativeimage.Platform
 intf org.graalvm.nativeimage.impl.InternalPlatform$PLATFORM_JNI

diff --git a/sdk/src/org.graalvm.nativeimage/src/META-INF/services/org.graalvm.nativeimage.Platform b/sdk/src/org.graalvm.nativeimage/src/META-INF/services/org.graalvm.nativeimage.Platform
@@ -3,5 +3,6 @@ org.graalvm.nativeimage.Platform$LINUX_AARCH64
 org.graalvm.nativeimage.Platform$ANDROID_AARCH64
 org.graalvm.nativeimage.Platform$DARWIN_AMD64
 org.graalvm.nativeimage.Platform$DARWIN_AARCH64
+org.graalvm.nativeimage.Platform$IOS_AMD64
 org.graalvm.nativeimage.Platform$IOS_AARCH64
 org.graalvm.nativeimage.Platform$WINDOWS_AMD64
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -336,6 +336,22 @@ public IOS_AARCH64() {
         }
     }
 
+    /**
+     * Supported leaf platform: iOS on x86 64-bit.
+     *
+     * @since 21.3
+     */
+    final class IOS_AMD64 implements IOS, AMD64 {
+
+        /**
+         * Instantiates a marker instance of this platform.
+         *
+         * @since 21.3
+         */
+        public IOS_AMD64() {
+        }
+    }
+
     /**
      * Supported leaf platform: Windows on x86 64-bit.
      *

diff --git a/...racle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMTargetSpecific.java b/...racle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMTargetSpecific.java
@@ -158,7 +158,12 @@ public int getFramePointerDwarfRegNum() {
 
             @Override
             public List<String> getLLCAdditionalOptions() {
-                return Collections.singletonList("-no-x86-call-frame-opt");
+                List<String> list = new ArrayList<>();
+                list.add("-no-x86-call-frame-opt");
+                if (Platform.includedIn(Platform.IOS.class)) {
+                    list.add("-mtriple=x86_64-ios");
+                }
+                return list;
             }
         });
     }