issue #169 details

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 project(Ravi VERSION 1.0.4 LANGUAGES C CXX)
 
 # By default on platforms where MIR is supported (right now Linux X86_64)
-# MIR JIt backend is automatically enabled. To disable user must specify
+# MIR JIT backend is automatically enabled. To disable user must specify
 # NO_JIT=ON
 # LLVM has to be explicitly specified using LLVM_JIT=ON
 
@@ -12,11 +12,10 @@ option(STATIC_BUILD "Build static version of Ravi, default is OFF" OFF)
 option(COMPUTED_GOTO "Controls whether the interpreter switch will use computed gotos on gcc/clang, default is ON" ON)
 option(LTESTS "Controls whether ltests are enabled in Debug mode; note requires Debug build" ON)
 
-# By default on X86_64 non-Windows platforms we enable MIR JIT
+# By default on non-Windows platforms we enable MIR JIT
 if (NOT WIN32
         AND NOT LLVM_JIT
-        AND NOT NO_JIT
-        AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+        AND NOT NO_JIT)
     set(MIR_JIT ON)
 endif ()
 
@@ -24,9 +23,6 @@ if (MIR_JIT)
     if (MSVC OR WIN32)
         message(FATAL_ERROR "MIR_JIT is not supported when using MSVC and/or WIN32")
     endif ()
-    if (NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)"))
-        message(FATAL_ERROR "MIR_JIT is only supported on X86-64 platforms")
-    endif ()
     set(LLVM_JIT OFF)
     set(STATIC_BUILD OFF) # Because we need to expose the symbols in the library
 endif ()
@@ -62,6 +58,10 @@ set(LLVM_JIT_SRCS src/ravi_llvmjit.cpp src/ravi_llvmtypes.cpp
         src/ravi_llvmarith1.cpp src/ravi_llvmcall.cpp src/ravi_llvmtable.cpp
         src/ravi_llvmarith2.cpp src/ravi_llvmtforcall.cpp src/ravi_llvmrest.cpp)
 # MIR sources
+#if (MIR_JIT)
+#    add_subdirectory(mir)
+#    set(MIRJIT_LIBRARIES c2mir)
+#endif()
 set(MIR_HEADERS mir/mir.h mir/mir-gen.h mir/mir-varr.h mir/mir-dlist.h mir/mir-htab.h
         mir/mir-hash.h mir/mir-bitmap.h)
 set(MIR_SRCS mir/mir.c mir/mir-gen.c)
@@ -117,13 +117,17 @@ if (LLVM_JIT)
 else ()
     if (MIR_JIT)
         message(STATUS "MIRJIT enabled")
+#        set(JIT_SRCS ${MIR_JIT_SRCS})
+#        set_property(SOURCE ${MIR_JIT_SRCS}
+#                APPEND
+#                PROPERTY INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/mir;${CMAKE_SOURCE_DIR}/mir/c2mir")
         set(JIT_SRCS ${MIR_SRCS} ${C2MIR_SRCS} ${MIR_JIT_SRCS})
         set_property(SOURCE ${MIR_SRCS} ${C2MIR_SRCS} ${MIR_JIT_SRCS}
                 APPEND
                 PROPERTY INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/mir;${CMAKE_SOURCE_DIR}/mir/c2mir")
         set_property(SOURCE ${MIR_SRCS} ${C2MIR_SRCS} ${MIR_JIT_SRCS}
                 APPEND
-                PROPERTY COMPILE_DEFINITIONS "x86_64;MIR_IO;MIR_SCAN")
+                PROPERTY COMPILE_DEFINITIONS "MIR_NO_IO=0;MIR_NO_SCAN=1")
     else()
         set(JIT_SRCS ${NO_JIT_SRCS})
     endif ()

mir/CMakeLists.txt

@@ -6,13 +6,7 @@ message(STATUS "OS type is ${CMAKE_SYSTEM_NAME}")
 message(STATUS "System processor is ${CMAKE_HOST_SYSTEM_PROCESSOR}")
 message(STATUS "Build type is ${CMAKE_BUILD_TYPE}")
 
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
-    set(TARGET x86_64)
-else()
-    message(FATAL "Unsupported platform")
-endif()
-
-set(MIR_HEADERS 
+set(MIR_HEADERS
     mir.h
     mir-gen.h
     mir-varr.h
@@ -33,16 +27,30 @@ set(C2MIR_SRCS
 
 set(LIBS dl)
 
-add_definitions(-D${TARGET})
-add_definitions(-DMIR_IO)
-add_definitions(-DMIR_SCAN)
+add_definitions(-DMIR_NO_IO=0)
+add_definitions(-DMIR_NO_SCAN=1)
 
 include_directories(".")
 include_directories("./c2mir")
 
+include(CheckCCompilerFlag)
+check_c_compiler_flag("-fsigned-char" COMPILER_OPT_SIGNED_CHAR_SUPPORTED)
+if (COMPILER_OPT_SIGNED_CHAR_SUPPORTED AND NOT CMAKE_C_FLAGS MATCHES "-fsigned-char")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char")
+endif()
+check_c_compiler_flag("-fno-tree-sra" COMPILER_OPT_NO_TREE_SRA_SUPPORTED)
+if (COMPILER_OPT_NO_TREE_SRA_SUPPORTED AND NOT CMAKE_C_FLAGS MATCHES "-fno-tree-sra")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-tree-sra")
+endif()
+check_c_compiler_flag("-fno-ipa-cp-clone" COMPILER_OPT_NO_IPA_CP_CLONE_SUPPORTED)
+if (COMPILER_OPT_NO_IPA_CP_CLONE_SUPPORTED AND NOT CMAKE_C_FLAGS MATCHES "-fno-ipa-cp-clone")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-ipa-cp-clone")
+endif()
+
+
 add_library(c2mir
     ${MIR_HEADERS}
     ${MIR_SRCS}
     ${C2MIR_SRCS})
 target_link_libraries(c2mir ${LIBS})
-
+set_property(TARGET c2mir PROPERTY C_STANDARD 11)