svn commit: r333049 - in stable/11/stand/pc98: boot2 libpc98

[TAKAHASHI Yoshihiro]

In article <CACNAnaEKPoSrmhdyyJSgVrc7h6mLKhyp33y3=5wK+dg1LGqhWg at mail.gmail.com>
Kyle Evans <kevans at freebsd.org> writes:

> On Thu, Apr 26, 2018 at 9:39 PM, Takahashi Yoshihiro <nyan at freebsd.org>
> wrote:
>> Author: nyan
>> Date: Fri Apr 27 02:39:36 2018
>> New Revision: 333049
>> URL: https://svnweb.freebsd.org/changeset/base/333049
>>
>> Log:
>>   whitespace changes to reduce diffs from i386.
>>   still broken pc98 boot.
> 
> Hi Takahashi,
> 
> Sorry about this. =( I tried to at least get it back into a buildable
> state, but I don't have the hardware to test it unfortunately. I realize
> now that I should have coordinated with you before-hand to step pc98
> through the stand/ mess gracefully.
> 
> What kind of breakage does it exhibit?

No problem.  I also don't test stable/11 on pc98 for a long time.
Please run build-test for pc98 if possible.

I got the following error.

cc   -O2 -pipe   -nostdinc
-I/usr/obj/pc98.i386/home/nyan/FreeBSD/11/stand/libsa
-I/home/nyan/FreeBSD/11/stand/libsa -D_STANDALONE
-I/home/nyan/FreeBSD/11/sys -Ddouble=jagged-little-pill
-Dfloat=floaty-mcfloatface -DLOADER_DISK_SUPPORT -ffreestanding
-mno-mmx -mno-sse -mno-avx -msoft-float -march=i386
-I. -DCOMPORT=0x238 -DCOMSPEED=9600 -DTERM_EMU
-Dalloca=__builtin_alloca -I/home/nyan/FreeBSD/11/stand/ficl
-I/home/nyan/FreeBSD/11/stand/ficl/i386
-I/home/nyan/FreeBSD/11/stand/common
-I/home/nyan/FreeBSD/11/stand/common
-I/home/nyan/FreeBSD/11/stand/pc98/btx/lib
-I/home/nyan/FreeBSD/11/stand/i386/libi386 -I/home/nyan/FreeBSD/11/sys
-D__printf__=__freebsd_kprintf__ -MD -MF.depend.biosdisk.o
-MTbiosdisk.o -std=gnu99 -Wno-pointer-sign -Wno-empty-body
-Wno-string-plus-int -Wno-unused-const-variable
-Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality
-Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef
-Wno-address-of-packed-member -Wno-switch -Wno-switch-enum
-Wno-knr-promoted-parameter -Wno-parentheses  -Qunused-arguments  -c
/home/nyan/FreeBSD/11/stand/pc98/libpc98/biosdisk.c -o biosdisk.o

/home/nyan/FreeBSD/11/stand/pc98/libpc98/biosdisk.c:467:62: error: no member
      named 'data' in 'struct i386_devdesc::(anonymous at
      /home/nyan/FreeBSD/11/stand/i386/libi386/libi386.h:39:2)'
    ((struct i386_devdesc *)(f->f_devdata))->d_kind.biosdisk.data = od;
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
/home/nyan/FreeBSD/11/stand/pc98/libpc98/biosdisk.c:734:70: error: no member
      named 'data' in 'struct i386_devdesc::(anonymous at
      /home/nyan/FreeBSD/11/stand/i386/libi386/libi386.h:39:2)'
    struct open_disk    *od = (struct open_disk *)(dev->d_kind.biosdisk.data);
                                                   ~~~~~~~~~~~~~~~~~~~~ ^
/home/nyan/FreeBSD/11/stand/pc98/libpc98/biosdisk.c:764:70: error: no member
      named 'data' in 'struct i386_devdesc::(anonymous at
      /home/nyan/FreeBSD/11/stand/i386/libi386/libi386.h:39:2)'
    struct open_disk    *od = (struct open_disk *)(dev->d_kind.biosdisk.data);
                                                   ~~~~~~~~~~~~~~~~~~~~ ^
/home/nyan/FreeBSD/11/stand/pc98/libpc98/biosdisk.c:776:99: error: no member
      named 'data' in 'struct i386_devdesc::(anonymous at
      /home/nyan/FreeBSD/11/stand/i386/libi386/libi386.h:39:2)'
  ...open_disk *)(((struct i386_devdesc *)devdata)->d_kind.biosdisk.data);
                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
4 errors generated.
*** Error code 1

Stop.
make[5]: stopped in /home/nyan/FreeBSD/11/stand/pc98/libpc98
*** Error code 1

Stop.
make[4]: stopped in /home/nyan/FreeBSD/11/stand/pc98
*** Error code 1

Stop.
make[3]: stopped in /home/nyan/FreeBSD/11/stand
*** Error code 1

Stop.
make[2]: stopped in /home/nyan/FreeBSD/11
*** Error code 1

Stop.
make[1]: stopped in /home/nyan/FreeBSD/11
*** Error code 1

Stop.
make: stopped in /home/nyan/FreeBSD/11

---
Takahashi Yoshihiro <nyan at FreeBSD.org>