Compile and link ISO_FORTRAN_ENV

Author: mjklemm

flang/module/iso_fortran_env.f90

@@ -22,7 +22,7 @@ module iso_fortran_env
     compiler_options => __builtin_compiler_options, &
     compiler_version => __builtin_compiler_version
 
-  use __fortran_builtin_kinds, only: &
+  use iso_fortran_env_impl, only: &
     selectedInt8, selectedInt16, selectedInt32, selectedInt64, selectedInt128, &
     safeInt8, safeInt16, safeInt32, safeInt64, safeInt128, &
     int8, int16, int32, int64, int128, &

flang/module/__fortran_builtin_kinds.f90 renamed to flang/module/iso_fortran_env_impl.f90

@@ -6,7 +6,11 @@
 !
 !===------------------------------------------------------------------------===!
 
-module __fortran_builtin_kinds
+! This MODULE implements part of the ISO_FORTRAN_ENV module file, which
+! partially requires linkable symbols for some entities defined
+! (e.g., real_kinds).
+
+module iso_fortran_env_impl
   implicit none
   private
 
@@ -107,4 +111,4 @@
       pack([real64x2], real64x2 >= 0), &
       pack([real128], real128 >= 0) &
     ]
-end module __fortran_builtin_kinds
+end module iso_fortran_env_impl

flang/runtime/CMakeLists.txt

@@ -169,6 +169,7 @@ set(sources
   unit-map.cpp
   unit.cpp
   utf.cpp
+  ${FORTRAN_MODULE_OBJECTS}
 )
 
 include(AddFlangOffloadRuntime)

flang/tools/f18/CMakeLists.txt

@@ -8,7 +8,7 @@ set(LLVM_LINK_COMPONENTS
 # to produce an object file for inclusion into the FortranRuntime
 # library.
 set(MODULES_WITH_IMPLEMENTATION
-  "__fortran_builtin_kinds"
+  "iso_fortran_env_impl"
 )
 
 # Define the list of Fortran module files for which it is
@@ -57,7 +57,7 @@ if (NOT CMAKE_CROSSCOMPILING)
         set(depends ${depends} ${FLANG_INTRINSIC_MODULES_DIR}/__fortran_type_info.mod)
       endif()
       if(${filename} STREQUAL "iso_fortran_env")
-        set(depends ${depends} ${FLANG_INTRINSIC_MODULES_DIR}/__fortran_builtin_kinds.mod)
+        set(depends ${depends} ${FLANG_INTRINSIC_MODULES_DIR}/iso_fortran_env_impl.mod)
       endif()
       if(${filename} STREQUAL "ieee_arithmetic" OR
          ${filename} STREQUAL "ieee_exceptions")
@@ -83,8 +83,8 @@ if (NOT CMAKE_CROSSCOMPILING)
     set(object_output "")
     set(include_in_link FALSE)
     if(${filename} IN_LIST MODULES_WITH_IMPLEMENTATION)
-      set(compile_with "-c")
       set(object_output "${CMAKE_CURRENT_BINARY_DIR}/${filename}${CMAKE_CXX_OUTPUT_EXTENSION}")
+      set(compile_with -c -o ${object_output})
       set(include_in_link TRUE)
     endif()