[Openmp-commits] 3.8 Merge Request: r263651

[Tom Stellard via Openmp-commits]

On Tue, Apr 26, 2016 at 02:54:44PM +0000, Peyton, Jonathan L wrote:
> Can this be merged for 3.8.1?
> 

Who is the code owner for this?

-Tom

> -- Johnny
> 
> -----Original Message-----
> From: Openmp-commits [mailto:openmp-commits-bounces at lists.llvm.org] On Behalf Of Jonathan Peyton via Openmp-commits
> Sent: Wednesday, March 16, 2016 1:44 PM
> To: openmp-commits at lists.llvm.org
> Subject: [Openmp-commits] [openmp] r263651 - [CMake] Fix Windows build problem for CMake versions < 3.3
> 
> Author: jlpeyton
> Date: Wed Mar 16 13:44:18 2016
> New Revision: 263651
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=263651&view=rev
> Log:
> [CMake] Fix Windows build problem for CMake versions < 3.3
> 
> Building libomp using CMake versions < 3.3 caused a link time error.  These errors occurred because when assembling z_Windows_NT-586_asm.asm, the
> definitions: OMPT_SUPPORT, _M_AMD64|_M_IA32 weren't defined on the command line.
> To fix the problem, the COMPILE_FLAGS property for the assembly file is appended to instead of the COMPILE_DEFINITIONS property being set.  For whatever reason, the COMPILE_DEFINITIONS property doesn't pick up the definitions for assembly files for the older CMake versions.
> 
> Modified:
>     openmp/trunk/runtime/src/CMakeLists.txt
> 
> Modified: openmp/trunk/runtime/src/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/CMakeLists.txt?rev=263651&r1=263650&r2=263651&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/src/CMakeLists.txt (original)
> +++ openmp/trunk/runtime/src/CMakeLists.txt Wed Mar 16 13:44:18 2016
> @@ -183,10 +183,11 @@ if(WIN32)
>    add_dependencies(omp libomp-needed-windows-files)
>    # z_Windows_NT-586_asm.asm requires definitions to be sent via command line
>    # It only needs the architecutre macro and OMPT_SUPPORT=0|1
> -  libomp_append(LIBOMP_MASM_DEFINITIONS "_M_IA32" IF_TRUE IA32)
> -  libomp_append(LIBOMP_MASM_DEFINITIONS "_M_AMD64" IF_TRUE INTEL64)
> -  libomp_append(LIBOMP_MASM_DEFINITIONS "OMPT_SUPPORT" IF_TRUE_1_0 LIBOMP_OMPT_SUPPORT)
> -  set_source_files_properties(z_Windows_NT-586_asm.asm PROPERTIES COMPILE_DEFINITIONS "${LIBOMP_MASM_DEFINITIONS}")
> +  libomp_append(LIBOMP_MASM_DEFINITIONS "-D_M_IA32" IF_TRUE IA32)  
> + libomp_append(LIBOMP_MASM_DEFINITIONS "-D_M_AMD64" IF_TRUE INTEL64)  
> + libomp_append(LIBOMP_MASM_DEFINITIONS "-DOMPT_SUPPORT" IF_TRUE_1_0 
> + LIBOMP_OMPT_SUPPORT)  
> + libomp_list_to_string("${LIBOMP_MASM_DEFINITIONS}" 
> + LIBOMP_MASM_DEFINITIONS)  set_property(SOURCE z_Windows_NT-586_asm.asm 
> + APPEND_STRING PROPERTY COMPILE_FLAGS " ${LIBOMP_MASM_DEFINITIONS}")
>    set_source_files_properties(thirdparty/ittnotify/ittnotify_static.c PROPERTIES COMPILE_DEFINITIONS "UNICODE")
>  
>    # Create Windows import library
> 
> 
> _______________________________________________
> Openmp-commits mailing list
> Openmp-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/openmp-commits