stand: push LIBC_SRC up into defs.mk
Other parts of stand/ that don't use libsa will need to grab bits from libc shortly. Push LIBC_SRC up to defs.mk in advance of this so that they can use it, and rename it to LIBCSRC to match the convention of the rest of the *SRC variables in this file. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D21282
This commit is contained in:
parent
dc26651a96
commit
80335781ad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=351119
@ -33,6 +33,7 @@ SASRC= ${BOOTSRC}/libsa
|
|||||||
SYSDIR= ${SRCTOP}/sys
|
SYSDIR= ${SRCTOP}/sys
|
||||||
UBOOTSRC= ${BOOTSRC}/uboot
|
UBOOTSRC= ${BOOTSRC}/uboot
|
||||||
ZFSSRC= ${SASRC}/zfs
|
ZFSSRC= ${SASRC}/zfs
|
||||||
|
LIBCSRC= ${SRCTOP}/lib/libc
|
||||||
|
|
||||||
BOOTOBJ= ${OBJTOP}/stand
|
BOOTOBJ= ${OBJTOP}/stand
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
.include <bsd.init.mk>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
|
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
|
||||||
LIBC_SRC= ${SRCTOP}/lib/libc
|
|
||||||
|
|
||||||
LIB?= sa
|
LIB?= sa
|
||||||
|
|
||||||
@ -21,12 +20,12 @@ SRCS+= gzguts.h zutil.h __main.c abort.c assert.c bcd.c environment.c getopt.c g
|
|||||||
# private (pruned) versions of libc string functions
|
# private (pruned) versions of libc string functions
|
||||||
SRCS+= strcasecmp.c
|
SRCS+= strcasecmp.c
|
||||||
|
|
||||||
.PATH: ${LIBC_SRC}/net
|
.PATH: ${LIBCSRC}/net
|
||||||
|
|
||||||
SRCS+= ntoh.c
|
SRCS+= ntoh.c
|
||||||
|
|
||||||
# string functions from libc
|
# string functions from libc
|
||||||
.PATH: ${LIBC_SRC}/string
|
.PATH: ${LIBCSRC}/string
|
||||||
SRCS+= bcmp.c bcopy.c bzero.c ffs.c fls.c \
|
SRCS+= bcmp.c bcopy.c bzero.c ffs.c fls.c \
|
||||||
memccpy.c memchr.c memcmp.c memcpy.c memmove.c memset.c \
|
memccpy.c memchr.c memcmp.c memcpy.c memmove.c memset.c \
|
||||||
qdivrem.c strcat.c strchr.c strcmp.c strcpy.c stpcpy.c stpncpy.c \
|
qdivrem.c strcat.c strchr.c strcmp.c strcpy.c stpcpy.c stpncpy.c \
|
||||||
@ -34,7 +33,7 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c fls.c \
|
|||||||
strnlen.c strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
|
strnlen.c strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
|
||||||
|
|
||||||
# stdlib functions from libc
|
# stdlib functions from libc
|
||||||
.PATH: ${LIBC_SRC}/stdlib
|
.PATH: ${LIBCSRC}/stdlib
|
||||||
SRCS+= abs.c strtol.c strtoll.c strtoul.c strtoull.c
|
SRCS+= abs.c strtol.c strtoll.c strtoul.c strtoull.c
|
||||||
|
|
||||||
# common boot code
|
# common boot code
|
||||||
@ -42,7 +41,7 @@ SRCS+= abs.c strtol.c strtoll.c strtoul.c strtoull.c
|
|||||||
SRCS+= subr_boot.c
|
SRCS+= subr_boot.c
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "arm"
|
.if ${MACHINE_CPUARCH} == "arm"
|
||||||
.PATH: ${LIBC_SRC}/arm/gen
|
.PATH: ${LIBCSRC}/arm/gen
|
||||||
|
|
||||||
# Do not generate movt/movw, because the relocation fixup for them does not
|
# Do not generate movt/movw, because the relocation fixup for them does not
|
||||||
# translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
|
# translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
|
||||||
@ -68,22 +67,22 @@ SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv"
|
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv"
|
||||||
.PATH: ${LIBC_SRC}/${MACHINE_CPUARCH}/gen
|
.PATH: ${LIBCSRC}/${MACHINE_CPUARCH}/gen
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "powerpc"
|
.if ${MACHINE_CPUARCH} == "powerpc"
|
||||||
.PATH: ${LIBC_SRC}/quad
|
.PATH: ${LIBCSRC}/quad
|
||||||
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
|
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
|
||||||
SRCS+= syncicache.c
|
SRCS+= syncicache.c
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "mips"
|
.if ${MACHINE_CPUARCH} == "mips"
|
||||||
.PATH: ${LIBC_SRC}/quad
|
.PATH: ${LIBCSRC}/quad
|
||||||
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
|
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# uuid functions from libc
|
# uuid functions from libc
|
||||||
.PATH: ${LIBC_SRC}/uuid
|
.PATH: ${LIBCSRC}/uuid
|
||||||
SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c
|
SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c
|
||||||
|
|
||||||
# _setjmp/_longjmp
|
# _setjmp/_longjmp
|
||||||
|
Loading…
Reference in New Issue
Block a user