From f495eb586acd8fd949fd4abe9647dc11cc448226 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 3 Feb 2010 18:47:30 +0000
Subject: [PATCH] Fix setjmp based on the new syntax

svn path=/branches/ros-amd64-bringup/; revision=45397
---
 reactos/lib/sdk/crt/setjmp/amd64/setjmp.s | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s b/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s
index e9521ae6e15..800a0b152b5 100644
--- a/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s
+++ b/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s
@@ -8,10 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
+#include <reactos/asm.h>
 #include <ndk/amd64/asm.h>
-#include <ndk/amd64/asmmacro.S>
-
-.intel_syntax noprefix
 
 #define JUMP_BUFFER_Frame 0x00
 #define JUMP_BUFFER_Rbx   0x08
@@ -46,7 +44,8 @@
  * Returns:    0
  * Notes:      Sets up the jmp_buf
  */
-.proc _setjmp
+PUBLIC __setjmp
+.proc __setjmp
     /* Load rsp as it was before the call into rax */
     lea rax, [rsp + 8]
     /* Load return address into r8 */
@@ -74,7 +73,7 @@
     movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15
     xor rax, rax
     ret
-.endproc
+.endp
 
 /*
  * int _setjmpex(jmp_buf _Buf,void *_Ctx);
@@ -84,7 +83,8 @@
  * Returns:    0
  * Notes:      Sets up the jmp_buf
  */
-.proc _setjmpex
+PUBLIC __setjmpex
+.proc __setjmpex
     /* Load rsp as it was before the call into rax */
     lea rax, [rsp + 8]
     /* Load return address into r8 */
@@ -112,7 +112,7 @@
     movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15
     xor rax, rax
     ret
-.endproc
+.endp
 
 
 /*
@@ -123,7 +123,8 @@
  * Returns:    Doesn't return
  * Notes:      Non-local goto
  */
-.proc longjmp
+PUBLIC _longjmp
+.proc _longjmp
 
     // FIXME: handle frame
 
@@ -154,4 +155,4 @@
     jnz 2f
     inc rax
 2:  jmp r8
-.endproc
+.endp