From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6A62C433F5 for ; Fri, 21 Jan 2022 20:11:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 54E1C81E25; Fri, 21 Jan 2022 21:11:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=arvanta.net Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0010B830DF; Fri, 21 Jan 2022 21:11:00 +0100 (CET) Received: from fx.arvanta.net (static-213-198-238-194.adsl.eunet.rs [213.198.238.194]) by phobos.denx.de (Postfix) with ESMTP id 5B54481B53 for ; Fri, 21 Jan 2022 21:10:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=arvanta.net Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mps@arvanta.net Received: from m1 (unknown [10.5.1.15]) by fx.arvanta.net (Postfix) with ESMTP id 93C9427A60; Fri, 21 Jan 2022 21:10:57 +0100 (CET) Date: Fri, 21 Jan 2022 21:10:57 +0100 From: Milan =?utf-8?Q?P=2E_Stani=C4=87?= To: Heinrich Schuchardt Cc: Simon Glass , u-boot@lists.denx.de Subject: Re: [PATCH] sandbox: fix build failure with musl and SDL Message-ID: References: <20220121170003.363500-1-heinrich.schuchardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220121170003.363500-1-heinrich.schuchardt@canonical.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Hi, it works and build pass without error or warning. Tested on alpine edge aarch64 bare metal. Thank you On Fri, 2022-01-21 at 18:00, Heinrich Schuchardt wrote: > sdl.c is compiled against the SDL library. > > Trying to redefine wchar_t with -fshort-wchar is not necessary > and leads to build failures when compiling against musl. > > Cc: Milan P. Stanić > Signed-off-by: Heinrich Schuchardt Tested-by: Milan P. Stanić > --- > arch/sandbox/Makefile | 7 +++++++ > arch/sandbox/cpu/Makefile | 11 ++++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile > index f6cf859f24..0bdd322f12 100644 > --- a/arch/sandbox/Makefile > +++ b/arch/sandbox/Makefile > @@ -4,3 +4,10 @@ head-y := arch/sandbox/cpu/start.o arch/sandbox/cpu/os.o > head-$(CONFIG_SANDBOX_SDL) += arch/sandbox/cpu/sdl.o > libs-y += arch/sandbox/cpu/ > libs-y += arch/sandbox/lib/ > + > +# sdl.c fails to compile with -fshort-wchar using musl. > +cmd_cc_sdl.o = $(CC) $(filter-out -nostdinc -fshort-wchar, \ > + $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $< > + > +$(obj)/sdl.o: $(src)/sdl.c FORCE > + $(call if_changed_dep,cc_sdl.o) > diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile > index de7fe7f391..b74c866e56 100644 > --- a/arch/sandbox/cpu/Makefile > +++ b/arch/sandbox/cpu/Makefile > @@ -7,7 +7,7 @@ > > obj-y := cache.o cpu.o state.o > extra-y := start.o os.o > -extra-$(CONFIG_SANDBOX_SDL) += sdl.o > +extra-$(CONFIG_SANDBOX_SDL) += sdl.o > obj-$(CONFIG_SPL_BUILD) += spl.o > obj-$(CONFIG_ETH_SANDBOX_RAW) += eth-raw-os.o > > @@ -19,8 +19,6 @@ cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \ > > $(obj)/os.o: $(src)/os.c FORCE > $(call if_changed_dep,cc_os.o) > -$(obj)/sdl.o: $(src)/sdl.c FORCE > - $(call if_changed_dep,cc_os.o) > > # eth-raw-os.c is built in the system env, so needs standard includes > # CFLAGS_REMOVE_eth-raw-os.o cannot be used to drop header include path > @@ -30,3 +28,10 @@ cmd_cc_eth-raw-os.o = $(CC) $(filter-out -nostdinc, \ > > $(obj)/eth-raw-os.o: $(src)/eth-raw-os.c FORCE > $(call if_changed_dep,cc_eth-raw-os.o) > + > +# sdl.c fails to build with -fshort-wchar using musl > +cmd_cc_sdl.o = $(CC) $(filter-out -nostdinc -fshort-wchar, \ > + $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $< > + > +$(obj)/sdl.o: $(src)/sdl.c FORCE > + $(call if_changed_dep,cc_sdl.o) > -- > 2.33.1 >