dlopen: Add source files to mark if runtime is dynamic library (#29097)

This PR adjusts the runtime build script and adds two new source files.
The source files set an `int` to indicate whether or not the runtime was
built as a dynamic library or not. It adjusts the runtime Makefile(s) in
order to include one of the two source files as needed.

TESTING

- [x] `standard`

Reviewed by @jabraham17. Thanks much!

Author: dlongnecke-cray

runtime/Makefile.help

@@ -90,7 +90,7 @@ SUBDIRS = \
 
 SRCS =
 
-RUNTIME_OBJS = \
+COMMON_RUNTIME_OBJS = \
 	$(COMMON_OBJS) \
 	$(TASKS_OBJS) \
 	$(THREADS_OBJS) \
@@ -104,6 +104,14 @@ RUNTIME_OBJS = \
 	$(AUXFS_HDFS_OBJS) \
 	$(AUXFS_CURL_OBJS)
 
+STATIC_RUNTIME_OBJS = \
+	$(STATIC_RUNTIME_ONLY_OBJS) \
+	$(COMMON_RUNTIME_OBJS)
+
+SHARED_RUNTIME_OBJS = \
+	$(SHARED_RUNTIME_ONLY_OBJS) \
+	$(COMMON_RUNTIME_OBJS)
+
 LAUNCH_LIB_OBJS = \
 	$(COMMON_LAUNCHER_OBJS) \
 	$(COMM_LAUNCHER_OBJS) \
@@ -176,25 +184,25 @@ else
   # RUNTIME_SHARED_LIB_CXX_LINK_FLAGS=-Wl,--no-undefined
 endif
 
-$(RUNTIME_SHARED_LIB): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP) \
+$(RUNTIME_SHARED_LIB): $(SHARED_RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP) \
                        $(RUNTIME_LIST_INCLUDESANDDEFINES) \
                        $(RUNTIME_LIST_LIBRARIES) \
                        $(RUNTIME_OVERRIDE_LD)
 ifneq ($(CHPL_MAKE_LIB_PIC),pic)
 	@echo "note: Skipping creation of '$(RUNTIME_SHARED_LIB_NAME)' because 'CHPL_LIB_PIC' != 'pic'"
 else
-	$(CHPL_MAKE_TARGET_CXX) -shared -o $@ $(RUNTIME_OBJS) $(LIBS) \
+	$(CHPL_MAKE_TARGET_CXX) -shared -o $@ $(SHARED_RUNTIME_OBJS) $(LIBS) \
 		$(RUNTIME_SHARED_LIB_CXX_LINK_FLAGS) \
 		$(CHPL_MAKE_TARGET_BUNDLED_RUNTIME_LINK_ARGS) \
 		$(CHPL_MAKE_TARGET_SYSTEM_RUNTIME_LINK_ARGS)
 endif
 
-$(RUNTIME_STATIC_LIB): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP) \
+$(RUNTIME_STATIC_LIB): $(STATIC_RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP) \
                        $(RUNTIME_LIST_INCLUDESANDDEFINES) \
                        $(RUNTIME_LIST_LIBRARIES) \
                        $(RUNTIME_OVERRIDE_LD)
 	@rm -f $@
-	$(AR) -rc $@ $(RUNTIME_OBJS)
+	$(AR) -rc $@ $(STATIC_RUNTIME_OBJS)
 	$(RANLIB) $@
 	$(TAGS_COMMAND)
 	CHPL_HOST_COMPILER='$(CHPL_MAKE_HOST_COMPILER)' \
@@ -205,13 +213,13 @@ $(RUNTIME_STATIC_LIB): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP) \
 	CHPL_TARGET_CXX='$(CHPL_MAKE_TARGET_CXX)' \
 	../util/printchplenv --runtime --no-tidy --anonymize --simple > $(RUNTIME_CHPLCONFIG)
 
-$(RUNTIME_LIST_INCLUDESANDDEFINES): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
+$(RUNTIME_LIST_INCLUDESANDDEFINES): $(COMMON_RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
 	$(MAKE) -f Makefile.config printincludesanddefines > $(RUNTIME_LIST_INCLUDESANDDEFINES)
 
-$(RUNTIME_LIST_LIBRARIES): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
+$(RUNTIME_LIST_LIBRARIES): $(COMMON_RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
 	$(MAKE) -f Makefile.config printlibraries > $(RUNTIME_LIST_LIBRARIES)
 
-$(RUNTIME_OVERRIDE_LD): $(RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
+$(RUNTIME_OVERRIDE_LD): $(COMMON_RUNTIME_OBJS) $(RUNTIME_DIR_TIMESTAMP)
 	$(MAKE) -f Makefile.config printoverrideld > $(RUNTIME_OVERRIDE_LD)
 
 $(RUNTIME_DIR)/main.o: $(RUNTIME_OBJDIR)/src/main.o

runtime/src/Makefile

@@ -39,6 +39,8 @@ include Makefile.share
 ifneq ($(MAKE_LAUNCHER),1)
 TARGETS = \
 	$(COMMON_OBJS) \
+	$(SHARED_RUNTIME_ONLY_OBJS) \
+	$(STATIC_RUNTIME_ONLY_OBJS) \
 	$(MAIN_OBJS) \
 	$(MAIN_MLI_OBJS) \
 	$(RUNTIME_MALLOC_OBJS) \

runtime/src/Makefile.share

@@ -81,6 +81,17 @@ MAIN_LAUNCHER_SRCS = \
 RUNTIME_MALLOC_SRCS = \
 	chpl-mem-replace-malloc.c
 
+STATIC_RUNTIME_ONLY_SRCS = \
+	chplrt-static-build-marker.c
+
+SHARED_RUNTIME_ONLY_SRCS = \
+	chplrt-shared-build-marker.c
+
+STATIC_RUNTIME_ONLY_OBJS = \
+	$(STATIC_RUNTIME_ONLY_SRCS:%.c=$(COMMON_OBJDIR)/%.o)
+
+SHARED_RUNTIME_ONLY_OBJS = \
+	$(SHARED_RUNTIME_ONLY_SRCS:%.c=$(COMMON_OBJDIR)/%.o)
 
 COMMON_OBJS = \
 	$(COMMON_SRCS:%.c=$(COMMON_OBJDIR)/%.o)

runtime/src/chpl-prginfo.c

@@ -35,13 +35,6 @@
 
 static chpl_rt_prginfo* chpl_prg_root;
 
-// TODO: Have to switch to linking in separate object files?
-#ifndef CHPL_RT_IS_BUILT_AS_DYNAMIC_LIBRARY
-  int chpl_rt_is_dynamic_library = 0;
-#else
-  int chpl_rt_is_dynamic_library = 1;
-#endif
-
 /** Define setters that module code can call to set up program data. */
 #define CONCAT(a__, b__) a__##b__
 #define PREFIX chpl_rt_prginfo_data_entry_set_

runtime/src/chplrt-shared-build-marker.c

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020-2026 Hewlett Packard Enterprise Development LP
+ * Copyright 2004-2019 Cray Inc.
+ * Other additional copyright holders may be indicated within.
+ *
+ * The entirety of this work is licensed under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "chplrt.h"
+
+int chpl_rt_is_dynamic_library = 1;

runtime/src/chplrt-static-build-marker.c

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020-2026 Hewlett Packard Enterprise Development LP
+ * Copyright 2004-2019 Cray Inc.
+ * Other additional copyright holders may be indicated within.
+ *
+ * The entirety of this work is licensed under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "chplrt.h"
+
+int chpl_rt_is_dynamic_library = 0;

test/dynamic-loading/SharedRuntimeBuildMarker.chpl

@@ -0,0 +1,8 @@
+use CTypes;
+
+// Variable that is defined in the runtime in 'chpl-prginfo.h'.
+proc main() {
+  extern const chpl_rt_is_dynamic_library: c_int;
+  var ok = chpl_rt_is_dynamic_library == 1;
+  assert(ok);
+}

test/dynamic-loading/SharedRuntimeBuildMarker.compopts

@@ -0,0 +1 @@
+--no-builtin-runtime

test/dynamic-loading/SharedRuntimeBuildMarker.good

@@ -0,0 +1 @@
+CHPL_LIB_PIC != pic