Date: Thu, 21 Feb 2019 06:02:51 +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: r344421 - in stable/11: share/mk stand/pc98/kgzldr stand/pc98/libpc98 Message-ID: <201902210602.x1L62p8O091859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Feb 21 06:02:51 2019 New Revision: 344421 URL: https://svnweb.freebsd.org/changeset/base/344421 Log: Direct commit to catch pc98 up to recent changes I have no means of actually testing the new features on pc98, so simply mark them as BROKEN_OPTIONS on pc98 and interested parties can test/report back as to the functionality. This is done out of an abundance of caution. pc98 also needed catching up on the inflate.c -> subr_inflate.c rename. Modified: stable/11/share/mk/src.opts.mk stable/11/stand/pc98/kgzldr/Makefile stable/11/stand/pc98/libpc98/biosdisk.c Modified: stable/11/share/mk/src.opts.mk ============================================================================== --- stable/11/share/mk/src.opts.mk Thu Feb 21 04:47:44 2019 (r344420) +++ stable/11/share/mk/src.opts.mk Thu Feb 21 06:02:51 2019 (r344421) @@ -306,7 +306,11 @@ BROKEN_OPTIONS+=LOADER_UBOOT .if ${__T} == "sparc64" || ${__T:Mpowerpc*} BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif - +# Both features are untested on pc98, so we'll mark them as disabled just to +# be safe and make sure we keep pc98 stable. +.if ${__TT:Mpc98*} +BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA +.endif .if ${__T:Mmips64*} # profiling won't work on MIPS64 because there is only assembly for o32 BROKEN_OPTIONS+=PROFILE Modified: stable/11/stand/pc98/kgzldr/Makefile ============================================================================== --- stable/11/stand/pc98/kgzldr/Makefile Thu Feb 21 04:47:44 2019 (r344420) +++ stable/11/stand/pc98/kgzldr/Makefile Thu Feb 21 06:02:51 2019 (r344421) @@ -7,7 +7,7 @@ STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +SRCS= start.s boot.c subr_inflate.c lib.c crt.s sio.s CFLAGS= -Os CFLAGS+=-DKZIP NO_SHARED= Modified: stable/11/stand/pc98/libpc98/biosdisk.c ============================================================================== --- stable/11/stand/pc98/libpc98/biosdisk.c Thu Feb 21 04:47:44 2019 (r344420) +++ stable/11/stand/pc98/libpc98/biosdisk.c Thu Feb 21 06:02:51 2019 (r344421) @@ -51,10 +51,6 @@ __FBSDID("$FreeBSD$"); #include "disk.h" #include "libi386.h" -#ifdef LOADER_GELI_SUPPORT -#error "Nope! No GELI on pc98 so sorry." -#endif - #define BIOS_NUMDRIVES 0x475 #define BIOSDISK_SECSIZE 512 #define BUFSIZE (1 * BIOSDISK_SECSIZE) @@ -364,7 +360,6 @@ bd_open(struct open_file *f, ...) err = disk_open(dev, BD(dev).bd_sectors * BD(dev).bd_sectorsize, BD(dev).bd_sectorsize); - /* i386 has GELI here */ return(err); } @@ -665,7 +660,6 @@ static int bd_read(struct disk_devdesc *dev, daddr_t dblk, int blks, caddr_t dest) { - /* i386 has GELI here */ return (bd_io(dev, dblk, blks, dest, 0)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902210602.x1L62p8O091859>