[compiler-rt] r242539 - compiler-rt: add support for mingw-w64 in builtins

[Hans Wennborg]

Merged to 3.7 (together with r242540) in 243059.

On Fri, Jul 17, 2015 at 9:23 AM, Reid Kleckner <reid at kleckner.net> wrote:
> Author: rnk
> Date: Fri Jul 17 11:23:05 2015
> New Revision: 242539
>
> URL: http://llvm.org/viewvc/llvm-project?rev=242539&view=rev
> Log:
> compiler-rt: add support for mingw-w64 in builtins
>
> The is so that we can avoid using libgcc and use compiler-rt with
> mingw-w64.
>
> Related driver patch
> http://reviews.llvm.org/D11077
>
> I have tested this with mingw-w64 and everything seems to be in order.
> I also sent this patch to the mingw-w64 mailing list for them to look at.
>
> Patch by Martell Malone.
>
> Differential Revision: http://reviews.llvm.org/D11085
>
> Modified:
>     compiler-rt/trunk/CMakeLists.txt
>     compiler-rt/trunk/lib/builtins/CMakeLists.txt
>     compiler-rt/trunk/lib/builtins/enable_execute_stack.c
>
> Modified: compiler-rt/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=242539&r1=242538&r2=242539&view=diff
> ==============================================================================
> --- compiler-rt/trunk/CMakeLists.txt (original)
> +++ compiler-rt/trunk/CMakeLists.txt Fri Jul 17 11:23:05 2015
> @@ -164,7 +164,7 @@ set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRE
>  # We support running instrumented tests when we're not cross compiling
>  # and target a UNIX-like system or Windows.
>  # We can run tests on Android even when we are cross-compiling.
> -if(("${CMAKE_HOST_SYSTEM}" STREQUAL "${CMAKE_SYSTEM}" AND (UNIX OR MSVC)) OR ANDROID
> +if(("${CMAKE_HOST_SYSTEM}" STREQUAL "${CMAKE_SYSTEM}" AND (UNIX OR WIN32)) OR ANDROID
>     OR COMPILER_RT_EMULATOR)
>    option(COMPILER_RT_CAN_EXECUTE_TESTS "Can we execute instrumented tests" ON)
>  else()
>
> Modified: compiler-rt/trunk/lib/builtins/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/CMakeLists.txt?rev=242539&r1=242538&r2=242539&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/builtins/CMakeLists.txt (original)
> +++ compiler-rt/trunk/lib/builtins/CMakeLists.txt Fri Jul 17 11:23:05 2015
> @@ -154,6 +154,12 @@ set(x86_64_SOURCES
>    x86_64/floatundixf.S
>    ${GENERIC_SOURCES})
>
> +if(WIN32)
> +  set(x86_64_SOURCES
> +      ${x86_64_SOURCES}
> +      x86_64/chkstk.S)
> +endif()
> +
>  set(i386_SOURCES
>    i386/ashldi3.S
>    i386/ashrdi3.S
> @@ -171,6 +177,12 @@ set(i386_SOURCES
>    i386/umoddi3.S
>    ${GENERIC_SOURCES})
>
> +if(WIN32)
> +  set(i386_SOURCES
> +      ${i386_SOURCES}
> +      i386/chkstk.S)
> +endif()
> +
>  set(i686_SOURCES
>    ${i386_SOURCES})
>
> @@ -260,7 +272,7 @@ set(arm_SOURCES
>
>  add_custom_target(builtins)
>
> -if (NOT WIN32)
> +if (NOT WIN32 OR MINGW)
>    foreach (arch x86_64 i386 i686 arm)
>      if (CAN_TARGET_${arch})
>        # Filter out generic versions of routines that are re-implemented in
>
> Modified: compiler-rt/trunk/lib/builtins/enable_execute_stack.c
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/enable_execute_stack.c?rev=242539&r1=242538&r2=242539&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/builtins/enable_execute_stack.c (original)
> +++ compiler-rt/trunk/lib/builtins/enable_execute_stack.c Fri Jul 17 11:23:05 2015
> @@ -10,7 +10,9 @@
>
>  #include "int_lib.h"
>
> +#ifndef _WIN32
>  #include <sys/mman.h>
> +#endif
>
>  /* #include "config.h"
>   * FIXME: CMake - include when cmake system is ready.
> @@ -18,9 +20,14 @@
>   */
>  #define HAVE_SYSCONF 1
>
> +#ifdef _WIN32
> +#include <windef.h>
> +#include <winbase.h>
> +#else
>  #ifndef __APPLE__
>  #include <unistd.h>
>  #endif /* __APPLE__ */
> +#endif /* _WIN32 */
>
>  #if __LP64__
>         #define TRAMPOLINE_SIZE 48
> @@ -40,6 +47,12 @@ COMPILER_RT_ABI void
>  __enable_execute_stack(void* addr)
>  {
>
> +#if _WIN32
> +       MEMORY_BASIC_INFORMATION mbi;
> +       if (!VirtualQuery (addr, &mbi, sizeof(mbi)))
> +               return; /* We should probably assert here because there is no return value */
> +       VirtualProtect (mbi.BaseAddress, mbi.RegionSize, PAGE_EXECUTE_READWRITE, &mbi.Protect);
> +#else
>  #if __APPLE__
>         /* On Darwin, pagesize is always 4096 bytes */
>         const uintptr_t pageSize = 4096;
> @@ -55,4 +68,5 @@ __enable_execute_stack(void* addr)
>         unsigned char* endPage = (unsigned char*)((p+TRAMPOLINE_SIZE+pageSize) & pageAlignMask);
>         size_t length = endPage - startPage;
>         (void) mprotect((void *)startPage, length, PROT_READ | PROT_WRITE | PROT_EXEC);
> +#endif
>  }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits