From afb673e5a45f4970a16b1b80ea094a18b6cc0dea Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 30 Mar 2013 14:29:58 +0100 Subject: [PATCH] Add core/threadasm.S to druntime. This is required for PPC and MIPS targets. Results in an empty object file on other CPU architectures. --- CMakeLists.txt | 4 +++- runtime/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03b9cf64..3bbb287f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,9 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ) -if(MSVC) +if(UNIX) + ENABLE_LANGUAGE(ASM) +elseif(MSVC) ENABLE_LANGUAGE(ASM_MASM) endif() diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 12209857..519ed05b 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -95,6 +95,7 @@ file(GLOB_RECURSE CORE_D_WIN ${RUNTIME_DIR}/src/core/sys/windows/*.d) set(CORE_D_SYS) if(UNIX) list(APPEND CORE_D_SYS ${CORE_D_UNIX}) + list(APPEND DCRT_C ${RUNTIME_DIR}/src/core/threadasm.S) if(APPLE) list(APPEND CORE_D_SYS ${CORE_D_OSX}) endif()