From owner-dev-commits-src-main@freebsd.org Sun Jan 3 04:28:28 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 B39DF4C39B2; Sun, 3 Jan 2021 04:28:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (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 4D7m3J4L04z3td6; Sun, 3 Jan 2021 04:28:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm1-x334.google.com with SMTP id k10so14135260wmi.3; Sat, 02 Jan 2021 20:28:28 -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=PaKD1CmHMwWMX8hnKWWav5YVfTBfjb58+nHZyyWTXHs=; b=FSByLfUNF5BWMVpGklM7IJGnVOFeE1bEzcGERhoaeJpZn7s+zUheDxAQOrLS66cugB y7GdNqnwWIN74ppVd27KjB9Ewi825z7RR4mRi9GtZkm65DTpLqTd2IIEK5yk/2tc27jK g+a+OJ7e4qEiQJNcfZt8xnv2SfKWgxTtXD/cn0Q5nOB565a2jyol9NxOB+PxCOr5Ffpa rRjEUo1w8n/lmL+DYUWq1Wu0+dVgCer1RG9mM2nAJPcxcwS2aoUljLF8pIH/ZI+zoFXv Qr0rCymOQk54lQv6i9nIGPr3jvVdjhOuuJqdg/lTRYfwAKirpULIu3vDKVSAY/5YT/vH McuQ== 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=PaKD1CmHMwWMX8hnKWWav5YVfTBfjb58+nHZyyWTXHs=; b=mcm8V70aAAVN2hDAU1mWWGwxOeUs4hAwu59BJaPf98QmSgNHxU7IYK1jpkUucoOcNw 5tYGl9GL4Cv/zF+iqnf8o7k3lQGbkNsoaivM2tkri5pQ+9kNXbflugfZZIkHGLOgXjK6 DUO+5Is30sQfb9x+ukjISF4UWXzz/qR/AC2E9WWzhrbUlA4yNmUx2CnnzRBoDenVPq9b jJpSS9cG3nnk/qV2XrvM6PylFTMBHGTOWgQiI1ksW0O4HU/JTmcZX5QE7aDUPm2zj5mv Yb2KMiPzTDb1V7wadg0V88o4I99HSfdE3dPVEYwtnVocAKDJqos8MAlMIT5THEpBustU Lu/g== X-Gm-Message-State: AOAM530dXiZJMvT43iOSJkWq6Hyw8PJumbVEzpP6Yxrr20RCog3nfM7/ Mj3brHjECH44bc2cSwaolmbJU0hifdtQuz5dINidio7RUyk= X-Google-Smtp-Source: ABdhPJxIAtyICTTWwuZujThTAWdDc1rB4fjuFW1ZIdB/LQ/J+xJBovyyh0we0+frj1NArz/4tUb+HturW0swBr71QVI= X-Received: by 2002:a1c:2e88:: with SMTP id u130mr21380642wmu.83.1609648106404; Sat, 02 Jan 2021 20:28:26 -0800 (PST) MIME-Version: 1.0 Received: by 2002:adf:f811:0:0:0:0:0 with HTTP; Sat, 2 Jan 2021 20:28:25 -0800 (PST) In-Reply-To: <202101022205.102M5BEE030241@gitrepo.freebsd.org> References: <202101022205.102M5BEE030241@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 3 Jan 2021 05:28:25 +0100 Message-ID: Subject: Re: git: a3479cfd2217 - main - loader: fix build on non-x86 platforms 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: 4D7m3J4L04z3td6 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 04:28:28 -0000 This still does not work, for example _.arm.armv6.buildworld: ld: error: undefined symbol: fonts >>> referenced by module.c >>> module.o:(build_font_module) ld: error: undefined symbol: gfx_state >>> referenced by module.c >>> module.o:(build_font_module) >>> referenced by lutils.c:0 (/usr/src/stand/liblua/lutils.c:0) >>> lutils.o:(lua_term_putimage) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_fb_bezier >>> referenced by lutils.c:489 (/usr/src/stand/liblua/lutils.c:489) >>> lutils.o:(lua_fb_bezier) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_fb_drawrect >>> referenced by lutils.c:510 (/usr/src/stand/liblua/lutils.c:510) >>> lutils.o:(lua_fb_drawrect) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_fb_line >>> referenced by lutils.c:466 (/usr/src/stand/liblua/lutils.c:466) >>> lutils.o:(lua_fb_line) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_fb_putimage >>> referenced by lutils.c:423 (/usr/src/stand/liblua/lutils.c:423) >>> lutils.o:(lua_fb_putimage) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a >>> referenced by lutils.c:390 (/usr/src/stand/liblua/lutils.c:390) >>> lutils.o:(lua_term_putimage) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_fb_setpixel >>> referenced by lutils.c:445 (/usr/src/stand/liblua/lutils.c:445) >>> lutils.o:(lua_fb_setpixel) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a ld: error: undefined symbol: gfx_term_drawrect >>> referenced by lutils.c:530 (/usr/src/stand/liblua/lutils.c:530) >>> lutils.o:(lua_term_drawrect) in archive /usr/obj/usr/src/arm.armv6/stand/liblua/liblua.a cc: error: linker command failed with exit code 1 (use -v to see invocation) On 1/2/21, Toomas Soome wrote: > The branch main has been updated by tsoome: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=a3479cfd2217d133d49aa7159ea23faf901dc586 > > commit a3479cfd2217d133d49aa7159ea23faf901dc586 > Author: Toomas Soome > AuthorDate: 2021-01-02 21:48:52 +0000 > Commit: Toomas Soome > CommitDate: 2021-01-02 22:04:56 +0000 > > loader: fix build on non-x86 platforms > > Need to build pnglite with all. > > Reported by: Herbert J. Skuhra > --- > stand/loader.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/stand/loader.mk b/stand/loader.mk > index 9ed8b65a2d06..cde7a31dca7e 100644 > --- a/stand/loader.mk > +++ b/stand/loader.mk > @@ -6,17 +6,17 @@ CFLAGS+=-I${LDRSRC} > > SRCS+= boot.c commands.c console.c devopen.c interp.c > SRCS+= interp_backslash.c interp_parse.c ls.c misc.c > -SRCS+= module.c nvstore.c > +SRCS+= module.c nvstore.c pnglite.c > > CFLAGS.module.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite > > -.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" > -SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c > -SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c > -SRCS+= pnglite.c > .PATH: ${SRCTOP}/contrib/pnglite > CFLAGS.pnglite.c+= -I${SRCTOP}/contrib/pnglite > CFLAGS.pnglite.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib > + > +.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" > +SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c > +SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c > .elif ${MACHINE_CPUARCH} == "aarch64" > SRCS+= load_elf64.c reloc_elf64.c > .elif ${MACHINE_CPUARCH} == "arm" > -- Mateusz Guzik