Fix base layer shared object linking.

Author: cstancu

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java

@@ -340,13 +340,18 @@ protected void setOutputKind(List<String> cmd) {
         @Override
         protected List<String> getLibrariesCommand() {
             List<String> cmd = new ArrayList<>();
+            String pushState = "-Wl,--push-state";
+            String popState = "-Wl,--pop-state";
             if (customStaticLibs) {
-                cmd.add("-Wl,--push-state");
+                cmd.add(pushState);
             }
+            String previousLayerLib = null;
             for (String lib : libs) {
                 String linkingMode = null;
-                if (ImageLayerBuildingSupport.buildingImageLayer() && HostedDynamicLayerInfo.singleton().isImageLayerLib(lib)) {
-                    linkingMode = "dynamic";
+                if (ImageLayerBuildingSupport.buildingExtensionLayer() && HostedDynamicLayerInfo.singleton().isImageLayerLib(lib)) {
+                    VMError.guarantee(!lib.isEmpty());
+                    VMError.guarantee(previousLayerLib == null, "We currently only support one previous layer."); // GR-58631
+                    previousLayerLib = lib;
                 } else if (dynamicLibC) {
                     linkingMode = LIB_C_NAMES.contains(lib) ? "dynamic" : "static";
                 } else if (staticLibCpp) {
@@ -358,7 +363,14 @@ protected List<String> getLibrariesCommand() {
                 cmd.add("-l" + lib);
             }
             if (customStaticLibs) {
-                cmd.add("-Wl,--pop-state");
+                cmd.add(popState);
+            }
+
+            if (previousLayerLib != null) {
+                cmd.add(pushState);
+                cmd.add("-Wl,-Bdynamic");
+                cmd.add("-l" + previousLayerLib);
+                cmd.add(popState);
             }
 
             // Make sure libgcc gets statically linked