fix Issue 10711 - shared phobos library should not depend on _Dmain

mak/MANIFEST

@@ -171,6 +171,7 @@ MANIFEST=\
 	src\rt\deh2.d \
 	src\rt\dmain2.d \
 	src\rt\dylib_fixes.c \
+	src\rt\entrypoint.d \
 	src\rt\image.d \
 	src\rt\invariant.d \
 	src\rt\lifetime.d \

mak/SRCS

@@ -84,6 +84,7 @@ SRCS=\
 	src\rt\deh.d \
 	src\rt\deh2.d \
 	src\rt\dmain2.d \
+	src\rt\entrypoint.d \
 	src\rt\invariant.d \
 	src\rt\lifetime.d \
 	src\rt\llmath.d \

src/rt/dmain2.d

@@ -1,5 +1,5 @@
 /**
- * Contains main program entry point and support routines.
+ * Contains druntime startup and shutdown routines.
  *
  * Copyright: Copyright Digital Mars 2000 - 2013.
  * License: Distributed under the
@@ -60,6 +60,7 @@ extern (C) void rt_moduleTlsCtor();
 extern (C) void rt_moduleDtor();
 extern (C) void rt_moduleTlsDtor();
 extern (C) void thread_joinAll();
+extern (C) bool runModuleUnitTests();
 
 version (OSX)
 {
@@ -352,52 +353,13 @@ extern (C) CArgs rt_cArgs()
     return _cArgs;
 }
 
-/***********************************
- * The D main() function supplied by the user's program
- *
- * It always has `_Dmain` symbol name and uses C calling convention.
- * But DMD frontend returns its type as `extern(D)` because of Issue @@@9028@@@.
- * As we need to deal with actual calling convention we have to mark it
- * as `extern(C)` and use its symbol name.
- */
-extern(C) int _Dmain(char[][] args);
-alias extern(C) int function(char[][] args) MainFunc;
-
-/***********************************
- * Substitutes for the C main() function.
- * Just calls into d_run_main with the default main function.
- * Applications are free to implement their own
- * main function and call the _d_run_main function
- * themselves with any main function.
- */
-extern (C) int main(int argc, char **argv)
-{
-    auto result = _d_run_main(argc, argv, &_Dmain);
-    // Issue 10344: flush stdout and return nonzero on failure
-    if (.fflush(.stdout) != 0)
-    {
-        .fprintf(.stderr, "Failed to flush stdout: %s\n", .strerror(.errno));
-        if (result == 0)
-        {
-            result = EXIT_FAILURE;
-        }
-    }
-    return result;
-}
-
-version (Solaris) extern (C) int _main(int argc, char** argv)
-{
-    // This is apparently needed on Solaris because the
-    // C tool chain seems to expect the main function
-    // to be called _main. It needs both not just one!
-    return main(argc, argv);
-}
-
 /***********************************
  * Run the given main function.
  * Its purpose is to wrap the D main()
  * function and catch any unhandled exceptions.
  */
+private alias extern(C) int function(char[][] args) MainFunc;
+
 extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)
 {
     // Remember the original C argc/argv
@@ -659,5 +621,15 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)
     _STD_critical_term();
     _STD_monitor_staticdtor();
 
+    // Issue 10344: flush stdout and return nonzero on failure
+    if (.fflush(.stdout) != 0)
+    {
+        .fprintf(.stderr, "Failed to flush stdout: %s\n", .strerror(.errno));
+        if (result == 0)
+        {
+            result = EXIT_FAILURE;
+        }
+    }
+
     return result;
 }

src/rt/entrypoint.d

@@ -0,0 +1,49 @@
+/**
+ * Contains druntime entry point for console programs.
+ *
+ * Copyright: Copyright Digital Mars 2000 - 2013.
+ * License: Distributed under the
+ *      $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
+ *    (See accompanying file LICENSE)
+ * Authors:   Walter Bright, Sean Kelly
+ * Source: $(DRUNTIMESRC src/rt/_entrypoint.d)
+ */
+
+module rt.entrypoint;
+
+alias extern(C) int function(char[][] args) MainFunc;
+
+extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc);
+
+
+/***********************************
+ * The D main() function supplied by the user's program
+ *
+ * It always has `_Dmain` symbol name and uses C calling convention.
+ * But DMD frontend returns its type as `extern(D)` because of Issue @@@9028@@@.
+ * As we need to deal with actual calling convention we have to mark it
+ * as `extern(C)` and use its symbol name.
+ */
+extern(C) int _Dmain(char[][] args);
+
+/***********************************
+ * Substitutes for the C main() function.
+ * Just calls into d_run_main with the default main function.
+ * Applications are free to implement their own
+ * main function and call the _d_run_main function
+ * themselves with any main function.
+ */
+extern (C) int main(int argc, char **argv)
+{
+    return _d_run_main(argc, argv, &_Dmain);
+}
+
+version (Solaris) extern (C) int _main(int argc, char** argv)
+{
+    // This is apparently needed on Solaris because the
+    // C tool chain seems to expect the main function
+    // to be called _main. It needs both not just one!
+    return main(argc, argv);
+}
+
+