summaryrefslogtreecommitdiff
path: root/2.25/0001-binutils-2.25aosp-flex-buildfix.patch
blob: f70ed8ee7bd9a404e27ec0909bb34827aa42fa66 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
--- binutils-2.25/binutils/arlex.l.omv~	2017-05-09 15:41:48.877545033 +0200
+++ binutils-2.25/binutils/arlex.l	2017-05-09 15:42:00.854659666 +0200
@@ -1,4 +1,4 @@
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{
 /* arlex.l - Strange script language lexer */
@@ -88,7 +88,3 @@ int linenumber;
 "\n"	 	 { linenumber ++; return NEWLINE; }	
 
 %%
-#ifndef yywrap
-/* Needed for lex, though not flex. */
-int yywrap(void) { return 1; }
-#endif
--- binutils-2.25/binutils/syslex.l.omv~	2017-05-09 15:41:07.085145065 +0200
+++ binutils-2.25/binutils/syslex.l	2017-05-09 15:41:34.285405377 +0200
@@ -1,4 +1,4 @@
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{
 /* Copyright (C) 2001-2014 Free Software Foundation, Inc.
@@ -36,10 +36,6 @@
 #define YY_NO_UNPUT
 #endif
 
-#ifndef yywrap
-static int yywrap (void) { return 1; }
-#endif
-
 extern int yylex (void);
 %}
 %%
--- binutils-2.25/ld/ldlex.l.omv~	2017-05-09 15:42:33.119968491 +0200
+++ binutils-2.25/ld/ldlex.l	2017-05-09 15:42:45.196084082 +0200
@@ -1,4 +1,4 @@
-%option nounput
+%option nounput noyywrap
 
 %{
 
@@ -86,11 +86,6 @@ static void lex_warn_invalid (char *wher
 	VERS_NODE	a node within a Sun style mapfile
 */
 #define RTOKEN(x)  {  yylval.token = x; return x; }
-
-/* Some versions of flex want this.  */
-#ifndef yywrap
-int yywrap (void) { return 1; }
-#endif
 %}
 
 %a 4000