xen-unstable build-failure: xg_cpuid_x86.c:99:42: error: ‘INIT_SPECIAL_FEATURES’ undeclared (first use in this function); did you mean ‘INIT_PV_MAX_FEATURES’?

[Sander Eikelenboom <linux@xxxxxxxxxxxxxx>]

L.S.,

I seem to be running into a build error with current xen-unstable.

--
Sander

echo '#if 0' >>/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new
echo '.endif' >>/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new
cat asm-macros.i 
>>/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new
echo '#endif' >>/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new
if ! cmp -s /usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new 
/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h; then mv -f 
/usr/src/new/xen-unstable/xen/include/asm-x86/asm-macros.h.new 
/usr/src/new/xen-unstable
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
make[3]: Leaving directory '/usr/src/new/xen-unstable/xen/arch/x86'
make -f /usr/src/new/xen-unstable/xen/Rules.mk include/asm-x86/asm-offsets.h
make[3]: Entering directory '/usr/src/new/xen-unstable/xen'
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc -MMD -MP -MF ./.asm-offsets.s.d -m64 -DBUILD_ID -fno-strict-aliasing 
-std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement 
-Wno-unused-but-set-variable -Wno-unused-local-typedefs -O1 
-fno-omit-frame-pointer -nostdinc
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
if ! cmp -s asm-offsets.s.new asm-offsets.s; then mv -f asm-offsets.s.new 
asm-offsets.s; else rm -f asm-offsets.s.new; fi
gcc  -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes 
-Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=__XEN_L
make[3]: Leaving directory '/usr/src/new/xen-unstable/xen'
make -f /usr/src/new/xen-unstable/xen/Rules.mk -C arch/x86 
/usr/src/new/xen-unstable/xen/xen
make[3]: Entering directory '/usr/src/new/xen-unstable/xen/arch/x86'
gcc  -DPIC -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall 
-Wstrict-prototypes -Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=_
gcc  -DPIC -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall 
-Wstrict-prototypes -Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=_
gcc  -DPIC -m64 -DBUILD_ID -fno-strict-aliasing -std=gnu99 -Wall 
-Wstrict-prototypes -Wdeclaration-after-statement -Wno-unused-but-set-variable 
-Wno-unused-local-typedefs   -g3 -Og -fno-omit-frame-pointer 
-D__XEN_INTERFACE_VERSION__=_
xg_cpuid_x86.c: In function ‘xc_get_static_cpu_featuremask’:
xg_cpuid_x86.c:99:42: error: ‘INIT_SPECIAL_FEATURES’ undeclared (first use in this function); 
did you mean ‘INIT_PV_MAX_FEATURES’?
 #define MASK(x) [XC_FEATUREMASK_ ## x] = INIT_ ## x ## _FEATURES
                                          ^~~~~
xg_cpuid_x86.c:102:9: note: in expansion of macro ‘MASK’
         MASK(SPECIAL),
         ^~~~
xg_cpuid_x86.c:99:42: note: each undeclared identifier is reported only once 
for each function it appears in
 #define MASK(x) [XC_FEATUREMASK_ ## x] = INIT_ ## x ## _FEATURES
                                          ^~~~~
xg_cpuid_x86.c:102:9: note: in expansion of macro ‘MASK’
         MASK(SPECIAL),
         ^~~~
make[6]: *** 
[/usr/src/new/xen-unstable/tools/libs/guest/../../../tools/Rules.mk:145: 
xg_cpuid_x86.o] Error 1
make[6]: *** Waiting for unfinished jobs....
sed "s!\(^\| \)$PWD/! !" .asm-macros.i.d >.asm-macros.i.d2.tmp && mv -f 
.asm-macros.i.d2.tmp .asm-macros.i.d2
make[6]: Leaving directory '/usr/src/new/xen-unstable/tools/libs/guest'
make[5]: *** [/usr/src/new/xen-unstable/tools/libs/../../tools/Rules.mk:161: 
subdir-install-guest] Error 2
make[5]: Leaving directory '/usr/src/new/xen-unstable/tools/libs'
make[4]: *** [/usr/src/new/xen-unstable/tools/libs/../../tools/Rules.mk:156: 
subdirs-install] Error 2
make[4]: Leaving directory '/usr/src/new/xen-unstable/tools/libs'
make[3]: *** [/usr/src/new/xen-unstable/tools/../tools/Rules.mk:161: 
subdir-install-libs] Error 2
make[3]: Leaving directory '/usr/src/new/xen-unstable/tools'
make[2]: *** [/usr/src/new/xen-unstable/tools/../tools/Rules.mk:156: 
subdirs-install] Error 2
make[2]: Leaving directory '/usr/src/new/xen-unstable/tools'
make[1]: *** [Makefile:66: install] Error 2
make[1]: Leaving directory '/usr/src/new/xen-unstable/tools'
make: *** [Makefile:140: install-tools] Error 2
make: *** Waiting for unfinished jobs....