diff --git a/flang/module/__fortran_ieee_exceptions.f90 b/flang/module/__fortran_ieee_exceptions.f90
index 0b620f55cee84..baba31c2ea3d1 100644
--- a/flang/module/__fortran_ieee_exceptions.f90
+++ b/flang/module/__fortran_ieee_exceptions.f90
@@ -53,7 +53,7 @@
 #define PRIVATE_R(G) private :: \
   G##_a2, G##_a3, G##_a4, G##_a8, G##_a10, G##_a16
 
-  interface
+  interface ieee_get_flag
     elemental subroutine ieee_get_flag(flag, flag_value)
       import ieee_flag_type
       type(ieee_flag_type), intent(in) :: flag
@@ -61,7 +61,7 @@ elemental subroutine ieee_get_flag(flag, flag_value)
     end subroutine ieee_get_flag
   end interface
 
-  interface
+  interface ieee_get_halting_mode
     elemental subroutine ieee_get_halting_mode(flag, halting)
       import ieee_flag_type
       type(ieee_flag_type), intent(in) :: flag
@@ -69,14 +69,14 @@ elemental subroutine ieee_get_halting_mode(flag, halting)
     end subroutine ieee_get_halting_mode
   end interface
 
-  interface
+  interface ieee_get_modes
     subroutine ieee_get_modes(modes)
       import ieee_modes_type
       type(ieee_modes_type), intent(out) :: modes
     end subroutine ieee_get_modes
   end interface
 
-  interface
+  interface ieee_get_status
     subroutine ieee_get_status(status)
       import ieee_status_type
       type(ieee_status_type), intent(out) :: status
@@ -109,14 +109,14 @@ end subroutine ieee_set_halting_mode_l##HKIND;
   PRIVATE_L(IEEE_SET_HALTING_MODE)
 #undef IEEE_SET_HALTING_MODE_L
 
-  interface
+  interface ieee_set_modes
     subroutine ieee_set_modes(modes)
       import ieee_modes_type
       type(ieee_modes_type), intent(in) :: modes
     end subroutine ieee_set_modes
   end interface
   
-  interface
+  interface ieee_set_status
     subroutine ieee_set_status(status)
       import ieee_status_type
       type(ieee_status_type), intent(in) :: status
@@ -139,7 +139,7 @@ end function ieee_support_flag
   PRIVATE_R(IEEE_SUPPORT_FLAG)
 #undef IEEE_SUPPORT_FLAG_R
 
-  interface
+  interface ieee_support_halting
     pure logical function ieee_support_halting(flag)
       import ieee_flag_type
       type(ieee_flag_type), intent(in) :: flag
diff --git a/flang/module/iso_fortran_env.f90 b/flang/module/iso_fortran_env.f90
index abf7098aca5b2..4109d26e50236 100644
--- a/flang/module/iso_fortran_env.f90
+++ b/flang/module/iso_fortran_env.f90
@@ -130,8 +130,10 @@ module iso_fortran_env
 
   integer, parameter :: input_unit = 5, output_unit = 6
   integer, parameter :: error_unit = 0
-  integer, parameter :: iostat_end = -1, iostat_eor = -2
-  integer, parameter :: iostat_inquire_internal_unit = -1
+  integer, parameter :: iostat_end = FORTRAN_RUNTIME_IOSTAT_END
+  integer, parameter :: iostat_eor = FORTRAN_RUNTIME_IOSTAT_EOR
+  integer, parameter :: iostat_inquire_internal_unit = &
+                          FORTRAN_RUNTIME_IOSTAT_INQUIRE_INTERNAL_UNIT
 
   integer, parameter :: character_storage_size = 8
   integer, parameter :: file_storage_size = 8