Thu Jun 15 03:20:59 2023 UTC ()
Add missing include paths for libz. Not used at the moment although.


(rin)
diff -r1.28 -r1.29 src/sys/stand/efiboot/Makefile.efiboot
cvs diff -r1.28 -r1.29 src/sys/stand/efiboot/Makefile.efiboot (switch to unified diff)

--- src/sys/stand/efiboot/Makefile.efiboot 2023/06/03 21:26:29 1.28
+++ src/sys/stand/efiboot/Makefile.efiboot 2023/06/15 03:20:58 1.29
@@ -1,173 +1,174 @@ @@ -1,173 +1,174 @@
1# $NetBSD: Makefile.efiboot,v 1.28 2023/06/03 21:26:29 lukem Exp $ 1# $NetBSD: Makefile.efiboot,v 1.29 2023/06/15 03:20:58 rin Exp $
2 2
3S= ${.CURDIR}/../../.. 3S= ${.CURDIR}/../../..
4 4
5NOMAN= # defined 5NOMAN= # defined
6NOPIE= # defined 6NOPIE= # defined
7NOLIBCSANITIZER=# defined 7NOLIBCSANITIZER=# defined
8NOSANITIZER= # defined 8NOSANITIZER= # defined
9NORELRO= # defined 9NORELRO= # defined
10PROG?= boot.efi 10PROG?= boot.efi
11NEWVERSWHAT?= "efiboot" 11NEWVERSWHAT?= "efiboot"
12 12
13EFIDIR= ${S}/external/bsd/gnu-efi/dist 13EFIDIR= ${S}/external/bsd/gnu-efi/dist
14GNUEFIARCH?= ${MACHINE_CPU} 14GNUEFIARCH?= ${MACHINE_CPU}
15CPPFLAGS+= -I${EFIDIR}/inc -I${EFIDIR}/inc/${GNUEFIARCH} 15CPPFLAGS+= -I${EFIDIR}/inc -I${EFIDIR}/inc/${GNUEFIARCH}
16CPPFLAGS+= -I${EFIDIR}/inc/protocol 16CPPFLAGS+= -I${EFIDIR}/inc/protocol
17 17
18LDSCRIPT?= ${EFIDIR}/gnuefi/elf_${GNUEFIARCH}_efi.lds 18LDSCRIPT?= ${EFIDIR}/gnuefi/elf_${GNUEFIARCH}_efi.lds
19 19
20AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} 20AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
21 21
22.PATH: ${EFIDIR}/gnuefi 22.PATH: ${EFIDIR}/gnuefi
23SOURCES= crt0-efi-${GNUEFIARCH}.S reloc_${GNUEFIARCH}.c 23SOURCES= crt0-efi-${GNUEFIARCH}.S reloc_${GNUEFIARCH}.c
24SOURCES+= boot.c bootmenu.c conf.c console.c dev_net.c devopen.c exec.c \ 24SOURCES+= boot.c bootmenu.c conf.c console.c dev_net.c devopen.c exec.c \
25 module.c panic.c prompt.c userconf.c 25 module.c panic.c prompt.c userconf.c
26SOURCES+= efiboot.c efichar.c efidev.c efigetsecs.c \ 26SOURCES+= efiboot.c efichar.c efidev.c efigetsecs.c \
27 efifile.c efiblock.c efinet.c efipxe.c efirng.c \ 27 efifile.c efiblock.c efinet.c efipxe.c efirng.c \
28 efiwatchdog.c efigop.c smbios.c 28 efiwatchdog.c efigop.c smbios.c
29 29
30.if ${EFIBOOT_FDT:Uno} == "yes" 30.if ${EFIBOOT_FDT:Uno} == "yes"
31CPPFLAGS+= -DEFIBOOT_FDT 31CPPFLAGS+= -DEFIBOOT_FDT
32SOURCES+= efifdt.c overlay.c 32SOURCES+= efifdt.c overlay.c
33.PATH: ${S}/external/bsd/libfdt/dist 33.PATH: ${S}/external/bsd/libfdt/dist
34CPPFLAGS+= -I${S}/external/bsd/libfdt/dist 34CPPFLAGS+= -I${S}/external/bsd/libfdt/dist
35SOURCES+= fdt.c fdt_addresses.c fdt_empty_tree.c fdt_overlay.c 35SOURCES+= fdt.c fdt_addresses.c fdt_empty_tree.c fdt_overlay.c
36SOURCES+= fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c fdt_wip.c 36SOURCES+= fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c fdt_wip.c
37.endif 37.endif
38 38
39.if ${EFIBOOT_ACPI:Uno} == "yes" 39.if ${EFIBOOT_ACPI:Uno} == "yes"
40CPPFLAGS+= -DEFIBOOT_ACPI 40CPPFLAGS+= -DEFIBOOT_ACPI
41SOURCES+= efiacpi.c 41SOURCES+= efiacpi.c
42.endif 42.endif
43 43
44SRCS= ${SOURCES} ${EXTRA_SOURCES} 44SRCS= ${SOURCES} ${EXTRA_SOURCES}
45 45
46.include <bsd.init.mk> 46.include <bsd.init.mk>
47 47
48STRIPFLAG= # nothing 48STRIPFLAG= # nothing
49 49
50LIBCRT0= # nothing 50LIBCRT0= # nothing
51LIBCRTI= # nothing 51LIBCRTI= # nothing
52LIBCRTBEGIN= # nothing 52LIBCRTBEGIN= # nothing
53LIBCRTEND= # nothing 53LIBCRTEND= # nothing
54LIBC= # nothing 54LIBC= # nothing
55 55
56BINDIR=/usr/mdec 56BINDIR=/usr/mdec
57BINMODE=444 57BINMODE=444
58 58
59.PATH: ${.CURDIR} ${.CURDIR}/.. 59.PATH: ${.CURDIR} ${.CURDIR}/..
60.PATH: ${.CURDIR}/../../lib 60.PATH: ${.CURDIR}/../../lib
61 61
62LDFLAGS+= --no-dynamic-linker --noinhibit-exec 62LDFLAGS+= --no-dynamic-linker --noinhibit-exec
63LDFLAGS+= -nostdlib -T${LDSCRIPT} -Bsymbolic -shared 63LDFLAGS+= -nostdlib -T${LDSCRIPT} -Bsymbolic -shared
64CPPFLAGS+= -I$S -I${.CURDIR} -I${.CURDIR}/../common -I$S/lib/libsa 64CPPFLAGS+= -I$S -I${.CURDIR} -I${.CURDIR}/../common -I$S/lib/libsa
65CPPFLAGS+= -I${.OBJDIR} 65CPPFLAGS+= -I${.OBJDIR}
66CPPFLAGS+= -I${.CURDIR}/../../lib 66CPPFLAGS+= -I${.CURDIR}/../../lib
67CPPFLAGS+= -I${S}/../common/include 67CPPFLAGS+= -I${S}/../common/include
68 68
69COPTS+= -fpic -g -O2 69COPTS+= -fpic -g -O2
70COPTS+= -fshort-wchar -fno-strict-aliasing 70COPTS+= -fshort-wchar -fno-strict-aliasing
71COPTS+= -ffreestanding -fno-stack-protector 71COPTS+= -ffreestanding -fno-stack-protector
72LDFLAGS+= --defsym=EFI_SUBSYSTEM=0xa 72LDFLAGS+= --defsym=EFI_SUBSYSTEM=0xa
73 73
74 74
75COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=unused-but-set-variable :} 75COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=unused-but-set-variable :}
76CPPFLAGS+= -nostdinc -D_STANDALONE 76CPPFLAGS+= -nostdinc -D_STANDALONE
77CPPFLAGS+= -DEFIBOOT 77CPPFLAGS+= -DEFIBOOT
78CPPFLAGS+= -DPROGRESS_FN=efi_progress 78CPPFLAGS+= -DPROGRESS_FN=efi_progress
79 79
80CPPFLAGS+= -Wall -Wmissing-prototypes 80CPPFLAGS+= -Wall -Wmissing-prototypes
81CPPFLAGS+= -Wno-pointer-sign 81CPPFLAGS+= -Wno-pointer-sign
82 82
83CPPFLAGS+= -DHEAP_VARIABLE 83CPPFLAGS+= -DHEAP_VARIABLE
84CPPFLAGS+= -DSUPPORT_CD9660 84CPPFLAGS+= -DSUPPORT_CD9660
85CPPFLAGS+= -D"devb2cdb(bno)=(bno)" 85CPPFLAGS+= -D"devb2cdb(bno)=(bno)"
86CPPFLAGS+= -DSUPPORT_DOSFS 86CPPFLAGS+= -DSUPPORT_DOSFS
87#CPPFLAGS+= -DSUPPORT_EXT2FS 87#CPPFLAGS+= -DSUPPORT_EXT2FS
88CPPFLAGS+= -DSUPPORT_BOOTP 88CPPFLAGS+= -DSUPPORT_BOOTP
89CPPFLAGS+= -DSUPPORT_DHCP 89CPPFLAGS+= -DSUPPORT_DHCP
90#CPPFLAGS+= -DSUPPORT_NFS 90#CPPFLAGS+= -DSUPPORT_NFS
91CPPFLAGS+= -DSUPPORT_TFTP 91CPPFLAGS+= -DSUPPORT_TFTP
92CPPFLAGS+= -DLIBSA_ENABLE_LS_OP 92CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
93CPPFLAGS+= -DLIBSA_FFS_EI 93CPPFLAGS+= -DLIBSA_FFS_EI
94CPPFLAGS+= -DLIBSA_DISKLABEL_EI 94CPPFLAGS+= -DLIBSA_DISKLABEL_EI
95CPPFLAGS+= -DDEFAULT_TIMEOUT=5 95CPPFLAGS+= -DDEFAULT_TIMEOUT=5
96 96
97#CPPFLAGS+= -DEFIBOOT_DEBUG 97#CPPFLAGS+= -DEFIBOOT_DEBUG
98#CPPFLAGS+= -DARP_DEBUG 98#CPPFLAGS+= -DARP_DEBUG
99#CPPFLAGS+= -DBOOTP_DEBUG 99#CPPFLAGS+= -DBOOTP_DEBUG
100#CPPFLAGS+= -DNET_DEBUG 100#CPPFLAGS+= -DNET_DEBUG
101#CPPFLAGS+= -DNETIF_DEBUG 101#CPPFLAGS+= -DNETIF_DEBUG
102#CPPFLAGS+= -DNFS_DEBUG 102#CPPFLAGS+= -DNFS_DEBUG
103#CPPFLAGS+= -DRARP_DEBUG 103#CPPFLAGS+= -DRARP_DEBUG
104#CPPFLAGS+= -DRPC_DEBUG 104#CPPFLAGS+= -DRPC_DEBUG
105 105
106# Follow the suit of Makefile.kern.inc; needed for the lfs64 union 106# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
107# accessors -- they don't actually dereference the resulting pointer, 107# accessors -- they don't actually dereference the resulting pointer,
108# just use it for type-checking. 108# just use it for type-checking.
109CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER} 109CWARNFLAGS+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
110 110
111SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT 111SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
112SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT 112SAMISCCPPFLAGS+= -DLIBSA_PRINTF_WIDTH_SUPPORT
113SAMISCCPPFLAGS+= -D"cdb2devb(bno)=(bno)" 113SAMISCCPPFLAGS+= -D"cdb2devb(bno)=(bno)"
114 114
115### find out what to use for libsa 115### find out what to use for libsa
116SA_AS= library 116SA_AS= library
117SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes" 117SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
118SAMISCMAKEFLAGS+="SA_USE_CREAD=yes" 118SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
119SAMISCMAKEFLAGS+="SA_INCLUDE_NET=yes" 119SAMISCMAKEFLAGS+="SA_INCLUDE_NET=yes"
120SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes" 120SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
121SAMISCMAKEFLAGS+="SA_ENABLE_BIENDIAN=yes" 121SAMISCMAKEFLAGS+="SA_ENABLE_BIENDIAN=yes"
122.include "${S}/lib/libsa/Makefile.inc" 122.include "${S}/lib/libsa/Makefile.inc"
123LIBSA= ${SALIB} 123LIBSA= ${SALIB}
124 124
125### find out what to use for libkern 125### find out what to use for libkern
126KERN_AS= library 126KERN_AS= library
127LIBKERN_ARCH?= ${MACHINE_ARCH} 127LIBKERN_ARCH?= ${MACHINE_ARCH}
128KERNMISCMAKEFLAGS+="LIBKERN_ARCH=${LIBKERN_ARCH}" 128KERNMISCMAKEFLAGS+="LIBKERN_ARCH=${LIBKERN_ARCH}"
129.include "${S}/lib/libkern/Makefile.inc" 129.include "${S}/lib/libkern/Makefile.inc"
130LIBKERN= ${KERNLIB} 130LIBKERN= ${KERNLIB}
131 131
132### find out what to use for libz 132### find out what to use for libz
133Z_AS= library 133Z_AS= library
134.include "${S}/lib/libz/Makefile.inc" 134.include "${S}/lib/libz/Makefile.inc"
 135CPPFLAGS+= -I${S}/lib/libz -I${S}/../common/dist/zlib
135LIBZ= ${ZLIB} 136LIBZ= ${ZLIB}
136 137
137### find out what to use for libgnuefi 138### find out what to use for libgnuefi
138GNUEFI_AS= library 139GNUEFI_AS= library
139LIBGNUEFI_ARCH?= ${MACHINE_ARCH} 140LIBGNUEFI_ARCH?= ${MACHINE_ARCH}
140GNUEFIMISCMAKEFLAGS+="LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH}" 141GNUEFIMISCMAKEFLAGS+="LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH}"
141GNUEFIMISCCPPFLAGS+= -I${EFIDIR}/lib 142GNUEFIMISCCPPFLAGS+= -I${EFIDIR}/lib
142.include "${S}/lib/libgnuefi/Makefile.inc" 143.include "${S}/lib/libgnuefi/Makefile.inc"
143LIBGNUEFI= ${GNUEFILIB} 144LIBGNUEFI= ${GNUEFILIB}
144 145
145cleandir distclean: .WAIT cleanlibdir 146cleandir distclean: .WAIT cleanlibdir
146 147
147cleanlibdir: 148cleanlibdir:
148 -rm -rf lib 149 -rm -rf lib
149 150
150LIBLIST= ${LIBGNUEFI} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBSA} 151LIBLIST= ${LIBGNUEFI} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBSA}
151 152
152VERSIONMACHINE=${MACHINE} 153VERSIONMACHINE=${MACHINE}
153.include "${S}/conf/newvers_stand.mk" 154.include "${S}/conf/newvers_stand.mk"
154 155
155CLEANFILES+= ${PROG}.so ${PROG}.tmp 156CLEANFILES+= ${PROG}.so ${PROG}.tmp
156 157
157${PROG}: ${PROG}.so 158${PROG}: ${PROG}.so
158 ${OBJCOPY} -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ 159 ${OBJCOPY} -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
159 -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \ 160 -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
160 -j .reloc ${OBJCOPY_FORMAT} ${PROG}.so ${.TARGET} 161 -j .reloc ${OBJCOPY_FORMAT} ${PROG}.so ${.TARGET}
161 162
162.include <bsd.prog.mk> 163.include <bsd.prog.mk>
163 164
164${PROG}.so: ${OBJS} ${LIBLIST} ${LDSCRIPT} ${.CURDIR}/../Makefile.efiboot 165${PROG}.so: ${OBJS} ${LIBLIST} ${LDSCRIPT} ${.CURDIR}/../Makefile.efiboot
165 ${LD} ${LDFLAGS} -o ${.TARGET}.tmp ${OBJS} ${LIBLIST} 166 ${LD} ${LDFLAGS} -o ${.TARGET}.tmp ${OBJS} ${LIBLIST}
166 @if ${OBJDUMP} -t ${.TARGET}.tmp | grep 'UND'; then \ 167 @if ${OBJDUMP} -t ${.TARGET}.tmp | grep 'UND'; then \
167 (echo Undefined symbols; false); \ 168 (echo Undefined symbols; false); \
168 fi 169 fi
169 rm -f ${.TARGET} 170 rm -f ${.TARGET}
170 mv ${.TARGET}.tmp ${.TARGET} 171 mv ${.TARGET}.tmp ${.TARGET}
171 172
172KLINK_MACHINE?= ${MACHINE} 173KLINK_MACHINE?= ${MACHINE}
173.include <bsd.klinks.mk> 174.include <bsd.klinks.mk>