i386 build fail

Having just updated my testing bhyve system to 12-current r321405M I
then started updating my poudriere 12-current jails, the amd64 jail
built fine at r321457 and then building i386 (should have got r321457
as well) failed with the following errors -

In file included from 
/usr/local/poudriere/jails/12i386/usr/src/lib/msun/tests/exponential_test.c:41:
In file included from 
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/ieeefp.h:13:
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/machine/ieeefp.h:111:9: 
error: '__fldcw' macro redefined [-Werror,-Wmacro-redefined]
#define __fldcw(addr)   __asm __volatile("fldcw %0" : : "m" (*(addr)))
         ^
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/fenv.h:98:9: 
note: previous definition is here
#define __fldcw(__cw)           __asm __volatile("fldcw %0" : : "m" (__cw))
         ^
In file included from 
/usr/local/poudriere/jails/12i386/usr/src/lib/msun/tests/exponential_test.c:41:
In file included from 
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/ieeefp.h:13:
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/machine/ieeefp.h:112:9: 
error: '__fldenv' macro redefined [-Werror,-Wmacro-redefined]
#define __fldenv(addr)  __asm __volatile("fldenv %0" : : "m" (*(addr)))
         ^
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/fenv.h:99:9: 
note: previous definition is here
#define __fldenv(__env)         __asm __volatile("fldenv %0" : : "m" 
(__env))
         ^
In file included from 
/usr/local/poudriere/jails/12i386/usr/src/lib/msun/tests/exponential_test.c:41:
In file included from 
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/ieeefp.h:13:
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/machine/ieeefp.h:114:9: 
error: '__fnstcw' macro redefined [-Werror,-Wmacro-redefined]
#define __fnstcw(addr)  __asm __volatile("fnstcw %0" : "=m" (*(addr)))
         ^
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/fenv.h:105:9: 
note: previous definition is here
#define __fnstcw(__cw)          __asm __volatile("fnstcw %0" : "=m" 
(*(__cw)))
         ^
In file included from 
/usr/local/poudriere/jails/12i386/usr/src/lib/msun/tests/exponential_test.c:41:
In file included from 
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/ieeefp.h:13:
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/machine/ieeefp.h:115:9: 
error: '__fnstenv' macro redefined [-Werror,-Wmacro-redefined]
#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr)))
         ^
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/fenv.h:104:9: 
note: previous definition is here
#define __fnstenv(__env)        __asm __volatile("fnstenv %0" : "=m" 
(*(__env)))
         ^
In file included from 
/usr/local/poudriere/jails/12i386/usr/src/lib/msun/tests/exponential_test.c:41:
In file included from 
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/ieeefp.h:13:
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/machine/ieeefp.h:116:9: 
error: '__fnstsw' macro redefined [-Werror,-Wmacro-redefined]
#define __fnstsw(addr)  __asm __volatile("fnstsw %0" : "=m" (*(addr)))
         ^
/usr/obj/i386.i386/usr/local/poudriere/jails/12i386/usr/src/tmp/usr/include/fenv.h:106:9: 
note: previous definition is here
#define __fnstsw(__sw)          __asm __volatile("fnstsw %0" : "=am" 
(*(__sw)))
         ^

I retried again to get a full build log, svn server is at r321463
This is a default build with no src.conf settings.

The full 20MB build log can be found here
http://shaneware.biz/freebsddebugdata/poudriere_log_2017-07-26-06-35.log

Shane