Merge branch 'main' into features_impl

Author: perazz

src/fpm_compiler.F90

@@ -10,7 +10,7 @@
 ! Intel oneAPI      ifx        icx     -module         -I            -qopenmp   X
 ! PGI               pgfortran  pgcc    -module         -I            -mp        X
 ! NVIDIA            nvfortran  nvc     -module         -I            -mp        X
-! LLVM flang        flang      clang   -module         -I            -mp        X
+! LLVM flang        flang      clang   -module-dir     -I            -fopenmp   X
 ! LFortran          lfortran   ---     -J              -I            --openmp   X
 ! Lahey/Futjitsu    lfc        ?       -M              -I            -openmp    ?
 ! NAG               nagfor     ?       -mdir           -I            -openmp    x
@@ -71,8 +71,8 @@ module fpm_compiler
         id_pgi, &
         id_nvhpc, &
         id_nag, &
+        id_flang_classic, &
         id_flang, &
-        id_flang_new, &
         id_f18, &
         id_ibmxl, &
         id_cray, &
@@ -275,7 +275,13 @@ module fpm_compiler
     flag_cray_free_form = " -ffree"
 
 character(*), parameter :: &
-    flag_flang_new_openmp = " -fopenmp"
+    flag_flang_new_openmp = " -fopenmp", &
+    flag_flang_new_debug = " -g", &
+    flag_flang_new_opt = " -O3", &
+    flag_flang_new_pic = " -fPIC", &
+    flag_flang_new_free_form = " -ffree-form", &
+    flag_flang_new_fixed_form = " -ffixed-form", &
+    flag_flang_new_no_implicit_typing = " -fimplicit-none"
 
 contains
 
@@ -296,11 +302,11 @@ function get_default_flags(self, release) result(flags)
     ! Append position-independent code (PIC) flag, that is necessary 
     ! building shared libraries
     select case (self%id)
-    case (id_gcc, id_f95, id_caf, id_flang, id_f18, id_lfortran, &
+    case (id_gcc, id_f95, id_caf, id_flang_classic, id_f18, id_lfortran, &
           id_intel_classic_nix, id_intel_classic_mac, id_intel_llvm_nix, &
           id_pgi, id_nvhpc, id_nag, id_cray, id_ibmxl)
         pic_flag = " -fPIC"
-    case (id_flang_new)
+    case (id_flang)
         ! flang-new doesn't support -fPIC on Windows MSVC target
         if (get_os_type() == OS_WINDOWS) then
             pic_flag = ""
@@ -414,6 +420,11 @@ subroutine get_release_compile_flags(id, flags)
         flags = &
             flag_lfortran_opt
 
+    case(id_flang)
+        flags = &
+            flag_flang_new_opt//&
+            flag_flang_new_pic
+
     end select
 end subroutine get_release_compile_flags
 
@@ -509,6 +520,12 @@ subroutine get_debug_compile_flags(id, flags)
 
     case(id_lfortran)
         flags = ""
+
+    case(id_flang)
+        flags = &
+            flag_flang_new_debug//&
+            flag_flang_new_pic
+
     end select
 end subroutine get_debug_compile_flags
 
@@ -521,7 +538,7 @@ pure subroutine set_cpp_preprocessor_flags(id, flags)
     select case(id)
     case default
         flag_cpp_preprocessor = ""
-    case(id_caf, id_gcc, id_f95, id_nvhpc, id_flang_new)
+    case(id_caf, id_gcc, id_f95, id_nvhpc, id_flang)
         flag_cpp_preprocessor = "-cpp"
     case(id_intel_classic_windows, id_intel_llvm_windows)
         flag_cpp_preprocessor = "/fpp"
@@ -616,7 +633,7 @@ function get_include_flag(self, path) result(flags)
         flags = "-I "//path
 
     case(id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, &
-        & id_flang, id_flang_new, id_f18, &
+        & id_flang_classic, id_flang, id_f18, &
         & id_intel_classic_nix, id_intel_classic_mac, &
         & id_intel_llvm_nix, id_lahey, id_nag, id_ibmxl, &
         & id_lfortran)
@@ -640,10 +657,10 @@ function get_module_flag(self, path) result(flags)
     case(id_caf, id_gcc, id_f95, id_cray, id_lfortran)
         flags = "-J "//path
 
-    case(id_nvhpc, id_pgi, id_flang)
+    case(id_nvhpc, id_pgi, id_flang_classic)
         flags = "-module "//path
 
-    case(id_flang_new, id_f18)
+    case(id_flang, id_f18)
         flags = "-module-dir "//path
 
     case(id_intel_classic_nix, id_intel_classic_mac, &
@@ -674,7 +691,7 @@ function get_shared_flag(self) result(shared_flag)
     select case (self%id)
     case default
         shared_flag = "-shared"
-    case (id_gcc, id_f95, id_flang, id_flang_new, id_lfortran)
+    case (id_gcc, id_f95, id_flang_classic, id_flang, id_lfortran)
         shared_flag = "-shared"
     case (id_intel_classic_nix, id_intel_llvm_nix, id_pgi, id_nvhpc)
         shared_flag = "-shared"
@@ -709,6 +726,9 @@ function get_feature_flag(self, feature) result(flags)
        case(id_cray)
            flags = flag_cray_no_implicit_typing
 
+       case(id_flang)
+           flags = flag_flang_new_no_implicit_typing
+
        end select
 
     case("implicit-typing")
@@ -740,7 +760,7 @@ function get_feature_flag(self, feature) result(flags)
        case(id_caf, id_gcc, id_f95)
            flags = flag_gnu_free_form
 
-       case(id_pgi, id_nvhpc, id_flang)
+       case(id_pgi, id_nvhpc, id_flang_classic)
            flags = flag_pgi_free_form
 
        case(id_nag)
@@ -756,14 +776,17 @@ function get_feature_flag(self, feature) result(flags)
        case(id_cray)
            flags = flag_cray_free_form
 
+       case(id_flang)
+           flags = flag_flang_new_free_form
+
        end select
 
     case("fixed-form")
        select case(self%id)
        case(id_caf, id_gcc, id_f95)
            flags = flag_gnu_fixed_form
 
-       case(id_pgi, id_nvhpc, id_flang)
+       case(id_pgi, id_nvhpc, id_flang_classic)
            flags = flag_pgi_fixed_form
 
        case(id_nag)
@@ -782,6 +805,9 @@ function get_feature_flag(self, feature) result(flags)
        case(id_lfortran)
            flags = flag_lfortran_fixed_form
 
+       case(id_flang)
+           flags = flag_flang_new_fixed_form
+
        end select
 
     case("default-form")
@@ -851,7 +877,7 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
     case(id_intel_llvm_nix,id_intel_llvm_windows)
         c_compiler = 'icx'
 
-    case(id_flang, id_flang_new, id_f18)
+    case(id_flang_classic, id_flang, id_f18)
         c_compiler='clang'
 
     case(id_ibmxl)
@@ -886,7 +912,7 @@ subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
     case(id_intel_llvm_nix,id_intel_llvm_windows)
         cxx_compiler = 'icpx'
 
-    case(id_flang, id_flang_new, id_f18)
+    case(id_flang_classic, id_flang, id_f18)
         cxx_compiler='clang++'
 
     case(id_ibmxl)
@@ -1000,7 +1026,7 @@ function match_compiler_type(compiler) result(id)
     end if
 
     if (check_compiler(compiler, "flang-new")) then
-        id = id_flang_new
+        id = id_flang
         return
     end if
 
@@ -1009,6 +1035,11 @@ function match_compiler_type(compiler) result(id)
         return
     end if
 
+    if (check_compiler(compiler, "flang-classic")) then
+        id = id_flang_classic
+        return
+    end if
+
     if (check_compiler(compiler, "flang")) then
         id = id_flang
         return
@@ -1793,8 +1824,8 @@ pure function compiler_id_name(id) result(name)
        case(id_pgi);                   name = "pgfortran"
        case(id_nvhpc);                 name = "nvfortran"
        case(id_nag);                   name = "nagfor"
-       case(id_flang);                 name = "flang"
-       case(id_flang_new);             name = "flang-new"
+       case(id_flang_classic);         name = "flang"
+       case(id_flang);                 name = "flang-new"
        case(id_f18);                   name = "f18"
        case(id_ibmxl);                 name = "xlf90"
        case(id_cray);                  name = "crayftn"

src/metapackage/fpm_meta_openmp.f90

@@ -2,7 +2,7 @@ module fpm_meta_openmp
     use fpm_compiler, only: compiler_t, id_gcc, id_f95, id_intel_classic_windows, &
        id_intel_llvm_windows, id_intel_classic_nix, id_intel_llvm_nix, &
        id_intel_classic_mac, id_pgi, id_nvhpc, id_ibmxl, id_nag, id_lfortran, &
-       id_flang, id_flang_new, flag_gnu_openmp, flag_intel_openmp_win, &
+       id_flang_classic, id_flang, flag_gnu_openmp, flag_intel_openmp_win, &
        flag_intel_openmp, flag_pgi_openmp, flag_nag_openmp, &
        flag_lfortran_openmp, flag_flang_new_openmp
     use fpm_strings, only: string_t
@@ -73,7 +73,7 @@ subroutine init_openmp(this,compiler,all_meta,error)
                 openmp_flag = flag_lfortran_openmp
                 link_flag = flag_lfortran_openmp
 
-           case (id_flang, id_flang_new)
+           case (id_flang_classic, id_flang)
                 openmp_flag = flag_flang_new_openmp
                 link_flag = flag_flang_new_openmp