Merge branch 'master' into leiflindholm/arm64

grub-core/lib/powerpc/setjmp.S

@@ -47,10 +47,11 @@ FUNCTION(grub_setjmp)
 	stw	28, 60(3)
 	stw	29, 64(3)
 	stw	30, 68(3)
+	stw	31, 72(3)
 	mflr	4
-	stw	4, 72(3)
-	mfcr	4
 	stw	4, 76(3)
+	mfcr	4
+	stw	4, 80(3)
 	li	3, 0
 	blr
 
@@ -76,9 +77,10 @@ FUNCTION(grub_longjmp)
 	lwz	28, 60(3)
 	lwz	29, 64(3)
 	lwz	30, 68(3)
-	lwz	5, 72(3)
-	mtlr	5
+	lwz	31, 72(3)
 	lwz	5, 76(3)
+	mtlr	5
+	lwz	5, 80(3)
 	mtcr	5
 	mr.	3, 4
 	bne	1f

grub-core/lib/relocator.c

@@ -1618,7 +1618,7 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 }
 
 void
-grub_mm_check_real (char *file, int line)
+grub_mm_check_real (const char *file, int line)
 {
   grub_mm_region_t r;
   grub_mm_header_t p, pa;

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