applying http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ffa28df4e4cc22481b4ed41c78632f35765f41d
BUG: https://bugs.freedesktop.org/show_bug.cgi?id=67354
Remaining changes to bison 3/2 compat problem
BUG: https://bugs.freedesktop.org/show_bug.cgi?id=67354