grub: Enhance Waddress-of-packed-member patch to cover x86_64 testcase

This was not compiled for x86_64 when previously testing aarch64
so some tests were missed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch b/meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch
index 4af6a599d5c8702b2fa722be809532bd5ab30c94..415f52ebe3b4fa741c5740b4900b36dae32efd79 100644 (file)
--- a/meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch
+++ b/meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch
@@ -247,3 +247,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  
  static grub_dl_t my_mod;
  
+--- a/grub-core/commands/usbtest.c
++++ b/grub-core/commands/usbtest.c
+@@ -63,6 +63,10 @@ static const char *usb_devspeed[] =
+     "High"
+   };
+ 
++#if __GNUC__ >= 9
++#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
++#endif
++
+ static grub_usb_err_t
+ grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid,
+                    char **string)