Skip to contentSkip to conversation

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

PATCH In review Khem Raj 3 participants 5 messages Mar 3, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 grub: Enhance Waddress-of-packed-member patch to cover x86_64 testcase

This was not compiled last time when testing aarch64

---
 .../files/disable-address-of-packed-member.patch    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch +13 -0
index 4af6a599d5..415f52ebe3 100644
@@ -247,3 +247,16 @@ Signed-off-by: Khem Raj <[email protected]>
  
  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)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 2/2 xserver-xorg: Fix build errors with clang

---
 ...t-xtest-Initialize-array-with-braces.patch | 36 +++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.20.4.bb       |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch new file +36 -0
new file mode 100644
index 0000000000..c0c242814b
@@ -0,0 +1,36 @@
+From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 1 Mar 2019 09:47:57 -0800
+Subject: [PATCH] test/xtest: Initialize array with braces
+
+Fixes an error when extra warnings are enabled, this is caught with clang
+
+test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
+    WindowRec root = {0};
+                      ^
+                      {}
+1 error generated.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ test/xtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/xtest.c b/test/xtest.c
+index fc5e433..d7e6620 100644
+--- a/test/xtest.c
++++ b/test/xtest.c
+@@ -61,7 +61,7 @@ xtest_init_devices(void)
+ {
+     ScreenRec screen = {0};
+     ClientRec server_client = {0};
+-    WindowRec root = {0};
++    WindowRec root = {{0}};
+     WindowOptRec optional = {0};
+ 
+     /* random stuff that needs initialization */
+-- 
+2.21.0
+
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb +1 -0
index 3f55987bba..ad99d6bece 100644
@@ -3,6 +3,7 @@ require xserver-xorg.inc
 SRC_URI += "file://musl-arm-inb-outb.patch \
             file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
             file://pkgconfig.patch \
+            file://0001-test-xtest-Initialize-array-with-braces.patch \
             "
 SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
 SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"
Signature · 1 line
2.21.0
#2 lore raw
In reply to Khem Raj
Quoted 1 line · Khem Raj

This was not compiled last time when testing aarch64

The subject and body have conflicting archs.
is it both?
- armin

Quoted 27 lines
---
 .../files/disable-address-of-packed-member.patch    | 13 +++++++++++++
 1 file changed, 13 insertions(+)
meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch +13 -0
index 4af6a599d5..415f52ebe3 100644
@@ -247,3 +247,16 @@ Signed-off-by: Khem Raj <[email protected]>
 
  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)
author
#3 lore raw
Quoted 7 lines · On Sat, Mar 2, 2019 at 5:57 PM akuster808 <[email protected]> wrote:
Quoted 1 line · Khem Raj

This was not compiled last time when testing aarch64

The subject and body have conflicting archs.
is it both?

That’s just for history since last time I tested it with Aarch64/Gcc9 and now I got to test x86_64/gcc9
And saw that the patch was not taking care of additional test cases that were getting built for x86

Quoted 35 lines

- armin

Quoted 7 lines
---
 .../files/disable-address-of-packed-member.patch    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

Quoted 9 lines

index 4af6a599d5..415f52ebe3 100644

meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch +2 -0
@@ -247,3 +247,16 @@ Signed-off-by: Khem Raj <[email protected]>
 
  static grub_dl_t my_mod;
 
+--- a/grub-core/commands/usbtest.c
++++ b/grub-core/commands/usbtest.c

meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch Signed-off-by: Khem Raj <[email protected]> · line 261

Quoted 10 lines
meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch +10 -0
+@@ -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,

Quoted 1 line
meta/recipes-bsp/grub/files/disable-address-of-packed-member.patch +1 -0
+                  char **string)
#4 lore raw
In reply to akuster808
Quoted 6 lines · On Sat, 2019-03-02 at 17:57 -0800, akuster808 wrote:
Quoted 1 line · Khem Raj

This was not compiled last time when testing aarch64

The subject and body have conflicting archs.
is it both?

I've tweaked the commit message...

Cheers,

Richard