Date: Tue, 13 Feb 2018 04:28:13 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r329192 - in stable/11/stand: efi/loader i386/zfsboot powerpc/ofw Message-ID: <201802130428.w1D4SDMm001614@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Tue Feb 13 04:28:13 2018 New Revision: 329192 URL: https://svnweb.freebsd.org/changeset/base/329192 Log: stand: Clean up some unintentional inconsistencies This is a direct commit to stable/11 to address the following final unintended inconsistencies between stable/11 and head: - Some unused LIBSTAND= cruft left in efi/loader/Makefie - A comment that flew in with unrelated changes - An #include that may go away now that stand is basically self-contained Modified: stable/11/stand/efi/loader/Makefile stable/11/stand/i386/zfsboot/zfsldr.S stable/11/stand/powerpc/ofw/ofwfdt.c Modified: stable/11/stand/efi/loader/Makefile ============================================================================== --- stable/11/stand/efi/loader/Makefile Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/efi/loader/Makefile Tue Feb 13 04:28:13 2018 (r329192) @@ -54,12 +54,6 @@ CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include CFLAGS+= -I${BOOTSRC}/i386/libi386 CFLAGS+= -DNO_PCI -DEFI -# make buildenv doesn't set DESTDIR, this means LIBSTAND -# will be wrong when crossbuilding. -.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) -LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -.endif - .if !defined(BOOT_HIDE_SERIAL_NUMBERS) # Export serial numbers, UUID, and asset tag from loader. CFLAGS+= -DSMBIOS_SERIAL_NUMBERS Modified: stable/11/stand/i386/zfsboot/zfsldr.S ============================================================================== --- stable/11/stand/i386/zfsboot/zfsldr.S Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/i386/zfsboot/zfsldr.S Tue Feb 13 04:28:13 2018 (r329192) @@ -33,7 +33,7 @@ .set SIZ_PAG,0x1000 # Page size .set SIZ_SEC,0x200 # Sector size .set COPY_BLKS,0x8 # Number of blocks - # to copy for boot2 + # to copy for boot2 (<= 15) .set COPY_BLK_SZ,0x8000 # Copy in 32k blocks; must be # a multiple of 16 bytes .set NSECT,(COPY_BLK_SZ / SIZ_SEC * COPY_BLKS) Modified: stable/11/stand/powerpc/ofw/ofwfdt.c ============================================================================== --- stable/11/stand/powerpc/ofw/ofwfdt.c Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/powerpc/ofw/ofwfdt.c Tue Feb 13 04:28:13 2018 (r329192) @@ -26,11 +26,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -/* - * Include stdlib.h because of DEBUG_MALLOC shenanigans in stand.h for now. - * This will be removed in the future, when libsa silently replaces stdlib.h. - */ -#include <stdlib.h> #include <stand.h> #include <sys/param.h> #include <fdt_platform.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802130428.w1D4SDMm001614>