[ros-diffs] [akhaldi] 52094: [CMAKE] * Add chkstk library and link crt against it. * Add chkstk_ms.s to libcntpr source files.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sun Jun  5 18:42:09 2011
New Revision: 52094

URL: http://svn.reactos.org/svn/reactos?rev=52094&view=rev
Log:
[CMAKE]
* Add chkstk library and link crt against it.
* Add chkstk_ms.s to libcntpr source files.

Modified:
    trunk/reactos/lib/sdk/crt/CMakeLists.txt
    trunk/reactos/lib/sdk/crt/crt.cmake
    trunk/reactos/lib/sdk/crt/libcntpr.cmake

Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt?rev=52094&r1=52093&r2=52094&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Jun  5 18:42:09 2011
@@ -2,6 +2,17 @@
 include_directories(include)
 
 add_definitions(-D_CRTBLD)
+
+if(ARCH MATCHES i386)
+    list(APPEND CHKSTK_SOURCE
+        except/i386/chkstk_asm.s
+        except/i386/chkstk_ms.s)
+elseif(ARCH MATCHES powerpc)
+    list(APPEND CHKSTK_SOURCE
+        except/powerpc/chkstk_asm.s)
+endif()
+
+add_library(chkstk ${CHKSTK_SOURCE})
 
 include(crt.cmake)
 include(libcntpr.cmake)

Modified: trunk/reactos/lib/sdk/crt/crt.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=52094&r1=52093&r2=52094&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Jun  5 18:42:09 2011
@@ -298,7 +298,6 @@
 
 if(ARCH MATCHES i386)
     list(APPEND CRT_SOURCE
-        except/i386/chkstk_asm.s
         except/i386/prolog.s
         except/i386/seh.s
         except/i386/seh_prolog.s
@@ -311,7 +310,6 @@
         setjmp/i386/setjmp.s)
 elseif(ARCH MATCHES amd64)
     list(APPEND CRT_SOURCE
-        except/amd64/chkstk_asm.s
         except/amd64/seh.s
         float/i386/clearfp.c
         float/i386/cntrlfp.c
@@ -432,7 +430,7 @@
 endif()
 
 add_library(crt ${CRT_SOURCE})
-
+target_link_libraries(crt chkstk)
 set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT)
 add_pch(crt precomp.h)
 add_dependencies(crt psdk asm)

Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake?rev=52094&r1=52093&r2=52094&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun Jun  5 18:42:09 2011
@@ -65,6 +65,7 @@
 if(ARCH MATCHES i386)
     list(APPEND LIBCNTPR_SOURCE
         except/i386/chkstk_asm.s
+        except/i386/chkstk_ms.s
         except/i386/seh.s
         except/i386/seh_prolog.s
         setjmp/i386/setjmp.s