瀏覽代碼

Merge topic 'tasking-asm'

fc163f9e43 Tasking: Add support for ASM through the cctc compiler driver
942f0d119b Tasking: Add identification for the tasking assembler

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10163
Brad King 10 月之前
父節點
當前提交
50eebed6ed
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 4 0
      Modules/CMakeDetermineASMCompiler.cmake
  2. 2 3
      Modules/Compiler/Tasking-ASM.cmake

+ 4 - 0
Modules/CMakeDetermineASMCompiler.cmake

@@ -130,6 +130,10 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_QCC "-V")
   set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_QCC "gcc_nto")
 
+  list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS Tasking)
+  set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_Tasking "--version")
+  set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_Tasking "TASKING")
+
   include(CMakeDetermineCompilerId)
   set(userflags)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT} "${userflags}")

+ 2 - 3
Modules/Compiler/Tasking-ASM.cmake

@@ -1,7 +1,6 @@
 include(Compiler/Tasking)
+__compiler_tasking(ASM)
 
 set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
-set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
 
-set(CMAKE_ASM_COMPILE_OBJECT       "<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
-set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS S;s;asm;msa)
+set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm;src)