diff --git a/rtl/arm/setjump.inc b/rtl/arm/setjump.inc
index 130bf80ce6..6f396d5296 100644
--- a/rtl/arm/setjump.inc
+++ b/rtl/arm/setjump.inc
@@ -15,10 +15,15 @@
 
  **********************************************************************}
 
-function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];
+function setjmp(var S : jmp_buf) : longint;assembler;
+  label FPC_SETJMP;
   asm
+    // the usual entry code would mix up things here
+  .globl FPC_SETJMP
+  FPC_SETJMP:
      stmia   r0,{v1-v6, sl, fp, sp, lr}
      mov     r0,#0
+     mov     pc,lr
   end;
 
 procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'FPC_LONGJMP'];
@@ -32,7 +37,10 @@ procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'F
 
 {
   $Log$
-  Revision 1.3  2004-01-20 21:01:57  florian
+  Revision 1.4  2004-03-23 19:13:09  florian
+    * setjmp fixed
+
+  Revision 1.3  2004/01/20 21:01:57  florian
     * fixed setjump
     * fixed syscalls
 
@@ -44,4 +52,4 @@ procedure longjmp(var S : jmp_buf;value : longint);assembler;[Public, alias : 'F
   Revision 1.1  2003/08/21 16:41:54  florian
     * empty dummy files
     + [long|set]jmp implemented
-}
\ No newline at end of file
+}