reduce diff

Author: isuruf

CMakeLists.txt

@@ -21,11 +21,9 @@ cmake_minimum_required(VERSION 2.8)
 SET(CMAKE_Fortran_COMPILER_WORKS 1)
 SET(CMAKE_Fortran_ABI_COMPILED 0)
 SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 1)
-SET(CMAKE_Fortran_PREPROCESS_SOURCE
-    "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
 SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
 
-# If we are not building as a part of LLVM, build Flang as an
+# If we are not building as a part of LLVM, build Flang as a
 # standalone project, using LLVM as an external library:
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
   project(Flang)
@@ -40,15 +38,12 @@ if( ${TARGET_OS} STREQUAL "Linux" )
   if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
     set(ARCHNAME x86-64)
     set(ARCH X86)
-    set(WRDSZ 64)
   elseif( ${TARGET_ARCHITECTURE} STREQUAL "aarch64" )
     set(ARCHNAME aarch64)
     set(ARCH ARM)
-    set(WRDSZ 64)
   elseif( ${TARGET_ARCHITECTURE} STREQUAL "ppc64le" )
     set(ARCHNAME ppc64le)
     set(ARCH POWER)
-    set(WRDSZ 64)
   else()
     message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
     return()
@@ -58,6 +53,8 @@ else()
   return()
 endif()
 
+math(EXPR WRDSZ "${CMAKE_SIZEOF_VOID_P} * 8")
+
 # If we are not building as a part of LLVM, build Flang as an
 # standalone project, using LLVM as an external library:
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

runtime/flangrti/CMakeLists.txt

@@ -1,3 +1,4 @@
+
 #
 # Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
 #
@@ -96,7 +97,7 @@ add_flang_library(flangrti_shared
 
 # Resolve symbols against libm
 if (NOT MSVC)
-  target_link_libraries(flangrti_shared PUBLIC m)
+  target_link_libraries(flangrti_shared m)
 endif()
 
 
@@ -106,14 +107,14 @@ if (NOT DEFINED LIBOMP_EXPORT_DIR)
     FLANG_LIBOMP
     NAMES omp libomp
     HINTS ${CMAKE_BINARY_DIR}/lib)
-  target_link_libraries(flangrti_shared PUBLIC ${FLANG_LIBOMP})
+  target_link_libraries(flangrti_shared ${FLANG_LIBOMP})
 endif()
 
 find_library( 
   LIBPGMATH
   NAMES pgmath libpgmath
   HINTS ${CMAKE_BINARY_DIR}/lib)
-target_link_libraries(flangrti_shared PUBLIC ${LIBPGMATH})
+target_link_libraries(flangrti_shared ${LIBPGMATH})
 
 if( ${TARGET_ARCHITECTURE} STREQUAL "aarch64" )
   target_compile_definitions(flangrti_static PRIVATE TARGET_LINUX_ARM)