Temporarily work around arm64 build failure with gcc-5 >= 5.3.1-4 using -mpc-relative...

diff --git a/debian/changelog b/debian/changelog
index e43e0f4a64cff33c5f3f119463789a320cc2072f..0d4ee41f3c5b7bb210bb0bab7916c1342cb037ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ grub2 (2.02~beta2-34) UNRELEASED; urgency=medium
   * Change versioned Conflicts from grub-common and grub2-common into Breaks
     or Breaks+Replaces as appropriate.
   * Remove pragmas related to -Wunreachable-code (closes: #812047).
+  * Temporarily work around arm64 build failure with gcc-5 >= 5.3.1-4 using
+    -mpc-relative-literal-loads.
 
   [ Didier Roche ]
   * Use new plymouth theme path to set grub theme configuration.

diff --git a/debian/rules b/debian/rules
index 614ba87d80f47970b6c7bbe1b477118f86163ce0..d86e69846b9608a3ba46929d6cdb7f9326097407 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,14 @@ export HOST_CFLAGS
 export HOST_LDFLAGS
 export TARGET_CPPFLAGS := -Wno-unused-but-set-variable
 
+ifeq ($(DEB_HOST_ARCH),arm64)
+# Work around unsupported relocations as reported in
+# https://lists.gnu.org/archive/html/grub-devel/2015-12/msg00092.html; see
+# also:
+# https://bugs.launchpad.net/bugs/1533009
+export TARGET_CFLAGS := -Os -mpc-relative-literal-loads
+endif
+
 ifeq (,$(shell which qemu-system-i386 2>/dev/null))
 with_check := no
 else