Use -Wl,-Bstatic for user libraries in FMUs

FMUs should be statically compiled. This enforces it, but might cause
some FMUs to no longer compile if no static library is available or
dependencies are missing in the Library annotation.

Also added a new file Compiler/Util/Autoconf.mo which is generated by
autoconf and contains constants previously in external C functions.

Belonging to [master]:
  - #3015

Author: sjoelund

.gitignore

@@ -164,3 +164,5 @@ tags
 
 *.plist
 *clang_output*
+
+Compiler/Util/Autoconf.mo

Compiler/Script/CevalScript.mo

@@ -61,6 +61,7 @@ import SimCode;
 
 // protected imports
 protected
+import Autoconf;
 import BaseHashSet;
 import CevalScriptBackend;
 import CevalFunction;
@@ -1711,7 +1712,7 @@ algorithm
         gcc_res = 0 == System.systemCall(gcc + " --version", touch_file);
         gccVersion = System.readFile(touch_file);
         System.systemCall("rm -f " + touch_file, "");
-        confcmd = System.configureCommandLine();
+        confcmd = Autoconf.configureCommandLine;
         vals = {Values.STRING(omhome),
                 Values.STRING(omlib),
                 Values.STRING(omcpath),

Compiler/Script/CevalScriptBackend.mo

@@ -51,6 +51,7 @@ import UnitAbsyn;
 
 // protected imports
 protected
+import Autoconf;
 import BackendDump;
 import BackendDAECreate;
 import BackendDAEUtil;
@@ -3385,6 +3386,8 @@ algorithm
         makefileStr := System.stringReplace(makefileStr, "@FMIPLATFORM@", System.modelicaPlatform());
         makefileStr := System.stringReplace(makefileStr, "@CPPFLAGS@", includeDefaultFmi);
         makefileStr := System.stringReplace(makefileStr, "@LIBTYPE_DYNAMIC@", "1");
+        makefileStr := System.stringReplace(makefileStr, "@BSTATIC@", Autoconf.bstatic);
+        makefileStr := System.stringReplace(makefileStr, "@BDYNAMIC@", Autoconf.bdynamic);
         makefileStr := System.stringReplace(makefileStr, "\r\n", "\n");
         System.writeFile(dir + "Makefile", makefileStr);
         System.writeFile(dir + "config.log", "Using cached values for dynamic platform");
@@ -3404,6 +3407,8 @@ algorithm
         makefileStr := System.stringReplace(makefileStr, "@FMIPLATFORM@", System.modelicaPlatform());
         makefileStr := System.stringReplace(makefileStr, "@CPPFLAGS@", "-DOMC_MINIMAL_RUNTIME=1 -DCMINPACK_NO_DLL=1 " + includeDefaultFmi);
         makefileStr := System.stringReplace(makefileStr, "@LIBTYPE_DYNAMIC@", "1");
+        makefileStr := System.stringReplace(makefileStr, "@BSTATIC@", Autoconf.bstatic);
+        makefileStr := System.stringReplace(makefileStr, "@BDYNAMIC@", Autoconf.bdynamic);
         makefileStr := System.stringReplace(makefileStr, "\r\n", "\n");
         System.writeFile(dir + "Makefile", makefileStr);
         System.writeFile(dir + "config.log", "Using cached values for static platform");

Compiler/Template/CodegenFMU.tpl

@@ -1163,7 +1163,7 @@ match platform
   nozip: <%fileNamePrefix%>_functions.h <%fileNamePrefix%>_literals.h $(OFILES) $(RUNTIMEFILES)
   <%\t%>mkdir -p ../binaries/$(FMIPLATFORM)
   ifeq (@LIBTYPE_DYNAMIC@,1)
-  <%\t%>$(LD) -o <%modelNamePrefix%>$(DLLEXT) $(OFILES) $(RUNTIMEFILES) <%dirExtra%> <%libsPos1%> <%libsPos2%> $(LDFLAGS)
+  <%\t%>$(LD) -o <%modelNamePrefix%>$(DLLEXT) $(OFILES) $(RUNTIMEFILES) <%dirExtra%> <%libsPos1%> @BSTATIC@ <%libsPos2%> @BDYNAMIC@ $(LDFLAGS)
   <%\t%>cp <%fileNamePrefix%>$(DLLEXT) <%fileNamePrefix%>_FMU.libs ../binaries/$(FMIPLATFORM)/
   endif
   <%\t%>head -n20 Makefile > ../resources/$(FMIPLATFORM).summary

Compiler/Util/Autoconf.mo.in

@@ -0,0 +1,9 @@
+encapsulated package Autoconf
+
+  constant Boolean haveBStatic = @BSTATIC@;
+  constant String bstatic = if haveBStatic then "-Wl,-Bstatic" else "";
+  constant String bdynamic = if haveBStatic then "-Wl,-Bdynamic" else "";
+  constant String configureCommandLine = "Configured @date@ using arguments: @CONFIGURE_ARGS@";
+
+annotation(__OpenModelica_Interface="util");
+end Autoconf;

Compiler/Util/Autoconf.mo.omdev.mingw

@@ -0,0 +1,8 @@
+encapsulated package Autoconf
+
+  constant String bstatic = "-Wl,-Bstatic";
+  constant String bdynamic = "-Wl,-Bdynamic";
+  constant String configureCommandLine = "Manually created Makefiles for OMDev";
+
+annotation(__OpenModelica_Interface="util");
+end Autoconf;

Compiler/Util/System.mo

@@ -779,14 +779,6 @@ public function getuid
   external "C" uid=System_getuid() annotation(Library = "omcruntime");
 end getuid;
 
-public function configureCommandLine
-"Returns the date and command used to configure OpenModelica.
-On the platforms that don't configure options, like OMDev, the returned string
-is more generic and does not contain a date."
-  output String cmdLine;
-  external "C" cmdLine=System_configureCommandLine() annotation(Library = "omcruntime");
-end configureCommandLine;
-
 public function realtimeTick
 "Tock returns the time since the last tock; undefined if tick was never called.
 The clock index is 0-31. The function fails if the number is out of range."

Compiler/boot/LoadCompilerSources.mos

@@ -133,6 +133,7 @@ if true then /* Suppress output */
 
   // "Util";
     "../Util/Array.mo",
+    "../Util/Autoconf.mo",
     "../Util/AvlSetCR.mo",
     "../Util/AvlSetPath.mo",
     "../Util/AvlSetString.mo",

Compiler/boot/Makefile.in

@@ -43,5 +43,8 @@ default: all
 
 include Makefile.common
 
+../Util/Autoconf.mo: ../Util/Autoconf.mo.in
+	(cd "$(TOP_DIR)" && ./config.status)
+
 Makefile: Makefile.in
 	(cd @top_builddir@ && ./config.status)

Compiler/boot/Makefile.omdev.mingw

@@ -52,4 +52,7 @@ LDFLAGS_SHARED_MAIN=-L"$(OMHOME)/$(LIB_OMC)" $(EXTRA_LD_FLAGS)
 
 default: all
 
+../Util/Autoconf.mo: ../Util/Autoconf.mo.omdev.mingw
+	cp -p "$<" "$@"
+
 include Makefile.common