Failure to build current - PARAM_LOGICAL_OP_NON_SHORT_CIRCUIT not declared

[Riccardo Mottola <riccardo.mottola%libero.it@localhost>]

Hi!

while building (sources of this night) on amd64 userland, I get this error:


/usr/src/obj/tooldir.NetBSD-9.99.50-amd64/bin/x86_64--netbsd-c++ -O2 
-march=core2 -Wall -Wpointer-arith -Wno-sign-compare 
-Wa,--fatal-warnings -Werror   -fPIE -Wno-narrowing -Wno-unused 
-march=core2 -std=gnu++98 -Wno-stack-protector -fno-exceptions -fno-rtti 
-fasynchronous-unwind-tables   -I. 
-I/usr/src/external/gpl3/gcc/usr.bin/backend/../gcc/arch/x86_64 -DIN_GCC 
-DHAVE_CONFIG_H -I/usr/src/external/gpl3/gcc/dist/gcc 
-I/usr/src/external/gpl3/gcc/dist/gcc/. 
-I/usr/src/external/gpl3/gcc/dist/gcc/../include 
-I/usr/src/external/gpl3/gcc/dist/gcc/../libcpp/include 
-I/usr/src/external/gpl3/gcc/dist/gcc/../libdecnumber 
-I/usr/src/external/gpl3/gcc/dist/gcc/../libdecnumber/dpd 
-I/usr/src/external/gpl3/gcc/dist/gcc/../libbacktrace 
-DTARGET_NAME=\"x86_64--netbsd\" 
-I/usr/src/external/gpl3/gcc/dist/libgcc 
-I/usr/src/external/gpl3/gcc/usr.bin/backend/../../lib/libgcc/libgcov/arch/x86_64 
--sysroot=/usr/src/obj/destdir.amd64 -DLOCALEDIR=\"/usr/share/locale\" 
-DNETBSD_NATIVE -I. -DENABLE_SHARED_LIBGCC  -c 
/usr/src/external/gpl3/gcc/dist/gcc/fold-const.c -o fold-const.o
In file included from /usr/src/external/gpl3/gcc/dist/gcc/fold-const.c:74:
/usr/src/external/gpl3/gcc/dist/gcc/fold-const.c: In function 
'tree_node* fold_range_test(location_t, tree_code, tree, tree, tree)':
/usr/src/external/gpl3/gcc/dist/gcc/fold-const.c:5539:20: error: 
'PARAM_LOGICAL_OP_NON_SHORT_CIRCUIT' was not declared in this scope
   if (PARAM_VALUE (PARAM_LOGICAL_OP_NON_SHORT_CIRCUIT) != -1)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src/external/gpl3/gcc/dist/gcc/params.h:97:46: note: in definition 
of macro 'PARAM_VALUE'
   ((int) global_options.x_param_values[(int) ENUM])
                                              ^~~~
/usr/src/external/gpl3/gcc/dist/gcc/fold-const.c:5539:20: note: 
suggested alternative: 'LOGICAL_OP_NON_SHORT_CIRCUIT'
   if (PARAM_VALUE (PARAM_LOGICAL_OP_NON_SHORT_CIRCUIT) != -1)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src/external/gpl3/gcc/dist/gcc/params.h:97:46: note: in definition 
of macro 'PARAM_VALUE'
   ((int) global_options.x_param_values[(int) ENUM])
                                              ^~~~
/usr/src/external/gpl3/gcc/dist/gcc/fold-const.c: In function 
'tree_node* fold_truth_andor(location_t, tree_code, tree, tree, tree, 
tree, tree)':