[llvm-branch-commits] [compiler-rt-branch] r243059 - Merging r242539 and r242540:

[Hans Wennborg]

Author: hans
Date: Thu Jul 23 18:03:42 2015
New Revision: 243059

URL: http://llvm.org/viewvc/llvm-project?rev=243059&view=rev
Log:
Merging r242539 and r242540:

------------------------------------------------------------------------
r242539 | rnk | 2015-07-17 09:23:05 -0700 (Fri, 17 Jul 2015) | 14 lines

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
------------------------------------------------------------------------

------------------------------------------------------------------------
r242540 | rnk | 2015-07-17 09:31:59 -0700 (Fri, 17 Jul 2015) | 1 line

Add missing chkstk.S files from r242539
------------------------------------------------------------------------

Added:
    compiler-rt/branches/release_37/lib/builtins/i386/chkstk.S
      - copied unchanged from r242540, compiler-rt/trunk/lib/builtins/i386/chkstk.S
    compiler-rt/branches/release_37/lib/builtins/x86_64/chkstk.S
      - copied unchanged from r242540, compiler-rt/trunk/lib/builtins/x86_64/chkstk.S
Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/CMakeLists.txt
    compiler-rt/branches/release_37/lib/builtins/CMakeLists.txt
    compiler-rt/branches/release_37/lib/builtins/enable_execute_stack.c

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 23 18:03:42 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350,242424,242444,242449,242647,242651
+/compiler-rt/trunk:242350,242424,242444,242449,242539-242540,242647,242651

Modified: compiler-rt/branches/release_37/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/CMakeLists.txt?rev=243059&r1=243058&r2=243059&view=diff
==============================================================================
--- compiler-rt/branches/release_37/CMakeLists.txt (original)
+++ compiler-rt/branches/release_37/CMakeLists.txt Thu Jul 23 18:03:42 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/branches/release_37/lib/builtins/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/lib/builtins/CMakeLists.txt?rev=243059&r1=243058&r2=243059&view=diff
==============================================================================
--- compiler-rt/branches/release_37/lib/builtins/CMakeLists.txt (original)
+++ compiler-rt/branches/release_37/lib/builtins/CMakeLists.txt Thu Jul 23 18:03:42 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/branches/release_37/lib/builtins/enable_execute_stack.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/lib/builtins/enable_execute_stack.c?rev=243059&r1=243058&r2=243059&view=diff
==============================================================================
--- compiler-rt/branches/release_37/lib/builtins/enable_execute_stack.c (original)
+++ compiler-rt/branches/release_37/lib/builtins/enable_execute_stack.c Thu Jul 23 18:03:42 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
 }