lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 002/223] MIPS: fix build on non-linux hosts
    Date
    [ Upstream commit 1196364f21ffe5d1e6d83cafd6a2edb89404a3ae ]

    calc_vmlinuz_load_addr.c requires SZ_64K to be defined for alignment
    purposes. It included "../../../../include/linux/sizes.h" to define
    that size, however "sizes.h" tries to include <linux/const.h> which
    assumes linux system headers. These may not exist eg. the following
    error was encountered when building Linux for OpenWrt under macOS:

    In file included from arch/mips/boot/compressed/calc_vmlinuz_load_addr.c:16:
    arch/mips/boot/compressed/../../../../include/linux/sizes.h:11:10: fatal error: 'linux/const.h' file not found
    ^~~~~~~~~~

    Change makefile to force building on local linux headers instead of
    system headers. Also change eye-watering relative reference in include
    file spec.

    Thanks to Jo-Philip Wich & Petr Štetiar for assistance in tracking this
    down & fixing.

    Suggested-by: Jo-Philipp Wich <jo@mein.io>
    Signed-off-by: Petr Štetiar <ynezz@true.cz>
    Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
    Signed-off-by: Paul Burton <paul.burton@mips.com>
    Cc: linux-mips@vger.kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/boot/compressed/Makefile | 2 ++
    arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +-
    2 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
    index 90aca95fe314..ad31c76c7a29 100644
    --- a/arch/mips/boot/compressed/Makefile
    +++ b/arch/mips/boot/compressed/Makefile
    @@ -75,6 +75,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \
    $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE
    $(call if_changed,objcopy)

    +HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE)
    +
    # Calculate the load address of the compressed kernel image
    hostprogs-y := calc_vmlinuz_load_addr

    diff --git a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
    index 542c3ede9722..d14f75ec8273 100644
    --- a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
    +++ b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
    @@ -13,7 +13,7 @@
    #include <stdint.h>
    #include <stdio.h>
    #include <stdlib.h>
    -#include "../../../../include/linux/sizes.h"
    +#include <linux/sizes.h>

    int main(int argc, char *argv[])
    {
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-02 12:09    [W:6.586 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site