From owner-dev-commits-src-main@freebsd.org Sun Jan 3 21:21:52 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A1F14DFF5D; Sun, 3 Jan 2021 21:21:52 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8BXc11nDz4mvG; Sun, 3 Jan 2021 21:21:51 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x42d.google.com with SMTP id t30so29631099wrb.0; Sun, 03 Jan 2021 13:21:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=PjTD/aY8qp0UmpXgJS14TvemJfeQ0nAqp8ZWP2W8Bqo=; b=HVMSBPiK3yRDoLuU/iSTzRqyA7D/uVitb7qtjvPrHMJxsjEtxdqFmy+wNlJS3qflex ByXcd4+9qBC69OJeq+KFaIgJ8Wu4CoSdHEgbRv76eto/UYW27oSqDbDsFX7eBITV4fGz qJgErMh5isAJ7vghLZ8pvuyzTIfaQZ23TAGaAhvaY5shYEvoA9t+x/8yfIvDX9fAoeQW YY7JV5oEP4e4IUI/c336Eat/NbEM9x5YeVVa1p+SrbaGRIqGVVD9bc4rYG4UIaaL8p6D 0gwKfsoJnLh92ygP1bC/ZlQE4llMtbZfUGmIS+uesBtAV5SqW9Uz5h4EVCpe0A036TzO g7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=PjTD/aY8qp0UmpXgJS14TvemJfeQ0nAqp8ZWP2W8Bqo=; b=KwHU9Dv7OfuVf4v39vkNTAb51anMreZD7Xax7qjBg1D/sJvxnBp4rzdweX6ptJfR62 hD1FSvzzsmD+kSaOawDgdkHcx4Z7gLuYSH7tzCMVyFGJ6eAioZ6W4ZXL/vjZ/IBUReTT IOrv97H12iC0WkpmfJRA+dyHlALN9YQtppSFsm+9C55Do/jsRhYAeGzfCbLyQ+/RepMW PuQzEWUn4qkoXs9qIPJC5ODVQ3yBuDaSkMpGNCBJs9IlAtkmhg+OIC6FBFiP/dhnITic PJasskleGrLsa77/Aa2zF4cBODa+us68PUnChoY86Uspg0yDftdyRTbbiadVpI+5wvYK ebGQ== X-Gm-Message-State: AOAM531uJ0rt6wUVKCvsuxhywbOlCmyutExCfNBHCF0SrDkX2YJBiW0x HmZzx3d5NiwW6H+ZnOZYFnfq4gLwiozchyqUKs3agi2ERu4= X-Google-Smtp-Source: ABdhPJwEGHt6Ujdg3ymFYL7tRKNpV5Vm4KNF1nD6ezmRaASpidSBcL1nVBBR/aDhgdKbW/zHSgj5RPSbEpxy/uEWWyE= X-Received: by 2002:adf:ec86:: with SMTP id z6mr76838602wrn.17.1609708910119; Sun, 03 Jan 2021 13:21:50 -0800 (PST) MIME-Version: 1.0 Received: by 2002:adf:f811:0:0:0:0:0 with HTTP; Sun, 3 Jan 2021 13:21:48 -0800 (PST) In-Reply-To: <202101031922.103JMjCW098991@gitrepo.freebsd.org> References: <202101031922.103JMjCW098991@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 3 Jan 2021 22:21:48 +0100 Message-ID: Subject: Re: git: 4f9139397e70 - main - loader: fix uboot build with gfx_fb To: Toomas Soome Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D8BXc11nDz4mvG X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 21:21:52 -0000 This still fails to build: powerpc.powerpc buildworld failed, check _.powerpc.powerpc.buildworld for details powerpc.powerpc64 buildworld failed, check _.powerpc.powerpc64.buildworld for details mips.mips64 buildworld failed, check _.mips.mips64.buildworld for details ld: error: undefined symbol: fonts >>> referenced by module.c:633 (/usr/src/stand/common/module.c:633) >>> module.o:(build_font_module) >>> referenced by module.c:633 (/usr/src/stand/common/module.c:633) >>> module.o:(build_font_module) ld: error: undefined symbol: gfx_state >>> referenced by module.c:0 (/usr/src/stand/common/module.c:0) >>> module.o:(build_font_module) >>> referenced by module.c:0 (/usr/src/stand/common/module.c:0) >>> module.o:(build_font_module) >>> referenced by loader.c:93 (/usr/src/stand/ficl/loader.c:93) >>> loader.o:(ficl_term_putimage) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a >>> referenced 1 more times ld: error: undefined symbol: gfx_fb_putimage >>> referenced by loader.c:114 (/usr/src/stand/ficl/loader.c:114) >>> loader.o:(ficl_term_putimage) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a >>> referenced by loader.c:154 (/usr/src/stand/ficl/loader.c:154) >>> loader.o:(ficl_fb_putimage) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a ld: error: undefined symbol: gfx_fb_setpixel >>> referenced by loader.c:173 (/usr/src/stand/ficl/loader.c:173) >>> loader.o:(ficl_fb_setpixel) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a ld: error: undefined symbol: gfx_fb_line >>> referenced by loader.c:190 (/usr/src/stand/ficl/loader.c:190) >>> loader.o:(ficl_fb_line) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a ld: error: undefined symbol: gfx_fb_bezier >>> referenced by loader.c:209 (/usr/src/stand/ficl/loader.c:209) >>> loader.o:(ficl_fb_bezier) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a ld: error: undefined symbol: gfx_fb_drawrect >>> referenced by loader.c:226 (/usr/src/stand/ficl/loader.c:226) >>> loader.o:(ficl_fb_drawrect) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a ld: error: undefined symbol: gfx_term_drawrect >>> referenced by loader.c:242 (/usr/src/stand/ficl/loader.c:242) >>> loader.o:(ficl_term_drawrect) in archive /usr/obj/usr/src/powerpc.powerpc64/stand/ficl/libficl.a On 1/3/21, Toomas Soome wrote: > The branch main has been updated by tsoome: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=4f9139397e709a106a73f362654ce245321e4a77 > > commit 4f9139397e709a106a73f362654ce245321e4a77 > Author: Toomas Soome > AuthorDate: 2021-01-03 10:26:48 +0000 > Commit: Toomas Soome > CommitDate: 2021-01-03 18:45:37 +0000 > > loader: fix uboot build with gfx_fb > > Need to add stub data and gfx functions to make linking happy. > --- > stand/uboot/lib/Makefile | 4 ++- > stand/uboot/lib/gfx_fb.c | 78 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 81 insertions(+), 1 deletion(-) > > diff --git a/stand/uboot/lib/Makefile b/stand/uboot/lib/Makefile > index e56cf4f0b370..448188c93058 100644 > --- a/stand/uboot/lib/Makefile > +++ b/stand/uboot/lib/Makefile > @@ -8,8 +8,10 @@ LIB= uboot > WARNS?= 2 > > SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c > -SRCS+= module.c net.c reboot.c time.c > +SRCS+= module.c net.c reboot.c time.c gfx_fb.c > > +CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite > +CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken > CFLAGS.glue.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib > > .if ${LOADER_DISK_SUPPORT:Uyes} == "yes" > diff --git a/stand/uboot/lib/gfx_fb.c b/stand/uboot/lib/gfx_fb.c > new file mode 100644 > index 000000000000..e2d3204da7b9 > --- /dev/null > +++ b/stand/uboot/lib/gfx_fb.c > @@ -0,0 +1,78 @@ > +/*- > + * Copyright 2021 Toomas Soome > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY > WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +/* > + * U-Boot-specific gfx stubs. > + */ > + > +#include > +#include > +#include "bootstrap.h" > +#include "gfx_fb.h" > + > +font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts); > +teken_gfx_t gfx_state = { 0 }; > + > +void > +gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused) > +{ > +} > + > +void > +gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused, > + uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused) > +{ > +} > + > +void > +gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused, > + uint32_t x2 __unused, uint32_t y2 __unused) > +{ > +} > + > +void > +gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused, > + uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused) > +{ > +} > + > +void > +gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused, > + uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused, > + uint32_t y2 __unused, uint32_t w __unused) > +{ > +} > + > +int > +gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused, > + uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused, > + uint32_t flags __unused) > +{ > + return (1); > +} > -- Mateusz Guzik