Commit ff840b8f authored by dill Upstream's avatar dill Upstream Committed by Eisenhauer, Greg
Browse files

dill 2019-05-22 (16f68395) 

Code extracted from:

    https://github.com/GTkorvo/dill.git

at commit 16f683955c35583fc95dede5be04609318c66d31 (master).

Upstream Shortlog
-----------------

Greg Eisenhauer (1):
      b59b1ffe Fix problem when IGNORE_NATIVE_ARCH is set and arch is completely unknown

Keichi Takahashi (1):
      297b7850 Fix build error when DILL_IGNORE_NATIVE is enabled
parent 444e1a5d

CMakeLists.txt

+7 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s64fx") 
else()

  message(STATUS "NO CG for Processor \"${CMAKE_SYSTEM_PROCESSOR}\"")

  set(NATIVE_CG FALSE)

  set(NATIVE_ARCH UNSUPPORTED)

endif()



if(CMAKE_SYSTEM_NAME MATCHES "Darwin|Linux")
@@ -141,6 +142,7 @@ option(DILL_IGNORE_NATIVE "Build to do emulation, regardless of architecture" 
  OFF)

if(DILL_IGNORE_NATIVE)

  set(NATIVE_CG FALSE)

  set(NATIVE_ARCH UNSUPPORTED)

endif()

set(LIBFFI_INTERNAL OFF)

find_package(LibFFI)
@@ -148,6 +150,10 @@ if(LIBFFI_FOUND) 
  message(STATUS "Enabling emulation")

  set(EMULATION_POSSIBLE TRUE)

elseif(DILL_IGNORE_NATIVE)

  find_program (AUTOCONF autoconf)

  if (AUTOCONF STREQUAL "AUTOCONF-NOTFOUND")

      message(FATAL_ERROR "DILL_IGNORE_NATIVE set, but autoconf not found, so unable to build libffi")

  endif()

  set(LIBFFI_INTERNAL ON)

  message(STATUS "Using private copy of libffi")

  include(ExternalProject)
@@ -227,7 +233,7 @@ option(DILL_MULTI_TARGET "Build all available target architectures" OFF) 
if(DILL_MULTI_TARGET)

  message(STATUS "arch files is ${arch_files}")

  list(APPEND SRC_list ${arch_files})

elseif(NATIVE_ARCH) 

elseif(NOT ${NATIVE_ARCH} STREQUAL "UNSUPPORTED")

  list(APPEND SRC_list dill_${ARCH_FILE}.c ${ARCH_FILE}.c ${ARCH_FILE}_rt.c)

endif()

dill_util.c

+3 −0
Original line number Diff line number Diff line 
#include "config.h"



#ifndef NATIVE_ARCH

#define NATIVE_ARCH "UNKNOWN"

#endif

#ifdef LINUX_KERNEL_MODULE

#ifndef MODULE

#define MODULE