diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-14 22:27:05 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-08-15 14:03:05 -0700 |
commit | 974fedf70ae759ced4ed8918ea8a9147329efff8 (patch) | |
tree | d2517ed159b94705f263658c77de650624350453 /common/recipes-bsp/efilinux | |
parent | 75e31097d90b83dae81181670d48bc896c4c1360 (diff) | |
download | meta-intel-974fedf70ae759ced4ed8918ea8a9147329efff8.tar.gz |
efilinux: Fix build warnings
Additional warnings found with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-bsp/efilinux')
3 files changed, 70 insertions, 1 deletions
diff --git a/common/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch b/common/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch new file mode 100644 index 00000000..afb99514 --- /dev/null +++ b/common/recipes-bsp/efilinux/efilinux/0001-Disable-address-of-packed-member-warning.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 7c171c1813651a3a02ad2cda361b42ebc7ce324d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 12 Aug 2017 10:34:19 -0700 | ||
4 | Subject: [PATCH 1/2] Disable address-of-packed-member warning | ||
5 | |||
6 | Clang complains so make it happy | ||
7 | |||
8 | loaders/bzimage/bzimage.c:346:55: error: taking address of packed member 'base' of class or structure 'dt_addr_t' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] | ||
9 | err = emalloc(gdt.limit, 8, (EFI_PHYSICAL_ADDRESS *)&gdt.base); | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Makefile | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index a955e34..ff1b79b 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -61,7 +61,7 @@ ifeq ($(ARCH),ia32) | ||
23 | endif | ||
24 | endif | ||
25 | ifeq ($(ARCH),x86_64) | ||
26 | - CFLAGS += -mno-red-zone | ||
27 | + CFLAGS += -mno-red-zone -Wno-address-of-packed-member | ||
28 | endif | ||
29 | |||
30 | LDFLAGS=-T $(LDSCRIPT) -Bsymbolic -shared -nostdlib -znocombreloc \ | ||
31 | -- | ||
32 | 2.14.1 | ||
33 | |||
diff --git a/common/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch b/common/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch new file mode 100644 index 00000000..127c187a --- /dev/null +++ b/common/recipes-bsp/efilinux/efilinux/0002-initialize-char-pointers.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 49053e4ff0f3550d019cdad8a93677c18fc69791 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 12 Aug 2017 10:35:09 -0700 | ||
4 | Subject: [PATCH 2/2] initialize char pointers | ||
5 | |||
6 | Clang complains about using them without initializing | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | entry.c | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/entry.c b/entry.c | ||
16 | index 0aa6cdd..23ba51e 100644 | ||
17 | --- a/entry.c | ||
18 | +++ b/entry.c | ||
19 | @@ -402,9 +402,9 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *_table) | ||
20 | WCHAR *error_buf; | ||
21 | EFI_STATUS err; | ||
22 | EFI_LOADED_IMAGE *info; | ||
23 | - CHAR16 *name, *options; | ||
24 | + CHAR16 *name = NULL, *options; | ||
25 | UINT32 options_size; | ||
26 | - char *cmdline; | ||
27 | + char *cmdline = NULL; | ||
28 | |||
29 | InitializeLib(image, _table); | ||
30 | sys_table = _table; | ||
31 | -- | ||
32 | 2.14.1 | ||
33 | |||
diff --git a/common/recipes-bsp/efilinux/efilinux_1.1.bb b/common/recipes-bsp/efilinux/efilinux_1.1.bb index 2f6e79d0..04422ddc 100644 --- a/common/recipes-bsp/efilinux/efilinux_1.1.bb +++ b/common/recipes-bsp/efilinux/efilinux_1.1.bb | |||
@@ -9,7 +9,10 @@ inherit deploy | |||
9 | SRCREV = "a995826f9e43f1134baea61610eafd8c173bb776" | 9 | SRCREV = "a995826f9e43f1134baea61610eafd8c173bb776" |
10 | PV = "1.1+git${SRCPV}" | 10 | PV = "1.1+git${SRCPV}" |
11 | 11 | ||
12 | SRC_URI = "git://git.kernel.org/pub/scm/boot/efilinux/efilinux.git" | 12 | SRC_URI = "git://git.kernel.org/pub/scm/boot/efilinux/efilinux.git \ |
13 | file://0001-Disable-address-of-packed-member-warning.patch \ | ||
14 | file://0002-initialize-char-pointers.patch \ | ||
15 | " | ||
13 | 16 | ||
14 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
15 | 18 | ||