flang-compiler · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -33,16 +33,19 @@ if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
   add_definitions(
    -DTARGET_X8664
    -DTARGET_LINUX_X8664
+   -DTARGET_64
   )
 elseif( ${TARGET_ARCHITECTURE} STREQUAL "aarch64" )
   add_definitions(
    -DTARGET_LLVM_ARM64
    -DTARGET_LINUX_ARM
+   -DTARGET_64
   )
 elseif( ${TARGET_ARCHITECTURE} STREQUAL "ppc64le" )
   add_definitions(
     -DTARGET_LINUX_POWER
     -DLINUX_POWER
+    -DTARGET_64
   )
 endif()
 

diff --git a/runtime/flang/CMakeLists.txt b/runtime/flang/CMakeLists.txt
@@ -40,7 +40,6 @@ SET(FTN_INTRINSICS_DESC_INDEP
   chmod3f.c
   commitqq3f.c
   ctime3f.c
-  cvt.c
   date3f.c
   dbesj03f.c
   dbesj13f.c
@@ -146,6 +145,7 @@ SET(FTN_INTRINSICS_DESC_INDEP
   merge.c
   mvbits3f.c
   nargs3f.c
+  omp_lib_kinds.F95
   omp_lib.F95
   outstr3f.c
   packtimeqq3f.c
@@ -465,6 +465,16 @@ add_flang_library(flang_static
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
+add_flang_library(flang-omp_static
+  ${FTN_INTRINSICS_DESC_INDEP}
+  ${FTN_INTRINSICS_DESC_DEP}
+  ${FTN_INTRINSICS_I8}
+  ${FTN_SUPPORT_DESC_INDEP}
+  ${FTN_SUPPORT_DESC_DEP}
+  ${FTN_SUPPORT_I8}
+  ${SHARED_SOURCES}
+  )
+set_property(TARGET flang-omp_static PROPERTY OUTPUT_NAME flang-omp)
 
 set(SHARED_LIBRARY TRUE)
 add_flang_library(flang_shared
@@ -477,9 +487,22 @@ add_flang_library(flang_shared
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
+add_flang_library(flang-omp_shared
+  ${FTN_INTRINSICS_DESC_INDEP}
+  ${FTN_INTRINSICS_DESC_DEP}
+  ${FTN_INTRINSICS_I8}
+  ${FTN_SUPPORT_DESC_INDEP}
+  ${FTN_SUPPORT_DESC_DEP}
+  ${FTN_SUPPORT_I8}
+  ${SHARED_SOURCES}
+  )
+set_property(TARGET flang-omp_shared PROPERTY OUTPUT_NAME flang-omp)
+
 target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
+target_link_libraries(flang-omp_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti-omp.so)
 # Resolve symbols against libm and librt
 target_link_libraries(flang_shared m rt)
+target_link_libraries(flang-omp_shared m rt)
 
 set(SHARED_LIBRARY FALSE)
 
@@ -536,6 +559,11 @@ set_source_files_properties(
   PROPERTIES
   OBJECT_OUTPUTS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
   )
+set_source_files_properties(
+  omp_lib_kinds.F95
+  PROPERTIES
+  OBJECT_OUTPUTS ${CMAKE_Fortran_MODULE_DIRECTORY}/omp_lib_kinds.mod
+  )
 
 # State a dependency on the module
 set_source_files_properties(
@@ -544,6 +572,11 @@ set_source_files_properties(
   PROPERTIES
   OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
   )
+set_source_files_properties(
+  omp_lib.F95
+  PROPERTIES
+  OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/omp_lib_kinds.mod
+  )
 
 # State a dependency on the module
 set_source_files_properties(
@@ -554,40 +587,66 @@ set_source_files_properties(
   OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
   )
 
-set_target_properties(flang_static flang_shared
+set_target_properties(flang_static flang_shared flang-omp_static flang-omp_shared
   PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${FLANG_RTE_LIB_DIR}
   )
-  
+
 target_include_directories(flang_static 
   PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   )
+target_include_directories(flang-omp_static
+  PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  )
 
 target_include_directories(flang_shared
   PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   )
+target_include_directories(flang-omp_shared
+  PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  )
 
 # Make sure the compiler is built before we bootstrap
 add_dependencies(flang_static 
   flang1
   flang2
+  flangrti_static
+  )
+add_dependencies(flang-omp_static
+  flang1
+  flang2
+  flangrti-omp_static
   )
 
 # Make sure the compiler is built before we bootstrap
 add_dependencies(flang_shared 
   flang1
   flang2
+  flangrti_shared
+  )
+add_dependencies(flang-omp_shared
+  flang1
+  flang2
+  flangrti-omp_shared
   )
 
 target_compile_options(flang_static PRIVATE -fPIC)
+target_compile_options(flang-omp_static PRIVATE -fPIC)
 
 target_compile_options(flang_shared PRIVATE -fPIC)
+target_compile_options(flang-omp_shared PRIVATE -fPIC)
 
 target_compile_options(flang_static PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)
+target_compile_options(flang-omp_static PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)
 
 target_compile_options(flang_shared PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)
+target_compile_options(flang-omp_shared PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)
 
diff --git a/runtime/flang/cvt.c b/runtime/flang/cvt.c
diff --git a/runtime/flang/gather_cmplx16.F95 b/runtime/flang/gather_cmplx16.F95
@@ -21,7 +21,7 @@
 
 subroutine ftn_gather_cmplx16( ta, a, lda, alpha, buffer, bufrows, bufcols )
   implicit none
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8 lda
 #else
   integer lda

diff --git a/runtime/flang/gather_cmplx8.F95 b/runtime/flang/gather_cmplx8.F95
@@ -21,7 +21,7 @@
 
 subroutine ftn_gather_cmplx8( ta, a, lda, alpha, buffer, bufrows, bufcols )
   implicit none
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8 lda
 #else
   integer lda

diff --git a/runtime/flang/gather_real4.F95 b/runtime/flang/gather_real4.F95
@@ -20,7 +20,7 @@
 
 subroutine ftn_gather_real4( a, lda, alpha, buffer, bufrows, bufcols )
   implicit none
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8 lda
 #else
   integer lda

diff --git a/runtime/flang/gather_real8.F95 b/runtime/flang/gather_real8.F95
@@ -20,7 +20,7 @@
 
 subroutine ftn_gather_real8( a, lda, alpha, buffer, bufrows, bufcols )
   implicit none
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8 lda
 #else
   integer lda

diff --git a/runtime/flang/iso_c_bind.F95 b/runtime/flang/iso_c_bind.F95
@@ -153,7 +153,7 @@ module ISO_C_BINDING
         interface operator (.ne.)
             module procedure compare_ne_cfunptrs
         end interface
-#if defined TARGET_LINUX_X8664 || defined TARGET_LLVM_64
+#if defined TARGET_64 || defined TARGET_LLVM_64
         ! added this to make the data-initializd module common block be at 32 bytes long
         ! maybe only needed for linux86-64
         integer*8 :: __iso_bind_private_i = 11, __iso_bind_private_j = 23

diff --git a/runtime/flang/mvmul_cmplx16.F95 b/runtime/flang/mvmul_cmplx16.F95
@@ -19,7 +19,7 @@
 
 subroutine ftn_mvmul_cmplx16( ta, tb, m, k, alpha, a, lda, b, beta, c )
   implicit none
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8 :: m, k, lda
 #else
   integer   :: m, k, lda
@@ -30,7 +30,7 @@ subroutine ftn_mvmul_cmplx16( ta, tb, m, k, alpha, a, lda, b, beta, c )
   integer   :: ta, tb
   ! Local variables
 
-#ifdef TARGET_X8664
+#ifdef TARGET_64
   integer*8   :: i, j, kk
 #else
   integer     :: i, j, kk