nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone
28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
39700a
From: Andrey Borzenkov <arvidjaar@gmail.com>
39700a
Date: Mon, 30 Dec 2013 12:56:19 +0000
28f7f8
Subject: [PATCH] strip .eh_frame section from arm64-efi kernel
39700a
39700a
Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
39700a
---
39700a
 grub-core/Makefile.core.def | 2 +-
28f7f8
 ChangeLog                   | 4 ++++
39700a
 2 files changed, 5 insertions(+), 1 deletion(-)
39700a
39700a
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
28f7f8
index c916246de27..42443bc00b9 100644
39700a
--- a/grub-core/Makefile.core.def
39700a
+++ b/grub-core/Makefile.core.def
39700a
@@ -66,7 +66,7 @@ kernel = {
39700a
   arm_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
39700a
 
39700a
   arm64_efi_ldflags          = '-Wl,-r,-d';
39700a
-  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
39700a
+  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
39700a
 
39700a
   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
39700a
   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
28f7f8
diff --git a/ChangeLog b/ChangeLog
28f7f8
index db843006df9..8c1ececa1ed 100644
28f7f8
--- a/ChangeLog
28f7f8
+++ b/ChangeLog
28f7f8
@@ -1,3 +1,7 @@
28f7f8
+2013-12-30  Andrey Borzenkov <arvidjaar@gmail.com>
28f7f8
+
28f7f8
+	* grub-core/Makefile.core.def: strip .eh_frame section for arm64-efi.
28f7f8
+
28f7f8
 2013-12-30  Vladimir Serbinenko  <phcoder@gmail.com>
28f7f8
 
28f7f8
 	* NEWS: Add few missing entries. Correct existing ones.