Patch "objtool: Fix 64-bit build on 32-bit host" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
objtool: Fix 64-bit build on 32-bit host
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
objtool-fix-64-bit-build-on-32-bit-host.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
14c47b54b0d9389e3ca0718e805cdd90c5a4303aMon Sep 17 00:00:00 2001
From: Mikulas Patocka <[email protected]>
Date: Sat, 2 Dec 2017 16:17:44 -0600
Subject: objtool: Fix 64-bit build on 32-bit host
From: Mikulas Patocka <[email protected]>
commit 14c47b54b0d9389e3ca0718e805cdd90c5a4303a upstream.
The new ORC unwinder breaks the build of a 64-bit kernel on a 32-bit host. Building the kernel on a i386 or x32 host fails with:
orc_dump.c: In function 'orc_dump':
orc_dump.c:105:26: error: passing argument 2 of 'elf_getshdrnum' from incompatible pointer type [-Werror=incompatible-pointer-types]
if (elf_getshdrnum(elf, &nr_sections)) {
^
In file included from /usr/local/include/gelf.h:32:0,
from elf.h:22,
from warn.h:26,
from orc_dump.c:20:
/usr/local/include/libelf.h:304:12: note: expected 'size_t * {aka unsigned int *}' but argument is of type 'long unsigned int *'
extern int elf_getshdrnum (Elf *__elf, size_t *__dst);
^~~~~~~~~~~~~~
orc_dump.c:190:17: error: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'Elf64_Sxword {aka long long int}' [-Werror=format=]
printf("%s+%lx:", name, rela.r_addend);
~~^ ~~~~~~~~~~~~~
%llxFix the build failure.
Another problem is that if the user specifies HOSTCC or HOSTLD variables, they are ignored in the objtool makefile. Change the Makefile to respect these variables.
--- tools/objtool/Makefile | 8 +++++--- tools/objtool/orc_dump.c | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-)
tools/objtool/Makefile +5 -3
@@ -7,9 +7,11 @@ ARCH := x86 endif # always use the host compiler -CC = gcc -LD = ld -AR = ar +HOSTCC ?= gcc +HOSTLD ?= ld +CC = $(HOSTCC) +LD = $(HOSTLD) +AR = ar ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(CURDIR)))
tools/objtool/orc_dump.c +4 -3
@@ -76,7 +76,8 @@ int orc_dump(const char *_objname)int fd, nr_entries, i, *orc_ip =NULL , orc_size =0 ;struct orc_entry *orc =NULL ;char *name; -unsigned long nr_sections, orc_ip_addr =0 ; +size_t nr_sections; +Elf64_Addr orc_ip_addr =0 ;size_t shstrtab_idx;Elf *elf;Elf_Scn *scn;
@@ -187,10 +188,10 @@ int orc_dump(const char *_objname)return -1 ; } -printf ("%s+%lx:" , name, rela.r_addend); +printf ("%s+%llx:" , name, (unsigned long long )rela.r_addend); }else { -printf ("%lx:" , orc_ip_addr + (i *sizeof (int )) + orc_ip[i]); +printf ("%llx:" , (unsigned long long )(orc_ip_addr + (i *sizeof (int )) + orc_ip[i])); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/objtool-fix-64-bit-build-on-32-bit-host.patch