* grub-core/lib/sparc64/setjmp.S: Force spilling of current window.

diff --git a/ChangeLog b/ChangeLog
index 7f1cf0e5377b2ff4a22328ebb8e681823ff16fe7..8f4de761a1a54369bb27bdd4c01e41e7b36411a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/sparc64/setjmp.S: Force spilling of current window.
+
 2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        On i386-ieee1275 we run in paged mode. So we need to explicitly map

diff --git a/grub-core/lib/sparc64/setjmp.S b/grub-core/lib/sparc64/setjmp.S
index ec9c53057e61108abba75bd1bc18ce9fbd1e7246..6c11bdda046138d3891251b814486a7965ed7848 100644 (file)
--- a/grub-core/lib/sparc64/setjmp.S
+++ b/grub-core/lib/sparc64/setjmp.S
@@ -41,7 +41,11 @@ FUNCTION(grub_setjmp)
 FUNCTION(grub_longjmp)
        ldx     [%o0 + 0x10], %g1
        movrz   %o1, 1, %o1
+
+       save %sp, -64, %sp
        flushw
+       restore
+
        ldx     [%o0 + 0x00], %o7
        ldx     [%o0 + 0x08], %fp
        sub     %fp, 192, %sp