From nobody Fri Dec 10 18:07:46 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AB69718CD66F; Fri, 10 Dec 2021 18:07:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9f5G35Khz3qgY; Fri, 10 Dec 2021 18:07:46 +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 460E51EAFF; Fri, 10 Dec 2021 18:07:46 +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 1BAI7kdA010543; Fri, 10 Dec 2021 18:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAI7kef010542; Fri, 10 Dec 2021 18:07:46 GMT (envelope-from git) Date: Fri, 10 Dec 2021 18:07:46 GMT Message-Id: <202112101807.1BAI7kef010542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2220b759d6b8 - main - loader.mk: Simplify a little bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2220b759d6b8cf912572fb22052edc5db4683dca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639159666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0Ki5+lko6Zrs3j2uQoAWmICxgcvLTpTMBirAM+SiCI=; b=Opi1ANB9aeTEhtGEqtR+uZ40yQBR5WFffMf6QrMEy3kESaNYWCxy6Uf96/+H9x32Zhffv+ e4QTDFTcvLmuGh+n3Y0S92xd8kAhT41qRklTw4u04otfs0Rz2ciB084rtLCzbSTH6HdpHP vLPdQ7ZpaJ8oWnKcsPwNNv+gpHm7lAZOwXcMGiHWuAvf3MM+jf4QiHGYShvcfdHiFrNvJa 2sepGk5eBZPD84gGOTHYMOvbO3/47cU4ZrJ2OIlR0khoJBJWE7nlO008UFIUGrryjgf/Ok 7mb1AAoB8obBphfUztDFccH6XvX8+tn2jz8eohHXa5nJPra7hzpnUUKLIgbIQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639159666; a=rsa-sha256; cv=none; b=D8RId2PcpS/1iqsN9v+SW88Yd9tfAhuu37YAA85tStdFYiruc1xArfRGoKK0m/wvSBkm1b amLCtqdlv7qGUJZGzlNUCEIPDFOUl05lxBhzvpe3zjAOnhLDGfkk4HUJh7I4FYxXMJ+MI/ uCanO6Xc4AZ312ohPKHPhp7j5Ci1cpIuGMNj2qqGg3yiVJZSltgZIoBuOtapRGvYyWv0db +YH4BUDqQEnomb9CP4MWMl+1UXB+UhxqyBNKj11qsrAqO1/QwD0nNCfrTGqExBMSErUZKk J7rkeMHbAtIqEcvR2yJbJSiXSutPt/hyw5xOgXmnw7tVpvxfq3p2c5IU90UcBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2220b759d6b8cf912572fb22052edc5db4683dca commit 2220b759d6b8cf912572fb22052edc5db4683dca Author: Warner Losh AuthorDate: 2021-12-10 18:04:37 +0000 Commit: Warner Losh CommitDate: 2021-12-10 18:04:37 +0000 loader.mk: Simplify a little bit The elf loader needs to know how to reach into the gfx_fb code, so simplify how we include files to find that stuff. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D33376 --- stand/loader.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/stand/loader.mk b/stand/loader.mk index 359aee58657c..fc20344ab051 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -17,33 +17,27 @@ 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 -CFLAGS.load_elf32.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite -CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE_CPUARCH} == "aarch64" SRCS+= load_elf64.c reloc_elf64.c -CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE_CPUARCH} == "arm" SRCS+= load_elf32.c reloc_elf32.c -CFLAGS.load_elf32.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE_CPUARCH} == "powerpc" SRCS+= load_elf32.c reloc_elf32.c SRCS+= load_elf64.c reloc_elf64.c SRCS+= metadata.c -CFLAGS.load_elf32.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite -CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE_ARCH:Mmips64*} != "" SRCS+= load_elf64.c reloc_elf64.c SRCS+= metadata.c -CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE} == "mips" SRCS+= load_elf32.c reloc_elf32.c SRCS+= metadata.c -CFLAGS.load_elf32.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .elif ${MACHINE_CPUARCH} == "riscv" SRCS+= load_elf64.c reloc_elf64.c SRCS+= metadata.c -CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .endif +# elf loaders set frame buffer things, so add includes for that. +CFLAGS.load_elf32.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite +CFLAGS.load_elf64.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite .if ${LOADER_DISK_SUPPORT:Uyes} == "yes" CFLAGS.part.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib