From owner-dev-commits-src-all@freebsd.org Sat Jan 2 22:05:12 2021 Return-Path: Delivered-To: dev-commits-src-all@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 226134BA321; Sat, 2 Jan 2021 22:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D7bY40T3qz3JXW; Sat, 2 Jan 2021 22:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0306B1C85E; Sat, 2 Jan 2021 22:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 102M5B4Z030242; Sat, 2 Jan 2021 22:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 102M5BEE030241; Sat, 2 Jan 2021 22:05:11 GMT (envelope-from git) Date: Sat, 2 Jan 2021 22:05:11 GMT Message-Id: <202101022205.102M5BEE030241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: a3479cfd2217 - main - loader: fix build on non-x86 platforms MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3479cfd2217d133d49aa7159ea23faf901dc586 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2021 22:05:12 -0000 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"