From mboxrd@z Thu Jan  1 00:00:00 1970
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 11 Jul 2021 06:39:08 +0300
Subject: [Buildroot] [PATCH 3/9] package make: build RISC-V nommu builds
 as linux
In-Reply-To: <20210709063641.277005-4-damien.lemoal@wdc.com>
References: <20210709063641.277005-1-damien.lemoal@wdc.com>
 <20210709063641.277005-4-damien.lemoal@wdc.com>
Message-ID: <87h7h1h63n.fsf@tarshish>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Hi Damien,

On Fri, Jul 09 2021, Damien Le Moal wrote:
> From: Christoph Hellwig <hch@lst.de>
>
> Using *-uclinux-* seems like an only partially followed convention.
> And at least for RISC-V gcc doesn't know about uclinux tuples, so
> switch back to the normal Linux one for now.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> [Damien]
> * Make the change conditional on BR2_riscv arch being "y".
>
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> ---
>  package/Makefile.in | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/package/Makefile.in b/package/Makefile.in
> index 86db62ba5b..a5eeb00872 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -39,9 +39,14 @@ endif
>  # Compute GNU_TARGET_NAME
>  GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI)
>  
> -# FLAT binary format needs uclinux
> +# FLAT binary format needs uclinux, except RISC-V which needs
> +# the regular linux name.
>  ifeq ($(BR2_BINFMT_FLAT),y)
> +ifeq ($(BR2_riscv),y)
> +TARGET_OS = linux
> +else
>  TARGET_OS = uclinux
> +endif

Maybe simplify the conditions part like this:

ifeq ($(BR2_BINFMT_FLAT):$(BR2_riscv),y:)
TARGET_OS = uclinux
else
TARGET_OS = linux
endif

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -