diff --git a/grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch b/grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch new file mode 100644 index 0000000..1d1f132 --- /dev/null +++ b/grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch @@ -0,0 +1,20 @@ +Index: grub-2.02~beta2/grub-core/kern/powerpc/dl.c +=================================================================== +--- grub-2.02~beta2.orig/grub-core/kern/powerpc/dl.c ++++ grub-2.02~beta2/grub-core/kern/powerpc/dl.c +@@ -61,6 +61,7 @@ struct trampoline + grub_uint32_t std; + grub_uint32_t addis; + grub_uint32_t addi; ++ grub_uint32_t clrldi; + grub_uint32_t mtctr; + grub_uint32_t bctr; + }; +@@ -70,6 +71,7 @@ static const struct trampoline trampolin + 0xf8410018, /* std r2,24(r1) */ + 0x3d800000, /* addis r12,0,0 */ + 0x398c0000, /* addi r12,r12,0 */ ++ 0x798c0020, /* clrldi r12,r12,32 */ + 0x7d8903a6, /* mtctr r12 */ + 0x4e800420, /* bctr */ + }; diff --git a/grub2.changes b/grub2.changes index 3b2288e..4af7371 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 11 14:34:55 UTC 2014 - dvaleev@suse.com + +- Fix the 64-bit trampoline code in dynamic linker (bnc#890999) + grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch + ------------------------------------------------------------------- Tue Jul 29 11:46:54 CEST 2014 - tiwai@suse.de diff --git a/grub2.spec b/grub2.spec index d10d109..86233fa 100644 --- a/grub2.spec +++ b/grub2.spec @@ -179,6 +179,7 @@ Patch229: grub2-xfs-Fix-termination-loop-for-directory-iteration.patch Patch230: grub2-xfs-Convert-inode-numbers-to-cpu-endianity-immediate.patch Patch231: grub2-xfs-V5-filesystem-format-support.patch Patch232: grub2-efi_gop-avoid-low-resolution.patch +Patch233: grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -374,6 +375,7 @@ mv po/grub.pot po/%{name}.pot %patch230 -p1 %patch231 -p1 %patch232 -p1 +%patch233 -p1 # Generate po/LINGUAS for message catalogs ... ./linguas.sh