Part 1 of 2-part patch: Use a specified list of languages in cmake project() command.

[dougk]

Summary

This is necessary to allow for explicit handling of '.S' files as distinct from '.c', which is necessary to allow different compilation options, which will eventually allow silencing some "-pedantic" warnings when compiling the assembly code of compiler-rt with gcc.

[dougk]

Ping.

[rnk]

cmake/modules/HandleLLVMOptions.cmake

169

This looks like it adds assembler flags without checking if the assembler supports them. What flags need to come through here? -mcpu? I think the list of flags that we need to pass to the assembler is probably shorter than the list of flags we pass to the compiler, and we might want to special case things in that direction.

[dougk]

cmake/modules/HandleLLVMOptions.cmake

169

That point is in general valid - some flag might be an error for the assembler. But in practice, the only flag ever passed to add_flag_or_print_warning is '-fPIC' (in the same file, about 20 lines down).

In terms of deciding whether a flag is acceptable to the assembler, this is difficult.
There is no CheckASMSourceCompiles() function which would be the analogous thing to CheckCXXSourceCompiles, which is a cmake macro that tests whether any given flag will fail the compile step. The cmake documentation explicitly states that there is no test for whether the assembler "works". Writing such a test might be possible by first compiling a trivial C program into assembly, then running the assembler with the additional flag to see whether that flag causes failure. But I think we don't need it (yet). The bottom line is that we have to assume that 'fPIC' is accepted by the assembler whenever it is acceptable to the CXX compiler.

There is also the question of whether other flags need to go into CMAKE_ASM_FLAGS that are not added specifically in add_flag_or_print_warning. Visual inspection suggests not. Pretty much all of the flags that are added into CMAKE_C_FLAGS and CMAKE_CXX_FLAGS are '-f' and '-W' options, which have no relevance to assembly source.

[rnk]

lgtm

cmake/modules/HandleLLVMOptions.cmake

169

Nice. Let's do it then.

CMakeLists.txt

 endif()
 
 if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
   set(cmake_3_2_USES_TERMINAL)
 else()
   set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
 endif()
 
-project(LLVM)
+project(LLVM C CXX ASM)
 
 # The following only works with the Ninja generator in CMake >= 3.0.
 set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
   "Define the maximum number of concurrent compilation jobs.")
 if(LLVM_PARALLEL_COMPILE_JOBS)
   if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_MAKE_PROGRAM MATCHES "ninja$")
     message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.")
   else()

cmake/modules/HandleLLVMOptions.cmake

 
 function(add_flag_or_print_warning flag name)
   check_c_compiler_flag("-Werror ${flag}" "C_SUPPORTS_${name}")
   check_cxx_compiler_flag("-Werror ${flag}" "CXX_SUPPORTS_${name}")
   if (C_SUPPORTS_${name} AND CXX_SUPPORTS_${name})
     message(STATUS "Building with ${flag}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
+    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${flag}" PARENT_SCOPE)
   else()
     message(WARNING "${flag} is not supported.")
   endif()
 endfunction()
 
 if( LLVM_ENABLE_PIC )
   if( XCODE )
     # Xcode has -mdynamic-no-pic on by default, which overrides -fPIC. I don't