Author: tkreuzer
Date: Mon Jun 6 19:01:26 2011
New Revision: 52119
URL:
http://svn.reactos.org/svn/reactos?rev=52119&view=rev
Log:
[CRT]
Fix amd64 build of build of chkstk
Modified:
trunk/reactos/lib/sdk/crt/CMakeLists.txt
trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt…
==============================================================================
--- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon Jun 6 19:01:26 2011
@@ -7,6 +7,10 @@
list(APPEND CHKSTK_SOURCE
except/i386/chkstk_asm.s
except/i386/chkstk_ms.s)
+elseif(ARCH MATCHES amd64)
+ list(APPEND CHKSTK_SOURCE
+ except/amd64/chkstk_asm.s
+ except/amd64/chkstk_ms.s)
elseif(ARCH MATCHES powerpc)
list(APPEND CHKSTK_SOURCE
except/powerpc/chkstk_asm.s)
Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Mon Jun 6 19:01:26
2011
@@ -13,22 +13,19 @@
/* CODE **********************************************************************/
.code64
-PUBLIC MsgUnimplemented
-MsgUnimplemented:
-.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n"
+EXTERN MsgUnimplemented:BYTE
-
-FUNC _chkstk
+FUNC __chkstk
.endprolog
UNIMPLEMENTED chkstk
ret
-ENDFUNC _chkstk
+ENDFUNC __chkstk
-FUNC _alloca_probe
+FUNC __alloca_probe
.endprolog
UNIMPLEMENTED alloca_probe
ret
-ENDFUNC _alloca_probe
+ENDFUNC __alloca_probe
END
/* EOF */