From nobody Tue Jan 24 22:10:00 2023 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 4P1h3Y2ztKz3bdVY; Tue, 24 Jan 2023 22:10:01 +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 4P1h3Y0MK3z4Hh7; Tue, 24 Jan 2023 22:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598201; 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=Pjr5F3PffNj9/isLHt4Ki+CNoYbi7KyMSo6LWEu6O1M=; b=TxnxFRTH4NZeOEWq7fGK/TzV5Z5TTvMrbpGjnCl2Kmj3cM5kD98TFuURwvOu/UpdJEEa+q Gtf8goOYkp5JVOgXm3Q3/GQx5zU7cfC3c808rIjY4eZ1/17nRcH2NYdrX2gBvDb1EzaH42 8xf2UVjE0EVBEZ2CE44Rl32q5103zES3C8tNdyhddGxECno+Q+gNbdmdkEO3Le0+d6bVBj KzF8bSf+6QX+YgJ3gkFAPmNR3TvV0kPUBrRzNPtfFxwOKjND+9GBP+b4YQiom6wv2HWc1g v0XD7Zb6iczyawKTmLjyE1zTAr+uSL7F+sRCoj93OJwqMEB6nADVEqe5XM3KHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598201; 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=Pjr5F3PffNj9/isLHt4Ki+CNoYbi7KyMSo6LWEu6O1M=; b=db/Cx3FJIUXeC0h1pyWYuxH+1YkP3gVGePkKLJB82o9R+wBtpzjZFu46Taj+Jim2oNm0Fq k6orGSYzsG5zE/ndRIiPDUcRk+eamKr/7yTf4UAamuhMbwcQhFcpWRq4xsz2dZ/Bt39sX9 VMcWxWQCXpgk5vFaJ9hLX64duRclTmBQKfQ0puqxyjn8y41Uk2GWYyKcRQNuEx/ttXhtWS sYe07YYgggLNt2CiR5W8zlfGulyx15unHD4iTB4oKw8LSUpGqr3oByNrImvvewVLbhv8jO SY25TOWuIgnpKHpHKSA0+9Fj0+ODdTuy/dQp2PWfGQVwgl50ScnFd6/k9pDO4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598201; a=rsa-sha256; cv=none; b=RaupBCjPYQVexycr+orXWawIeNm9MfgkqIKdup29q+ukSDfbFepajrVyGcmHevieIPn/Vi nYHA3+6b8WORuVk4IOq0a32rU/jEQNHy8WOawPpP5jOo8F6jh/fg8NDwCu/MYqfA7BW/6r oM+tNS/4pULFQbBuKTXcNGQex8pB0O6ytHwlJur+EOzcs+QwPZXuM+3iQD+WiDPt4OV18N A10JV41NpWb5uYBHyp2+9rBJZ8YwubgZ/mt4dH44FNcs9mtDBKapg4dEdiR3k/p290hlmr C4NTOl3Ly4Qa+R8sLeHTF5Q9DTT2Bu6tYkZNpiqiwtrDVo/M+rKw/oQZ4TXIcA== 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 4P1h3X6JGQzQNT; Tue, 24 Jan 2023 22:10:00 +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 30OMA0IB072667; Tue, 24 Jan 2023 22:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMA04Q072648; Tue, 24 Jan 2023 22:10:00 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:00 GMT Message-Id: <202301242210.30OMA04Q072648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c24f457a7d9a - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c24f457a7d9a9eb0929c91484215d9aed3a0efcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c24f457a7d9a9eb0929c91484215d9aed3a0efcf commit c24f457a7d9a9eb0929c91484215d9aed3a0efcf Author: Warner Losh AuthorDate: 2021-12-10 18:04:37 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:18 +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 (cherry picked from commit 2220b759d6b8cf912572fb22052edc5db4683dca) --- stand/loader.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/stand/loader.mk b/stand/loader.mk index e71508a1cefc..6e3ca887fcb9 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