diff -Nru mesa-9.1-9.1.7/debian/bzr-builder.manifest mesa-9.1-9.1.7/debian/bzr-builder.manifest
--- mesa-9.1-9.1.7/debian/bzr-builder.manifest	2014-06-07 16:17:19.000000000 +0000
+++ mesa-9.1-9.1.7/debian/bzr-builder.manifest	2014-06-08 18:46:09.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-201406071617+emgd0~33484
-lp:~thopiekar/emgd/mesa-9.1 revid:git-v1:6ddadd0e944daf06098e2870e0b7cda62369c146
+# bzr-builder format 0.3 deb-version {debupstream}-201406081845+emgd0~33486
+lp:~thopiekar/emgd/mesa-9.1 revid:git-v1:7bd3ae82e2ad6c68cdc3d3913edbb7652bf033f9
diff -Nru mesa-9.1-9.1.7/debian/changelog mesa-9.1-9.1.7/debian/changelog
--- mesa-9.1-9.1.7/debian/changelog	2014-06-07 16:17:19.000000000 +0000
+++ mesa-9.1-9.1.7/debian/changelog	2014-06-08 18:46:09.000000000 +0000
@@ -1,8 +1,8 @@
-mesa-9.1 (9.1.7-201406071617+emgd0~33484~ubuntu14.04.1) trusty; urgency=low
+mesa-9.1 (9.1.7-201406081845+emgd0~33486~ubuntu14.04.1) trusty; urgency=low
 
   * Auto build.
 
- -- Thomas-Karl Pietrowski <thopiekar@googlemail.com>  Sat, 07 Jun 2014 16:17:19 +0000
+ -- Thomas-Karl Pietrowski <thopiekar@googlemail.com>  Sun, 08 Jun 2014 18:46:09 +0000
 
 mesa-9.1 (9.1.7) raring-proposed; urgency=low
 
diff -Nru mesa-9.1-9.1.7/src/glsl/glsl_lexer.ll mesa-9.1-9.1.7/src/glsl/glsl_lexer.ll
--- mesa-9.1-9.1.7/src/glsl/glsl_lexer.ll	2014-06-07 16:17:14.000000000 +0000
+++ mesa-9.1-9.1.7/src/glsl/glsl_lexer.ll	2014-06-08 18:46:02.000000000 +0000
@@ -149,7 +149,7 @@
 %option bison-bridge bison-locations reentrant noyywrap
 %option nounput noyy_top_state
 %option never-interactive
-%option prefix="_mesa_glsl_"
+%option prefix="_mesa_glsl_lexer_"
 %option extra-type="struct _mesa_glsl_parse_state *"
 
 %x PP PRAGMA
diff -Nru mesa-9.1-9.1.7/src/glsl/glsl_parser_extras.h mesa-9.1-9.1.7/src/glsl/glsl_parser_extras.h
--- mesa-9.1-9.1.7/src/glsl/glsl_parser_extras.h	2014-06-07 16:17:14.000000000 +0000
+++ mesa-9.1-9.1.7/src/glsl/glsl_parser_extras.h	2014-06-08 18:46:02.000000000 +0000
@@ -321,8 +321,8 @@
 extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);
 
 union YYSTYPE;
-extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc, 
-			  void *scanner);
+extern int _mesa_glsl_lexer_lex(union YYSTYPE *yylval, YYLTYPE *yylloc,
+                                void *scanner);
 
 extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);
 
diff -Nru mesa-9.1-9.1.7/src/glsl/glsl_parser.yy mesa-9.1-9.1.7/src/glsl/glsl_parser.yy
--- mesa-9.1-9.1.7/src/glsl/glsl_parser.yy	2014-06-07 16:17:14.000000000 +0000
+++ mesa-9.1-9.1.7/src/glsl/glsl_parser.yy	2014-06-08 18:46:02.000000000 +0000
@@ -31,16 +31,22 @@
 #include "glsl_types.h"
 #include "main/context.h"
 
-#define YYLEX_PARAM state->scanner
-
 #undef yyerror
 
 static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
 {
    _mesa_glsl_error(loc, st, "%s", msg);
 }
+
+static int
+_mesa_glsl_lex(YYSTYPE *val, YYLTYPE *loc, _mesa_glsl_parse_state *state)
+{
+   return _mesa_glsl_lexer_lex(val, loc, state->scanner);
+}
 %}
 
+%expect 0
+
 %pure-parser
 %error-verbose
 
@@ -53,7 +59,7 @@
    @$.source = 0;
 }
 
-%lex-param   {void *scanner}
+%lex-param   {struct _mesa_glsl_parse_state *state}
 %parse-param {struct _mesa_glsl_parse_state *state}
 
 %union {
diff -Nru mesa-9.1-9.1.7/src/mesa/program/program_parse.y mesa-9.1-9.1.7/src/mesa/program/program_parse.y
--- mesa-9.1-9.1.7/src/mesa/program/program_parse.y	2014-06-07 16:17:14.000000000 +0000
+++ mesa-9.1-9.1.7/src/mesa/program/program_parse.y	2014-06-08 18:46:02.000000000 +0000
@@ -98,7 +98,7 @@
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)					\
    do {									\
-      if (YYID(N)) {							\
+      if (N) {							\
 	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\
 	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
 	 (Current).position = YYRHSLOC(Rhs, 1).position;		\
@@ -112,16 +112,14 @@
 	 (Current).position = YYRHSLOC(Rhs, 0).position			\
 	    + (Current).first_column;					\
       }									\
-   } while(YYID(0))
-
-#define YYLEX_PARAM state->scanner
+   } while(0)
 %}
 
 %pure-parser
 %locations
+%lex-param   { struct asm_parser_state *state }
 %parse-param { struct asm_parser_state *state }
 %error-verbose
-%lex-param { void *scanner }
 
 %union {
    struct asm_instruction *inst;
@@ -269,8 +267,16 @@
 %type <negate> optionalSign
 
 %{
-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
-    void *yyscanner);
+extern int
+_mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
+                        void *yyscanner);
+
+static int
+yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
+      struct asm_parser_state *state)
+{
+   return _mesa_program_lexer_lex(yylval_param, yylloc_param, state->scanner);
+}
 %}
 
 %%