git: a3479cfd2217 - main - loader: fix build on non-x86 platforms

[Mateusz Guzik]

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 <tsoome at freebsd.org> wrote:
> The branch main has been updated by tsoome:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=a3479cfd2217d133d49aa7159ea23faf901dc586
>
> commit a3479cfd2217d133d49aa7159ea23faf901dc586
> Author:     Toomas Soome <tsoome at FreeBSD.org>
> AuthorDate: 2021-01-02 21:48:52 +0000
> Commit:     Toomas Soome <tsoome at FreeBSD.org>
> 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 <mjguzik gmail.com>