[flang] Fix unrelated build error found in testing

Original-commit: flang-compiler/f18@5a00d77827feda979f2b11a33a22b7c7b05e824a
Reviewed-on: https://github.com/flang-compiler/f18/pull/926
Tree-same-pre-rewrite: false

diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt
index fbac112..99713cc 100644 (file)
--- a/flang/runtime/CMakeLists.txt
+++ b/flang/runtime/CMakeLists.txt
@@ -6,10 +6,6 @@
 #
 #===------------------------------------------------------------------------===#
 
-# Allow an unresolved external reference to the entry point of the
-# Fortran main PROGRAM from main.cc.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -u __FortranProgram")
-
 add_library(FortranRuntime
   ISO_Fortran_binding.cc
   derived-type.cc

diff --git a/flang/runtime/main.cc b/flang/runtime/main.cc
index 0dd0963..1252614 100644 (file)
--- a/flang/runtime/main.cc
+++ b/flang/runtime/main.cc
@@ -19,9 +19,7 @@ const char **envp;
 
 extern "C" {
 
-void __FortranProgram();  // PROGRAM statement
-
-int main(int argc, const char *argv[], const char *envp[]) {
+void RTNAME(ProgramStart)(int argc, const char *argv[], const char *envp[]) {
 
   Fortran::runtime::argc = argc;
   Fortran::runtime::argv = argv;
@@ -40,7 +38,5 @@ int main(int argc, const char *argv[], const char *envp[]) {
 
   std::atexit(Fortran::runtime::NotifyOtherImagesOfNormalEnd);
   // TODO: Runtime configuration settings from environment
-  __FortranProgram();
-  return EXIT_SUCCESS;
 }
 }

diff --git a/flang/runtime/main.h b/flang/runtime/main.h
index bd744ae..9a076b9 100644 (file)
--- a/flang/runtime/main.h
+++ b/flang/runtime/main.h
@@ -9,10 +9,16 @@
 #ifndef FORTRAN_RUNTIME_MAIN_H_
 #define FORTRAN_RUNTIME_MAIN_H_
 
+#include "entry-names.h"
+
 namespace Fortran::runtime {
 extern int argc;
 extern const char **argv;
 extern const char **envp;
 }
 
+extern "C" {
+void RTNAME(ProgramStart)(int, const char *[], const char *[]);
+}
+
 #endif  // FORTRAN_RUNTIME_MAIN_H_