* grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.

	* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.

diff --git a/ChangeLog b/ChangeLog
index 07318d8d112b86fed7979a996627b17ed2ffa679..d55dd8f4683bd9baa5fbbdff5bd6f2a07b2f2aec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.
+       * grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.
+
 2013-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/script/execute.c (gettext_append): Remove nested functions.

diff --git a/grub-core/lib/ia64/longjmp.S b/grub-core/lib/ia64/longjmp.S
index 729bdc76e5032a2b3c781c792dca3bc7ae4bdea4..38afb2243c6b9f8764a85821acd969e2b305517f 100644 (file)
--- a/grub-core/lib/ia64/longjmp.S
+++ b/grub-core/lib/ia64/longjmp.S
@@ -40,10 +40,10 @@
 
        /* __longjmp(__jmp_buf buf, int val) */
 
-       .text 
-       .global longjmp
-       .proc longjmp
-longjmp:
+       .text
+
+       .proc EXT_C(grub_longjmp)
+FUNCTION(grub_longjmp)
        alloc r8=ar.pfs,2,1,0,0
        mov r27=ar.rsc
        add r2=0x98,in0         // r2 <- &jmpbuf.orig_jmp_buf_addr
@@ -159,4 +159,4 @@ longjmp:
        invala                  // virt. -> phys. regnum mapping may change
        mov pr=r24,-1
        br.ret.dptk.few rp
-       .endp longjmp
+       .endp EXT_C(grub_longjmp)

diff --git a/grub-core/lib/ia64/setjmp.S b/grub-core/lib/ia64/setjmp.S
index dc19be0ce3f9ac534b7b18c62f7ef64f471bae77..a0382d83d602d9b4fb5123d8c244e1115ae0c48c 100644 (file)
--- a/grub-core/lib/ia64/setjmp.S
+++ b/grub-core/lib/ia64/setjmp.S
@@ -74,13 +74,13 @@ GRUB_MOD_LICENSE "GPLv2+"
        /* The following two entry points are the traditional entry points: */
 
        .text
-       .global setjmp
-       .proc setjmp
-setjmp:
+       
+       .proc EXT_C(grub_setjmp)
+FUNCTION(grub_setjmp)
        alloc r8=ar.pfs,2,0,0,0
        mov in1=1
        br.cond.sptk.many __sigsetjmp
-       .endp setjmp
+       .endp EXT_C(grub_setjmp)
 
        /* __sigsetjmp(__jmp_buf buf, int savemask) */
 

diff --git a/include/grub/ia64/setjmp.h b/include/grub/ia64/setjmp.h
index a71c9c56d74b4aaf17e2de609c72d17537bf1cb3..6e9bc8bef4f3201892c6756a923f69f4c44bebc0 100644 (file)
--- a/include/grub/ia64/setjmp.h
+++ b/include/grub/ia64/setjmp.h
@@ -24,5 +24,5 @@
 /* the __jmp_buf element type should be __float80 per ABI... */
 typedef long grub_jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees 128-bit alignment! */
 
-int grub_setjmp (grub_jmp_buf env);
+int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice));
 void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));