Ignore any potential undefined references caused by inlining in base …

…layer.
oracle · Apr 26, 2024 · dd58510 · dd58510
1 parent da291fe
commit dd58510
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -716,6 +716,8 @@ public static boolean useLIRBackend() {
     public static final HostedOptionKey<Boolean> RemoveUnusedSymbols = new HostedOptionKey<>(OS.getCurrent() != OS.DARWIN);
     @Option(help = "Keep all undefined symbols.")//
     public static final HostedOptionKey<Boolean> PreserveUndefinedSymbols = new HostedOptionKey<>(false);
+    @Option(help = "Ignore undefined symbols referenced from the built image.")//
+    public static final HostedOptionKey<Boolean> IgnoreUndefinedReferences = new HostedOptionKey<>(false);
     @Option(help = "Use linker option to remove all local symbols from image.")//
     public static final HostedOptionKey<Boolean> DeleteLocalSymbols = new HostedOptionKey<>(true);
     @Option(help = "Compatibility option to make symbols used for the image heap global. " +
@@ -1143,6 +1145,8 @@ public void update(EconomicMap<OptionKey<?>, Object> values, Object boxedValue)
             super.update(values, boxedValue);
             ClosedTypeWorld.update(values, false);
             PreserveUndefinedSymbols.update(values, true);
+            /* Ignore any potential undefined references caused by inlining in base layer. */
+            IgnoreUndefinedReferences.update(values, true);
             AOTTrivialInline.update(values, false);
             if (imageLayerEnabledHandler != null) {
                 imageLayerEnabledHandler.onOptionEnabled(values);

diff --git a/...tratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java b/...tratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java
@@ -270,6 +270,10 @@ private static class BinutilsCCLinkerInvocation extends CCLinkerInvocation {
                 /* Perform garbage collection of unused input sections. */
                 additionalPreOptions.add("-Wl,--gc-sections");
             }
+            if (SubstrateOptions.IgnoreUndefinedReferences.getValue()) {
+                /* Ignore references to undefined symbols from the object files. */
+                additionalPreOptions.add("-Wl,--unresolved-symbols=ignore-in-object-files");
+            }
 
             /* Use --version-script to control the visibility of image symbols. */
             try {