svn commit: r351119 - in head/stand: . libsa
Kyle Evans
kevans at FreeBSD.org
Fri Aug 16 13:22:58 UTC 2019
Author: kevans
Date: Fri Aug 16 13:22:57 2019
New Revision: 351119
URL: https://svnweb.freebsd.org/changeset/base/351119
Log:
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
Modified:
head/stand/defs.mk
head/stand/libsa/Makefile
Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk Fri Aug 16 13:10:08 2019 (r351118)
+++ head/stand/defs.mk Fri Aug 16 13:22:57 2019 (r351119)
@@ -33,6 +33,7 @@ SASRC= ${BOOTSRC}/libsa
SYSDIR= ${SRCTOP}/sys
UBOOTSRC= ${BOOTSRC}/uboot
ZFSSRC= ${SASRC}/zfs
+LIBCSRC= ${SRCTOP}/lib/libc
BOOTOBJ= ${OBJTOP}/stand
Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile Fri Aug 16 13:10:08 2019 (r351118)
+++ head/stand/libsa/Makefile Fri Aug 16 13:22:57 2019 (r351119)
@@ -9,7 +9,6 @@
.include <bsd.init.mk>
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
-LIBC_SRC= ${SRCTOP}/lib/libc
LIB?= sa
@@ -21,12 +20,12 @@ SRCS+= gzguts.h zutil.h __main.c abort.c assert.c bcd.
# private (pruned) versions of libc string functions
SRCS+= strcasecmp.c
-.PATH: ${LIBC_SRC}/net
+.PATH: ${LIBCSRC}/net
SRCS+= ntoh.c
# string functions from libc
-.PATH: ${LIBC_SRC}/string
+.PATH: ${LIBCSRC}/string
SRCS+= bcmp.c bcopy.c bzero.c ffs.c fls.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 \
@@ -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
# stdlib functions from libc
-.PATH: ${LIBC_SRC}/stdlib
+.PATH: ${LIBCSRC}/stdlib
SRCS+= abs.c strtol.c strtoll.c strtoul.c strtoull.c
# common boot code
@@ -42,7 +41,7 @@ SRCS+= abs.c strtol.c strtoll.c strtoul.c strtoull.c
SRCS+= subr_boot.c
.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
# 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 a
.endif
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv"
-.PATH: ${LIBC_SRC}/${MACHINE_CPUARCH}/gen
+.PATH: ${LIBCSRC}/${MACHINE_CPUARCH}/gen
.endif
.if ${MACHINE_CPUARCH} == "powerpc"
-.PATH: ${LIBC_SRC}/quad
+.PATH: ${LIBCSRC}/quad
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
SRCS+= syncicache.c
.endif
.if ${MACHINE_CPUARCH} == "mips"
-.PATH: ${LIBC_SRC}/quad
+.PATH: ${LIBCSRC}/quad
SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
.endif
# 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
# _setjmp/_longjmp
More information about the svn-src-all
mailing list