Date: Thu, 12 Oct 2017 14:56:48 +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: r324553 - in head/sys/boot: . libsa libsa32 libstand32 Message-ID: <201710121456.v9CEumMv035209@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Oct 12 14:56:48 2017 New Revision: 324553 URL: https://svnweb.freebsd.org/changeset/base/324553 Log: Rename libstand.a to libsa.a and libstand32.a to libsa32.a Sponsored by: Netflix Added: head/sys/boot/libsa32/ head/sys/boot/libsa32/Makefile (contents, props changed) - copied, changed from r324552, head/sys/boot/libstand32/Makefile head/sys/boot/libsa32/Makefile.depend (contents, props changed) - copied, changed from r324552, head/sys/boot/libstand32/Makefile.depend Deleted: head/sys/boot/libstand32/Makefile head/sys/boot/libstand32/Makefile.depend Modified: head/sys/boot/Makefile.amd64 head/sys/boot/Makefile.i386 head/sys/boot/Makefile.inc head/sys/boot/Makefile.powerpc head/sys/boot/libsa/Makefile Modified: head/sys/boot/Makefile.amd64 ============================================================================== --- head/sys/boot/Makefile.amd64 Thu Oct 12 14:56:42 2017 (r324552) +++ head/sys/boot/Makefile.amd64 Thu Oct 12 14:56:48 2017 (r324553) @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR+= efi -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= zfs SUBDIR+= userboot Modified: head/sys/boot/Makefile.i386 ============================================================================== --- head/sys/boot/Makefile.i386 Thu Oct 12 14:56:42 2017 (r324552) +++ head/sys/boot/Makefile.i386 Thu Oct 12 14:56:48 2017 (r324553) @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR+= efi -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= zfs .if !defined(LOADER_NO_GELI_SUPPORT) Modified: head/sys/boot/Makefile.inc ============================================================================== --- head/sys/boot/Makefile.inc Thu Oct 12 14:56:42 2017 (r324552) +++ head/sys/boot/Makefile.inc Thu Oct 12 14:56:48 2017 (r324553) @@ -5,11 +5,11 @@ .if !defined(__BOOT_MAKEFILE_INC__) __BOOT_MAKEFILE_INC__=${MFILE} -SASRC=${SRCTOP}/lib/libstand -# Normal standalone library -LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a +SASRC=${SRCTOP}/sys/boot/libsa +# Normal Standalone library +LIBSA=${OBJTOP}/sys/boot/libsa/libsa.a # Standalone library compiled for 32-bit version of the processor -LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a +LIBSA32=${OBJTOP}/sys/boot/libsa32/libsa32.a CFLAGS+=-I${SASRC} Modified: head/sys/boot/Makefile.powerpc ============================================================================== --- head/sys/boot/Makefile.powerpc Thu Oct 12 14:56:42 2017 (r324552) +++ head/sys/boot/Makefile.powerpc Thu Oct 12 14:56:48 2017 (r324553) @@ -4,6 +4,6 @@ SUBDIR+= fdt .endif -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= ofw SUBDIR+= uboot Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Thu Oct 12 14:56:42 2017 (r324552) +++ head/sys/boot/libsa/Makefile Thu Oct 12 14:56:48 2017 (r324553) @@ -17,7 +17,7 @@ INTERNALLIB= LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc -LIB?= stand +LIB?= sa NO_PIC= WARNS?= 0 Copied and modified: head/sys/boot/libsa32/Makefile (from r324552, head/sys/boot/libstand32/Makefile) ============================================================================== --- head/sys/boot/libstand32/Makefile Thu Oct 12 14:56:42 2017 (r324552, copy source) +++ head/sys/boot/libsa32/Makefile Thu Oct 12 14:56:48 2017 (r324553) @@ -4,20 +4,18 @@ .include "../Makefile.inc" +LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" LIBSTAND_CPUARCH=i386 .else LIBSTAND_CPUARCH=${MACHINE_CPUARCH} .endif -INTERNALLIB= -INCS= -MAN= -.PATH: ${SASRC} .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -m32 -I. .endif +.PATH: ${SASRC} .include "${SASRC}/Makefile" .if ${MACHINE_CPUARCH} == "amd64" Copied and modified: head/sys/boot/libsa32/Makefile.depend (from r324552, head/sys/boot/libstand32/Makefile.depend) ==============================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710121456.v9CEumMv035209>