Re: svn commit: r324452 - in head/sys/boot: . arm/uboot efi/boot1 efi/loader i386/gptboot i386/gptzfsboot i386/loader i386/zfsboot mips/beri/boot2 mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw

2017-10-09 Thread Ngie Cooper (yaneurabeya) 

> On Oct 9, 2017, at 16:23, John Baldwin  wrote:

…

> s/along/alone/.  bde@ probably prefers that the comments start with a capital
> letter as well.

Also: standalone is one word, not 2.
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r324452 - in head/sys/boot: . arm/uboot efi/boot1 efi/loader i386/gptboot i386/gptzfsboot i386/loader i386/zfsboot mips/beri/boot2 mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw

2017-10-09 Thread John Baldwin 
On Monday, October 09, 2017 10:12:47 PM Warner Losh wrote:
> Author: imp
> Date: Mon Oct  9 22:12:46 2017
> New Revision: 324452
> URL: https://svnweb.freebsd.org/changeset/base/324452
> 
> Log:
>   Define LIBSA* and use them instead of overloaded LIBSTAND
>   
>   LIBSA is the current stand alone library. LIBSA32 is the 32-bit
>   version of the library. LIBSAU is the userboot version of libsa. Use
>   the proper define instead of the more generic define.
>   
>   Sponsored by: Netflix
> 
> Modified:
>   head/sys/boot/Makefile.inc
>   head/sys/boot/arm/uboot/Makefile
>   head/sys/boot/efi/boot1/Makefile
>   head/sys/boot/efi/loader/Makefile
>   head/sys/boot/i386/gptboot/Makefile
>   head/sys/boot/i386/gptzfsboot/Makefile
>   head/sys/boot/i386/loader/Makefile
>   head/sys/boot/i386/zfsboot/Makefile
>   head/sys/boot/mips/beri/boot2/Makefile
>   head/sys/boot/mips/beri/loader/Makefile
>   head/sys/boot/mips/uboot/Makefile
>   head/sys/boot/powerpc/kboot/Makefile
>   head/sys/boot/powerpc/ofw/Makefile
>   head/sys/boot/powerpc/ps3/Makefile
>   head/sys/boot/powerpc/uboot/Makefile
>   head/sys/boot/sparc64/loader/Makefile
>   head/sys/boot/userboot/userboot/Makefile
> 
> Modified: head/sys/boot/Makefile.inc
> ==
> --- head/sys/boot/Makefile.incMon Oct  9 22:12:39 2017
> (r324451)
> +++ head/sys/boot/Makefile.incMon Oct  9 22:12:46 2017
> (r324452)
> @@ -6,6 +6,12 @@
>  __BOOT_MAKEFILE_INC__=${MFILE}
>  
>  SASRC=${SRCTOP}/lib/libstand
> +# Normal stand alone library
> +LIBSA=${OBJTOP}/lib/libstand/libstand.a
> +# stand alone library compiled for 32-bit version of the processor
> +LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
> +# stand along library compiled for userboot
> +LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a

s/along/alone/.  bde@ probably prefers that the comments start with a capital
letter as well.

-- 
John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r324452 - in head/sys/boot: . arm/uboot efi/boot1 efi/loader i386/gptboot i386/gptzfsboot i386/loader i386/zfsboot mips/beri/boot2 mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw ...

2017-10-09 Thread Warner Losh 
Author: imp
Date: Mon Oct  9 22:12:46 2017
New Revision: 324452
URL: https://svnweb.freebsd.org/changeset/base/324452

Log:
  Define LIBSA* and use them instead of overloaded LIBSTAND
  
  LIBSA is the current stand alone library. LIBSA32 is the 32-bit
  version of the library. LIBSAU is the userboot version of libsa. Use
  the proper define instead of the more generic define.
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/Makefile.inc
  head/sys/boot/arm/uboot/Makefile
  head/sys/boot/efi/boot1/Makefile
  head/sys/boot/efi/loader/Makefile
  head/sys/boot/i386/gptboot/Makefile
  head/sys/boot/i386/gptzfsboot/Makefile
  head/sys/boot/i386/loader/Makefile
  head/sys/boot/i386/zfsboot/Makefile
  head/sys/boot/mips/beri/boot2/Makefile
  head/sys/boot/mips/beri/loader/Makefile
  head/sys/boot/mips/uboot/Makefile
  head/sys/boot/powerpc/kboot/Makefile
  head/sys/boot/powerpc/ofw/Makefile
  head/sys/boot/powerpc/ps3/Makefile
  head/sys/boot/powerpc/uboot/Makefile
  head/sys/boot/sparc64/loader/Makefile
  head/sys/boot/userboot/userboot/Makefile

Modified: head/sys/boot/Makefile.inc
==
--- head/sys/boot/Makefile.inc  Mon Oct  9 22:12:39 2017(r324451)
+++ head/sys/boot/Makefile.inc  Mon Oct  9 22:12:46 2017(r324452)
@@ -6,6 +6,12 @@
 __BOOT_MAKEFILE_INC__=${MFILE}
 
 SASRC=${SRCTOP}/lib/libstand
+# Normal stand alone library
+LIBSA=${OBJTOP}/lib/libstand/libstand.a
+# stand alone library compiled for 32-bit version of the processor
+LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
+# stand along library compiled for userboot
+LIBSAU=${OBJTOP}/sys/boot/userboot/libstand/libstand.a
 
 SSP_CFLAGS=
 

Modified: head/sys/boot/arm/uboot/Makefile
==
--- head/sys/boot/arm/uboot/MakefileMon Oct  9 22:12:39 2017
(r324451)
+++ head/sys/boot/arm/uboot/MakefileMon Oct  9 22:12:46 2017
(r324452)
@@ -112,7 +112,6 @@ LIBUBOOT=   ${.OBJDIR}/../../uboot/lib/libuboot.a
 CFLAGS+=   -I${.CURDIR}/../../uboot/lib
 CFLAGS+=   -I${.OBJDIR}/../../uboot/lib
 
-# where to get libstand from
 CFLAGS+=   -I${SASRC}
 
 CFLAGS+=   -fPIC
@@ -120,8 +119,8 @@ CFLAGS+=-fPIC
 # clang doesn't understand %D as a specifier to printf
 NO_WERROR.clang=
 
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
 
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 

Modified: head/sys/boot/efi/boot1/Makefile
==
--- head/sys/boot/efi/boot1/MakefileMon Oct  9 22:12:39 2017
(r324451)
+++ head/sys/boot/efi/boot1/MakefileMon Oct  9 22:12:46 2017
(r324452)
@@ -90,8 +90,8 @@ LIBEFI=   ${.OBJDIR}/../libefi/libefi.a
 # __aeabi_* (arm) or __divdi3 (i386).
 # as well as required string and memory functions for all platforms.
 #
-DPADD+=${LIBEFI} ${LIBSTAND}
-LDADD+=${LIBEFI} ${LIBSTAND}
+DPADD+=${LIBEFI} ${LIBSA}
+LDADD+=${LIBEFI} ${LIBSA}
 
 DPADD+=${LDSCRIPT}
 

Modified: head/sys/boot/efi/loader/Makefile
==
--- head/sys/boot/efi/loader/Makefile   Mon Oct  9 22:12:39 2017
(r324451)
+++ head/sys/boot/efi/loader/Makefile   Mon Oct  9 22:12:46 2017
(r324452)
@@ -150,9 +150,9 @@ loader.efi: ${PROG}
 
 LIBEFI=${.OBJDIR}/../libefi/libefi.a
 
-DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} \
+DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} \
${LDSCRIPT}
-LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND}
+LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}
 
 .include 
 

Modified: head/sys/boot/i386/gptboot/Makefile
==
--- head/sys/boot/i386/gptboot/Makefile Mon Oct  9 22:12:39 2017
(r324451)
+++ head/sys/boot/i386/gptboot/Makefile Mon Oct  9 22:12:46 2017
(r324452)
@@ -50,8 +50,6 @@ OPENCRYPTO_XTS=   xform_aes_xts.o
 
 LD_FLAGS=${LD_FLAGS_BIN}
 
-LIBSTAND=  ${.OBJDIR}/../../libstand32/libstand.a
-
 # Pick up ../Makefile.inc early.
 .include 
 
@@ -76,7 +74,7 @@ gptboot.bin: gptboot.out
${OBJCOPY} -S -O binary gptboot.out ${.TARGET}
 
 gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o cons.o util.o 
${OPENCRYPTO_XTS}
-   ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} 
${LIBGELIBOOT} ${LIBSTAND}
+   ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} 
${LIBGELIBOOT} ${LIBSA32}
 
 gptboot.o: ${.CURDIR}/../../com