Date: Thu, 12 Oct 2017 14:56:28 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324551 - in head: lib/libstand lib/libstand/amd64 lib/libstand/i386 lib/libstand/mips lib/libstand/powerpc lib/libstand/sparc64 sys/boot/libsa sys/boot/libsa/amd64 sys/boot/libsa/i386 ... Message-ID: <201710121456.v9CEuSRE035015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Oct 12 14:56:28 2017 New Revision: 324551 URL: https://svnweb.freebsd.org/changeset/base/324551 Log: Move lib/libstand to sys/boot/libsa Move the sources to sys/boot. Make adjustments related to the move. Kill LIBSTAND_SRC since it's no longer needed. Sponsored by: Netflix Added: head/sys/boot/libsa/Makefile.depend (contents, props changed) - copied, changed from r324550, head/lib/libstand/Makefile.depend head/sys/boot/libsa/__main.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/__main.c head/sys/boot/libsa/amd64/ head/sys/boot/libsa/amd64/_setjmp.S (contents, props changed) - copied, changed from r324550, head/lib/libstand/amd64/_setjmp.S head/sys/boot/libsa/arp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/arp.c head/sys/boot/libsa/assert.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/assert.c head/sys/boot/libsa/bcd.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/bcd.c head/sys/boot/libsa/bootp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/bootp.c head/sys/boot/libsa/bootp.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/bootp.h head/sys/boot/libsa/bootparam.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/bootparam.c head/sys/boot/libsa/bootparam.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/bootparam.h head/sys/boot/libsa/bzipfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/bzipfs.c head/sys/boot/libsa/cd9660.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/cd9660.c head/sys/boot/libsa/close.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/close.c head/sys/boot/libsa/closeall.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/closeall.c head/sys/boot/libsa/dev.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/dev.c head/sys/boot/libsa/dosfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/dosfs.c head/sys/boot/libsa/dosfs.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/dosfs.h head/sys/boot/libsa/environment.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/environment.c head/sys/boot/libsa/ether.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/ether.c head/sys/boot/libsa/ext2fs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/ext2fs.c head/sys/boot/libsa/fstat.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/fstat.c head/sys/boot/libsa/getopt.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/getopt.c head/sys/boot/libsa/gets.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/gets.c head/sys/boot/libsa/globals.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/globals.c head/sys/boot/libsa/gzipfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/gzipfs.c head/sys/boot/libsa/i386/ head/sys/boot/libsa/i386/_setjmp.S (contents, props changed) - copied, changed from r324550, head/lib/libstand/i386/_setjmp.S head/sys/boot/libsa/in_cksum.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/in_cksum.c head/sys/boot/libsa/inet_ntoa.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/inet_ntoa.c head/sys/boot/libsa/ioctl.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/ioctl.c head/sys/boot/libsa/iodesc.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/iodesc.h head/sys/boot/libsa/ip.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/ip.c head/sys/boot/libsa/libstand.3 (contents, props changed) - copied, changed from r324550, head/lib/libstand/libstand.3 head/sys/boot/libsa/lseek.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/lseek.c head/sys/boot/libsa/mips/ head/sys/boot/libsa/mips/_setjmp.S (contents, props changed) - copied, changed from r324550, head/lib/libstand/mips/_setjmp.S head/sys/boot/libsa/nandfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/nandfs.c head/sys/boot/libsa/net.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/net.c head/sys/boot/libsa/net.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/net.h head/sys/boot/libsa/netif.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/netif.c head/sys/boot/libsa/netif.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/netif.h head/sys/boot/libsa/nfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/nfs.c head/sys/boot/libsa/nfsv2.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/nfsv2.h head/sys/boot/libsa/nullfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/nullfs.c head/sys/boot/libsa/open.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/open.c head/sys/boot/libsa/pager.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/pager.c head/sys/boot/libsa/pkgfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/pkgfs.c head/sys/boot/libsa/powerpc/ head/sys/boot/libsa/powerpc/_setjmp.S (contents, props changed) - copied, changed from r324550, head/lib/libstand/powerpc/_setjmp.S head/sys/boot/libsa/powerpc/syncicache.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/powerpc/syncicache.c head/sys/boot/libsa/printf.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/printf.c head/sys/boot/libsa/qdivrem.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/qdivrem.c head/sys/boot/libsa/quad.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/quad.h head/sys/boot/libsa/random.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/random.c head/sys/boot/libsa/rarp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/rarp.c head/sys/boot/libsa/read.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/read.c head/sys/boot/libsa/readdir.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/readdir.c head/sys/boot/libsa/rpc.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/rpc.c head/sys/boot/libsa/rpc.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/rpc.h head/sys/boot/libsa/rpcv2.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/rpcv2.h head/sys/boot/libsa/saioctl.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/saioctl.h head/sys/boot/libsa/sbrk.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/sbrk.c head/sys/boot/libsa/sparc64/ head/sys/boot/libsa/sparc64/_setjmp.S (contents, props changed) - copied, changed from r324550, head/lib/libstand/sparc64/_setjmp.S head/sys/boot/libsa/splitfs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/splitfs.c head/sys/boot/libsa/stand.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/stand.h head/sys/boot/libsa/stat.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/stat.c head/sys/boot/libsa/strcasecmp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/strcasecmp.c head/sys/boot/libsa/strdup.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/strdup.c head/sys/boot/libsa/strerror.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/strerror.c head/sys/boot/libsa/strtol.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/strtol.c head/sys/boot/libsa/strtoul.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/strtoul.c head/sys/boot/libsa/tftp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/tftp.c head/sys/boot/libsa/tftp.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/tftp.h head/sys/boot/libsa/twiddle.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/twiddle.c head/sys/boot/libsa/udp.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/udp.c head/sys/boot/libsa/ufs.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/ufs.c head/sys/boot/libsa/uuid_from_string.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/uuid_from_string.c head/sys/boot/libsa/uuid_to_string.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/uuid_to_string.c head/sys/boot/libsa/write.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/write.c head/sys/boot/libsa/zalloc.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/zalloc.c head/sys/boot/libsa/zalloc_defs.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/zalloc_defs.h head/sys/boot/libsa/zalloc_malloc.c (contents, props changed) - copied, changed from r324550, head/lib/libstand/zalloc_malloc.c head/sys/boot/libsa/zalloc_mem.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/zalloc_mem.h head/sys/boot/libsa/zalloc_protos.h (contents, props changed) - copied, changed from r324550, head/lib/libstand/zalloc_protos.h Deleted: head/lib/libstand/Makefile head/lib/libstand/Makefile.depend head/lib/libstand/__main.c head/lib/libstand/amd64/_setjmp.S head/lib/libstand/arp.c head/lib/libstand/assert.c head/lib/libstand/bcd.c head/lib/libstand/bootp.c head/lib/libstand/bootp.h head/lib/libstand/bootparam.c head/lib/libstand/bootparam.h head/lib/libstand/bzipfs.c head/lib/libstand/cd9660.c head/lib/libstand/close.c head/lib/libstand/closeall.c head/lib/libstand/dev.c head/lib/libstand/dosfs.c head/lib/libstand/dosfs.h head/lib/libstand/environment.c head/lib/libstand/ether.c head/lib/libstand/ext2fs.c head/lib/libstand/fstat.c head/lib/libstand/getopt.c head/lib/libstand/gets.c head/lib/libstand/globals.c head/lib/libstand/gzipfs.c head/lib/libstand/i386/_setjmp.S head/lib/libstand/in_cksum.c head/lib/libstand/inet_ntoa.c head/lib/libstand/ioctl.c head/lib/libstand/iodesc.h head/lib/libstand/ip.c head/lib/libstand/libstand.3 head/lib/libstand/lseek.c head/lib/libstand/mips/_setjmp.S head/lib/libstand/nandfs.c head/lib/libstand/net.c head/lib/libstand/net.h head/lib/libstand/netif.c head/lib/libstand/netif.h head/lib/libstand/nfs.c head/lib/libstand/nfsv2.h head/lib/libstand/nullfs.c head/lib/libstand/open.c head/lib/libstand/pager.c head/lib/libstand/pkgfs.c head/lib/libstand/powerpc/_setjmp.S head/lib/libstand/powerpc/syncicache.c head/lib/libstand/printf.c head/lib/libstand/qdivrem.c head/lib/libstand/quad.h head/lib/libstand/random.c head/lib/libstand/rarp.c head/lib/libstand/read.c head/lib/libstand/readdir.c head/lib/libstand/rpc.c head/lib/libstand/rpc.h head/lib/libstand/rpcv2.h head/lib/libstand/saioctl.h head/lib/libstand/sbrk.c head/lib/libstand/sparc64/_setjmp.S head/lib/libstand/splitfs.c head/lib/libstand/stand.h head/lib/libstand/stat.c head/lib/libstand/strcasecmp.c head/lib/libstand/strdup.c head/lib/libstand/strerror.c head/lib/libstand/strtol.c head/lib/libstand/strtoul.c head/lib/libstand/tftp.c head/lib/libstand/tftp.h head/lib/libstand/twiddle.c head/lib/libstand/udp.c head/lib/libstand/ufs.c head/lib/libstand/uuid_from_string.c head/lib/libstand/uuid_to_string.c head/lib/libstand/write.c head/lib/libstand/zalloc.c head/lib/libstand/zalloc_defs.h head/lib/libstand/zalloc_malloc.c head/lib/libstand/zalloc_mem.h head/lib/libstand/zalloc_protos.h Modified: head/sys/boot/libsa/Makefile head/sys/boot/libstand32/Makefile head/sys/boot/userboot/libstand/Makefile Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Thu Oct 12 14:53:25 2017 (r324550) +++ head/sys/boot/libsa/Makefile Thu Oct 12 14:56:28 2017 (r324551) @@ -1,14 +1,161 @@ # $FreeBSD$ +# Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ +# +# Notes: +# - We don't use the libc strerror/sys_errlist because the string table is +# quite large. +# +MK_PROFILE= no +MK_SSP= no + .include <src.opts.mk> .include "../Makefile.inc" -LIBSTAND_SRC= ${SASRC} -LIBC_SRC= ${SRCTOP}/lib/libc INTERNALLIB= -INCS= -MAN= -.PATH: ${SASRC} +LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} +LIBC_SRC= ${SRCTOP}/lib/libc -.include "${SASRC}/Makefile" +LIB?= stand +NO_PIC= +WARNS?= 0 + +CFLAGS+= -I${SASRC} + +# standalone components and stuff we have modified locally +SRCS+= gzguts.h zutil.h __main.c assert.c bcd.c environment.c getopt.c gets.c \ + globals.c pager.c printf.c strdup.c strerror.c strtol.c strtoul.c random.c \ + sbrk.c twiddle.c zalloc.c zalloc_malloc.c + +# private (pruned) versions of libc string functions +SRCS+= strcasecmp.c + +.PATH: ${LIBC_SRC}/net + +SRCS+= ntoh.c + +# string functions from libc +.PATH: ${LIBC_SRC}/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 \ + strcspn.c strlcat.c strlcpy.c strlen.c strncat.c strncmp.c strncpy.c \ + strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c +.if ${MACHINE_CPUARCH} == "arm" +.PATH: ${LIBC_SRC}/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). +# Also, the fpu is not available in a standalone environment. +.if ${COMPILER_VERSION} < 30800 +CFLAGS.clang+= -mllvm -arm-use-movt=0 +.else +CFLAGS.clang+= -mno-movt +.endif +CFLAGS.clang+= -mfpu=none + +# Compiler support functions +.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/ +# __clzsi2 and ctzsi2 for various builtin functions +SRCS+= clzsi2.c ctzsi2.c +# Divide and modulus functions called by the compiler +SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c +SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c + +.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm/ +SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S +SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S +.endif + +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" +.PATH: ${LIBC_SRC}/${MACHINE_CPUARCH}/gen +.endif + +.if ${MACHINE_CPUARCH} == "powerpc" +.PATH: ${LIBC_SRC}/quad +SRCS+= ashldi3.c ashrdi3.c +SRCS+= syncicache.c +.endif + +# uuid functions from libc +.PATH: ${LIBC_SRC}/uuid +SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c + +# _setjmp/_longjmp +.PATH: ${SASRC}/${LIBSTAND_CPUARCH} +SRCS+= _setjmp.S + +# decompression functionality from libbz2 +# NOTE: to actually test this functionality after libbz2 upgrade compile +# loader(8) with LOADER_BZIP2_SUPPORT defined +.PATH: ${SRCTOP}/contrib/bzip2 +CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS +SRCS+= libstand_bzlib_private.h + +.for file in bzlib.c crctable.c decompress.c huffman.c randtable.c +SRCS+= _${file} +CLEANFILES+= _${file} + +_${file}: ${file} + sed "s|bzlib_private\.h|libstand_bzlib_private.h|" \ + ${.ALLSRC} > ${.TARGET} +.endfor + +CLEANFILES+= libstand_bzlib_private.h +libstand_bzlib_private.h: bzlib_private.h + sed -e 's|<stdlib.h>|"stand.h"|' \ + ${.ALLSRC} > ${.TARGET} + +# decompression functionality from zlib +.PATH: ${SRCTOP}/contrib/zlib +CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib +SRCS+= adler32.c crc32.c libstand_zutil.h libstand_gzguts.h + +.for file in infback.c inffast.c inflate.c inftrees.c zutil.c +SRCS+= _${file} +CLEANFILES+= _${file} + +_${file}: ${file} + sed -e "s|zutil\.h|libstand_zutil.h|" \ + -e "s|gzguts\.h|libstand_gzguts.h|" \ + ${.ALLSRC} > ${.TARGET} +.endfor + +# depend on stand.h being able to be included multiple times +.for file in zutil.h gzguts.h +CLEANFILES+= libstand_${file} +libstand_${file}: ${file} + sed -e 's|<fcntl.h>|"stand.h"|' \ + -e 's|<stddef.h>|"stand.h"|' \ + -e 's|<string.h>|"stand.h"|' \ + -e 's|<stdio.h>|"stand.h"|' \ + -e 's|<stdlib.h>|"stand.h"|' \ + ${.ALLSRC} > ${.TARGET} +.endfor + +# io routines +SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c \ + fstat.c close.c lseek.c open.c read.c write.c readdir.c + +# network routines +SRCS+= arp.c ether.c ip.c inet_ntoa.c in_cksum.c net.c udp.c netif.c rpc.c + +# network info services: +SRCS+= bootp.c rarp.c bootparam.c + +# boot filesystems +SRCS+= ufs.c nfs.c cd9660.c tftp.c gzipfs.c bzipfs.c +SRCS+= dosfs.c ext2fs.c +SRCS+= splitfs.c +SRCS+= pkgfs.c +.if ${MK_NAND} != "no" +SRCS+= nandfs.c +.endif + +# explicit_bzero +.PATH: ${SRCTOP}/sys/libkern +SRCS+= explicit_bzero.c + +.include <bsd.stand.mk> +.include <bsd.lib.mk> Copied and modified: head/sys/boot/libsa/Makefile.depend (from r324550, head/lib/libstand/Makefile.depend) ============================================================================== Copied and modified: head/sys/boot/libsa/__main.c (from r324550, head/lib/libstand/__main.c) ============================================================================== Copied and modified: head/sys/boot/libsa/amd64/_setjmp.S (from r324550, head/lib/libstand/amd64/_setjmp.S) ============================================================================== Copied and modified: head/sys/boot/libsa/arp.c (from r324550, head/lib/libstand/arp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/assert.c (from r324550, head/lib/libstand/assert.c) ============================================================================== Copied and modified: head/sys/boot/libsa/bcd.c (from r324550, head/lib/libstand/bcd.c) ============================================================================== Copied and modified: head/sys/boot/libsa/bootp.c (from r324550, head/lib/libstand/bootp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/bootp.h (from r324550, head/lib/libstand/bootp.h) ============================================================================== Copied and modified: head/sys/boot/libsa/bootparam.c (from r324550, head/lib/libstand/bootparam.c) ============================================================================== Copied and modified: head/sys/boot/libsa/bootparam.h (from r324550, head/lib/libstand/bootparam.h) ============================================================================== Copied and modified: head/sys/boot/libsa/bzipfs.c (from r324550, head/lib/libstand/bzipfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/cd9660.c (from r324550, head/lib/libstand/cd9660.c) ============================================================================== Copied and modified: head/sys/boot/libsa/close.c (from r324550, head/lib/libstand/close.c) ============================================================================== Copied and modified: head/sys/boot/libsa/closeall.c (from r324550, head/lib/libstand/closeall.c) ============================================================================== Copied and modified: head/sys/boot/libsa/dev.c (from r324550, head/lib/libstand/dev.c) ============================================================================== Copied and modified: head/sys/boot/libsa/dosfs.c (from r324550, head/lib/libstand/dosfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/dosfs.h (from r324550, head/lib/libstand/dosfs.h) ============================================================================== Copied and modified: head/sys/boot/libsa/environment.c (from r324550, head/lib/libstand/environment.c) ============================================================================== Copied and modified: head/sys/boot/libsa/ether.c (from r324550, head/lib/libstand/ether.c) ============================================================================== Copied and modified: head/sys/boot/libsa/ext2fs.c (from r324550, head/lib/libstand/ext2fs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/fstat.c (from r324550, head/lib/libstand/fstat.c) ============================================================================== Copied and modified: head/sys/boot/libsa/getopt.c (from r324550, head/lib/libstand/getopt.c) ============================================================================== Copied and modified: head/sys/boot/libsa/gets.c (from r324550, head/lib/libstand/gets.c) ============================================================================== Copied and modified: head/sys/boot/libsa/globals.c (from r324550, head/lib/libstand/globals.c) ============================================================================== Copied and modified: head/sys/boot/libsa/gzipfs.c (from r324550, head/lib/libstand/gzipfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/i386/_setjmp.S (from r324550, head/lib/libstand/i386/_setjmp.S) ============================================================================== Copied and modified: head/sys/boot/libsa/in_cksum.c (from r324550, head/lib/libstand/in_cksum.c) ============================================================================== Copied and modified: head/sys/boot/libsa/inet_ntoa.c (from r324550, head/lib/libstand/inet_ntoa.c) ============================================================================== Copied and modified: head/sys/boot/libsa/ioctl.c (from r324550, head/lib/libstand/ioctl.c) ============================================================================== Copied and modified: head/sys/boot/libsa/iodesc.h (from r324550, head/lib/libstand/iodesc.h) ============================================================================== Copied and modified: head/sys/boot/libsa/ip.c (from r324550, head/lib/libstand/ip.c) ============================================================================== Copied and modified: head/sys/boot/libsa/libstand.3 (from r324550, head/lib/libstand/libstand.3) ============================================================================== Copied and modified: head/sys/boot/libsa/lseek.c (from r324550, head/lib/libstand/lseek.c) ============================================================================== Copied and modified: head/sys/boot/libsa/mips/_setjmp.S (from r324550, head/lib/libstand/mips/_setjmp.S) ============================================================================== Copied and modified: head/sys/boot/libsa/nandfs.c (from r324550, head/lib/libstand/nandfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/net.c (from r324550, head/lib/libstand/net.c) ============================================================================== Copied and modified: head/sys/boot/libsa/net.h (from r324550, head/lib/libstand/net.h) ============================================================================== Copied and modified: head/sys/boot/libsa/netif.c (from r324550, head/lib/libstand/netif.c) ============================================================================== Copied and modified: head/sys/boot/libsa/netif.h (from r324550, head/lib/libstand/netif.h) ============================================================================== Copied and modified: head/sys/boot/libsa/nfs.c (from r324550, head/lib/libstand/nfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/nfsv2.h (from r324550, head/lib/libstand/nfsv2.h) ============================================================================== Copied and modified: head/sys/boot/libsa/nullfs.c (from r324550, head/lib/libstand/nullfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/open.c (from r324550, head/lib/libstand/open.c) ============================================================================== Copied and modified: head/sys/boot/libsa/pager.c (from r324550, head/lib/libstand/pager.c) ============================================================================== Copied and modified: head/sys/boot/libsa/pkgfs.c (from r324550, head/lib/libstand/pkgfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/powerpc/_setjmp.S (from r324550, head/lib/libstand/powerpc/_setjmp.S) ============================================================================== Copied and modified: head/sys/boot/libsa/powerpc/syncicache.c (from r324550, head/lib/libstand/powerpc/syncicache.c) ============================================================================== Copied and modified: head/sys/boot/libsa/printf.c (from r324550, head/lib/libstand/printf.c) ============================================================================== Copied and modified: head/sys/boot/libsa/qdivrem.c (from r324550, head/lib/libstand/qdivrem.c) ============================================================================== Copied and modified: head/sys/boot/libsa/quad.h (from r324550, head/lib/libstand/quad.h) ============================================================================== Copied and modified: head/sys/boot/libsa/random.c (from r324550, head/lib/libstand/random.c) ============================================================================== Copied and modified: head/sys/boot/libsa/rarp.c (from r324550, head/lib/libstand/rarp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/read.c (from r324550, head/lib/libstand/read.c) ============================================================================== Copied and modified: head/sys/boot/libsa/readdir.c (from r324550, head/lib/libstand/readdir.c) ============================================================================== Copied and modified: head/sys/boot/libsa/rpc.c (from r324550, head/lib/libstand/rpc.c) ============================================================================== Copied and modified: head/sys/boot/libsa/rpc.h (from r324550, head/lib/libstand/rpc.h) ============================================================================== Copied and modified: head/sys/boot/libsa/rpcv2.h (from r324550, head/lib/libstand/rpcv2.h) ============================================================================== Copied and modified: head/sys/boot/libsa/saioctl.h (from r324550, head/lib/libstand/saioctl.h) ============================================================================== Copied and modified: head/sys/boot/libsa/sbrk.c (from r324550, head/lib/libstand/sbrk.c) ============================================================================== Copied and modified: head/sys/boot/libsa/sparc64/_setjmp.S (from r324550, head/lib/libstand/sparc64/_setjmp.S) ============================================================================== Copied and modified: head/sys/boot/libsa/splitfs.c (from r324550, head/lib/libstand/splitfs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/stand.h (from r324550, head/lib/libstand/stand.h) ============================================================================== Copied and modified: head/sys/boot/libsa/stat.c (from r324550, head/lib/libstand/stat.c) ============================================================================== Copied and modified: head/sys/boot/libsa/strcasecmp.c (from r324550, head/lib/libstand/strcasecmp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/strdup.c (from r324550, head/lib/libstand/strdup.c) ============================================================================== Copied and modified: head/sys/boot/libsa/strerror.c (from r324550, head/lib/libstand/strerror.c) ============================================================================== Copied and modified: head/sys/boot/libsa/strtol.c (from r324550, head/lib/libstand/strtol.c) ============================================================================== Copied and modified: head/sys/boot/libsa/strtoul.c (from r324550, head/lib/libstand/strtoul.c) ============================================================================== Copied and modified: head/sys/boot/libsa/tftp.c (from r324550, head/lib/libstand/tftp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/tftp.h (from r324550, head/lib/libstand/tftp.h) ============================================================================== Copied and modified: head/sys/boot/libsa/twiddle.c (from r324550, head/lib/libstand/twiddle.c) ============================================================================== Copied and modified: head/sys/boot/libsa/udp.c (from r324550, head/lib/libstand/udp.c) ============================================================================== Copied and modified: head/sys/boot/libsa/ufs.c (from r324550, head/lib/libstand/ufs.c) ============================================================================== Copied and modified: head/sys/boot/libsa/uuid_from_string.c (from r324550, head/lib/libstand/uuid_from_string.c) ============================================================================== Copied and modified: head/sys/boot/libsa/uuid_to_string.c (from r324550, head/lib/libstand/uuid_to_string.c) ============================================================================== Copied and modified: head/sys/boot/libsa/write.c (from r324550, head/lib/libstand/write.c) ============================================================================== Copied and modified: head/sys/boot/libsa/zalloc.c (from r324550, head/lib/libstand/zalloc.c) ============================================================================== Copied and modified: head/sys/boot/libsa/zalloc_defs.h (from r324550, head/lib/libstand/zalloc_defs.h) ============================================================================== Copied and modified: head/sys/boot/libsa/zalloc_malloc.c (from r324550, head/lib/libstand/zalloc_malloc.c) ============================================================================== Copied and modified: head/sys/boot/libsa/zalloc_mem.h (from r324550, head/lib/libstand/zalloc_mem.h) ============================================================================== Copied and modified: head/sys/boot/libsa/zalloc_protos.h (from r324550, head/lib/libstand/zalloc_protos.h) ============================================================================== Modified: head/sys/boot/libstand32/Makefile ============================================================================== --- head/sys/boot/libstand32/Makefile Thu Oct 12 14:53:25 2017 (r324550) +++ head/sys/boot/libstand32/Makefile Thu Oct 12 14:56:28 2017 (r324551) @@ -9,8 +9,6 @@ LIBSTAND_CPUARCH=i386 .else LIBSTAND_CPUARCH=${MACHINE_CPUARCH} .endif -LIBSTAND_SRC= ${SASRC} -LIBC_SRC= ${SRCTOP}/lib/libc INTERNALLIB= INCS= MAN= Modified: head/sys/boot/userboot/libstand/Makefile ============================================================================== --- head/sys/boot/userboot/libstand/Makefile Thu Oct 12 14:53:25 2017 (r324550) +++ head/sys/boot/userboot/libstand/Makefile Thu Oct 12 14:56:28 2017 (r324551) @@ -3,11 +3,6 @@ .include <src.opts.mk> .include "../Makefile.inc" -LIBSTAND_SRC= ${SASRC} +.PATH: ${SASRC} -INTERNALLIB= -INCS= -MAN= -.PATH: ${LIBSTAND_SRC} - -.include "${LIBSTAND_SRC}/Makefile" +.include "${SASRC}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710121456.v9CEuSRE035015>