diff options
author | Jakub Jelinek <jakub@redhat.com> | 2020-04-16 10:12:30 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2020-04-16 10:12:30 +0200 |
commit | 2ca17e0a89ff6c37e17851a5bd7b0a03ee8de535 (patch) | |
tree | d382835bed7c6ccc5103c89226444912b774794a /intl/plural-exp.h | |
parent | fc6b42bbaa298ea6c10af185e1dd0126f5a760cd (diff) | |
download | gcc-2ca17e0a89ff6c37e17851a5bd7b0a03ee8de535.zip gcc-2ca17e0a89ff6c37e17851a5bd7b0a03ee8de535.tar.gz gcc-2ca17e0a89ff6c37e17851a5bd7b0a03ee8de535.tar.bz2 |
intl: Allow building both with old bison and bison >= 3 [PR92008]
bison 3 apparently made a backwards incompatible change, dropped
YYLEX_PARAM/YYPARSE_PARAM support and instead needs %param or %lex-param
and %parse-param. Furthermore, there is no easy way to conditionalize
on bison version in the *.y files.
While e.g. glibc bumped bison requirement and just has the bison 3
compatible version, Richi said there are still systems with older bison
where we want to build gcc.
So, this patch instead determines during configure bison version, and
depending on that when building plural.c (if building it at all) tweaks
what is passed over to bison if needed.
Tested with both bison 3 and bison 1.35, in each case with reconfiguring
intl and building with make all-yes (as in my setup intl isn't normally
used).
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/92008
* configure.ac: Add check for bison >= 3, AC_DEFINE HAVE_BISON3
and AC_SUBST BISON3_YES and BISON3_NO.
* Makefile.in (.y.c): Prefix $(YACC) invocation with @BISON3_NO@,
add @BISON3_YES@ prefixed rule to adjust the *.y source using sed
and adjust output afterwards.
* plural-exp.h (PLURAL_PARSE): If HAVE_BISON3 is defined, use
struct parse_args * type for arg instead of void *.
* plural.y: Add magic /* BISON3 ... */ comments with bison >= 3
directives.
(YYLEX_PARAM, YYPARSE_PARAM): Don't define if HAVE_BISON3 is defined.
(yylex, yyerror): Adjust prototypes and definitions if HAVE_BISON3
is defined.
* plural.c: Regenerated.
* config.h.in: Regenerated.
* configure: Regenerated.
Diffstat (limited to 'intl/plural-exp.h')
-rw-r--r-- | intl/plural-exp.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intl/plural-exp.h b/intl/plural-exp.h index cedc0db..e27c280 100644 --- a/intl/plural-exp.h +++ b/intl/plural-exp.h @@ -1,5 +1,5 @@ /* Expression parsing and evaluation for plural form selection. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000-2020 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@cygnus.com>, 2000. This program is free software; you can redistribute it and/or modify it @@ -111,7 +111,11 @@ struct parse_args extern void FREE_EXPRESSION PARAMS ((struct expression *exp)) internal_function; +#ifdef HAVE_BISON3 +extern int PLURAL_PARSE PARAMS ((struct parse_args *arg)); +#else extern int PLURAL_PARSE PARAMS ((void *arg)); +#endif extern struct expression GERMANIC_PLURAL attribute_hidden; extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry, struct expression **pluralp, |