gcc-9.1

Wolfgang Thaller committed 7 years ago

Commit 6fbf4221 parent ec13cc931387 files · +2442466 −1054331Browse files

Showing the changes to gcc/libcpp (73 of 31387 files). Show all

Unified · Split

73 files

gcc/libcpp/ChangeLog +457 −9
gcc/libcpp/Makefile.in +3 −4
gcc/libcpp/aclocal.m4 +4 −5
gcc/libcpp/charset.c +18 −16
gcc/libcpp/config.in +5 −0
gcc/libcpp/configure +566 −484
gcc/libcpp/configure.ac +1 −2
gcc/libcpp/directives-only.c +2 −2
gcc/libcpp/directives.c +142 −209
gcc/libcpp/errors.c +42 −34
gcc/libcpp/expr.c +12 −28
gcc/libcpp/files.c +42 −28
gcc/libcpp/identifiers.c +3 −3
gcc/libcpp/include/cpp-id-data.h +0 −82
gcc/libcpp/include/cpplib.h +238 −150
gcc/libcpp/include/line-map.h +310 −210
gcc/libcpp/include/mkdeps.h +1 −1
gcc/libcpp/include/symtab.h +1 −1
gcc/libcpp/init.c +9 −5
gcc/libcpp/internal.h +51 −28
gcc/libcpp/lex.c +44 −24
gcc/libcpp/line-map.c +293 −305
gcc/libcpp/location-example.txt +196 −151
gcc/libcpp/macro.c +429 −409
gcc/libcpp/makeucnid.c +2 −2
gcc/libcpp/mkdeps.c +1 −1
gcc/libcpp/pch.c +51 −76
gcc/libcpp/po/ChangeLog +32 −6
gcc/libcpp/po/be.gmo +0 −0
gcc/libcpp/po/be.po +163 −166
gcc/libcpp/po/ca.gmo +0 −0
gcc/libcpp/po/ca.po +180 −165
gcc/libcpp/po/cpplib.pot +157 −157
gcc/libcpp/po/da.gmo +0 −0
gcc/libcpp/po/da.po +184 −169
gcc/libcpp/po/de.gmo +0 −0
gcc/libcpp/po/de.po +183 −168
gcc/libcpp/po/el.gmo +0 −0
gcc/libcpp/po/el.po +163 −170
gcc/libcpp/po/eo.po +185 −170
gcc/libcpp/po/es.gmo +0 −0
gcc/libcpp/po/es.po +182 −165
gcc/libcpp/po/fi.gmo +0 −0
gcc/libcpp/po/fi.po +185 −170
gcc/libcpp/po/fr.gmo +0 −0
gcc/libcpp/po/fr.po +183 −168
gcc/libcpp/po/id.gmo +0 −0
gcc/libcpp/po/id.po +182 −165
gcc/libcpp/po/ja.gmo +0 −0
gcc/libcpp/po/ja.po +182 −165
gcc/libcpp/po/nl.gmo +0 −0
gcc/libcpp/po/nl.po +182 −165
gcc/libcpp/po/pt_BR.po +184 −169
gcc/libcpp/po/ru.gmo +0 −0
gcc/libcpp/po/ru.po +183 −168
gcc/libcpp/po/sr.po +182 −165
gcc/libcpp/po/sv.gmo +0 −0
gcc/libcpp/po/sv.po +169 −169
gcc/libcpp/po/tr.gmo +0 −0
gcc/libcpp/po/tr.po +182 −165
gcc/libcpp/po/uk.gmo +0 −0
gcc/libcpp/po/uk.po +184 −169
gcc/libcpp/po/vi.gmo +0 −0
gcc/libcpp/po/vi.po +183 −166
gcc/libcpp/po/zh_CN.gmo +0 −0
gcc/libcpp/po/zh_CN.po +182 −165
gcc/libcpp/po/zh_TW.gmo +0 −0
gcc/libcpp/po/zh_TW.po +182 −165
gcc/libcpp/symtab.c +23 −14
gcc/libcpp/system.h +5 −1
gcc/libcpp/traditional.c +51 −42
gcc/libcpp/ucnid.h +1 −1
gcc/libcpp/ucnid.tab +1 −1

@@ -1,10 +1,458 @@
1	2018-07-26 Release Manager	1	2019-05-03 Release Manager
2		2
3	* GCC 8.2.0 released.	3	* GCC 9.1.0 released.
4		4
5	2018-05-02 Release Manager	5	2019-04-03 Jonathan Wakely <jwakely@redhat.com>
6		6
7	* GCC 8.1.0 released.	7	* files.c (search_path_exhausted): Fix typo in comment.
		8
		9	2019-02-26 Martin Liska <mliska@suse.cz>
		10
		11	* symtab.c (ht_dump_statistics): Make
		12	horizontal alignment for statistics.
		13
		14	2019-02-20 David Malcolm <dmalcolm@redhat.com>
		15
		16	PR c/89410
		17	* include/line-map.h (linenum_arith_t): New typedef.
		18	(compare): Use it.
		19
		20	2019-02-18 Martin Liska <mliska@suse.cz>
		21
		22	PR c++/89383
		23	* line-map.c (linemap_line_start): Use 1UL in order
		24	to not overflow.
		25
		26	2019-02-11 Martin Liska <mliska@suse.cz>
		27
		28	PR lto/88147
		29	* line-map.c (linemap_line_start): Don't reuse the existing line
		30	map if the line offset is sufficiently large to cause overflow
		31	when computing location_t values.
		32
		33	2019-01-26 Jakub Jelinek <jakub@redhat.com>
		34
		35	PR preprocessor/88974
		36	* directives.c (SEEN_EOL): Move macro to ...
		37	* internal.h (SEEN_EOL): ... here.
		38	* expr.c (parse_has_include): Don't cpp_get_token if SEEN_EOL ().
		39
		40	2019-01-01 Jakub Jelinek <jakub@redhat.com>
		41
		42	Update copyright years.
		43
		44	2018-11-27 Mike Gulick <mgulick@mathworks.com>
		45
		46	PR preprocessor/83173
		47	* location-example.txt: Update example -fdump-internal-locations
		48	output.
		49
		50	2018-11-27 Mike Gulick <mgulick@mathworks.com>
		51
		52	PR preprocessor/83173
		53	* files.c (_cpp_stack_include): Check if
		54	line_table->highest_location is past current line before
		55	decrementing.
		56
		57	2018-11-13 David Malcolm <dmalcolm@redhat.com>
		58
		59	* charset.c: Replace "source_location" with "location_t".
		60	* directives-only.c: Likewise.
		61	* directives.c: Likewise.
		62	* errors.c: Likewise.
		63	* expr.c: Likewise.
		64	* files.c: Likewise.
		65	* include/cpplib.h: Likewise. Rename MAX_SOURCE_LOCATION to
		66	MAX_LOCATION_T.
		67	* include/line-map.h: Likewise.
		68	* init.c: Likewise.
		69	* internal.h: Likewise.
		70	* lex.c: Likewise.
		71	* line-map.c: Likewise.
		72	* location-example.txt: Likewise.
		73	* macro.c: Likewise.
		74	* pch.c: Likewise.
		75	* traditional.c: Likewise.
		76
		77	2018-11-07 Hafiz Abid Qadeer <abidh@codesourcery.com>
		78
		79	* configure: Regenerated.
		80
		81	2018-11-05 Martin Liska <mliska@suse.cz>
		82
		83	* symtab.c (ht_dump_statistics): Replace %zu with %lu format.
		84
		85	2018-11-05 Martin Liska <mliska@suse.cz>
		86
		87	* symtab.c (ht_dump_statistics): Fix format and
		88	pass missing argument.
		89
		90	2018-11-05 Martin Liska <mliska@suse.cz>
		91
		92	* symtab.c (ht_dump_statistics): Make dump conditional
		93	based on alloc_subobject.
		94
		95	2018-10-31 Joseph Myers <joseph@codesourcery.com>
		96
		97	PR bootstrap/82856
		98	* configure.ac: Remove AC_PREREQ. Use AC_LANG_SOURCE.
		99	* aclocal.m4, config.in, configure: Regenerate.
		100
		101	2018-10-31 Nathan Sidwell <nathan@acm.org>
		102
		103	* internal.h (struct cpp_reader): Rename forced_token_location_p
		104	to forced_token_location and drop its pointerness.
		105	* include/cpplib.h (cpp_force_token_locations): Take location, not
		106	pointer to one.
		107	* init.c (cpp_create_reader): Adjust.
		108	* lex.c (cpp_read_main_file):
		109
		110	* directives.c (do_include_common): Commonize cleanup path.
		111	(_cpp_pop_buffer): Fix leak.
		112
		113	* include/line-map.h (IS_ORDINARY_LOC, IS_MACRO_LOC): New
		114	predicates.
		115	(IS_ADHOC_LOC): Move earlier.
		116	(MAP_ORDINARY_P): Use IS_ORDINARY_LOC.
		117	* line-map.c (linemap_location_from_macro_expansion_p): Use
		118	IS_MACRO_LOC.
		119
		120	* include/cpplib.h (cpp_macro_definition_location): Make inline.
		121	* macro.c (warn_of_redefinition): Fix comments, examine macro
		122	type, use C++ for.
		123	(cpp_macro_definition_location): Don't define here.
		124
		125	* include/cpplib.h (HT_NODE): Don't cast NODE.
		126	(NODE_LEN, NODE_NAME): Use HT_NODE.
		127
		128	* directives.c (DIRECTIVE_TABLE): Drop historical frequency
		129	comments.
		130	* files.c (_cpp_stack_file): Fix indentation.
		131
		132	2018-10-17 Joseph Myers <joseph@codesourcery.com>
		133
		134	* include/cpplib.h (enum c_lang): Add CLK_GNUC2X and CLK_STDC2X.
		135	* init.c (lang_defaults): Add GNUC2X and STDC2X entries.
		136	(cpp_init_builtins): Define __STDC_VERSION__ to 202000L for C2X.
		137
		138	2018-10-11 David Malcolm <dmalcolm@redhat.com>
		139
		140	* macro.c (_cpp_arguments_ok): If the argument count is wrong, add
		141	a note showing the definition of the macro.
		142
		143	2018-10-11 Nathan Sidwell <nathan@acm.org>
		144
		145	* include/line-map.h (LINEMAPS_MACRO_LOWEST_LOCATION): Fix
		146	off-by-one error.
		147	* line-map.c (linemap_enter_macro): Use RAII. Clear all of the
		148	macro_locations.
		149
		150	2018-10-09 David Malcolm <dmalcolm@redhat.com>
		151
		152	* charset.c (noop_error_cb): Rename to...
		153	(noop_diagnostic_cb): ...this, converting params to enums.
		154	(cpp_interpret_string_ranges): Update for renaming and enums.
		155	* directives.c (check_eol_1): Convert reason to enum.
		156	(do_diagnostic): Convert code and reason to enum.
		157	(do_error): Use CPP_W_NONE rather than 0.
		158	(do_pragma_dependency): Likewise.
		159	* errors.c (cpp_diagnostic_at): Convert level and reason to enums.
		160	Update for renaming.
		161	(cpp_diagnostic): Convert level and reason to enums.
		162	(cpp_error): Convert level to enum.
		163	(cpp_warning): Convert reason to enums.
		164	(cpp_pedwarning): Likewise.
		165	(cpp_warning_syshdr): Likewise.
		166	(cpp_diagnostic_with_line): Convert level and reason to enums.
		167	Update for renaming.
		168	(cpp_error_with_line): Convert level to enum.
		169	(cpp_warning_with_line): Convert reason to enums.
		170	(cpp_pedwarning_with_line): Likewise.
		171	(cpp_warning_with_line_syshdr): Likewise.
		172	(cpp_error_at): Convert level to enum.
		173	(cpp_errno): Likewise.
		174	(cpp_errno_filename): Likewise.
		175	* include/cpplib.h (enum cpp_diagnostic_level): Name this enum,
		176	and move to before struct cpp_callbacks.
		177	(enum cpp_warning_reason): Likewise.
		178	(cpp_callbacks::diagnostic): Convert params from int to enums.
		179	(cpp_error): Convert int param to enum cpp_diagnostic_level.
		180	(cpp_warning): Convert int param to enum cpp_warning_reason.
		181	(cpp_pedwarning): Likewise.
		182	(cpp_warning_syshdr): Likewise.
		183	(cpp_errno): Convert int param to enum cpp_diagnostic_level.
		184	(cpp_errno_filename): Likewise.
		185	(cpp_error_with_line): Likewise.
		186	(cpp_warning_with_line): Convert int param to enum
		187	cpp_warning_reason.
		188	(cpp_pedwarning_with_line): Likewise.
		189	(cpp_warning_with_line_syshdr): Likewise.
		190	(cpp_error_at): Convert int param to enum cpp_diagnostic_level.
		191	* macro.c (create_iso_definition): Convert int to enum.
		192	(_cpp_create_definition): Likewise.
		193
		194	2018-09-17 David Malcolm <dmalcolm@redhat.com>
		195
		196	* include/line-map.h (range_label::get_text): Add param
		197	"range_idx".
		198
		199	2018-08-30 Nathan Sidwell <nathan@acm.org>
		200
		201	* include/line-map.h (enum lc_reason): Comment each member
		202	separately.
		203	(struct line_maps): Fix reallocator comment.
		204
		205	2018-08-27 David Malcolm <dmalcolm@redhat.com>
		206
		207	PR 87091
		208	* include/line-map.h (enum range_display_kind): New enum.
		209	(struct location_range): Replace field "m_show_caret_p" with
		210	"m_range_display_kind", converting from bool to the new enum.
		211	(class rich_location): Add example of line insertion fix-it hint.
		212	(rich_location::add_range): Convert param "show_caret_p" from bool
		213	to enum range_display_kind and rename to "range_display_kind",
		214	giving it a default of SHOW_RANGE_WITHOUT_CARET.
		215	(rich_location::set_range): Likewise, albeit without a default.
		216	* line-map.c (rich_location::rich_location): Update for conversion
		217	of show_caret_p to tri-state enum.
		218	(rich_location::add_range): Likewise.
		219	(rich_location::set_range): Likewise.
		220
		221	2018-08-24 H.J. Lu <hongjiu.lu@intel.com>
		222
		223	PR bootstrap/86872
		224	* line-map.c (pure_location_p): Return true if linemap_lookup
		225	returns NULL.
		226	(linemap_add): Set start_location to 0 if we run out of line map
		227	space.
		228
		229	2018-08-20 Nathan Sidwell <nathan@acm.org>
		230
		231	* include/cpplib.h: Fixup some whitespace.
		232	(cpp_hashnode): Reduce type to 2 bit & flags to 8.
		233
		234	* include/cpplib.h (NODE_BUILTIN, NODE_MACRO_ARG): Delete.
		235	Renumber others.
		236	(enum node_type): Replace NT_MACRO with NT_USER_MACRO,
		237	NT_BUILTIN_MACRO, NT_MACRO_ARG. Delete NT_ASSERTION.
		238	(NTV_MACRO, NTV_ANSWER, NTV_BUILTIN, NTV_ARGUMENT, NTV_NONE):
		239	Delete.
		240	(CPP_HASHNODE_VALUE_IDX): Delete.
		241	(union _cpp_hashnode_value): GTY tag from enum node_type directly.
		242	(struct cpp_hashnode): Adjust GTY desc for value field.
		243	(cpp_user_macro_p, cpp_builtin_macro_p, cpp_macro_p): Adjust.
		244	* directives.c (undefine_macros): Clear value.anwers, adjust flag
		245	clearing.
		246	(_cpp_test_assertion): No need to check NT_ASSERTION.
		247	(do_assert, do_unassert): Likewise.
		248	* init.c (cpp_init_special_builtins): Set type not flags.
		249	* macro.c (struct macro_arg_saved_data): Add type field.
		250	(cpp_get_token_1): Check type not NT_VOID.
		251	(_cpp_free_definition): Adjust flag clearing. Nullify
		252	value.answers.
		253	(_cpp_save_parameter, _cpp_unsave_parameters): Save and restore
		254	type.
		255	(lex_expansion_token): Check type not flags.
		256	(_cpp_create_definition): Set type to NT_USER_MACRO.
		257	(_cpp_notify_macro_use): Adjust type checking.
		258	* pch.c (write_macdef, count_defs, write_defs, cpp_valid_state)
		259	(save_macros): Adjust node type/flag handling.
		260	* traditional.c (_cpp_scan_out_logical_line): Check type not flags.
		261
		262	* directives.c (do_undef): Use cpp_macro_p & cpp_builtin_macro_p.
		263	* include/cpplib.h (enum cpp_macro_kind): Remove trailing comma.
		264	(cpp_fun_like_macro_p): Make inline, define.
		265	* macro.c (cpp_define_lazily): Use UCHAR_MAX.
		266	(cpp_fun_like_macro_p): Delete.
		267
		268	* Makefile.in (TAGS_SOURCES): Remove cpp-id-data.h.
		269	* include/cpp-id-data.h: Delete.
		270	* internal.h: Include cpplib.h not cpp-id-data.h.
		271
		272	* include/cpp-id-data.h (struct answer): Delete.
		273	* include/cpplib.h (struct answer): Don't forward-declare.
		274	(enum cpp_macro_kind): Add cmk_assert.
		275	(struct cpp_macro): Union parms and next assert chain.
		276	(union _cpp_hashnode_value): 'answer' field is cpp_macro.
		277	* directives.c (parse_answer): Convert to use cpp_macro. Return
		278	true on success.
		279	(parse_assertion, find_answer, _cpp_test_assertion, cpp_do_assert)
		280	(cpp_do_unassert): Convert to use cpp_macro.
		281	* macro.c (warn_of_redefinition, _cpp_new_macro)
		282	(check_trad_stringification, cpp_macro_definition): Adjust macro
		283	parm access.
		284	* traditional.c (_cpp_replacement_text_len)
		285	(_cpp_copy_replacement_text, _cpp_create_trad_definition): Likewise.
		286
		287	2018-08-17 Nathan Sidwell <nathan@acm.org>
		288
		289	* include/cpplib.h (struct cpp_callbacks): Replace
		290	user_builtin_macro with user_lazy_macro.
		291	(struct cpp_macro): add lazy field.
		292	(enum cpp_builtin_type): Remove BT_FIRST_USER, BT_LAST_USER.
		293	(cpp_define_lazily): Declare.
		294	* macro.c (enter_macro_context) Use _cpp_maybe_notify_macro_use.
		295	(warn_of_redefinition): Use cpp_builtin_macro_p, directly call
		296	user_lazy_macro hook.
		297	(_cpp_new_macro): Clear lazy field.
		298	(cpp_define_lazily): Define.
		299	(_cpp_notify_macro_use): Adjust lazy definition code.
		300	(cpp_macro_definition): No need to do lazy definition here.
		301	* pch.c (write_macdef, save_macros): Likewise.
		302
		303	* include/cpplib.h (enum cpp_macro_kind): New.
		304	(struct cpp_macro): Make body trailing array. Add kind field,
		305	delete traditional flag.
		306	* internal.h (_cpp_new_macro): Declare.
		307	(_cpp_reserve_room): New inline.
		308	(_cpp_commit_buf): Declare.
		309	(_cpp_create_trad_definition): Return new macro.
		310	* lex.c (_cpp_commit_buff): New.
		311	* macro.c (macro_real_token_count): Count backwards.
		312	(replace_args): Pointer equality not orderedness.
		313	(_cpp_save_parameter): Use _cpp_reserve_room.
		314	(alloc_expansion_token): Delete.
		315	(lex_expansion_token): Return macro pointer. Use _cpp_reserve_room.
		316	(create_iso_definition): Allocate macro itself. Adjust for
		317	different allocation ordering.
		318	(_cpp_new_macro): New.
		319	(_cpp_create_definition): Adjust for API changes.
		320	* traditional.c (push_replacement_text): Don't set traditional
		321	flag.
		322	(save_replacement_text): Likewise.
		323	(_cpp_create_trad_definition): Allocate macro itself, Adjust for
		324	different allocation ordering.
		325
		326	* cpp-id-data.h (uchar, UC): Move to internal.h
		327	(struct cpp_macro): Move to cpplib.h.
		328	* internal.h (uchar, UC): From cpp-id-data.h.
		329	* include/cpplib.h (struct cpp_macro): From cpp-id-data.h.
		330
		331	2018-08-16 Nathan Sidwell <nathan@acm.org>
		332
		333	* internal.h (_cpp_save_parameter): Take parmno, not macro.
		334	(_cpp_unsave_parameters): Declare.
		335	* macro.c (_cpp_save_parameter): Take parm number, not macro.
		336	Return true on success.
		337	(_cpp_unsave_parameters): New.
		338	(parse_params): Take parm_no and variadic pointers, not macro.
		339	Reimplement parsing logic.
		340	(create_iso_definition): Adjust parse_params changes. Call
		341	_cpp_unsave_parameters here.
		342	(_cpp_create_definition): Don't unsave params here.
		343	* traditional.c (scan_parameters): Take n_param pointer, adjust.
		344	(_cpp_create_trad_definition): Ajust scan_parameters change. Call
		345	_cpp_unsave_parameters.
		346
		347	* include/cpplib.h (cpp_user_macro_p, cpp_builtin_macro_p)
		348	(cpp_macro_p): New inlines.
		349	* directives.c (do_pragma_poison): Use cpp_macro_p.
		350	(do_ifdef, do_ifndef): Likewise. Use _cpp_maybe_notify_macro_use.
		351	(cpp_pop_definition): Use cpp_macro_p. Move _cpp_free_definition
		352	earlier. Don't zap node directly.
		353	* expr.c (parse_defined): Use _cpp_maybe_notify_macro_use &
		354	cpp_macro_p.
		355	* files.c (should_stack_file): Use cpp_macro_p.
		356	* identifiers.c (cpp_defined): Likewise.
		357	* internal.h (_cpp_mark_macro): Use cpp_user_macro_p.
		358	(_cpp_notify_macro_use): Declare.
		359	(_cpp_maybe_notify_macro_use): New inline.
		360	* lex.c (is_macro): Use cpp_macro_p.
		361	* macro.c (_cpp_warn_if_unused_macro): Use cpp_user_macro_p.
		362	(enter_macro_context): Likewise.
		363	(_cpp_create_definition): Use cpp_builtin_macro_p,
		364	cpp_user_macro_p. Move _cpp_free_definition earlier.
		365	(_cpp_notify_macro_use): New, broken out of multiple call sites.
		366	* traditional.c (fun_like_macro_p): Use cpp_builtin_macro_p.
		367	(maybe_start_funlike, _cpp_scan_out_logical_line)
		368	(push_replacement_text): Likewise.
		369
		370	2018-08-15 David Malcolm <dmalcolm@redhat.com>
		371
		372	* include/line-map.h (struct location_range): Add "m_label" field.
		373	(class rich_location): Add description of labels to leading
		374	comment.
		375	(rich_location::rich_location): Add "label" param, defaulting to
		376	NULL.
		377	(rich_location::add_range): Likewise.
		378	(struct label_text): New struct.
		379	(class range_label): New abstract base class.
		380	* line-map.c (rich_location::rich_location): Add "label" param;
		381	use it.
		382	(rich_location::add_range): Likewise.
		383
		384	2018-08-08 Nathan Sidwell <nathan@acm.org>
		385
		386	Make linemap::included_from a location
		387	libcpp/
		388	* include/line-map.h (struct line_map_ordinary): Replace
		389	included_from map index with included_at source_location.
		390	(ORDINARY_MAP_INCLUDER_FILE_INDEX): Delete.
		391	(LAST_SOURCE_LINE_LOCATION): Delete.
		392	(LAST_SOURCE_LINE, LAST_SOURCE_COLUMN): Delete.
		393	(linemap_included_from): New.
		394	(linemap_included_from_linemap): Declare.
		395	(MAIN_FILE_P): Adjust.
		396	* line-map.c (linemap_included_from_linemap): New.
		397	(lonemap_check_files_exited): Use linemap_included_at.
		398	(linemap_add): Adjust inclusion setting.
		399	(linemap_dump, linemap_dump_location): Adjust.
		400	* directives.c (do_linemarker): Use linemap_included_at.
		401
		402	2018-08-07 Nathan Sidwell <nathan@acm.org>
		403
		404	* line-map.c: (linemap_init): Set default allocator here.
		405	(new_linemap): Rather than here. Refactor allocation logic.
		406
		407	2018-07-20 David Malcolm <dmalcolm@redhat.com>
		408
		409	* include/line-map.h (rich_location::set_range): Remove redundant
		410	line_maps * parameter.
		411	* line-map.c (rich_location::set_range): Likewise.
		412
		413	2018-07-18 Bernd Edlinger <bernd.edlinger@hotmail.de>
		414
		415	PR 69558
		416	* macro.c (enter_macro_context): Change the location info for builtin
		417	macros and _Pragma from location of the closing parenthesis to location
		418	of the macro expansion point.
		419
		420	2018-07-17 Jason Franklin <j_fra@fastmail.us>
		421	Jakub Jelinek <jakub@redhat.com>
		422
		423	* lex.c (_cpp_lex_direct): Use CPP_DL_NOTE instead of CPP_DL_PEDWARN,
		424	CPP_DL_WARNING or CPP_DL_ERROR for note that diagnostics for C++ style
		425	comments is reported only once per file and guard those calls on the
		426	preceding cpp_error returning true.
		427
		428	2018-07-03 Nathan Sidwell <nathan@acm.org>
		429
		430	Reorg line_map data structures for better packing.
		431	* include/line-map.h (enum lc_reason): Add LC_HWM.
		432	(LINE_MAP_MAX_LOCATION): Define here.
		433	(struct line_map): Move reason field to line_map_ordinary. Adjust
		434	GTY tagging.
		435	(struct line_map_ordinary): Reorder fields for less padding.
		436	(struct line_map_macro): Likewise.
		437	(MAP_ORDINARY_P): New.
		438	(linemap_check_ordinary, linemap_check_macro): Adjust.
		439	* line-map.c (LINE_MAP_MAX_SOURCE_LOCATION): Delete.
		440	(new_linemap): Take start_location, not reason. Adjust.
		441	(linemap_add, linemap_enter_macro): Adjust.
		442	(linemap_line_start): Likewise.
		443	(linemap_macro_expansion_map_p): Use MAP_ORDINARY_P.
		444	(linemap_macro_loc_to_spelling_point): Likewise.
		445	(linemap_macro_loc_to_def_point): Likewise.
		446	(linemap_dump): Likewise.
		447
		448	2018-05-23 Jason Merrill <jason@redhat.com>
		449
		450	* system.h: #include <new> earlier.
		451
		452	2018-05-17 Jason Merrill <jason@redhat.com>
		453
		454	* line-map.c (linemap_init): Use placement new.
		455	* system.h: #include <new>.
8		456
9	2018-03-14 David Malcolm <dmalcolm@redhat.com>	457	2018-03-14 David Malcolm <dmalcolm@redhat.com>
10		458
@@ -52,10 +500,10 @@ · 41 unmodified lines
52		500
53	2018-01-18 Boris Kolpackov <boris@codesynthesis.com>	501	2018-01-18 Boris Kolpackov <boris@codesynthesis.com>
54		502
55	PR other/70268	503	PR other/70268
56	* include/cpplib.h (cpp_callbacks::remap_filename): New callback.	504	* include/cpplib.h (cpp_callbacks::remap_filename): New callback.
57	* macro.c (_cpp_builtin_macro_text): Call remap_filename for	505	* macro.c (_cpp_builtin_macro_text): Call remap_filename for
58	__FILE__ and __BASE_FILE__.	506	__FILE__ and __BASE_FILE__.
59		507
60	2018-01-10 Kelvin Nilsen <kelvin@gcc.gnu.org>	508	2018-01-10 Kelvin Nilsen <kelvin@gcc.gnu.org>
61		509
@@ -5312,7 +5760,7 @@ · 5250 unmodified lines
5312	* include/symtab.h: Moved from gcc/hashtable.h. Change header	5760	* include/symtab.h: Moved from gcc/hashtable.h. Change header
5313	guard name.	5761	guard name.
5314		5762
5315	Copyright (C) 2004-2018 Free Software Foundation, Inc.	5763	Copyright (C) 2004-2019 Free Software Foundation, Inc.
5316		5764
5317	Copying and distribution of this file, with or without modification,	5765	Copying and distribution of this file, with or without modification,
5318	are permitted in any medium without royalty provided the copyright	5766	are permitted in any medium without royalty provided the copyright

gcc/libcpp/Makefile.in+3−4

 # @configure_input@
 # Makefile for libcpp.  Run 'configure' to generate Makefile from Makefile.in
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2019 Free Software Foundation, Inc.
 #This file is part of libcpp.
 	sed 's:$(srcdir)/::g' <po/$(PACKAGE).pot.tmp >po/$(PACKAGE).pot
 	rm po/$(PACKAGE).pot.tmp
-TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h ucnid.h \
+TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h system.h ucnid.h \
-    include/line-map.h include/symtab.h include/cpp-id-data.h \
+    include/cpplib.h include/line-map.h include/mkdeps.h include/symtab.h
-    include/cpplib.h include/mkdeps.h system.h
 TAGS: $(TAGS_SOURCES)
 	cd $(srcdir) && etags $(TAGS_SOURCES)

gcc/libcpp/aclocal.m4+4−5

-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_include([../config/acx.m4])
 m4_include([../config/codeset.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/lib-ld.m4])
 m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
-m4_include([../config/override.m4])
 m4_include([../config/warnings.m4])

gcc/libcpp/charset.c+18−16

 /* CPP Library - charsets
-   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
    Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges.
   return cpp_interpret_string_1 (pfile, from, count, to, type, NULL, NULL);
 }
-/* A "do nothing" error-handling callback for use by
+/* A "do nothing" diagnostic-handling callback for use by
    cpp_interpret_string_ranges, so that it can temporarily suppress
-   error-handling.  */
+   diagnostic-handling.  */
 static bool
-noop_error_cb (cpp_reader *, int, int, rich_location *,
+noop_diagnostic_cb (cpp_reader *, enum cpp_diagnostic_level,
-	       const char *, va_list *)
+		    enum cpp_warning_reason, rich_location *,
+		    const char *, va_list *)
 {
   /* no-op.  */
   return true;
     return "execution character set != source character set";
   /* For on-demand strings we have already lexed the strings, so there
-     should be no errors.  However, if we have bogus source location
+     should be no diagnostics.  However, if we have bogus source location
      data (or stringified macro arguments), the attempt to lex the
-     strings could fail with an error.  Temporarily install an
+     strings could fail with an diagnostic.  Temporarily install an
-     error-handler to catch the error, so that it can lead to this call
+     diagnostic-handler to catch the diagnostic, so that it can lead to this call
      failing, rather than being emitted as a user-visible diagnostic.
-     If an error does occur, we should see it via the return value of
+     If an diagnostic does occur, we should see it via the return value of
      cpp_interpret_string_1.  */
-  bool (*saved_error_handler) (cpp_reader *, int, int, rich_location *,
+  bool (*saved_diagnostic_handler) (cpp_reader *, enum cpp_diagnostic_level,
-			       const char *, va_list *)
+				    enum cpp_warning_reason, rich_location *,
+				    const char *, va_list *)
     ATTRIBUTE_FPTR_PRINTF(5,0);
-  saved_error_handler = pfile->cb.error;
+  saved_diagnostic_handler = pfile->cb.diagnostic;
-  pfile->cb.error = noop_error_cb;
+  pfile->cb.diagnostic = noop_diagnostic_cb;
   bool result = cpp_interpret_string_1 (pfile, from, count, NULL, type,
 					loc_readers, out);
-  /* Restore the saved error-handler.  */
+  /* Restore the saved diagnostic-handler.  */
-  pfile->cb.error = saved_error_handler;
+  pfile->cb.diagnostic = saved_diagnostic_handler;
   if (!result)
     return "cpp_interpret_string_1 failed";
 /* Constructor for cpp_string_location_reader.  */
 cpp_string_location_reader::
-cpp_string_location_reader (source_location src_loc,
+cpp_string_location_reader (location_t src_loc,
 			    line_maps *line_table)
 : m_line_table (line_table)
 {

gcc/libcpp/config.in+5−0

 # endif
 #endif
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS

gcc/libcpp/configure+566−484

@@ -1,12 +1,12 @@
1	#! /bin/sh	1	#! /bin/sh
2	# Guess values for system-dependent variables and create Makefiles.	2	# Guess values for system-dependent variables and create Makefiles.
3	# Generated by GNU Autoconf 2.64 for cpplib .	3	# Generated by GNU Autoconf 2.69 for cpplib .
4	#	4	#
5	# Report bugs to <gcc-bugs@gcc.gnu.org>.	5	# Report bugs to <gcc-bugs@gcc.gnu.org>.
6	#	6	#
7	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,	7	#
8	# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software	8	# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
9	# Foundation, Inc.	9	#
10	#	10	#
11	# This configure script is free software; the Free Software Foundation	11	# This configure script is free software; the Free Software Foundation
12	# gives unlimited permission to copy, distribute and modify it.	12	# gives unlimited permission to copy, distribute and modify it.
@@ -89,6 +89,7 @@ fi · 76 unmodified lines
89	IFS=" "" $as_nl"	89	IFS=" "" $as_nl"
90		90
91	# Find who we are. Look in the path if we contain no directory separator.	91	# Find who we are. Look in the path if we contain no directory separator.
		92	as_myself=
92	case $0 in #((	93	case $0 in #((
93	[\\/] ) as_myself=$0 ;;	94	[\\/] ) as_myself=$0 ;;
94	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	95	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -133,6 +134,31 @@ export LANGUAGE · 38 unmodified lines
133	# CDPATH.	134	# CDPATH.
134	(unset CDPATH) >/dev/null 2>&1 && unset CDPATH	135	(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
135		136
		137	# Use a proper internal environment variable to ensure we don't fall
		138	# into an infinite loop, continuously re-executing ourselves.
		139	if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
		140	_as_can_reexec=no; export _as_can_reexec;
		141	# We cannot yet assume a decent shell, so we have to provide a
		142	# neutralization value for shells without unset; and this also
		143	# works around shells that cannot unset nonexistent variables.
		144	# Preserve -v and -x to the replacement shell.
		145	BASH_ENV=/dev/null
		146	ENV=/dev/null
		147	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
		148	case $- in # ((((
		149	vx* \| xv* ) as_opts=-vx ;;
		150	v ) as_opts=-v ;;
		151	x ) as_opts=-x ;;
		152	* ) as_opts= ;;
		153	esac
		154	exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
		155	# Admittedly, this is quite paranoid, since all the known shells bail
		156	# out after a failed `exec'.
		157	$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
		158	as_fn_exit 255
		159	fi
		160	# We don't want this to propagate to other subprocesses.
		161	{ _as_can_reexec=; unset _as_can_reexec;}
136	if test "x$CONFIG_SHELL" = x; then	162	if test "x$CONFIG_SHELL" = x; then
137	as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :	163	as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
138	emulate sh	164	emulate sh
@@ -166,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : · 27 unmodified lines
166	else	192	else
167	exitcode=1; echo positional parameters were not saved.	193	exitcode=1; echo positional parameters were not saved.
168	fi	194	fi
169	test x\$exitcode = x0 \|\| exit 1"	195	test x\$exitcode = x0 \|\| exit 1
		196	test -x / \|\| exit 1"
170	as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO	197	as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
171	as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO	198	as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
172	eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&	199	eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -211,14 +238,25 @@ IFS=$as_save_IFS · 38 unmodified lines
211		238
212		239
213	if test "x$CONFIG_SHELL" != x; then :	240	if test "x$CONFIG_SHELL" != x; then :
214	# We cannot yet assume a decent shell, so we have to provide a	241	export CONFIG_SHELL
215	# neutralization value for shells without unset; and this also	242	# We cannot yet assume a decent shell, so we have to provide a
216	# works around shells that cannot unset nonexistent variables.	243	# neutralization value for shells without unset; and this also
217	BASH_ENV=/dev/null	244	# works around shells that cannot unset nonexistent variables.
218	ENV=/dev/null	245	# Preserve -v and -x to the replacement shell.
219	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV	246	BASH_ENV=/dev/null
220	export CONFIG_SHELL	247	ENV=/dev/null
221	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}	248	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
		249	case $- in # ((((
		250	vx* \| xv* ) as_opts=-vx ;;
		251	v ) as_opts=-v ;;
		252	x ) as_opts=-x ;;
		253	* ) as_opts= ;;
		254	esac
		255	exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
		256	# Admittedly, this is quite paranoid, since all the known shells bail
		257	# out after a failed `exec'.
		258	$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
		259	exit 255
222	fi	260	fi
223		261
224	if test x$as_have_required = xno; then :	262	if test x$as_have_required = xno; then :
@@ -317,10 +355,18 @@ $as_echo X"$as_dir" \| · 92 unmodified lines
317	test -d "$as_dir" && break	355	test -d "$as_dir" && break
318	done	356	done
319	test -z "$as_dirs" \|\| eval "mkdir $as_dirs"	357	test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
320	} \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir"	358	} \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir"
321		359
322		360
323	} # as_fn_mkdir_p	361	} # as_fn_mkdir_p
		362
		363	# as_fn_executable_p FILE
		364	# -----------------------
		365	# Test if FILE is an executable regular file.
		366	as_fn_executable_p ()
		367	{
		368	test -f "$1" && test -x "$1"
		369	} # as_fn_executable_p
324	# as_fn_append VAR VALUE	370	# as_fn_append VAR VALUE
325	# ----------------------	371	# ----------------------
326	# Append the text in VALUE to the end of the definition contained in VAR. Take	372	# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -357,19 +403,19 @@ else · 30 unmodified lines
357	fi # as_fn_arith	403	fi # as_fn_arith
358		404
359		405
360	# as_fn_error ERROR [LINENO LOG_FD]	406	# as_fn_error STATUS ERROR [LINENO LOG_FD]
361	# ---------------------------------	407	# ----------------------------------------
362	# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are	408	# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
363	# provided, also output the error to LOG_FD, referencing LINENO. Then exit the	409	# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
364	# script with status $?, using 1 if that was 0.	410	# script with STATUS, using 1 if that was 0.
365	as_fn_error ()	411	as_fn_error ()
366	{	412	{
367	as_status=$?; test $as_status -eq 0 && as_status=1	413	as_status=$1; test $as_status -eq 0 && as_status=1
368	if test "$3"; then	414	if test "$4"; then
369	as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	415	as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
370	$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3	416	$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
371	fi	417	fi
372	$as_echo "$as_me: error: $1" >&2	418	$as_echo "$as_me: error: $2" >&2
373	as_fn_exit $as_status	419	as_fn_exit $as_status
374	} # as_fn_error	420	} # as_fn_error
375		421
@@ -442,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits · 66 unmodified lines
442	chmod +x "$as_me.lineno" \|\|	488	chmod +x "$as_me.lineno" \|\|
443	{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }	489	{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
444		490
		491	# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
		492	# already done that, so ensure we don't try to do so again and fall
		493	# in an infinite loop. This has already happened in practice.
		494	_as_can_reexec=no; export _as_can_reexec
445	# Don't try to exec as it changes $[0], causing all sort of problems	495	# Don't try to exec as it changes $[0], causing all sort of problems
446	# (the dirname of $[0] is not the place where we might find the	496	# (the dirname of $[0] is not the place where we might find the
447	# original and so on. Autoconf is especially sensitive to this).	497	# original and so on. Autoconf is especially sensitive to this).
@@ -476,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then · 28 unmodified lines
476	# ... but there are two gotchas:	526	# ... but there are two gotchas:
477	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.	527	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
478	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.	528	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
479	# In both cases, we have to default to `cp -p'.	529	# In both cases, we have to default to `cp -pR'.
480	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|	530	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
481	as_ln_s='cp -p'	531	as_ln_s='cp -pR'
482	elif ln conf$$.file conf$$ 2>/dev/null; then	532	elif ln conf$$.file conf$$ 2>/dev/null; then
483	as_ln_s=ln	533	as_ln_s=ln
484	else	534	else
485	as_ln_s='cp -p'	535	as_ln_s='cp -pR'
486	fi	536	fi
487	else	537	else
488	as_ln_s='cp -p'	538	as_ln_s='cp -pR'
489	fi	539	fi
490	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file	540	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
491	rmdir conf$$.dir 2>/dev/null	541	rmdir conf$$.dir 2>/dev/null
@@ -497,28 +547,8 @@ else · 5 unmodified lines
497	as_mkdir_p=false	547	as_mkdir_p=false
498	fi	548	fi
499		549
500	if test -x / >/dev/null 2>&1; then	550	as_test_x='test -x'
501	as_test_x='test -x'	551	as_executable_p=as_fn_executable_p
502	else
503	if ls -dL / >/dev/null 2>&1; then
504	as_ls_L_option=L
505	else
506	as_ls_L_option=
507	fi
508	as_test_x='
509	eval sh -c '\''
510	if test -d "$1"; then
511	test -d "$1/.";
512	else
513	case $1 in #(
514	-*)set "./$1";;
515	esac;
516	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
517	???[sx]):;;)false;;esac;fi
518	'\'' sh
519	'
520	fi
521	as_executable_p=$as_test_x
522		552
523	# Sed expression to map a string onto a valid CPP name.	553	# Sed expression to map a string onto a valid CPP name.
524	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"	554	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -527,10 +557,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" · 2 unmodified lines
527	as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"	557	as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
528		558
529		559
530	exec 7<&0 </dev/null 6>&1	560	test -n "$DJDIR" \|\| exec 7<&0 </dev/null
		561	exec 6>&1
531		562
532	# Name of the host.	563	# Name of the host.
533	# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,	564	# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
534	# so uname gets run too.	565	# so uname gets run too.
535	ac_hostname=`(hostname \|\| uname -n) 2>/dev/null \| sed 1q`	566	ac_hostname=`(hostname \|\| uname -n) 2>/dev/null \| sed 1q`
536		567
@@ -779,8 +810,9 @@ do · 242 unmodified lines
779	fi	810	fi
780		811
781	case $ac_option in	812	case $ac_option in
782	=) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;;	813	=?) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;;
783	*) ac_optarg=yes ;;	814	*=) ac_optarg= ;;
		815	*) ac_optarg=yes ;;
784	esac	816	esac
785		817
786	# Accept the important Cygnus configure options, so we can diagnose typos.	818	# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -825,7 +857,7 @@ do · 38 unmodified lines
825	ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'`	857	ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'`
826	# Reject names that are not valid shell variable names.	858	# Reject names that are not valid shell variable names.
827	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&	859	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
828	as_fn_error "invalid feature name: $ac_useropt"	860	as_fn_error $? "invalid feature name: $ac_useropt"
829	ac_useropt_orig=$ac_useropt	861	ac_useropt_orig=$ac_useropt
830	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`	862	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
831	case $ac_user_opts in	863	case $ac_user_opts in
@@ -851,7 +883,7 @@ do · 19 unmodified lines
851	ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'`	883	ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'`
852	# Reject names that are not valid shell variable names.	884	# Reject names that are not valid shell variable names.
853	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&	885	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
854	as_fn_error "invalid feature name: $ac_useropt"	886	as_fn_error $? "invalid feature name: $ac_useropt"
855	ac_useropt_orig=$ac_useropt	887	ac_useropt_orig=$ac_useropt
856	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`	888	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
857	case $ac_user_opts in	889	case $ac_user_opts in
@@ -1055,7 +1087,7 @@ do · 197 unmodified lines
1055	ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'`	1087	ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'`
1056	# Reject names that are not valid shell variable names.	1088	# Reject names that are not valid shell variable names.
1057	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&	1089	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1058	as_fn_error "invalid package name: $ac_useropt"	1090	as_fn_error $? "invalid package name: $ac_useropt"
1059	ac_useropt_orig=$ac_useropt	1091	ac_useropt_orig=$ac_useropt
1060	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`	1092	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
1061	case $ac_user_opts in	1093	case $ac_user_opts in
@@ -1071,7 +1103,7 @@ do · 9 unmodified lines
1071	ac_useropt=`expr "x$ac_option" : 'x-without-$.$'`	1103	ac_useropt=`expr "x$ac_option" : 'x-without-$.$'`
1072	# Reject names that are not valid shell variable names.	1104	# Reject names that are not valid shell variable names.
1073	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&	1105	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1074	as_fn_error "invalid package name: $ac_useropt"	1106	as_fn_error $? "invalid package name: $ac_useropt"
1075	ac_useropt_orig=$ac_useropt	1107	ac_useropt_orig=$ac_useropt
1076	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`	1108	ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
1077	case $ac_user_opts in	1109	case $ac_user_opts in
@@ -1101,8 +1133,8 @@ do · 23 unmodified lines
1101	\| --x-librar=* \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=*)	1133	\| --x-librar=* \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=*)
1102	x_libraries=$ac_optarg ;;	1134	x_libraries=$ac_optarg ;;
1103		1135
1104	-*) as_fn_error "unrecognized option: \`$ac_option'	1136	-*) as_fn_error $? "unrecognized option: \`$ac_option'
1105	Try \`$0 --help' for more information."	1137	Try \`$0 --help' for more information"
1106	;;	1138	;;
1107		1139
1108	=)	1140	=)
@@ -1110,7 +1142,7 @@ Try \`$0 --help' for more information." · 1 unmodified line
1110	# Reject names that are not valid shell variable names.	1142	# Reject names that are not valid shell variable names.
1111	case $ac_envvar in #(	1143	case $ac_envvar in #(
1112	'' \| [0-9]* \| [!_$as_cr_alnum] )	1144	'' \| [0-9]* \| [!_$as_cr_alnum] )
1113	as_fn_error "invalid variable name: \`$ac_envvar'" ;;	1145	as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1114	esac	1146	esac
1115	eval $ac_envvar=\$ac_optarg	1147	eval $ac_envvar=\$ac_optarg
1116	export $ac_envvar ;;	1148	export $ac_envvar ;;
@@ -1120,7 +1152,7 @@ Try \`$0 --help' for more information." · 3 unmodified lines
1120	$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2	1152	$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1121	expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&	1153	expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1122	$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2	1154	$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1123	: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}	1155	: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1124	;;	1156	;;
1125		1157
1126	esac	1158	esac
@@ -1128,13 +1160,13 @@ done · 1 unmodified line
1128		1160
1129	if test -n "$ac_prev"; then	1161	if test -n "$ac_prev"; then
1130	ac_option=--`echo $ac_prev \| sed 's/_/-/g'`	1162	ac_option=--`echo $ac_prev \| sed 's/_/-/g'`
1131	as_fn_error "missing argument to $ac_option"	1163	as_fn_error $? "missing argument to $ac_option"
1132	fi	1164	fi
1133		1165
1134	if test -n "$ac_unrecognized_opts"; then	1166	if test -n "$ac_unrecognized_opts"; then
1135	case $enable_option_checking in	1167	case $enable_option_checking in
1136	no) ;;	1168	no) ;;
1137	fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;	1169	fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1138	*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;	1170	*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1139	esac	1171	esac
1140	fi	1172	fi
@@ -1157,7 +1189,7 @@ do · 16 unmodified lines
1157	[\\/$]* \| ?:[\\/]* ) continue;;	1189	[\\/$]* \| ?:[\\/]* ) continue;;
1158	NONE \| '' ) case $ac_var in *prefix ) continue;; esac;;	1190	NONE \| '' ) case $ac_var in *prefix ) continue;; esac;;
1159	esac	1191	esac
1160	as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"	1192	as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1161	done	1193	done
1162		1194
1163	# There might be people who depend on the old broken behavior: `$host'	1195	# There might be people who depend on the old broken behavior: `$host'
@@ -1171,8 +1203,6 @@ target=$target_alias · 7 unmodified lines
1171	if test "x$host_alias" != x; then	1203	if test "x$host_alias" != x; then
1172	if test "x$build_alias" = x; then	1204	if test "x$build_alias" = x; then
1173	cross_compiling=maybe	1205	cross_compiling=maybe
1174	$as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1175	If a cross compiler is detected then cross compile mode will be used." >&2
1176	elif test "x$build_alias" != "x$host_alias"; then	1206	elif test "x$build_alias" != "x$host_alias"; then
1177	cross_compiling=yes	1207	cross_compiling=yes
1178	fi	1208	fi
@@ -1187,9 +1217,9 @@ test "$silent" = yes && exec 6>/dev/null · 8 unmodified lines
1187	ac_pwd=`pwd` && test -n "$ac_pwd" &&	1217	ac_pwd=`pwd` && test -n "$ac_pwd" &&
1188	ac_ls_di=`ls -di .` &&	1218	ac_ls_di=`ls -di .` &&
1189	ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\|	1219	ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\|
1190	as_fn_error "working directory cannot be determined"	1220	as_fn_error $? "working directory cannot be determined"
1191	test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\|	1221	test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\|
1192	as_fn_error "pwd does not report name of working directory"	1222	as_fn_error $? "pwd does not report name of working directory"
1193		1223
1194		1224
1195	# Find the source files, if location was not specified.	1225	# Find the source files, if location was not specified.
@@ -1228,11 +1258,11 @@ else · 32 unmodified lines
1228	fi	1258	fi
1229	if test ! -r "$srcdir/$ac_unique_file"; then	1259	if test ! -r "$srcdir/$ac_unique_file"; then
1230	test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."	1260	test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1231	as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"	1261	as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1232	fi	1262	fi
1233	ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"	1263	ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1234	ac_abs_confdir=`(	1264	ac_abs_confdir=`(
1235	cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error "$ac_msg"	1265	cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error $? "$ac_msg"
1236	pwd)`	1266	pwd)`
1237	# When building in place, set srcdir=.	1267	# When building in place, set srcdir=.
1238	if test "$ac_abs_confdir" = "$ac_pwd"; then	1268	if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1272,7 +1302,7 @@ Configuration: · 33 unmodified lines
1272	--help=short display options specific to this package	1302	--help=short display options specific to this package
1273	--help=recursive display the short help of all the included packages	1303	--help=recursive display the short help of all the included packages
1274	-V, --version display version information and exit	1304	-V, --version display version information and exit
1275	-q, --quiet, --silent do not print \`checking...' messages	1305	-q, --quiet, --silent do not print \`checking ...' messages
1276	--cache-file=FILE cache test results in FILE [disabled]	1306	--cache-file=FILE cache test results in FILE [disabled]
1277	-C, --config-cache alias for \`--cache-file=config.cache'	1307	-C, --config-cache alias for \`--cache-file=config.cache'
1278	-n, --no-create do not create output files	1308	-n, --no-create do not create output files
@@ -1360,7 +1390,7 @@ Some influential environment variables: · 81 unmodified lines
1360	LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a	1390	LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1361	nonstandard directory <lib dir>	1391	nonstandard directory <lib dir>
1362	LIBS libraries to pass to the linker, e.g. -l<library>	1392	LIBS libraries to pass to the linker, e.g. -l<library>
1363	CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if	1393	CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1364	you have headers in a nonstandard directory <include dir>	1394	you have headers in a nonstandard directory <include dir>
1365	CXX C++ compiler command	1395	CXX C++ compiler command
1366	CXXFLAGS C++ compiler flags	1396	CXXFLAGS C++ compiler flags
@@ -1433,9 +1463,9 @@ test -n "$ac_init_help" && exit $ac_status · 66 unmodified lines
1433	if $ac_init_version; then	1463	if $ac_init_version; then
1434	cat <<\_ACEOF	1464	cat <<\_ACEOF
1435	cpplib configure	1465	cpplib configure
1436	generated by GNU Autoconf 2.64	1466	generated by GNU Autoconf 2.69
1437		1467
1438	Copyright (C) 2009 Free Software Foundation, Inc.	1468	Copyright (C) 2012 Free Software Foundation, Inc.
1439	This configure script is free software; the Free Software Foundation	1469	This configure script is free software; the Free Software Foundation
1440	gives unlimited permission to copy, distribute and modify it.	1470	gives unlimited permission to copy, distribute and modify it.
1441	_ACEOF	1471	_ACEOF
@@ -1479,8 +1509,8 @@ sed 's/^/\| /' conftest.$ac_ext >&5 · 37 unmodified lines
1479		1509
1480	ac_retval=1	1510	ac_retval=1
1481	fi	1511	fi
1482	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1512	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1483	return $ac_retval	1513	as_fn_set_status $ac_retval
1484		1514
1485	} # ac_fn_c_try_compile	1515	} # ac_fn_c_try_compile
1486		1516
@@ -1517,8 +1547,8 @@ sed 's/^/\| /' conftest.$ac_ext >&5 · 30 unmodified lines
1517		1547
1518	ac_retval=1	1548	ac_retval=1
1519	fi	1549	fi
1520	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1550	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1521	return $ac_retval	1551	as_fn_set_status $ac_retval
1522		1552
1523	} # ac_fn_cxx_try_compile	1553	} # ac_fn_cxx_try_compile
1524		1554
@@ -1543,7 +1573,7 @@ $as_echo "$ac_try_echo"; } >&5 · 18 unmodified lines
1543	mv -f conftest.er1 conftest.err	1573	mv -f conftest.er1 conftest.err
1544	fi	1574	fi
1545	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5	1575	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1546	test $ac_status = 0; } >/dev/null && {	1576	test $ac_status = 0; } > conftest.i && {
1547	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|	1577	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
1548	test ! -s conftest.err	1578	test ! -s conftest.err
1549	}; then :	1579	}; then :
@@ -1554,8 +1584,8 @@ sed 's/^/\| /' conftest.$ac_ext >&5 · 4 unmodified lines
1554		1584
1555	ac_retval=1	1585	ac_retval=1
1556	fi	1586	fi
1557	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1587	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1558	return $ac_retval	1588	as_fn_set_status $ac_retval
1559		1589
1560	} # ac_fn_c_try_cpp	1590	} # ac_fn_c_try_cpp
1561		1591
@@ -1567,10 +1597,10 @@ fi · 5 unmodified lines
1567	ac_fn_c_check_header_mongrel ()	1597	ac_fn_c_check_header_mongrel ()
1568	{	1598	{
1569	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	1599	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1570	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1600	if eval \${$3+:} false; then :
1571	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5	1601	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1572	$as_echo_n "checking for $2... " >&6; }	1602	$as_echo_n "checking for $2... " >&6; }
1573	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1603	if eval \${$3+:} false; then :
1574	$as_echo_n "(cached) " >&6	1604	$as_echo_n "(cached) " >&6
1575	fi	1605	fi
1576	eval ac_res=\$$3	1606	eval ac_res=\$$3
@@ -1606,7 +1636,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : · 29 unmodified lines
1606	else	1636	else
1607	ac_header_preproc=no	1637	ac_header_preproc=no
1608	fi	1638	fi
1609	rm -f conftest.err conftest.$ac_ext	1639	rm -f conftest.err conftest.i conftest.$ac_ext
1610	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5	1640	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1611	$as_echo "$ac_header_preproc" >&6; }	1641	$as_echo "$ac_header_preproc" >&6; }
1612		1642
@@ -1629,17 +1659,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} · 16 unmodified lines
1629	$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}	1659	$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1630	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5	1660	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1631	$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}	1661	$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1632	( cat <<\_ASBOX	1662	( $as_echo "## ----------------------------------- ##
1633	## ----------------------------------- ##
1634	## Report this to gcc-bugs@gcc.gnu.org ##	1663	## Report this to gcc-bugs@gcc.gnu.org ##
1635	## ----------------------------------- ##	1664	## ----------------------------------- ##"
1636	_ASBOX
1637	) \| sed "s/^/$as_me: WARNING: /" >&2	1665	) \| sed "s/^/$as_me: WARNING: /" >&2
1638	;;	1666	;;
1639	esac	1667	esac
1640	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5	1668	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1641	$as_echo_n "checking for $2... " >&6; }	1669	$as_echo_n "checking for $2... " >&6; }
1642	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1670	if eval \${$3+:} false; then :
1643	$as_echo_n "(cached) " >&6	1671	$as_echo_n "(cached) " >&6
1644	else	1672	else
1645	eval "$3=\$ac_header_compiler"	1673	eval "$3=\$ac_header_compiler"
@@ -1648,7 +1676,7 @@ eval ac_res=\$$3 · 2 unmodified lines
1648	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	1676	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1649	$as_echo "$ac_res" >&6; }	1677	$as_echo "$ac_res" >&6; }
1650	fi	1678	fi
1651	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1679	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1652		1680
1653	} # ac_fn_c_check_header_mongrel	1681	} # ac_fn_c_check_header_mongrel
1654		1682
@@ -1689,8 +1717,8 @@ sed 's/^/\| /' conftest.$ac_ext >&5 · 34 unmodified lines
1689	ac_retval=$ac_status	1717	ac_retval=$ac_status
1690	fi	1718	fi
1691	rm -rf conftest.dSYM conftest_ipa8_conftest.oo	1719	rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1692	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1720	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1693	return $ac_retval	1721	as_fn_set_status $ac_retval
1694		1722
1695	} # ac_fn_c_try_run	1723	} # ac_fn_c_try_run
1696		1724
@@ -1703,7 +1731,7 @@ ac_fn_c_check_header_compile () · 6 unmodified lines
1703	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	1731	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1704	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5	1732	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1705	$as_echo_n "checking for $2... " >&6; }	1733	$as_echo_n "checking for $2... " >&6; }
1706	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1734	if eval \${$3+:} false; then :
1707	$as_echo_n "(cached) " >&6	1735	$as_echo_n "(cached) " >&6
1708	else	1736	else
1709	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	1737	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1721,7 +1749,7 @@ fi · 11 unmodified lines
1721	eval ac_res=\$$3	1749	eval ac_res=\$$3
1722	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	1750	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1723	$as_echo "$ac_res" >&6; }	1751	$as_echo "$ac_res" >&6; }
1724	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1752	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1725		1753
1726	} # ac_fn_c_check_header_compile	1754	} # ac_fn_c_check_header_compile
1727		1755
@@ -1752,7 +1780,7 @@ $as_echo "$ac_try_echo"; } >&5 · 24 unmodified lines
1752	test ! -s conftest.err	1780	test ! -s conftest.err
1753	} && test -s conftest$ac_exeext && {	1781	} && test -s conftest$ac_exeext && {
1754	test "$cross_compiling" = yes \|\|	1782	test "$cross_compiling" = yes \|\|
1755	$as_test_x conftest$ac_exeext	1783	test -x conftest$ac_exeext
1756	}; then :	1784	}; then :
1757	ac_retval=0	1785	ac_retval=0
1758	else	1786	else
@@ -1766,8 +1794,8 @@ fi · 7 unmodified lines
1766	# interfere with the next link command; also delete a directory that is	1794	# interfere with the next link command; also delete a directory that is
1767	# left behind by Apple's compiler. We do this before executing the actions.	1795	# left behind by Apple's compiler. We do this before executing the actions.
1768	rm -rf conftest.dSYM conftest_ipa8_conftest.oo	1796	rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1769	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1797	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1770	return $ac_retval	1798	as_fn_set_status $ac_retval
1771		1799
1772	} # ac_fn_c_try_link	1800	} # ac_fn_c_try_link
1773		1801
@@ -1780,7 +1808,7 @@ ac_fn_c_check_type () · 6 unmodified lines
1780	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	1808	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1781	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5	1809	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1782	$as_echo_n "checking for $2... " >&6; }	1810	$as_echo_n "checking for $2... " >&6; }
1783	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1811	if eval \${$3+:} false; then :
1784	$as_echo_n "(cached) " >&6	1812	$as_echo_n "(cached) " >&6
1785	else	1813	else
1786	eval "$3=no"	1814	eval "$3=no"
@@ -1821,7 +1849,7 @@ fi · 34 unmodified lines
1821	eval ac_res=\$$3	1849	eval ac_res=\$$3
1822	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	1850	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1823	$as_echo "$ac_res" >&6; }	1851	$as_echo "$ac_res" >&6; }
1824	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1852	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1825		1853
1826	} # ac_fn_c_check_type	1854	} # ac_fn_c_check_type
1827		1855
@@ -1834,10 +1862,12 @@ ac_fn_c_find_uintX_t () · 6 unmodified lines
1834	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	1862	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1835	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5	1863	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
1836	$as_echo_n "checking for uint$2_t... " >&6; }	1864	$as_echo_n "checking for uint$2_t... " >&6; }
1837	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	1865	if eval \${$3+:} false; then :
1838	$as_echo_n "(cached) " >&6	1866	$as_echo_n "(cached) " >&6
1839	else	1867	else
1840	eval "$3=no"	1868	eval "$3=no"
		1869	# Order is important - never check a type that is potentially smaller
		1870	# than half of the expected target width.
1841	for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \	1871	for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
1842	'unsigned long long int' 'unsigned short int' 'unsigned char'; do	1872	'unsigned long long int' 'unsigned short int' 'unsigned char'; do
1843	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	1873	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1846,8 +1876,9 @@ $ac_includes_default · 2 unmodified lines
1846	int	1876	int
1847	main ()	1877	main ()
1848	{	1878	{
1849	static int test_array [1 - 2 * !(($ac_type) -1 >> ($2 - 1) == 1)];	1879	static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
1850	test_array [0] = 0	1880	test_array [0] = 0;
		1881	return test_array [0];
1851		1882
1852	;	1883	;
1853	return 0;	1884	return 0;
@@ -1862,8 +1893,7 @@ if ac_fn_c_try_compile "$LINENO"; then : · 8 unmodified lines
1862	esac	1893	esac
1863	fi	1894	fi
1864	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext	1895	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1865	eval as_val=\$$3	1896	if eval test \"x\$"$3"\" = x"no"; then :
1866	if test "x$as_val" = x""no; then :
1867		1897
1868	else	1898	else
1869	break	1899	break
@@ -1873,7 +1903,7 @@ fi · 3 unmodified lines
1873	eval ac_res=\$$3	1903	eval ac_res=\$$3
1874	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	1904	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1875	$as_echo "$ac_res" >&6; }	1905	$as_echo "$ac_res" >&6; }
1876	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	1906	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1877		1907
1878	} # ac_fn_c_find_uintX_t	1908	} # ac_fn_c_find_uintX_t
1879		1909
@@ -1894,7 +1924,8 @@ int · 14 unmodified lines
1894	main ()	1924	main ()
1895	{	1925	{
1896	static int test_array [1 - 2 * !(($2) >= 0)];	1926	static int test_array [1 - 2 * !(($2) >= 0)];
1897	test_array [0] = 0	1927	test_array [0] = 0;
		1928	return test_array [0];
1898		1929
1899	;	1930	;
1900	return 0;	1931	return 0;
@@ -1910,7 +1941,8 @@ int · 9 unmodified lines
1910	main ()	1941	main ()
1911	{	1942	{
1912	static int test_array [1 - 2 * !(($2) <= $ac_mid)];	1943	static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1913	test_array [0] = 0	1944	test_array [0] = 0;
		1945	return test_array [0];
1914		1946
1915	;	1947	;
1916	return 0;	1948	return 0;
@@ -1936,7 +1968,8 @@ int · 19 unmodified lines
1936	main ()	1968	main ()
1937	{	1969	{
1938	static int test_array [1 - 2 * !(($2) < 0)];	1970	static int test_array [1 - 2 * !(($2) < 0)];
1939	test_array [0] = 0	1971	test_array [0] = 0;
		1972	return test_array [0];
1940		1973
1941	;	1974	;
1942	return 0;	1975	return 0;
@@ -1952,7 +1985,8 @@ int · 9 unmodified lines
1952	main ()	1985	main ()
1953	{	1986	{
1954	static int test_array [1 - 2 * !(($2) >= $ac_mid)];	1987	static int test_array [1 - 2 * !(($2) >= $ac_mid)];
1955	test_array [0] = 0	1988	test_array [0] = 0;
		1989	return test_array [0];
1956		1990
1957	;	1991	;
1958	return 0;	1992	return 0;
@@ -1986,7 +2020,8 @@ int · 27 unmodified lines
1986	main ()	2020	main ()
1987	{	2021	{
1988	static int test_array [1 - 2 * !(($2) <= $ac_mid)];	2022	static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1989	test_array [0] = 0	2023	test_array [0] = 0;
		2024	return test_array [0];
1990		2025
1991	;	2026	;
1992	return 0;	2027	return 0;
@@ -2050,8 +2085,8 @@ rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ · 57 unmodified lines
2050	rm -f conftest.val	2085	rm -f conftest.val
2051		2086
2052	fi	2087	fi
2053	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	2088	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2054	return $ac_retval	2089	as_fn_set_status $ac_retval
2055		2090
2056	} # ac_fn_c_compute_int	2091	} # ac_fn_c_compute_int
2057		2092
@@ -2063,7 +2098,7 @@ ac_fn_c_check_func () · 5 unmodified lines
2063	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	2098	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2064	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5	2099	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2065	$as_echo_n "checking for $2... " >&6; }	2100	$as_echo_n "checking for $2... " >&6; }
2066	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	2101	if eval \${$3+:} false; then :
2067	$as_echo_n "(cached) " >&6	2102	$as_echo_n "(cached) " >&6
2068	else	2103	else
2069	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	2104	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2118,13 +2153,14 @@ fi · 48 unmodified lines
2118	eval ac_res=\$$3	2153	eval ac_res=\$$3
2119	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	2154	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2120	$as_echo "$ac_res" >&6; }	2155	$as_echo "$ac_res" >&6; }
2121	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	2156	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2122		2157
2123	} # ac_fn_c_check_func	2158	} # ac_fn_c_check_func
2124		2159
2125	# ac_fn_c_check_decl LINENO SYMBOL VAR	2160	# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
2126	# ------------------------------------	2161	# ---------------------------------------------
2127	# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.	2162	# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
		2163	# accordingly.
2128	ac_fn_c_check_decl ()	2164	ac_fn_c_check_decl ()
2129	{	2165	{
2130	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	2166	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -2132,7 +2168,7 @@ ac_fn_c_check_decl () · 1 unmodified line
2132	as_decl_use=`echo $2\|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`	2168	as_decl_use=`echo $2\|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
2133	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5	2169	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
2134	$as_echo_n "checking whether $as_decl_name is declared... " >&6; }	2170	$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
2135	if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :	2171	if eval \${$3+:} false; then :
2136	$as_echo_n "(cached) " >&6	2172	$as_echo_n "(cached) " >&6
2137	else	2173	else
2138	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	2174	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2163,7 +2199,7 @@ fi · 24 unmodified lines
2163	eval ac_res=\$$3	2199	eval ac_res=\$$3
2164	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5	2200	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2165	$as_echo "$ac_res" >&6; }	2201	$as_echo "$ac_res" >&6; }
2166	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	2202	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2167		2203
2168	} # ac_fn_c_check_decl	2204	} # ac_fn_c_check_decl
2169		2205
@@ -2194,7 +2230,7 @@ $as_echo "$ac_try_echo"; } >&5 · 24 unmodified lines
2194	test ! -s conftest.err	2230	test ! -s conftest.err
2195	} && test -s conftest$ac_exeext && {	2231	} && test -s conftest$ac_exeext && {
2196	test "$cross_compiling" = yes \|\|	2232	test "$cross_compiling" = yes \|\|
2197	$as_test_x conftest$ac_exeext	2233	test -x conftest$ac_exeext
2198	}; then :	2234	}; then :
2199	ac_retval=0	2235	ac_retval=0
2200	else	2236	else
@@ -2208,8 +2244,8 @@ fi · 7 unmodified lines
2208	# interfere with the next link command; also delete a directory that is	2244	# interfere with the next link command; also delete a directory that is
2209	# left behind by Apple's compiler. We do this before executing the actions.	2245	# left behind by Apple's compiler. We do this before executing the actions.
2210	rm -rf conftest.dSYM conftest_ipa8_conftest.oo	2246	rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2211	eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}	2247	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2212	return $ac_retval	2248	as_fn_set_status $ac_retval
2213		2249
2214	} # ac_fn_cxx_try_link	2250	} # ac_fn_cxx_try_link
2215	cat >config.log <<_ACEOF	2251	cat >config.log <<_ACEOF
@@ -2217,7 +2253,7 @@ This file contains any messages produced by compilers while · 1 unmodified line
2217	running configure, to aid debugging if configure makes a mistake.	2253	running configure, to aid debugging if configure makes a mistake.
2218		2254
2219	It was created by cpplib $as_me , which was	2255	It was created by cpplib $as_me , which was
2220	generated by GNU Autoconf 2.64. Invocation command line was	2256	generated by GNU Autoconf 2.69. Invocation command line was
2221		2257
2222	$ $0 $@	2258	$ $0 $@
2223		2259
@@ -2327,11 +2363,9 @@ trap 'exit_status=$? · 103 unmodified lines
2327	{	2363	{
2328	echo	2364	echo
2329		2365
2330	cat <<\_ASBOX	2366	$as_echo "## ---------------- ##
2331	## ---------------- ##
2332	## Cache variables. ##	2367	## Cache variables. ##
2333	## ---------------- ##	2368	## ---------------- ##"
2334	_ASBOX
2335	echo	2369	echo
2336	# The following way of writing the cache mishandles newlines in values,	2370	# The following way of writing the cache mishandles newlines in values,
2337	(	2371	(
@@ -2365,11 +2399,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; · 27 unmodified lines
2365	)	2399	)
2366	echo	2400	echo
2367		2401
2368	cat <<\_ASBOX	2402	$as_echo "## ----------------- ##
2369	## ----------------- ##
2370	## Output variables. ##	2403	## Output variables. ##
2371	## ----------------- ##	2404	## ----------------- ##"
2372	_ASBOX
2373	echo	2405	echo
2374	for ac_var in $ac_subst_vars	2406	for ac_var in $ac_subst_vars
2375	do	2407	do
@@ -2382,11 +2414,9 @@ _ASBOX · 6 unmodified lines
2382	echo	2414	echo
2383		2415
2384	if test -n "$ac_subst_files"; then	2416	if test -n "$ac_subst_files"; then
2385	cat <<\_ASBOX	2417	$as_echo "## ------------------- ##
2386	## ------------------- ##
2387	## File substitutions. ##	2418	## File substitutions. ##
2388	## ------------------- ##	2419	## ------------------- ##"
2389	_ASBOX
2390	echo	2420	echo
2391	for ac_var in $ac_subst_files	2421	for ac_var in $ac_subst_files
2392	do	2422	do
@@ -2400,11 +2430,9 @@ _ASBOX · 7 unmodified lines
2400	fi	2430	fi
2401		2431
2402	if test -s confdefs.h; then	2432	if test -s confdefs.h; then
2403	cat <<\_ASBOX	2433	$as_echo "## ----------- ##
2404	## ----------- ##
2405	## confdefs.h. ##	2434	## confdefs.h. ##
2406	## ----------- ##	2435	## ----------- ##"
2407	_ASBOX
2408	echo	2436	echo
2409	cat confdefs.h	2437	cat confdefs.h
2410	echo	2438	echo
@@ -2459,7 +2487,12 @@ _ACEOF · 48 unmodified lines
2459	ac_site_file1=NONE	2487	ac_site_file1=NONE
2460	ac_site_file2=NONE	2488	ac_site_file2=NONE
2461	if test -n "$CONFIG_SITE"; then	2489	if test -n "$CONFIG_SITE"; then
2462	ac_site_file1=$CONFIG_SITE	2490	# We do not want a PATH search for config.site.
		2491	case $CONFIG_SITE in #((
		2492	-*) ac_site_file1=./$CONFIG_SITE;;
		2493	/) ac_site_file1=$CONFIG_SITE;;
		2494	*) ac_site_file1=./$CONFIG_SITE;;
		2495	esac
2463	elif test "x$prefix" != xNONE; then	2496	elif test "x$prefix" != xNONE; then
2464	ac_site_file1=$prefix/share/config.site	2497	ac_site_file1=$prefix/share/config.site
2465	ac_site_file2=$prefix/etc/config.site	2498	ac_site_file2=$prefix/etc/config.site
@@ -2470,18 +2503,22 @@ fi · 4 unmodified lines
2470	for ac_site_file in "$ac_site_file1" "$ac_site_file2"	2503	for ac_site_file in "$ac_site_file1" "$ac_site_file2"
2471	do	2504	do
2472	test "x$ac_site_file" = xNONE && continue	2505	test "x$ac_site_file" = xNONE && continue
2473	if test -r "$ac_site_file"; then	2506	if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
2474	{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5	2507	{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2475	$as_echo "$as_me: loading site script $ac_site_file" >&6;}	2508	$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2476	sed 's/^/\| /' "$ac_site_file" >&5	2509	sed 's/^/\| /' "$ac_site_file" >&5
2477	. "$ac_site_file"	2510	. "$ac_site_file" \
		2511	\|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
		2512	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
		2513	as_fn_error $? "failed to load site script $ac_site_file
		2514	See \`config.log' for more details" "$LINENO" 5; }
2478	fi	2515	fi
2479	done	2516	done
2480		2517
2481	if test -r "$cache_file"; then	2518	if test -r "$cache_file"; then
2482	# Some versions of bash will fail to source /dev/null (special	2519	# Some versions of bash will fail to source /dev/null (special files
2483	# files actually), so we avoid doing that.	2520	# actually), so we avoid doing that. DJGPP emulates it as a regular file.
2484	if test -f "$cache_file"; then	2521	if test /dev/null != "$cache_file" && test -f "$cache_file"; then
2485	{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5	2522	{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
2486	$as_echo "$as_me: loading cache $cache_file" >&6;}	2523	$as_echo "$as_me: loading cache $cache_file" >&6;}
2487	case $cache_file in	2524	case $cache_file in
@@ -2550,7 +2587,7 @@ if $ac_cache_corrupted; then · 62 unmodified lines
2550	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	2587	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2551	{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5	2588	{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2552	$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}	2589	$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2553	as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5	2590	as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2554	fi	2591	fi
2555	## -------------------- ##	2592	## -------------------- ##
2556	## Main body of script. ##	2593	## Main body of script. ##
@@ -2565,21 +2602,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu · 8 unmodified lines
2565		2602
2566		2603
2567		2604
2568
2569
2570
2571	ac_aux_dir=	2605	ac_aux_dir=
2572	for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do	2606	for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2573	for ac_t in install-sh install.sh shtool; do	2607	if test -f "$ac_dir/install-sh"; then
2574	if test -f "$ac_dir/$ac_t"; then	2608	ac_aux_dir=$ac_dir
2575	ac_aux_dir=$ac_dir	2609	ac_install_sh="$ac_aux_dir/install-sh -c"
2576	ac_install_sh="$ac_aux_dir/$ac_t -c"	2610	break
2577	break 2	2611	elif test -f "$ac_dir/install.sh"; then
2578	fi	2612	ac_aux_dir=$ac_dir
2579	done	2613	ac_install_sh="$ac_aux_dir/install.sh -c"
		2614	break
		2615	elif test -f "$ac_dir/shtool"; then
		2616	ac_aux_dir=$ac_dir
		2617	ac_install_sh="$ac_aux_dir/shtool install -c"
		2618	break
		2619	fi
2580	done	2620	done
2581	if test -z "$ac_aux_dir"; then	2621	if test -z "$ac_aux_dir"; then
2582	as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5	2622	as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2583	fi	2623	fi
2584		2624
2585	# These three variables are undocumented and unsupported,	2625	# These three variables are undocumented and unsupported,
@@ -2593,27 +2633,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. · 7 unmodified lines
2593		2633
2594	# Make sure we can run config.sub.	2634	# Make sure we can run config.sub.
2595	$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\|	2635	$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\|
2596	as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5	2636	as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
2597		2637
2598	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5	2638	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
2599	$as_echo_n "checking build system type... " >&6; }	2639	$as_echo_n "checking build system type... " >&6; }
2600	if test "${ac_cv_build+set}" = set; then :	2640	if ${ac_cv_build+:} false; then :
2601	$as_echo_n "(cached) " >&6	2641	$as_echo_n "(cached) " >&6
2602	else	2642	else
2603	ac_build_alias=$build_alias	2643	ac_build_alias=$build_alias
2604	test "x$ac_build_alias" = x &&	2644	test "x$ac_build_alias" = x &&
2605	ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`	2645	ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
2606	test "x$ac_build_alias" = x &&	2646	test "x$ac_build_alias" = x &&
2607	as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5	2647	as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
2608	ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\|	2648	ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\|
2609	as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5	2649	as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
2610		2650
2611	fi	2651	fi
2612	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5	2652	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
2613	$as_echo "$ac_cv_build" >&6; }	2653	$as_echo "$ac_cv_build" >&6; }
2614	case $ac_cv_build in	2654	case $ac_cv_build in
2615	--*) ;;	2655	--*) ;;
2616	*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;	2656	*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
2617	esac	2657	esac
2618	build=$ac_cv_build	2658	build=$ac_cv_build
2619	ac_save_IFS=$IFS; IFS='-'	2659	ac_save_IFS=$IFS; IFS='-'
@@ -2631,14 +2671,14 @@ case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac · 11 unmodified lines
2631		2671
2632	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5	2672	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
2633	$as_echo_n "checking host system type... " >&6; }	2673	$as_echo_n "checking host system type... " >&6; }
2634	if test "${ac_cv_host+set}" = set; then :	2674	if ${ac_cv_host+:} false; then :
2635	$as_echo_n "(cached) " >&6	2675	$as_echo_n "(cached) " >&6
2636	else	2676	else
2637	if test "x$host_alias" = x; then	2677	if test "x$host_alias" = x; then
2638	ac_cv_host=$ac_cv_build	2678	ac_cv_host=$ac_cv_build
2639	else	2679	else
2640	ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\|	2680	ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\|
2641	as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5	2681	as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
2642	fi	2682	fi
2643		2683
2644	fi	2684	fi
@@ -2646,7 +2686,7 @@ fi · 1 unmodified line
2646	$as_echo "$ac_cv_host" >&6; }	2686	$as_echo "$ac_cv_host" >&6; }
2647	case $ac_cv_host in	2687	case $ac_cv_host in
2648	--*) ;;	2688	--*) ;;
2649	*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;	2689	*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
2650	esac	2690	esac
2651	host=$ac_cv_host	2691	host=$ac_cv_host
2652	ac_save_IFS=$IFS; IFS='-'	2692	ac_save_IFS=$IFS; IFS='-'
@@ -2664,14 +2704,14 @@ case $host_os in \ ) host_os=`echo "$host_os" \| sed 's/ /-/g'`;; esac · 11 unmodified lines
2664		2704
2665	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5	2705	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
2666	$as_echo_n "checking target system type... " >&6; }	2706	$as_echo_n "checking target system type... " >&6; }
2667	if test "${ac_cv_target+set}" = set; then :	2707	if ${ac_cv_target+:} false; then :
2668	$as_echo_n "(cached) " >&6	2708	$as_echo_n "(cached) " >&6
2669	else	2709	else
2670	if test "x$target_alias" = x; then	2710	if test "x$target_alias" = x; then
2671	ac_cv_target=$ac_cv_host	2711	ac_cv_target=$ac_cv_host
2672	else	2712	else
2673	ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` \|\|	2713	ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` \|\|
2674	as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5	2714	as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
2675	fi	2715	fi
2676		2716
2677	fi	2717	fi
@@ -2679,7 +2719,7 @@ fi · 1 unmodified line
2679	$as_echo "$ac_cv_target" >&6; }	2719	$as_echo "$ac_cv_target" >&6; }
2680	case $ac_cv_target in	2720	case $ac_cv_target in
2681	--*) ;;	2721	--*) ;;
2682	*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;	2722	*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
2683	esac	2723	esac
2684	target=$ac_cv_target	2724	target=$ac_cv_target
2685	ac_save_IFS=$IFS; IFS='-'	2725	ac_save_IFS=$IFS; IFS='-'
@@ -2708,7 +2748,7 @@ test -n "$target_alias" && · 22 unmodified lines
2708	$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }	2748	$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2709	set x ${MAKE-make}	2749	set x ${MAKE-make}
2710	ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`	2750	ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2711	if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :	2751	if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
2712	$as_echo_n "(cached) " >&6	2752	$as_echo_n "(cached) " >&6
2713	else	2753	else
2714	cat >conftest.make <<\_ACEOF	2754	cat >conftest.make <<\_ACEOF
@@ -2716,7 +2756,7 @@ SHELL = /bin/sh · 1 unmodified line
2716	all:	2756	all:
2717	@echo '@@@%%%=$(MAKE)=@@@%%%'	2757	@echo '@@@%%%=$(MAKE)=@@@%%%'
2718	_ACEOF	2758	_ACEOF
2719	# GNU make sometimes prints "make[1]: Entering...", which would confuse us.	2759	# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
2720	case `${MAKE-make} -f conftest.make 2>/dev/null` in	2760	case `${MAKE-make} -f conftest.make 2>/dev/null` in
2721	@@@%%%=?=@@@%%%*)	2761	@@@%%%=?=@@@%%%*)
2722	eval ac_cv_prog_make_${ac_make}_set=yes;;	2762	eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2752,7 +2792,7 @@ fi · 29 unmodified lines
2752	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5	2792	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2753	$as_echo_n "checking for a BSD-compatible install... " >&6; }	2793	$as_echo_n "checking for a BSD-compatible install... " >&6; }
2754	if test -z "$INSTALL"; then	2794	if test -z "$INSTALL"; then
2755	if test "${ac_cv_path_install+set}" = set; then :	2795	if ${ac_cv_path_install+:} false; then :
2756	$as_echo_n "(cached) " >&6	2796	$as_echo_n "(cached) " >&6
2757	else	2797	else
2758	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	2798	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2772,7 +2812,7 @@ case $as_dir/ in #(( · 13 unmodified lines
2772	# by default.	2812	# by default.
2773	for ac_prog in ginstall scoinst install; do	2813	for ac_prog in ginstall scoinst install; do
2774	for ac_exec_ext in '' $ac_executable_extensions; do	2814	for ac_exec_ext in '' $ac_executable_extensions; do
2775	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then	2815	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2776	if test $ac_prog = install &&	2816	if test $ac_prog = install &&
2777	grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then	2817	grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2778	# AIX install. It has an incompatible calling convention.	2818	# AIX install. It has an incompatible calling convention.
@@ -2838,7 +2878,7 @@ if test -n "$ac_tool_prefix"; then · 59 unmodified lines
2838	set dummy ${ac_tool_prefix}gcc; ac_word=$2	2878	set dummy ${ac_tool_prefix}gcc; ac_word=$2
2839	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	2879	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2840	$as_echo_n "checking for $ac_word... " >&6; }	2880	$as_echo_n "checking for $ac_word... " >&6; }
2841	if test "${ac_cv_prog_CC+set}" = set; then :	2881	if ${ac_cv_prog_CC+:} false; then :
2842	$as_echo_n "(cached) " >&6	2882	$as_echo_n "(cached) " >&6
2843	else	2883	else
2844	if test -n "$CC"; then	2884	if test -n "$CC"; then
@@ -2850,7 +2890,7 @@ do · 5 unmodified lines
2850	IFS=$as_save_IFS	2890	IFS=$as_save_IFS
2851	test -z "$as_dir" && as_dir=.	2891	test -z "$as_dir" && as_dir=.
2852	for ac_exec_ext in '' $ac_executable_extensions; do	2892	for ac_exec_ext in '' $ac_executable_extensions; do
2853	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	2893	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2854	ac_cv_prog_CC="${ac_tool_prefix}gcc"	2894	ac_cv_prog_CC="${ac_tool_prefix}gcc"
2855	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	2895	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2856	break 2	2896	break 2
@@ -2878,7 +2918,7 @@ if test -z "$ac_cv_prog_CC"; then · 21 unmodified lines
2878	set dummy gcc; ac_word=$2	2918	set dummy gcc; ac_word=$2
2879	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	2919	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2880	$as_echo_n "checking for $ac_word... " >&6; }	2920	$as_echo_n "checking for $ac_word... " >&6; }
2881	if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :	2921	if ${ac_cv_prog_ac_ct_CC+:} false; then :
2882	$as_echo_n "(cached) " >&6	2922	$as_echo_n "(cached) " >&6
2883	else	2923	else
2884	if test -n "$ac_ct_CC"; then	2924	if test -n "$ac_ct_CC"; then
@@ -2890,7 +2930,7 @@ do · 5 unmodified lines
2890	IFS=$as_save_IFS	2930	IFS=$as_save_IFS
2891	test -z "$as_dir" && as_dir=.	2931	test -z "$as_dir" && as_dir=.
2892	for ac_exec_ext in '' $ac_executable_extensions; do	2932	for ac_exec_ext in '' $ac_executable_extensions; do
2893	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	2933	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2894	ac_cv_prog_ac_ct_CC="gcc"	2934	ac_cv_prog_ac_ct_CC="gcc"
2895	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	2935	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2896	break 2	2936	break 2
@@ -2931,7 +2971,7 @@ if test -z "$CC"; then · 34 unmodified lines
2931	set dummy ${ac_tool_prefix}cc; ac_word=$2	2971	set dummy ${ac_tool_prefix}cc; ac_word=$2
2932	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	2972	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2933	$as_echo_n "checking for $ac_word... " >&6; }	2973	$as_echo_n "checking for $ac_word... " >&6; }
2934	if test "${ac_cv_prog_CC+set}" = set; then :	2974	if ${ac_cv_prog_CC+:} false; then :
2935	$as_echo_n "(cached) " >&6	2975	$as_echo_n "(cached) " >&6
2936	else	2976	else
2937	if test -n "$CC"; then	2977	if test -n "$CC"; then
@@ -2943,7 +2983,7 @@ do · 5 unmodified lines
2943	IFS=$as_save_IFS	2983	IFS=$as_save_IFS
2944	test -z "$as_dir" && as_dir=.	2984	test -z "$as_dir" && as_dir=.
2945	for ac_exec_ext in '' $ac_executable_extensions; do	2985	for ac_exec_ext in '' $ac_executable_extensions; do
2946	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	2986	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2947	ac_cv_prog_CC="${ac_tool_prefix}cc"	2987	ac_cv_prog_CC="${ac_tool_prefix}cc"
2948	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	2988	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2949	break 2	2989	break 2
@@ -2971,7 +3011,7 @@ if test -z "$CC"; then · 21 unmodified lines
2971	set dummy cc; ac_word=$2	3011	set dummy cc; ac_word=$2
2972	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3012	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2973	$as_echo_n "checking for $ac_word... " >&6; }	3013	$as_echo_n "checking for $ac_word... " >&6; }
2974	if test "${ac_cv_prog_CC+set}" = set; then :	3014	if ${ac_cv_prog_CC+:} false; then :
2975	$as_echo_n "(cached) " >&6	3015	$as_echo_n "(cached) " >&6
2976	else	3016	else
2977	if test -n "$CC"; then	3017	if test -n "$CC"; then
@@ -2984,7 +3024,7 @@ do · 6 unmodified lines
2984	IFS=$as_save_IFS	3024	IFS=$as_save_IFS
2985	test -z "$as_dir" && as_dir=.	3025	test -z "$as_dir" && as_dir=.
2986	for ac_exec_ext in '' $ac_executable_extensions; do	3026	for ac_exec_ext in '' $ac_executable_extensions; do
2987	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3027	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2988	if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then	3028	if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2989	ac_prog_rejected=yes	3029	ac_prog_rejected=yes
2990	continue	3030	continue
@@ -3030,7 +3070,7 @@ if test -z "$CC"; then · 39 unmodified lines
3030	set dummy $ac_tool_prefix$ac_prog; ac_word=$2	3070	set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3031	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3071	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3032	$as_echo_n "checking for $ac_word... " >&6; }	3072	$as_echo_n "checking for $ac_word... " >&6; }
3033	if test "${ac_cv_prog_CC+set}" = set; then :	3073	if ${ac_cv_prog_CC+:} false; then :
3034	$as_echo_n "(cached) " >&6	3074	$as_echo_n "(cached) " >&6
3035	else	3075	else
3036	if test -n "$CC"; then	3076	if test -n "$CC"; then
@@ -3042,7 +3082,7 @@ do · 5 unmodified lines
3042	IFS=$as_save_IFS	3082	IFS=$as_save_IFS
3043	test -z "$as_dir" && as_dir=.	3083	test -z "$as_dir" && as_dir=.
3044	for ac_exec_ext in '' $ac_executable_extensions; do	3084	for ac_exec_ext in '' $ac_executable_extensions; do
3045	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3085	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3046	ac_cv_prog_CC="$ac_tool_prefix$ac_prog"	3086	ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3047	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3087	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3048	break 2	3088	break 2
@@ -3074,7 +3114,7 @@ do · 25 unmodified lines
3074	set dummy $ac_prog; ac_word=$2	3114	set dummy $ac_prog; ac_word=$2
3075	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3115	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3076	$as_echo_n "checking for $ac_word... " >&6; }	3116	$as_echo_n "checking for $ac_word... " >&6; }
3077	if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :	3117	if ${ac_cv_prog_ac_ct_CC+:} false; then :
3078	$as_echo_n "(cached) " >&6	3118	$as_echo_n "(cached) " >&6
3079	else	3119	else
3080	if test -n "$ac_ct_CC"; then	3120	if test -n "$ac_ct_CC"; then
@@ -3086,7 +3126,7 @@ do · 5 unmodified lines
3086	IFS=$as_save_IFS	3126	IFS=$as_save_IFS
3087	test -z "$as_dir" && as_dir=.	3127	test -z "$as_dir" && as_dir=.
3088	for ac_exec_ext in '' $ac_executable_extensions; do	3128	for ac_exec_ext in '' $ac_executable_extensions; do
3089	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3129	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3090	ac_cv_prog_ac_ct_CC="$ac_prog"	3130	ac_cv_prog_ac_ct_CC="$ac_prog"
3091	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3131	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3092	break 2	3132	break 2
@@ -3128,8 +3168,8 @@ fi · 35 unmodified lines
3128		3168
3129	test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	3169	test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3130	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	3170	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3131	as_fn_error "no acceptable C compiler found in \$PATH	3171	as_fn_error $? "no acceptable C compiler found in \$PATH
3132	See \`config.log' for more details." "$LINENO" 5; }	3172	See \`config.log' for more details" "$LINENO" 5; }
3133		3173
3134	# Provide some information about the compiler.	3174	# Provide some information about the compiler.
3135	$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5	3175	$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3150,8 +3190,8 @@ $as_echo "$ac_try_echo"; } >&5 · 14 unmodified lines
3150	... rest of stderr output deleted ...	3190	... rest of stderr output deleted ...
3151	10q' conftest.err >conftest.er1	3191	10q' conftest.err >conftest.er1
3152	cat conftest.er1 >&5	3192	cat conftest.er1 >&5
3153	rm -f conftest.er1 conftest.err
3154	fi	3193	fi
		3194	rm -f conftest.er1 conftest.err
3155	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5	3195	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3156	test $ac_status = 0; }	3196	test $ac_status = 0; }
3157	done	3197	done
@@ -3168,12 +3208,12 @@ main () · 10 unmodified lines
3168	}	3208	}
3169	_ACEOF	3209	_ACEOF
3170	ac_clean_files_save=$ac_clean_files	3210	ac_clean_files_save=$ac_clean_files
3171	ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"	3211	ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
3172	# Try to create an executable without -o first, disregard a.out.	3212	# Try to create an executable without -o first, disregard a.out.
3173	# It will help us diagnose broken compilers, and finding out an intuition	3213	# It will help us diagnose broken compilers, and finding out an intuition
3174	# of exeext.	3214	# of exeext.
3175	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5	3215	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
3176	$as_echo_n "checking for C compiler default output file name... " >&6; }	3216	$as_echo_n "checking whether the C compiler works... " >&6; }
3177	ac_link_default=`$as_echo "$ac_link" \| sed 's/ -o conftest[^ ]//'`	3217	ac_link_default=`$as_echo "$ac_link" \| sed 's/ -o conftest[^ ]//'`
3178		3218
3179	# The possible output files:	3219	# The possible output files:
@@ -3235,62 +3275,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= · 55 unmodified lines
3235	else	3275	else
3236	ac_file=''	3276	ac_file=''
3237	fi	3277	fi
3238	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
3239	$as_echo "$ac_file" >&6; }
3240	if test -z "$ac_file"; then :	3278	if test -z "$ac_file"; then :
3241	$as_echo "$as_me: failed program was:" >&5	3279	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		3280	$as_echo "no" >&6; }
		3281	$as_echo "$as_me: failed program was:" >&5
3242	sed 's/^/\| /' conftest.$ac_ext >&5	3282	sed 's/^/\| /' conftest.$ac_ext >&5
3243		3283
3244	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	3284	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3245	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	3285	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3246	{ as_fn_set_status 77	3286	as_fn_error 77 "C compiler cannot create executables
3247	as_fn_error "C compiler cannot create executables	3287	See \`config.log' for more details" "$LINENO" 5; }
3248	See \`config.log' for more details." "$LINENO" 5; }; }	3288	else
		3289	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
		3290	$as_echo "yes" >&6; }
3249	fi	3291	fi
		3292	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
		3293	$as_echo_n "checking for C compiler default output file name... " >&6; }
		3294	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
		3295	$as_echo "$ac_file" >&6; }
3250	ac_exeext=$ac_cv_exeext	3296	ac_exeext=$ac_cv_exeext
3251		3297
3252	# Check that the compiler produces executables we can run. If not, either	3298	rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
3253	# the compiler is broken, or we cross compile.
3254	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
3255	$as_echo_n "checking whether the C compiler works... " >&6; }
3256	# If not cross compiling, check that we can run a simple program.
3257	if test "$cross_compiling" != yes; then
3258	if { ac_try='./$ac_file'
3259	{ { case "(($ac_try" in
3260	\" \| \` \| \\) ac_try_echo=\$ac_try;;
3261	*) ac_try_echo=$ac_try;;
3262	esac
3263	eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3264	$as_echo "$ac_try_echo"; } >&5
3265	(eval "$ac_try") 2>&5
3266	ac_status=$?
3267	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3268	test $ac_status = 0; }; }; then
3269	cross_compiling=no
3270	else
3271	if test "$cross_compiling" = maybe; then
3272	cross_compiling=yes
3273	else
3274	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3275	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3276	as_fn_error "cannot run C compiled programs.
3277	If you meant to cross compile, use \`--host'.
3278	See \`config.log' for more details." "$LINENO" 5; }
3279	fi
3280	fi
3281	fi
3282	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3283	$as_echo "yes" >&6; }
3284
3285	rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
3286	ac_clean_files=$ac_clean_files_save	3299	ac_clean_files=$ac_clean_files_save
3287	# Check that the compiler produces executables we can run. If not, either
3288	# the compiler is broken, or we cross compile.
3289	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
3290	$as_echo_n "checking whether we are cross compiling... " >&6; }
3291	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
3292	$as_echo "$cross_compiling" >&6; }
3293
3294	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5	3300	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
3295	$as_echo_n "checking for suffix of executables... " >&6; }	3301	$as_echo_n "checking for suffix of executables... " >&6; }
3296	if { { ac_try="$ac_link"	3302	if { { ac_try="$ac_link"
@@ -3320,19 +3326,78 @@ done · 23 unmodified lines
3320	else	3326	else
3321	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	3327	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3322	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	3328	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3323	as_fn_error "cannot compute suffix of executables: cannot compile and link	3329	as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3324	See \`config.log' for more details." "$LINENO" 5; }	3330	See \`config.log' for more details" "$LINENO" 5; }
3325	fi	3331	fi
3326	rm -f conftest$ac_cv_exeext	3332	rm -f conftest conftest$ac_cv_exeext
3327	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5	3333	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
3328	$as_echo "$ac_cv_exeext" >&6; }	3334	$as_echo "$ac_cv_exeext" >&6; }
3329		3335
3330	rm -f conftest.$ac_ext	3336	rm -f conftest.$ac_ext
3331	EXEEXT=$ac_cv_exeext	3337	EXEEXT=$ac_cv_exeext
3332	ac_exeext=$EXEEXT	3338	ac_exeext=$EXEEXT
		3339	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		3340	/* end confdefs.h. */
		3341	#include <stdio.h>
		3342	int
		3343	main ()
		3344	{
		3345	FILE *f = fopen ("conftest.out", "w");
		3346	return ferror (f) \|\| fclose (f) != 0;
		3347
		3348	;
		3349	return 0;
		3350	}
		3351	_ACEOF
		3352	ac_clean_files="$ac_clean_files conftest.out"
		3353	# Check that the compiler produces executables we can run. If not, either
		3354	# the compiler is broken, or we cross compile.
		3355	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
		3356	$as_echo_n "checking whether we are cross compiling... " >&6; }
		3357	if test "$cross_compiling" != yes; then
		3358	{ { ac_try="$ac_link"
		3359	case "(($ac_try" in
		3360	\" \| \` \| \\) ac_try_echo=\$ac_try;;
		3361	*) ac_try_echo=$ac_try;;
		3362	esac
		3363	eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
		3364	$as_echo "$ac_try_echo"; } >&5
		3365	(eval "$ac_link") 2>&5
		3366	ac_status=$?
		3367	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		3368	test $ac_status = 0; }
		3369	if { ac_try='./conftest$ac_cv_exeext'
		3370	{ { case "(($ac_try" in
		3371	\" \| \` \| \\) ac_try_echo=\$ac_try;;
		3372	*) ac_try_echo=$ac_try;;
		3373	esac
		3374	eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
		3375	$as_echo "$ac_try_echo"; } >&5
		3376	(eval "$ac_try") 2>&5
		3377	ac_status=$?
		3378	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		3379	test $ac_status = 0; }; }; then
		3380	cross_compiling=no
		3381	else
		3382	if test "$cross_compiling" = maybe; then
		3383	cross_compiling=yes
		3384	else
		3385	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
		3386	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
		3387	as_fn_error $? "cannot run C compiled programs.
		3388	If you meant to cross compile, use \`--host'.
		3389	See \`config.log' for more details" "$LINENO" 5; }
		3390	fi
		3391	fi
		3392	fi
		3393	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
		3394	$as_echo "$cross_compiling" >&6; }
		3395
		3396	rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
		3397	ac_clean_files=$ac_clean_files_save
3333	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5	3398	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
3334	$as_echo_n "checking for suffix of object files... " >&6; }	3399	$as_echo_n "checking for suffix of object files... " >&6; }
3335	if test "${ac_cv_objext+set}" = set; then :	3400	if ${ac_cv_objext+:} false; then :
3336	$as_echo_n "(cached) " >&6	3401	$as_echo_n "(cached) " >&6
3337	else	3402	else
3338	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	3403	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3372,8 +3437,8 @@ sed 's/^/\| /' conftest.$ac_ext >&5 · 33 unmodified lines
3372		3437
3373	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	3438	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3374	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	3439	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3375	as_fn_error "cannot compute suffix of object files: cannot compile	3440	as_fn_error $? "cannot compute suffix of object files: cannot compile
3376	See \`config.log' for more details." "$LINENO" 5; }	3441	See \`config.log' for more details" "$LINENO" 5; }
3377	fi	3442	fi
3378	rm -f conftest.$ac_cv_objext conftest.$ac_ext	3443	rm -f conftest.$ac_cv_objext conftest.$ac_ext
3379	fi	3444	fi
@@ -3383,7 +3448,7 @@ OBJEXT=$ac_cv_objext · 3 unmodified lines
3383	ac_objext=$OBJEXT	3448	ac_objext=$OBJEXT
3384	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5	3449	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
3385	$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }	3450	$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3386	if test "${ac_cv_c_compiler_gnu+set}" = set; then :	3451	if ${ac_cv_c_compiler_gnu+:} false; then :
3387	$as_echo_n "(cached) " >&6	3452	$as_echo_n "(cached) " >&6
3388	else	3453	else
3389	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	3454	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3420,7 +3485,7 @@ ac_test_CFLAGS=${CFLAGS+set} · 30 unmodified lines
3420	ac_save_CFLAGS=$CFLAGS	3485	ac_save_CFLAGS=$CFLAGS
3421	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5	3486	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
3422	$as_echo_n "checking whether $CC accepts -g... " >&6; }	3487	$as_echo_n "checking whether $CC accepts -g... " >&6; }
3423	if test "${ac_cv_prog_cc_g+set}" = set; then :	3488	if ${ac_cv_prog_cc_g+:} false; then :
3424	$as_echo_n "(cached) " >&6	3489	$as_echo_n "(cached) " >&6
3425	else	3490	else
3426	ac_save_c_werror_flag=$ac_c_werror_flag	3491	ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3498,7 +3563,7 @@ else · 71 unmodified lines
3498	fi	3563	fi
3499	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5	3564	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
3500	$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }	3565	$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
3501	if test "${ac_cv_prog_cc_c89+set}" = set; then :	3566	if ${ac_cv_prog_cc_c89+:} false; then :
3502	$as_echo_n "(cached) " >&6	3567	$as_echo_n "(cached) " >&6
3503	else	3568	else
3504	ac_cv_prog_cc_c89=no	3569	ac_cv_prog_cc_c89=no
@@ -3507,8 +3572,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext · 2 unmodified lines
3507	/* end confdefs.h. */	3572	/* end confdefs.h. */
3508	#include <stdarg.h>	3573	#include <stdarg.h>
3509	#include <stdio.h>	3574	#include <stdio.h>
3510	#include <sys/types.h>	3575	struct stat;
3511	#include <sys/stat.h>
3512	/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */	3576	/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
3513	struct buf { int x; };	3577	struct buf { int x; };
3514	FILE * (rcsopen) (struct buf , struct stat *, int);	3578	FILE * (rcsopen) (struct buf , struct stat *, int);
@@ -3609,7 +3673,7 @@ if test -z "$CXX"; then · 94 unmodified lines
3609	set dummy $ac_tool_prefix$ac_prog; ac_word=$2	3673	set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3610	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3674	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3611	$as_echo_n "checking for $ac_word... " >&6; }	3675	$as_echo_n "checking for $ac_word... " >&6; }
3612	if test "${ac_cv_prog_CXX+set}" = set; then :	3676	if ${ac_cv_prog_CXX+:} false; then :
3613	$as_echo_n "(cached) " >&6	3677	$as_echo_n "(cached) " >&6
3614	else	3678	else
3615	if test -n "$CXX"; then	3679	if test -n "$CXX"; then
@@ -3621,7 +3685,7 @@ do · 5 unmodified lines
3621	IFS=$as_save_IFS	3685	IFS=$as_save_IFS
3622	test -z "$as_dir" && as_dir=.	3686	test -z "$as_dir" && as_dir=.
3623	for ac_exec_ext in '' $ac_executable_extensions; do	3687	for ac_exec_ext in '' $ac_executable_extensions; do
3624	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3688	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3625	ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"	3689	ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3626	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3690	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3627	break 2	3691	break 2
@@ -3653,7 +3717,7 @@ do · 25 unmodified lines
3653	set dummy $ac_prog; ac_word=$2	3717	set dummy $ac_prog; ac_word=$2
3654	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3718	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3655	$as_echo_n "checking for $ac_word... " >&6; }	3719	$as_echo_n "checking for $ac_word... " >&6; }
3656	if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :	3720	if ${ac_cv_prog_ac_ct_CXX+:} false; then :
3657	$as_echo_n "(cached) " >&6	3721	$as_echo_n "(cached) " >&6
3658	else	3722	else
3659	if test -n "$ac_ct_CXX"; then	3723	if test -n "$ac_ct_CXX"; then
@@ -3665,7 +3729,7 @@ do · 5 unmodified lines
3665	IFS=$as_save_IFS	3729	IFS=$as_save_IFS
3666	test -z "$as_dir" && as_dir=.	3730	test -z "$as_dir" && as_dir=.
3667	for ac_exec_ext in '' $ac_executable_extensions; do	3731	for ac_exec_ext in '' $ac_executable_extensions; do
3668	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3732	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3669	ac_cv_prog_ac_ct_CXX="$ac_prog"	3733	ac_cv_prog_ac_ct_CXX="$ac_prog"
3670	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3734	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3671	break 2	3735	break 2
@@ -3723,15 +3787,15 @@ $as_echo "$ac_try_echo"; } >&5 · 51 unmodified lines
3723	... rest of stderr output deleted ...	3787	... rest of stderr output deleted ...
3724	10q' conftest.err >conftest.er1	3788	10q' conftest.err >conftest.er1
3725	cat conftest.er1 >&5	3789	cat conftest.er1 >&5
3726	rm -f conftest.er1 conftest.err
3727	fi	3790	fi
		3791	rm -f conftest.er1 conftest.err
3728	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5	3792	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3729	test $ac_status = 0; }	3793	test $ac_status = 0; }
3730	done	3794	done
3731		3795
3732	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5	3796	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
3733	$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }	3797	$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
3734	if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :	3798	if ${ac_cv_cxx_compiler_gnu+:} false; then :
3735	$as_echo_n "(cached) " >&6	3799	$as_echo_n "(cached) " >&6
3736	else	3800	else
3737	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	3801	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3768,7 +3832,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} · 30 unmodified lines
3768	ac_save_CXXFLAGS=$CXXFLAGS	3832	ac_save_CXXFLAGS=$CXXFLAGS
3769	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5	3833	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
3770	$as_echo_n "checking whether $CXX accepts -g... " >&6; }	3834	$as_echo_n "checking whether $CXX accepts -g... " >&6; }
3771	if test "${ac_cv_prog_cxx_g+set}" = set; then :	3835	if ${ac_cv_prog_cxx_g+:} false; then :
3772	$as_echo_n "(cached) " >&6	3836	$as_echo_n "(cached) " >&6
3773	else	3837	else
3774	ac_save_cxx_werror_flag=$ac_cxx_werror_flag	3838	ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3855,7 +3919,7 @@ if test -n "$ac_tool_prefix"; then · 80 unmodified lines
3855	set dummy ${ac_tool_prefix}ranlib; ac_word=$2	3919	set dummy ${ac_tool_prefix}ranlib; ac_word=$2
3856	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3920	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3857	$as_echo_n "checking for $ac_word... " >&6; }	3921	$as_echo_n "checking for $ac_word... " >&6; }
3858	if test "${ac_cv_prog_RANLIB+set}" = set; then :	3922	if ${ac_cv_prog_RANLIB+:} false; then :
3859	$as_echo_n "(cached) " >&6	3923	$as_echo_n "(cached) " >&6
3860	else	3924	else
3861	if test -n "$RANLIB"; then	3925	if test -n "$RANLIB"; then
@@ -3867,7 +3931,7 @@ do · 5 unmodified lines
3867	IFS=$as_save_IFS	3931	IFS=$as_save_IFS
3868	test -z "$as_dir" && as_dir=.	3932	test -z "$as_dir" && as_dir=.
3869	for ac_exec_ext in '' $ac_executable_extensions; do	3933	for ac_exec_ext in '' $ac_executable_extensions; do
3870	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3934	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3871	ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"	3935	ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
3872	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3936	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3873	break 2	3937	break 2
@@ -3895,7 +3959,7 @@ if test -z "$ac_cv_prog_RANLIB"; then · 21 unmodified lines
3895	set dummy ranlib; ac_word=$2	3959	set dummy ranlib; ac_word=$2
3896	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	3960	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3897	$as_echo_n "checking for $ac_word... " >&6; }	3961	$as_echo_n "checking for $ac_word... " >&6; }
3898	if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :	3962	if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
3899	$as_echo_n "(cached) " >&6	3963	$as_echo_n "(cached) " >&6
3900	else	3964	else
3901	if test -n "$ac_ct_RANLIB"; then	3965	if test -n "$ac_ct_RANLIB"; then
@@ -3907,7 +3971,7 @@ do · 5 unmodified lines
3907	IFS=$as_save_IFS	3971	IFS=$as_save_IFS
3908	test -z "$as_dir" && as_dir=.	3972	test -z "$as_dir" && as_dir=.
3909	for ac_exec_ext in '' $ac_executable_extensions; do	3973	for ac_exec_ext in '' $ac_executable_extensions; do
3910	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	3974	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3911	ac_cv_prog_ac_ct_RANLIB="ranlib"	3975	ac_cv_prog_ac_ct_RANLIB="ranlib"
3912	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	3976	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3913	break 2	3977	break 2
@@ -3956,7 +4020,7 @@ if test -n "$CPP" && test -d "$CPP"; then · 42 unmodified lines
3956	CPP=	4020	CPP=
3957	fi	4021	fi
3958	if test -z "$CPP"; then	4022	if test -z "$CPP"; then
3959	if test "${ac_cv_prog_CPP+set}" = set; then :	4023	if ${ac_cv_prog_CPP+:} false; then :
3960	$as_echo_n "(cached) " >&6	4024	$as_echo_n "(cached) " >&6
3961	else	4025	else
3962	# Double quotes because CPP needs to be expanded	4026	# Double quotes because CPP needs to be expanded
@@ -3986,7 +4050,7 @@ else · 23 unmodified lines
3986	# Broken: fails on valid input.	4050	# Broken: fails on valid input.
3987	continue	4051	continue
3988	fi	4052	fi
3989	rm -f conftest.err conftest.$ac_ext	4053	rm -f conftest.err conftest.i conftest.$ac_ext
3990		4054
3991	# OK, works on sane cases. Now check whether nonexistent headers	4055	# OK, works on sane cases. Now check whether nonexistent headers
3992	# can be detected and how.	4056	# can be detected and how.
@@ -4002,11 +4066,11 @@ else · 9 unmodified lines
4002	ac_preproc_ok=:	4066	ac_preproc_ok=:
4003	break	4067	break
4004	fi	4068	fi
4005	rm -f conftest.err conftest.$ac_ext	4069	rm -f conftest.err conftest.i conftest.$ac_ext
4006		4070
4007	done	4071	done
4008	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.	4072	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4009	rm -f conftest.err conftest.$ac_ext	4073	rm -f conftest.i conftest.err conftest.$ac_ext
4010	if $ac_preproc_ok; then :	4074	if $ac_preproc_ok; then :
4011	break	4075	break
4012	fi	4076	fi
@@ -4045,7 +4109,7 @@ else · 32 unmodified lines
4045	# Broken: fails on valid input.	4109	# Broken: fails on valid input.
4046	continue	4110	continue
4047	fi	4111	fi
4048	rm -f conftest.err conftest.$ac_ext	4112	rm -f conftest.err conftest.i conftest.$ac_ext
4049		4113
4050	# OK, works on sane cases. Now check whether nonexistent headers	4114	# OK, works on sane cases. Now check whether nonexistent headers
4051	# can be detected and how.	4115	# can be detected and how.
@@ -4061,18 +4125,18 @@ else · 9 unmodified lines
4061	ac_preproc_ok=:	4125	ac_preproc_ok=:
4062	break	4126	break
4063	fi	4127	fi
4064	rm -f conftest.err conftest.$ac_ext	4128	rm -f conftest.err conftest.i conftest.$ac_ext
4065		4129
4066	done	4130	done
4067	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.	4131	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4068	rm -f conftest.err conftest.$ac_ext	4132	rm -f conftest.i conftest.err conftest.$ac_ext
4069	if $ac_preproc_ok; then :	4133	if $ac_preproc_ok; then :
4070		4134
4071	else	4135	else
4072	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	4136	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4073	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	4137	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4074	as_fn_error "C preprocessor \"$CPP\" fails sanity check	4138	as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4075	See \`config.log' for more details." "$LINENO" 5; }	4139	See \`config.log' for more details" "$LINENO" 5; }
4076	fi	4140	fi
4077		4141
4078	ac_ext=c	4142	ac_ext=c
@@ -4084,7 +4148,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu · 5 unmodified lines
4084		4148
4085	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5	4149	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4086	$as_echo_n "checking for grep that handles long lines and -e... " >&6; }	4150	$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4087	if test "${ac_cv_path_GREP+set}" = set; then :	4151	if ${ac_cv_path_GREP+:} false; then :
4088	$as_echo_n "(cached) " >&6	4152	$as_echo_n "(cached) " >&6
4089	else	4153	else
4090	if test -z "$GREP"; then	4154	if test -z "$GREP"; then
@@ -4098,7 +4162,7 @@ do · 7 unmodified lines
4098	for ac_prog in grep ggrep; do	4162	for ac_prog in grep ggrep; do
4099	for ac_exec_ext in '' $ac_executable_extensions; do	4163	for ac_exec_ext in '' $ac_executable_extensions; do
4100	ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"	4164	ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4101	{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue	4165	as_fn_executable_p "$ac_path_GREP" \|\| continue
4102	# Check for GNU ac_path_GREP and select it if it is found.	4166	# Check for GNU ac_path_GREP and select it if it is found.
4103	# Check for GNU $ac_path_GREP	4167	# Check for GNU $ac_path_GREP
4104	case `"$ac_path_GREP" --version 2>&1` in	4168	case `"$ac_path_GREP" --version 2>&1` in
@@ -4133,7 +4197,7 @@ esac · 28 unmodified lines
4133	done	4197	done
4134	IFS=$as_save_IFS	4198	IFS=$as_save_IFS
4135	if test -z "$ac_cv_path_GREP"; then	4199	if test -z "$ac_cv_path_GREP"; then
4136	as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5	4200	as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4137	fi	4201	fi
4138	else	4202	else
4139	ac_cv_path_GREP=$GREP	4203	ac_cv_path_GREP=$GREP
@@ -4147,7 +4211,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } · 7 unmodified lines
4147		4211
4148	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5	4212	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4149	$as_echo_n "checking for egrep... " >&6; }	4213	$as_echo_n "checking for egrep... " >&6; }
4150	if test "${ac_cv_path_EGREP+set}" = set; then :	4214	if ${ac_cv_path_EGREP+:} false; then :
4151	$as_echo_n "(cached) " >&6	4215	$as_echo_n "(cached) " >&6
4152	else	4216	else
4153	if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1	4217	if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1
@@ -4164,7 +4228,7 @@ do · 10 unmodified lines
4164	for ac_prog in egrep; do	4228	for ac_prog in egrep; do
4165	for ac_exec_ext in '' $ac_executable_extensions; do	4229	for ac_exec_ext in '' $ac_executable_extensions; do
4166	ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"	4230	ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4167	{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue	4231	as_fn_executable_p "$ac_path_EGREP" \|\| continue
4168	# Check for GNU ac_path_EGREP and select it if it is found.	4232	# Check for GNU ac_path_EGREP and select it if it is found.
4169	# Check for GNU $ac_path_EGREP	4233	# Check for GNU $ac_path_EGREP
4170	case `"$ac_path_EGREP" --version 2>&1` in	4234	case `"$ac_path_EGREP" --version 2>&1` in
@@ -4199,7 +4263,7 @@ esac · 28 unmodified lines
4199	done	4263	done
4200	IFS=$as_save_IFS	4264	IFS=$as_save_IFS
4201	if test -z "$ac_cv_path_EGREP"; then	4265	if test -z "$ac_cv_path_EGREP"; then
4202	as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5	4266	as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4203	fi	4267	fi
4204	else	4268	else
4205	ac_cv_path_EGREP=$EGREP	4269	ac_cv_path_EGREP=$EGREP
@@ -4214,7 +4278,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } · 8 unmodified lines
4214		4278
4215	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5	4279	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
4216	$as_echo_n "checking for ANSI C header files... " >&6; }	4280	$as_echo_n "checking for ANSI C header files... " >&6; }
4217	if test "${ac_cv_header_stdc+set}" = set; then :	4281	if ${ac_cv_header_stdc+:} false; then :
4218	$as_echo_n "(cached) " >&6	4282	$as_echo_n "(cached) " >&6
4219	else	4283	else
4220	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	4284	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4331,8 +4395,7 @@ do : · 110 unmodified lines
4331	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	4395	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
4332	ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default	4396	ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4333	"	4397	"
4334	eval as_val=\$$as_ac_Header	4398	if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
4335	if test "x$as_val" = x""yes; then :
4336	cat >>confdefs.h <<_ACEOF	4399	cat >>confdefs.h <<_ACEOF
4337	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	4400	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
4338	_ACEOF	4401	_ACEOF
@@ -4344,7 +4407,7 @@ done · 5 unmodified lines
4344		4407
4345		4408
4346	ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"	4409	ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
4347	if test "x$ac_cv_header_minix_config_h" = x""yes; then :	4410	if test "x$ac_cv_header_minix_config_h" = xyes; then :
4348	MINIX=yes	4411	MINIX=yes
4349	else	4412	else
4350	MINIX=	4413	MINIX=
@@ -4366,14 +4429,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h · 15 unmodified lines
4366		4429
4367	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5	4430	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
4368	$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }	4431	$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
4369	if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :	4432	if ${ac_cv_safe_to_define___extensions__+:} false; then :
4370	$as_echo_n "(cached) " >&6	4433	$as_echo_n "(cached) " >&6
4371	else	4434	else
4372	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	4435	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4373	/* end confdefs.h. */	4436	/* end confdefs.h. */
4374		4437
4375	# define __EXTENSIONS__ 1	4438	# define __EXTENSIONS__ 1
4376	$ac_includes_default	4439	$ac_includes_default
4377	int	4440	int
4378	main ()	4441	main ()
4379	{	4442	{
@@ -4412,7 +4475,7 @@ if test "$enable_largefile" != no; then · 32 unmodified lines
4412		4475
4413	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5	4476	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
4414	$as_echo_n "checking for special C compiler options needed for large files... " >&6; }	4477	$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
4415	if test "${ac_cv_sys_largefile_CC+set}" = set; then :	4478	if ${ac_cv_sys_largefile_CC+:} false; then :
4416	$as_echo_n "(cached) " >&6	4479	$as_echo_n "(cached) " >&6
4417	else	4480	else
4418	ac_cv_sys_largefile_CC=no	4481	ac_cv_sys_largefile_CC=no
@@ -4463,7 +4526,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } · 44 unmodified lines
4463		4526
4464	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5	4527	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
4465	$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }	4528	$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
4466	if test "${ac_cv_sys_file_offset_bits+set}" = set; then :	4529	if ${ac_cv_sys_file_offset_bits+:} false; then :
4467	$as_echo_n "(cached) " >&6	4530	$as_echo_n "(cached) " >&6
4468	else	4531	else
4469	while :; do	4532	while :; do
@@ -4532,7 +4595,7 @@ rm -rf conftest* · 62 unmodified lines
4532	if test $ac_cv_sys_file_offset_bits = unknown; then	4595	if test $ac_cv_sys_file_offset_bits = unknown; then
4533	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5	4596	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
4534	$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }	4597	$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
4535	if test "${ac_cv_sys_large_files+set}" = set; then :	4598	if ${ac_cv_sys_large_files+:} false; then :
4536	$as_echo_n "(cached) " >&6	4599	$as_echo_n "(cached) " >&6
4537	else	4600	else
4538	while :; do	4601	while :; do
@@ -4599,6 +4662,8 @@ _ACEOF · 60 unmodified lines
4599	esac	4662	esac
4600	rm -rf conftest*	4663	rm -rf conftest*
4601	fi	4664	fi
		4665
		4666
4602	fi	4667	fi
4603		4668
4604		4669
@@ -4609,7 +4674,7 @@ do · 4 unmodified lines
4609	set dummy $ac_prog; ac_word=$2	4674	set dummy $ac_prog; ac_word=$2
4610	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	4675	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4611	$as_echo_n "checking for $ac_word... " >&6; }	4676	$as_echo_n "checking for $ac_word... " >&6; }
4612	if test "${ac_cv_prog_ACLOCAL+set}" = set; then :	4677	if ${ac_cv_prog_ACLOCAL+:} false; then :
4613	$as_echo_n "(cached) " >&6	4678	$as_echo_n "(cached) " >&6
4614	else	4679	else
4615	if test -n "$ACLOCAL"; then	4680	if test -n "$ACLOCAL"; then
@@ -4621,7 +4686,7 @@ do · 5 unmodified lines
4621	IFS=$as_save_IFS	4686	IFS=$as_save_IFS
4622	test -z "$as_dir" && as_dir=.	4687	test -z "$as_dir" && as_dir=.
4623	for ac_exec_ext in '' $ac_executable_extensions; do	4688	for ac_exec_ext in '' $ac_executable_extensions; do
4624	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	4689	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4625	ac_cv_prog_ACLOCAL="$ac_prog"	4690	ac_cv_prog_ACLOCAL="$ac_prog"
4626	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	4691	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4627	break 2	4692	break 2
@@ -4652,7 +4717,7 @@ do · 24 unmodified lines
4652	set dummy $ac_prog; ac_word=$2	4717	set dummy $ac_prog; ac_word=$2
4653	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	4718	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4654	$as_echo_n "checking for $ac_word... " >&6; }	4719	$as_echo_n "checking for $ac_word... " >&6; }
4655	if test "${ac_cv_prog_AUTOCONF+set}" = set; then :	4720	if ${ac_cv_prog_AUTOCONF+:} false; then :
4656	$as_echo_n "(cached) " >&6	4721	$as_echo_n "(cached) " >&6
4657	else	4722	else
4658	if test -n "$AUTOCONF"; then	4723	if test -n "$AUTOCONF"; then
@@ -4664,7 +4729,7 @@ do · 5 unmodified lines
4664	IFS=$as_save_IFS	4729	IFS=$as_save_IFS
4665	test -z "$as_dir" && as_dir=.	4730	test -z "$as_dir" && as_dir=.
4666	for ac_exec_ext in '' $ac_executable_extensions; do	4731	for ac_exec_ext in '' $ac_executable_extensions; do
4667	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	4732	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4668	ac_cv_prog_AUTOCONF="$ac_prog"	4733	ac_cv_prog_AUTOCONF="$ac_prog"
4669	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	4734	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4670	break 2	4735	break 2
@@ -4695,7 +4760,7 @@ do · 24 unmodified lines
4695	set dummy $ac_prog; ac_word=$2	4760	set dummy $ac_prog; ac_word=$2
4696	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	4761	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4697	$as_echo_n "checking for $ac_word... " >&6; }	4762	$as_echo_n "checking for $ac_word... " >&6; }
4698	if test "${ac_cv_prog_AUTOHEADER+set}" = set; then :	4763	if ${ac_cv_prog_AUTOHEADER+:} false; then :
4699	$as_echo_n "(cached) " >&6	4764	$as_echo_n "(cached) " >&6
4700	else	4765	else
4701	if test -n "$AUTOHEADER"; then	4766	if test -n "$AUTOHEADER"; then
@@ -4707,7 +4772,7 @@ do · 5 unmodified lines
4707	IFS=$as_save_IFS	4772	IFS=$as_save_IFS
4708	test -z "$as_dir" && as_dir=.	4773	test -z "$as_dir" && as_dir=.
4709	for ac_exec_ext in '' $ac_executable_extensions; do	4774	for ac_exec_ext in '' $ac_executable_extensions; do
4710	if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then	4775	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4711	ac_cv_prog_AUTOHEADER="$ac_prog"	4776	ac_cv_prog_AUTOHEADER="$ac_prog"
4712	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	4777	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4713	break 2	4778	break 2
@@ -4756,7 +4821,7 @@ for real_option in -W -Wall -Wno-narrowing -Wwrite-strings \ · 42 unmodified lines
4756		4821
4757	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5	4822	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
4758	$as_echo_n "checking whether $CC supports $option... " >&6; }	4823	$as_echo_n "checking whether $CC supports $option... " >&6; }
4759	if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then :	4824	if eval \${$as_acx_Woption+:} false; then :
4760	$as_echo_n "(cached) " >&6	4825	$as_echo_n "(cached) " >&6
4761	else	4826	else
4762	CFLAGS="$option"	4827	CFLAGS="$option"
@@ -4814,7 +4879,7 @@ for real_option in -Wstrict-prototypes -Wmissing-prototypes \ · 51 unmodified lines
4814		4879
4815	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5	4880	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
4816	$as_echo_n "checking whether $CC supports $option... " >&6; }	4881	$as_echo_n "checking whether $CC supports $option... " >&6; }
4817	if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then :	4882	if eval \${$as_acx_Woption+:} false; then :
4818	$as_echo_n "(cached) " >&6	4883	$as_echo_n "(cached) " >&6
4819	else	4884	else
4820	CFLAGS="$option"	4885	CFLAGS="$option"
@@ -4864,7 +4929,7 @@ WARN_PEDANTIC= · 43 unmodified lines
4864	if test "$GCC" = yes; then :	4929	if test "$GCC" = yes; then :
4865	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -pedantic -Wlong-long" >&5	4930	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -pedantic -Wlong-long" >&5
4866	$as_echo_n "checking whether $CC supports -pedantic -Wlong-long... " >&6; }	4931	$as_echo_n "checking whether $CC supports -pedantic -Wlong-long... " >&6; }
4867	if test "${acx_cv_prog_cc_pedantic__Wlong_long+set}" = set; then :	4932	if ${acx_cv_prog_cc_pedantic__Wlong_long+:} false; then :
4868	$as_echo_n "(cached) " >&6	4933	$as_echo_n "(cached) " >&6
4869	else	4934	else
4870	save_CFLAGS="$CFLAGS"	4935	save_CFLAGS="$CFLAGS"
@@ -4923,7 +4988,7 @@ for real_option in -fno-exceptions -fno-rtti; do · 52 unmodified lines
4923		4988
4924	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5	4989	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
4925	$as_echo_n "checking whether $CC supports $option... " >&6; }	4990	$as_echo_n "checking whether $CC supports $option... " >&6; }
4926	if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then :	4991	if eval \${$as_acx_Woption+:} false; then :
4927	$as_echo_n "(cached) " >&6	4992	$as_echo_n "(cached) " >&6
4928	else	4993	else
4929	CFLAGS="$option"	4994	CFLAGS="$option"
@@ -5019,7 +5084,7 @@ _ACEOF · 89 unmodified lines
5019	if ac_fn_cxx_try_compile "$LINENO"; then :	5084	if ac_fn_cxx_try_compile "$LINENO"; then :
5020		5085
5021	else	5086	else
5022	as_fn_error "C++ compiler missing or inoperational" "$LINENO" 5	5087	as_fn_error $? "C++ compiler missing or inoperational" "$LINENO" 5
5023	fi	5088	fi
5024	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext	5089	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5025	ac_ext=c	5090	ac_ext=c
@@ -5033,7 +5098,7 @@ depcc="$CXX" am_compiler_list= · 7 unmodified lines
5033	am_depcomp=$ac_aux_dir/depcomp	5098	am_depcomp=$ac_aux_dir/depcomp
5034	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5	5099	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
5035	$as_echo_n "checking dependency style of $depcc... " >&6; }	5100	$as_echo_n "checking dependency style of $depcc... " >&6; }
5036	if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :	5101	if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
5037	$as_echo_n "(cached) " >&6	5102	$as_echo_n "(cached) " >&6
5038	else	5103	else
5039	if test -f "$am_depcomp"; then	5104	if test -f "$am_depcomp"; then
@@ -5119,7 +5184,7 @@ fi · 79 unmodified lines
5119	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5	5184	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
5120	$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }	5185	$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
5121	if test x${am_cv_CXX_dependencies_compiler_type-none} = xnone	5186	if test x${am_cv_CXX_dependencies_compiler_type-none} = xnone
5122	then as_fn_error "no usable dependency style found" "$LINENO" 5	5187	then as_fn_error $? "no usable dependency style found" "$LINENO" 5
5123	else CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type	5188	else CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
5124		5189
5125	fi	5190	fi
@@ -5128,7 +5193,7 @@ fi · 2 unmodified lines
5128	# Checks for header files.	5193	# Checks for header files.
5129	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5	5194	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
5130	$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }	5195	$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
5131	if test "${ac_cv_header_time+set}" = set; then :	5196	if ${ac_cv_header_time+:} false; then :
5132	$as_echo_n "(cached) " >&6	5197	$as_echo_n "(cached) " >&6
5133	else	5198	else
5134	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5199	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5163,7 +5228,7 @@ fi · 28 unmodified lines
5163		5228
5164	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5	5229	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
5165	$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }	5230	$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
5166	if test "${gcc_cv_header_string+set}" = set; then :	5231	if ${gcc_cv_header_string+:} false; then :
5167	$as_echo_n "(cached) " >&6	5232	$as_echo_n "(cached) " >&6
5168	else	5233	else
5169	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5234	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5199,8 +5264,7 @@ for ac_header in locale.h fcntl.h limits.h stddef.h \ · 29 unmodified lines
5199	do :	5264	do :
5200	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	5265	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
5201	ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	5266	ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
5202	eval as_val=\$$as_ac_Header	5267	if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
5203	if test "x$as_val" = x""yes; then :
5204	cat >>confdefs.h <<_ACEOF	5268	cat >>confdefs.h <<_ACEOF
5205	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	5269	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
5206	_ACEOF	5270	_ACEOF
@@ -5213,7 +5277,7 @@ done · 6 unmodified lines
5213	# Checks for typedefs, structures, and compiler characteristics.	5277	# Checks for typedefs, structures, and compiler characteristics.
5214	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5	5278	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
5215	$as_echo_n "checking whether byte ordering is bigendian... " >&6; }	5279	$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
5216	if test "${ac_cv_c_bigendian+set}" = set; then :	5280	if ${ac_cv_c_bigendian+:} false; then :
5217	$as_echo_n "(cached) " >&6	5281	$as_echo_n "(cached) " >&6
5218	else	5282	else
5219	ac_cv_c_bigendian=unknown	5283	ac_cv_c_bigendian=unknown
@@ -5431,13 +5495,13 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h · 211 unmodified lines
5431		5495
5432	;; #(	5496	;; #(
5433	*)	5497	*)
5434	as_fn_error "unknown endianness	5498	as_fn_error $? "unknown endianness
5435	presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;	5499	presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
5436	esac	5500	esac
5437		5501
5438	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5	5502	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
5439	$as_echo_n "checking for an ANSI C-conforming const... " >&6; }	5503	$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
5440	if test "${ac_cv_c_const+set}" = set; then :	5504	if ${ac_cv_c_const+:} false; then :
5441	$as_echo_n "(cached) " >&6	5505	$as_echo_n "(cached) " >&6
5442	else	5506	else
5443	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5507	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5446,11 +5510,11 @@ else · 2 unmodified lines
5446	int	5510	int
5447	main ()	5511	main ()
5448	{	5512	{
5449	/* FIXME: Include the comments suggested by Paul. */	5513
5450	#ifndef __cplusplus	5514	#ifndef __cplusplus
5451	/* Ultrix mips cc rejects this. */	5515	/* Ultrix mips cc rejects this sort of thing. */
5452	typedef int charset[2];	5516	typedef int charset[2];
5453	const charset cs;	5517	const charset cs = { 0, 0 };
5454	/* SunOS 4.1.1 cc rejects this. */	5518	/* SunOS 4.1.1 cc rejects this. */
5455	char const const pcpcc;	5519	char const const pcpcc;
5456	char **ppc;	5520	char **ppc;
@@ -5467,8 +5531,9 @@ main () · 10 unmodified lines
5467	++pcpcc;	5531	++pcpcc;
5468	ppc = (char**) pcpcc;	5532	ppc = (char**) pcpcc;
5469	pcpcc = (char const const ) ppc;	5533	pcpcc = (char const const ) ppc;
5470	{ /* SCO 3.2v4 cc rejects this. */	5534	{ /* SCO 3.2v4 cc rejects this sort of thing. */
5471	char *t;	5535	char tx;
		5536	char *t = &tx;
5472	char const s = 0 ? (char ) 0 : (char const *) 0;	5537	char const s = 0 ? (char ) 0 : (char const *) 0;
5473		5538
5474	*t++ = 0;	5539	*t++ = 0;
@@ -5484,10 +5549,10 @@ main () · 9 unmodified lines
5484	iptr p = 0;	5549	iptr p = 0;
5485	++p;	5550	++p;
5486	}	5551	}
5487	{ /* AIX XL C 1.02.0.0 rejects this saying	5552	{ /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
5488	"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */	5553	"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
5489	struct s { int j; const int *ap[3]; };	5554	struct s { int j; const int *ap[3]; } bx;
5490	struct s *b; b->j = 5;	5555	struct s *b = &bx; b->j = 5;
5491	}	5556	}
5492	{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */	5557	{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
5493	const int foo = 10;	5558	const int foo = 10;
@@ -5517,7 +5582,7 @@ fi · 23 unmodified lines
5517		5582
5518	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5	5583	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
5519	$as_echo_n "checking for inline... " >&6; }	5584	$as_echo_n "checking for inline... " >&6; }
5520	if test "${ac_cv_c_inline+set}" = set; then :	5585	if ${ac_cv_c_inline+:} false; then :
5521	$as_echo_n "(cached) " >&6	5586	$as_echo_n "(cached) " >&6
5522	else	5587	else
5523	ac_cv_c_inline=no	5588	ac_cv_c_inline=no
@@ -5559,7 +5624,7 @@ esac · 35 unmodified lines
5559		5624
5560	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5	5625	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5
5561	$as_echo_n "checking for obstacks... " >&6; }	5626	$as_echo_n "checking for obstacks... " >&6; }
5562	if test "${ac_cv_func_obstack+set}" = set; then :	5627	if ${ac_cv_func_obstack+:} false; then :
5563	$as_echo_n "(cached) " >&6	5628	$as_echo_n "(cached) " >&6
5564	else	5629	else
5565	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5630	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5602,7 +5667,7 @@ esac · 36 unmodified lines
5602	fi	5667	fi
5603		5668
5604	ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"	5669	ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
5605	if test "x$ac_cv_type_off_t" = x""yes; then :	5670	if test "x$ac_cv_type_off_t" = xyes; then :
5606		5671
5607	else	5672	else
5608		5673
@@ -5613,7 +5678,7 @@ _ACEOF · 4 unmodified lines
5613	fi	5678	fi
5614		5679
5615	ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"	5680	ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
5616	if test "x$ac_cv_type_size_t" = x""yes; then :	5681	if test "x$ac_cv_type_size_t" = xyes; then :
5617		5682
5618	else	5683	else
5619		5684
@@ -5624,7 +5689,7 @@ _ACEOF · 4 unmodified lines
5624	fi	5689	fi
5625		5690
5626	ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"	5691	ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
5627	if test "x$ac_cv_type_ssize_t" = x""yes; then :	5692	if test "x$ac_cv_type_ssize_t" = xyes; then :
5628		5693
5629	else	5694	else
5630		5695
@@ -5636,7 +5701,7 @@ fi · 5 unmodified lines
5636		5701
5637		5702
5638	ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"	5703	ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
5639	if test "x$ac_cv_type_uintptr_t" = x""yes; then :	5704	if test "x$ac_cv_type_uintptr_t" = xyes; then :
5640		5705
5641	$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h	5706	$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
5642		5707
@@ -5650,7 +5715,8 @@ int · 7 unmodified lines
5650	main ()	5715	main ()
5651	{	5716	{
5652	static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];	5717	static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
5653	test_array [0] = 0	5718	test_array [0] = 0;
		5719	return test_array [0];
5654		5720
5655	;	5721	;
5656	return 0;	5722	return 0;
@@ -5671,7 +5737,7 @@ fi · 14 unmodified lines
5671		5737
5672		5738
5673	ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"	5739	ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
5674	if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :	5740	if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
5675		5741
5676	else	5742	else
5677		5743
@@ -5696,11 +5762,11 @@ _ACEOF · 18 unmodified lines
5696	esac	5762	esac
5697		5763
5698	if test x"$ac_cv_c_uint64_t" = x"no"; then	5764	if test x"$ac_cv_c_uint64_t" = x"no"; then
5699	as_fn_error "uint64_t not found" "$LINENO" 5	5765	as_fn_error $? "uint64_t not found" "$LINENO" 5
5700	fi	5766	fi
5701	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5	5767	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
5702	$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }	5768	$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
5703	if test "${ac_cv_struct_tm+set}" = set; then :	5769	if ${ac_cv_struct_tm+:} false; then :
5704	$as_echo_n "(cached) " >&6	5770	$as_echo_n "(cached) " >&6
5705	else	5771	else
5706	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5772	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5739,7 +5805,7 @@ fi · 32 unmodified lines
5739	# This bug is HP SR number 8606223364.	5805	# This bug is HP SR number 8606223364.
5740	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5	5806	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
5741	$as_echo_n "checking size of int... " >&6; }	5807	$as_echo_n "checking size of int... " >&6; }
5742	if test "${ac_cv_sizeof_int+set}" = set; then :	5808	if ${ac_cv_sizeof_int+:} false; then :
5743	$as_echo_n "(cached) " >&6	5809	$as_echo_n "(cached) " >&6
5744	else	5810	else
5745	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :	5811	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
@@ -5748,9 +5814,8 @@ else · 2 unmodified lines
5748	if test "$ac_cv_type_int" = yes; then	5814	if test "$ac_cv_type_int" = yes; then
5749	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	5815	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5750	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	5816	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5751	{ as_fn_set_status 77	5817	as_fn_error 77 "cannot compute sizeof (int)
5752	as_fn_error "cannot compute sizeof (int)	5818	See \`config.log' for more details" "$LINENO" 5; }
5753	See \`config.log' for more details." "$LINENO" 5; }; }
5754	else	5819	else
5755	ac_cv_sizeof_int=0	5820	ac_cv_sizeof_int=0
5756	fi	5821	fi
@@ -5773,7 +5838,7 @@ _ACEOF · 16 unmodified lines
5773	# This bug is HP SR number 8606223364.	5838	# This bug is HP SR number 8606223364.
5774	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5	5839	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
5775	$as_echo_n "checking size of long... " >&6; }	5840	$as_echo_n "checking size of long... " >&6; }
5776	if test "${ac_cv_sizeof_long+set}" = set; then :	5841	if ${ac_cv_sizeof_long+:} false; then :
5777	$as_echo_n "(cached) " >&6	5842	$as_echo_n "(cached) " >&6
5778	else	5843	else
5779	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :	5844	if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
@@ -5782,9 +5847,8 @@ else · 2 unmodified lines
5782	if test "$ac_cv_type_long" = yes; then	5847	if test "$ac_cv_type_long" = yes; then
5783	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	5848	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5784	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	5849	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5785	{ as_fn_set_status 77	5850	as_fn_error 77 "cannot compute sizeof (long)
5786	as_fn_error "cannot compute sizeof (long)	5851	See \`config.log' for more details" "$LINENO" 5; }
5787	See \`config.log' for more details." "$LINENO" 5; }; }
5788	else	5852	else
5789	ac_cv_sizeof_long=0	5853	ac_cv_sizeof_long=0
5790	fi	5854	fi
@@ -5806,8 +5870,7 @@ for ac_func in clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked · 15 unmodified lines
5806	do :	5870	do :
5807	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`	5871	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
5808	ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"	5872	ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
5809	eval as_val=\$$as_ac_var	5873	if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
5810	if test "x$as_val" = x""yes; then :
5811	cat >>confdefs.h <<_ACEOF	5874	cat >>confdefs.h <<_ACEOF
5812	#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1	5875	#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1
5813	_ACEOF	5876	_ACEOF
@@ -5816,7 +5879,7 @@ fi · 2 unmodified lines
5816	done	5879	done
5817		5880
5818	ac_fn_c_check_decl "$LINENO" "abort" "ac_cv_have_decl_abort" "$ac_includes_default"	5881	ac_fn_c_check_decl "$LINENO" "abort" "ac_cv_have_decl_abort" "$ac_includes_default"
5819	if test "x$ac_cv_have_decl_abort" = x""yes; then :	5882	if test "x$ac_cv_have_decl_abort" = xyes; then :
5820	ac_have_decl=1	5883	ac_have_decl=1
5821	else	5884	else
5822	ac_have_decl=0	5885	ac_have_decl=0
@@ -5826,7 +5889,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5826	#define HAVE_DECL_ABORT $ac_have_decl	5889	#define HAVE_DECL_ABORT $ac_have_decl
5827	_ACEOF	5890	_ACEOF
5828	ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"	5891	ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
5829	if test "x$ac_cv_have_decl_asprintf" = x""yes; then :	5892	if test "x$ac_cv_have_decl_asprintf" = xyes; then :
5830	ac_have_decl=1	5893	ac_have_decl=1
5831	else	5894	else
5832	ac_have_decl=0	5895	ac_have_decl=0
@@ -5835,8 +5898,9 @@ fi · 2 unmodified lines
5835	cat >>confdefs.h <<_ACEOF	5898	cat >>confdefs.h <<_ACEOF
5836	#define HAVE_DECL_ASPRINTF $ac_have_decl	5899	#define HAVE_DECL_ASPRINTF $ac_have_decl
5837	_ACEOF	5900	_ACEOF
5838	ac_fn_c_check_decl "$LINENO" "basename(char *)" "ac_cv_have_decl_basename_char_p_" "$ac_includes_default"	5901	as_ac_Symbol=`$as_echo "ac_cv_have_decl_basename(char *)" \| $as_tr_sh`
5839	if test "x$ac_cv_have_decl_basename_char_p_" = x""yes; then :	5902	ac_fn_c_check_decl "$LINENO" "basename(char *)" "$as_ac_Symbol" "$ac_includes_default"
		5903	if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
5840	ac_have_decl=1	5904	ac_have_decl=1
5841	else	5905	else
5842	ac_have_decl=0	5906	ac_have_decl=0
@@ -5846,7 +5910,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5846	#define HAVE_DECL_BASENAME $ac_have_decl	5910	#define HAVE_DECL_BASENAME $ac_have_decl
5847	_ACEOF	5911	_ACEOF
5848	ac_fn_c_check_decl "$LINENO" "errno" "ac_cv_have_decl_errno" "$ac_includes_default"	5912	ac_fn_c_check_decl "$LINENO" "errno" "ac_cv_have_decl_errno" "$ac_includes_default"
5849	if test "x$ac_cv_have_decl_errno" = x""yes; then :	5913	if test "x$ac_cv_have_decl_errno" = xyes; then :
5850	ac_have_decl=1	5914	ac_have_decl=1
5851	else	5915	else
5852	ac_have_decl=0	5916	ac_have_decl=0
@@ -5856,7 +5920,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5856	#define HAVE_DECL_ERRNO $ac_have_decl	5920	#define HAVE_DECL_ERRNO $ac_have_decl
5857	_ACEOF	5921	_ACEOF
5858	ac_fn_c_check_decl "$LINENO" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default"	5922	ac_fn_c_check_decl "$LINENO" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default"
5859	if test "x$ac_cv_have_decl_getopt" = x""yes; then :	5923	if test "x$ac_cv_have_decl_getopt" = xyes; then :
5860	ac_have_decl=1	5924	ac_have_decl=1
5861	else	5925	else
5862	ac_have_decl=0	5926	ac_have_decl=0
@@ -5866,7 +5930,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5866	#define HAVE_DECL_GETOPT $ac_have_decl	5930	#define HAVE_DECL_GETOPT $ac_have_decl
5867	_ACEOF	5931	_ACEOF
5868	ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"	5932	ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
5869	if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :	5933	if test "x$ac_cv_have_decl_vasprintf" = xyes; then :
5870	ac_have_decl=1	5934	ac_have_decl=1
5871	else	5935	else
5872	ac_have_decl=0	5936	ac_have_decl=0
@@ -5877,7 +5941,7 @@ cat >>confdefs.h <<_ACEOF · 4 unmodified lines
5877	_ACEOF	5941	_ACEOF
5878		5942
5879	ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"	5943	ac_fn_c_check_decl "$LINENO" "clearerr_unlocked" "ac_cv_have_decl_clearerr_unlocked" "$ac_includes_default"
5880	if test "x$ac_cv_have_decl_clearerr_unlocked" = x""yes; then :	5944	if test "x$ac_cv_have_decl_clearerr_unlocked" = xyes; then :
5881	ac_have_decl=1	5945	ac_have_decl=1
5882	else	5946	else
5883	ac_have_decl=0	5947	ac_have_decl=0
@@ -5887,7 +5951,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5887	#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl	5951	#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl
5888	_ACEOF	5952	_ACEOF
5889	ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"	5953	ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default"
5890	if test "x$ac_cv_have_decl_feof_unlocked" = x""yes; then :	5954	if test "x$ac_cv_have_decl_feof_unlocked" = xyes; then :
5891	ac_have_decl=1	5955	ac_have_decl=1
5892	else	5956	else
5893	ac_have_decl=0	5957	ac_have_decl=0
@@ -5897,7 +5961,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5897	#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl	5961	#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl
5898	_ACEOF	5962	_ACEOF
5899	ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"	5963	ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default"
5900	if test "x$ac_cv_have_decl_ferror_unlocked" = x""yes; then :	5964	if test "x$ac_cv_have_decl_ferror_unlocked" = xyes; then :
5901	ac_have_decl=1	5965	ac_have_decl=1
5902	else	5966	else
5903	ac_have_decl=0	5967	ac_have_decl=0
@@ -5907,7 +5971,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5907	#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl	5971	#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl
5908	_ACEOF	5972	_ACEOF
5909	ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"	5973	ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default"
5910	if test "x$ac_cv_have_decl_fflush_unlocked" = x""yes; then :	5974	if test "x$ac_cv_have_decl_fflush_unlocked" = xyes; then :
5911	ac_have_decl=1	5975	ac_have_decl=1
5912	else	5976	else
5913	ac_have_decl=0	5977	ac_have_decl=0
@@ -5917,7 +5981,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5917	#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl	5981	#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl
5918	_ACEOF	5982	_ACEOF
5919	ac_fn_c_check_decl "$LINENO" "fgetc_unlocked" "ac_cv_have_decl_fgetc_unlocked" "$ac_includes_default"	5983	ac_fn_c_check_decl "$LINENO" "fgetc_unlocked" "ac_cv_have_decl_fgetc_unlocked" "$ac_includes_default"
5920	if test "x$ac_cv_have_decl_fgetc_unlocked" = x""yes; then :	5984	if test "x$ac_cv_have_decl_fgetc_unlocked" = xyes; then :
5921	ac_have_decl=1	5985	ac_have_decl=1
5922	else	5986	else
5923	ac_have_decl=0	5987	ac_have_decl=0
@@ -5927,7 +5991,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5927	#define HAVE_DECL_FGETC_UNLOCKED $ac_have_decl	5991	#define HAVE_DECL_FGETC_UNLOCKED $ac_have_decl
5928	_ACEOF	5992	_ACEOF
5929	ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"	5993	ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default"
5930	if test "x$ac_cv_have_decl_fgets_unlocked" = x""yes; then :	5994	if test "x$ac_cv_have_decl_fgets_unlocked" = xyes; then :
5931	ac_have_decl=1	5995	ac_have_decl=1
5932	else	5996	else
5933	ac_have_decl=0	5997	ac_have_decl=0
@@ -5937,7 +6001,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5937	#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl	6001	#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl
5938	_ACEOF	6002	_ACEOF
5939	ac_fn_c_check_decl "$LINENO" "fileno_unlocked" "ac_cv_have_decl_fileno_unlocked" "$ac_includes_default"	6003	ac_fn_c_check_decl "$LINENO" "fileno_unlocked" "ac_cv_have_decl_fileno_unlocked" "$ac_includes_default"
5940	if test "x$ac_cv_have_decl_fileno_unlocked" = x""yes; then :	6004	if test "x$ac_cv_have_decl_fileno_unlocked" = xyes; then :
5941	ac_have_decl=1	6005	ac_have_decl=1
5942	else	6006	else
5943	ac_have_decl=0	6007	ac_have_decl=0
@@ -5947,7 +6011,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5947	#define HAVE_DECL_FILENO_UNLOCKED $ac_have_decl	6011	#define HAVE_DECL_FILENO_UNLOCKED $ac_have_decl
5948	_ACEOF	6012	_ACEOF
5949	ac_fn_c_check_decl "$LINENO" "fprintf_unlocked" "ac_cv_have_decl_fprintf_unlocked" "$ac_includes_default"	6013	ac_fn_c_check_decl "$LINENO" "fprintf_unlocked" "ac_cv_have_decl_fprintf_unlocked" "$ac_includes_default"
5950	if test "x$ac_cv_have_decl_fprintf_unlocked" = x""yes; then :	6014	if test "x$ac_cv_have_decl_fprintf_unlocked" = xyes; then :
5951	ac_have_decl=1	6015	ac_have_decl=1
5952	else	6016	else
5953	ac_have_decl=0	6017	ac_have_decl=0
@@ -5957,7 +6021,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5957	#define HAVE_DECL_FPRINTF_UNLOCKED $ac_have_decl	6021	#define HAVE_DECL_FPRINTF_UNLOCKED $ac_have_decl
5958	_ACEOF	6022	_ACEOF
5959	ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"	6023	ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default"
5960	if test "x$ac_cv_have_decl_fputc_unlocked" = x""yes; then :	6024	if test "x$ac_cv_have_decl_fputc_unlocked" = xyes; then :
5961	ac_have_decl=1	6025	ac_have_decl=1
5962	else	6026	else
5963	ac_have_decl=0	6027	ac_have_decl=0
@@ -5967,7 +6031,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5967	#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl	6031	#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl
5968	_ACEOF	6032	_ACEOF
5969	ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"	6033	ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default"
5970	if test "x$ac_cv_have_decl_fputs_unlocked" = x""yes; then :	6034	if test "x$ac_cv_have_decl_fputs_unlocked" = xyes; then :
5971	ac_have_decl=1	6035	ac_have_decl=1
5972	else	6036	else
5973	ac_have_decl=0	6037	ac_have_decl=0
@@ -5977,7 +6041,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5977	#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl	6041	#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl
5978	_ACEOF	6042	_ACEOF
5979	ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"	6043	ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default"
5980	if test "x$ac_cv_have_decl_fread_unlocked" = x""yes; then :	6044	if test "x$ac_cv_have_decl_fread_unlocked" = xyes; then :
5981	ac_have_decl=1	6045	ac_have_decl=1
5982	else	6046	else
5983	ac_have_decl=0	6047	ac_have_decl=0
@@ -5987,7 +6051,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5987	#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl	6051	#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl
5988	_ACEOF	6052	_ACEOF
5989	ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"	6053	ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default"
5990	if test "x$ac_cv_have_decl_fwrite_unlocked" = x""yes; then :	6054	if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes; then :
5991	ac_have_decl=1	6055	ac_have_decl=1
5992	else	6056	else
5993	ac_have_decl=0	6057	ac_have_decl=0
@@ -5997,7 +6061,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
5997	#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl	6061	#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl
5998	_ACEOF	6062	_ACEOF
5999	ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"	6063	ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default"
6000	if test "x$ac_cv_have_decl_getchar_unlocked" = x""yes; then :	6064	if test "x$ac_cv_have_decl_getchar_unlocked" = xyes; then :
6001	ac_have_decl=1	6065	ac_have_decl=1
6002	else	6066	else
6003	ac_have_decl=0	6067	ac_have_decl=0
@@ -6007,7 +6071,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
6007	#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl	6071	#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl
6008	_ACEOF	6072	_ACEOF
6009	ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"	6073	ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
6010	if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :	6074	if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
6011	ac_have_decl=1	6075	ac_have_decl=1
6012	else	6076	else
6013	ac_have_decl=0	6077	ac_have_decl=0
@@ -6017,7 +6081,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
6017	#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl	6081	#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
6018	_ACEOF	6082	_ACEOF
6019	ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"	6083	ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default"
6020	if test "x$ac_cv_have_decl_putchar_unlocked" = x""yes; then :	6084	if test "x$ac_cv_have_decl_putchar_unlocked" = xyes; then :
6021	ac_have_decl=1	6085	ac_have_decl=1
6022	else	6086	else
6023	ac_have_decl=0	6087	ac_have_decl=0
@@ -6027,7 +6091,7 @@ cat >>confdefs.h <<_ACEOF · 3 unmodified lines
6027	#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl	6091	#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl
6028	_ACEOF	6092	_ACEOF
6029	ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"	6093	ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default"
6030	if test "x$ac_cv_have_decl_putc_unlocked" = x""yes; then :	6094	if test "x$ac_cv_have_decl_putc_unlocked" = xyes; then :
6031	ac_have_decl=1	6095	ac_have_decl=1
6032	else	6096	else
6033	ac_have_decl=0	6097	ac_have_decl=0
@@ -6043,7 +6107,7 @@ _ACEOF · 9 unmodified lines
6043	# for constant arguments. Useless!	6107	# for constant arguments. Useless!
6044	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5	6108	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
6045	$as_echo_n "checking for working alloca.h... " >&6; }	6109	$as_echo_n "checking for working alloca.h... " >&6; }
6046	if test "${ac_cv_working_alloca_h+set}" = set; then :	6110	if ${ac_cv_working_alloca_h+:} false; then :
6047	$as_echo_n "(cached) " >&6	6111	$as_echo_n "(cached) " >&6
6048	else	6112	else
6049	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6113	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6076,7 +6140,7 @@ fi · 26 unmodified lines
6076		6140
6077	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5	6141	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
6078	$as_echo_n "checking for alloca... " >&6; }	6142	$as_echo_n "checking for alloca... " >&6; }
6079	if test "${ac_cv_func_alloca_works+set}" = set; then :	6143	if ${ac_cv_func_alloca_works+:} false; then :
6080	$as_echo_n "(cached) " >&6	6144	$as_echo_n "(cached) " >&6
6081	else	6145	else
6082	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6146	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6095,7 +6159,7 @@ else · 12 unmodified lines
6095	#pragma alloca	6159	#pragma alloca
6096	# else	6160	# else
6097	# ifndef alloca /* predefined by HP cc +Olibcalls */	6161	# ifndef alloca /* predefined by HP cc +Olibcalls */
6098	char *alloca ();	6162	void *alloca (size_t);
6099	# endif	6163	# endif
6100	# endif	6164	# endif
6101	# endif	6165	# endif
@@ -6139,7 +6203,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h · 37 unmodified lines
6139		6203
6140	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5	6204	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
6141	$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }	6205	$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
6142	if test "${ac_cv_os_cray+set}" = set; then :	6206	if ${ac_cv_os_cray+:} false; then :
6143	$as_echo_n "(cached) " >&6	6207	$as_echo_n "(cached) " >&6
6144	else	6208	else
6145	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6209	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6166,8 +6230,7 @@ if test $ac_cv_os_cray = yes; then · 20 unmodified lines
6166	for ac_func in _getb67 GETB67 getb67; do	6230	for ac_func in _getb67 GETB67 getb67; do
6167	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`	6231	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
6168	ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"	6232	ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
6169	eval as_val=\$$as_ac_var	6233	if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
6170	if test "x$as_val" = x""yes; then :
6171		6234
6172	cat >>confdefs.h <<_ACEOF	6235	cat >>confdefs.h <<_ACEOF
6173	#define CRAY_STACKSEG_END $ac_func	6236	#define CRAY_STACKSEG_END $ac_func
@@ -6181,7 +6244,7 @@ fi · 7 unmodified lines
6181		6244
6182	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5	6245	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
6183	$as_echo_n "checking stack direction for C alloca... " >&6; }	6246	$as_echo_n "checking stack direction for C alloca... " >&6; }
6184	if test "${ac_cv_c_stack_direction+set}" = set; then :	6247	if ${ac_cv_c_stack_direction+:} false; then :
6185	$as_echo_n "(cached) " >&6	6248	$as_echo_n "(cached) " >&6
6186	else	6249	else
6187	if test "$cross_compiling" = yes; then :	6250	if test "$cross_compiling" = yes; then :
@@ -6191,23 +6254,20 @@ else · 3 unmodified lines
6191	/* end confdefs.h. */	6254	/* end confdefs.h. */
6192	$ac_includes_default	6255	$ac_includes_default
6193	int	6256	int
6194	find_stack_direction ()	6257	find_stack_direction (int *addr, int depth)
6195	{	6258	{
6196	static char *addr = 0;	6259	int dir, dummy = 0;
6197	auto char dummy;	6260	if (! addr)
6198	if (addr == 0)	6261	addr = &dummy;
6199	{	6262	*addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
6200	addr = &dummy;	6263	dir = depth ? find_stack_direction (addr, depth - 1) : 0;
6201	return find_stack_direction ();	6264	return dir + dummy;
6202	}
6203	else
6204	return (&dummy > addr) ? 1 : -1;
6205	}	6265	}
6206		6266
6207	int	6267	int
6208	main ()	6268	main (int argc, char **argv)
6209	{	6269	{
6210	return find_stack_direction () < 0;	6270	return find_stack_direction (0, argc + !argv + 20) < 0;
6211	}	6271	}
6212	_ACEOF	6272	_ACEOF
6213	if ac_fn_c_try_run "$LINENO"; then :	6273	if ac_fn_c_try_run "$LINENO"; then :
@@ -6231,7 +6291,7 @@ fi · 17 unmodified lines
6231		6291
6232	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5	6292	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
6233	$as_echo_n "checking for ANSI C header files... " >&6; }	6293	$as_echo_n "checking for ANSI C header files... " >&6; }
6234	if test "${ac_cv_header_stdc+set}" = set; then :	6294	if ${ac_cv_header_stdc+:} false; then :
6235	$as_echo_n "(cached) " >&6	6295	$as_echo_n "(cached) " >&6
6236	else	6296	else
6237	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6297	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6344,7 +6404,7 @@ fi · 106 unmodified lines
6344		6404
6345	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5	6405	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
6346	$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }	6406	$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
6347	if test "${am_cv_langinfo_codeset+set}" = set; then :	6407	if ${am_cv_langinfo_codeset+:} false; then :
6348	$as_echo_n "(cached) " >&6	6408	$as_echo_n "(cached) " >&6
6349	else	6409	else
6350	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6410	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6448,7 +6508,7 @@ fi · 97 unmodified lines
6448		6508
6449	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uchar" >&5	6509	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uchar" >&5
6450	$as_echo_n "checking for uchar... " >&6; }	6510	$as_echo_n "checking for uchar... " >&6; }
6451	if test "${gcc_cv_type_uchar+set}" = set; then :	6511	if ${gcc_cv_type_uchar+:} false; then :
6452	$as_echo_n "(cached) " >&6	6512	$as_echo_n "(cached) " >&6
6453	else	6513	else
6454	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	6514	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6564,7 +6624,7 @@ else · 109 unmodified lines
6564	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5	6624	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
6565	$as_echo_n "checking for non-GNU ld... " >&6; }	6625	$as_echo_n "checking for non-GNU ld... " >&6; }
6566	fi	6626	fi
6567	if test "${acl_cv_path_LD+set}" = set; then :	6627	if ${acl_cv_path_LD+:} false; then :
6568	$as_echo_n "(cached) " >&6	6628	$as_echo_n "(cached) " >&6
6569	else	6629	else
6570	if test -z "$LD"; then	6630	if test -z "$LD"; then
@@ -6597,10 +6657,10 @@ else · 26 unmodified lines
6597	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5	6657	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6598	$as_echo "no" >&6; }	6658	$as_echo "no" >&6; }
6599	fi	6659	fi
6600	test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5	6660	test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
6601	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5	6661	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
6602	$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }	6662	$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
6603	if test "${acl_cv_prog_gnu_ld+set}" = set; then :	6663	if ${acl_cv_prog_gnu_ld+:} false; then :
6604	$as_echo_n "(cached) " >&6	6664	$as_echo_n "(cached) " >&6
6605	else	6665	else
6606	# I'd rather use --version here, but apparently some GNU ld's only accept -v.	6666	# I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -6618,7 +6678,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld · 11 unmodified lines
6618		6678
6619	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5	6679	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
6620	$as_echo_n "checking for shared library run path origin... " >&6; }	6680	$as_echo_n "checking for shared library run path origin... " >&6; }
6621	if test "${acl_cv_rpath+set}" = set; then :	6681	if ${acl_cv_rpath+:} false; then :
6622	$as_echo_n "(cached) " >&6	6682	$as_echo_n "(cached) " >&6
6623	else	6683	else
6624		6684
@@ -7036,7 +7096,7 @@ fi · 411 unmodified lines
7036		7096
7037	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5	7097	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
7038	$as_echo_n "checking for iconv... " >&6; }	7098	$as_echo_n "checking for iconv... " >&6; }
7039	if test "${am_cv_func_iconv+set}" = set; then :	7099	if ${am_cv_func_iconv+:} false; then :
7040	$as_echo_n "(cached) " >&6	7100	$as_echo_n "(cached) " >&6
7041	else	7101	else
7042		7102
@@ -7105,7 +7165,7 @@ rm -f core conftest.err conftest.$ac_objext \ · 62 unmodified lines
7105	if test "$am_cv_func_iconv" != yes; then	7165	if test "$am_cv_func_iconv" != yes; then
7106	am_save_CPPFLAGS="$CPPFLAGS"	7166	am_save_CPPFLAGS="$CPPFLAGS"
7107	am_save_LIBS="$LIBS"	7167	am_save_LIBS="$LIBS"
7108	CPPFLAGS="$LIBS $INCICONV"	7168	CPPFLAGS="$CPPFLAGS $INCICONV"
7109	LIBS="$LIBS $LIBICONV"	7169	LIBS="$LIBS $LIBICONV"
7110	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	7170	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7111	/* end confdefs.h. */	7171	/* end confdefs.h. */
@@ -7177,7 +7237,7 @@ $as_echo "$LIBICONV" >&6; } · 65 unmodified lines
7177	if test "$am_cv_func_iconv" = yes; then	7237	if test "$am_cv_func_iconv" = yes; then
7178	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5	7238	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
7179	$as_echo_n "checking for iconv declaration... " >&6; }	7239	$as_echo_n "checking for iconv declaration... " >&6; }
7180	if test "${am_cv_proto_iconv+set}" = set; then :	7240	if ${am_cv_proto_iconv+:} false; then :
7181	$as_echo_n "(cached) " >&6	7241	$as_echo_n "(cached) " >&6
7182	else	7242	else
7183		7243
@@ -7378,7 +7438,7 @@ if test x$enable_valgrind_annotations != xno \ · 194 unmodified lines
7378	if (test $have_valgrind_h = no \	7438	if (test $have_valgrind_h = no \
7379	&& test $gcc_cv_header_memcheck_h = no \	7439	&& test $gcc_cv_header_memcheck_h = no \
7380	&& test $gcc_cv_header_valgrind_memcheck_h = no); then	7440	&& test $gcc_cv_header_valgrind_memcheck_h = no); then
7381	as_fn_error "*** Can't find valgrind/memcheck.h, memcheck.h or valgrind.h" "$LINENO" 5	7441	as_fn_error $? "*** Can't find valgrind/memcheck.h, memcheck.h or valgrind.h" "$LINENO" 5
7382	fi	7442	fi
7383		7443
7384	$as_echo "#define ENABLE_VALGRIND_ANNOTATIONS 1" >>confdefs.h	7444	$as_echo "#define ENABLE_VALGRIND_ANNOTATIONS 1" >>confdefs.h
@@ -7455,10 +7515,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; · 70 unmodified lines
7455	:end' >>confcache	7515	:end' >>confcache
7456	if diff "$cache_file" confcache >/dev/null 2>&1; then :; else	7516	if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
7457	if test -w "$cache_file"; then	7517	if test -w "$cache_file"; then
7458	test "x$cache_file" != "x/dev/null" &&	7518	if test "x$cache_file" != "x/dev/null"; then
7459	{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5	7519	{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
7460	$as_echo "$as_me: updating cache $cache_file" >&6;}	7520	$as_echo "$as_me: updating cache $cache_file" >&6;}
7461	cat confcache >$cache_file	7521	if test ! -f "$cache_file" \|\| test -h "$cache_file"; then
		7522	cat confcache >"$cache_file"
		7523	else
		7524	case $cache_file in #(
		7525	/ \| ?:*)
		7526	mv -f confcache "$cache_file"$$ &&
		7527	mv -f "$cache_file"$$ "$cache_file" ;; #(
		7528	*)
		7529	mv -f confcache "$cache_file" ;;
		7530	esac
		7531	fi
		7532	fi
7462	else	7533	else
7463	{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5	7534	{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
7464	$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}	7535	$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -7474,6 +7545,7 @@ DEFS=-DHAVE_CONFIG_H · 9 unmodified lines
7474		7545
7475	ac_libobjs=	7546	ac_libobjs=
7476	ac_ltlibobjs=	7547	ac_ltlibobjs=
		7548	U=
7477	for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue	7549	for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
7478	# 1. Remove the extension, and $U if already installed.	7550	# 1. Remove the extension, and $U if already installed.
7479	ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'	7551	ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -7490,7 +7562,7 @@ LTLIBOBJS=$ac_ltlibobjs · 10 unmodified lines
7490		7562
7491		7563
7492		7564
7493	: ${CONFIG_STATUS=./config.status}	7565	: "${CONFIG_STATUS=./config.status}"
7494	ac_write_fail=0	7566	ac_write_fail=0
7495	ac_clean_files_save=$ac_clean_files	7567	ac_clean_files_save=$ac_clean_files
7496	ac_clean_files="$ac_clean_files $CONFIG_STATUS"	7568	ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -7591,6 +7663,7 @@ fi · 94 unmodified lines
7591	IFS=" "" $as_nl"	7663	IFS=" "" $as_nl"
7592		7664
7593	# Find who we are. Look in the path if we contain no directory separator.	7665	# Find who we are. Look in the path if we contain no directory separator.
		7666	as_myself=
7594	case $0 in #((	7667	case $0 in #((
7595	[\\/] ) as_myself=$0 ;;	7668	[\\/] ) as_myself=$0 ;;
7596	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	7669	*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7636,19 +7709,19 @@ export LANGUAGE · 39 unmodified lines
7636	(unset CDPATH) >/dev/null 2>&1 && unset CDPATH	7709	(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
7637		7710
7638		7711
7639	# as_fn_error ERROR [LINENO LOG_FD]	7712	# as_fn_error STATUS ERROR [LINENO LOG_FD]
7640	# ---------------------------------	7713	# ----------------------------------------
7641	# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are	7714	# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
7642	# provided, also output the error to LOG_FD, referencing LINENO. Then exit the	7715	# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
7643	# script with status $?, using 1 if that was 0.	7716	# script with STATUS, using 1 if that was 0.
7644	as_fn_error ()	7717	as_fn_error ()
7645	{	7718	{
7646	as_status=$?; test $as_status -eq 0 && as_status=1	7719	as_status=$1; test $as_status -eq 0 && as_status=1
7647	if test "$3"; then	7720	if test "$4"; then
7648	as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack	7721	as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
7649	$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3	7722	$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
7650	fi	7723	fi
7651	$as_echo "$as_me: error: $1" >&2	7724	$as_echo "$as_me: error: $2" >&2
7652	as_fn_exit $as_status	7725	as_fn_exit $as_status
7653	} # as_fn_error	7726	} # as_fn_error
7654		7727
@@ -7786,16 +7859,16 @@ if (echo >conf$$.file) 2>/dev/null; then · 131 unmodified lines
7786	# ... but there are two gotchas:	7859	# ... but there are two gotchas:
7787	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.	7860	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
7788	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.	7861	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
7789	# In both cases, we have to default to `cp -p'.	7862	# In both cases, we have to default to `cp -pR'.
7790	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|	7863	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
7791	as_ln_s='cp -p'	7864	as_ln_s='cp -pR'
7792	elif ln conf$$.file conf$$ 2>/dev/null; then	7865	elif ln conf$$.file conf$$ 2>/dev/null; then
7793	as_ln_s=ln	7866	as_ln_s=ln
7794	else	7867	else
7795	as_ln_s='cp -p'	7868	as_ln_s='cp -pR'
7796	fi	7869	fi
7797	else	7870	else
7798	as_ln_s='cp -p'	7871	as_ln_s='cp -pR'
7799	fi	7872	fi
7800	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file	7873	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
7801	rmdir conf$$.dir 2>/dev/null	7874	rmdir conf$$.dir 2>/dev/null
@@ -7844,7 +7917,7 @@ $as_echo X"$as_dir" \| · 42 unmodified lines
7844	test -d "$as_dir" && break	7917	test -d "$as_dir" && break
7845	done	7918	done
7846	test -z "$as_dirs" \|\| eval "mkdir $as_dirs"	7919	test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
7847	} \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir"	7920	} \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir"
7848		7921
7849		7922
7850	} # as_fn_mkdir_p	7923	} # as_fn_mkdir_p
@@ -7855,28 +7928,16 @@ else · 4 unmodified lines
7855	as_mkdir_p=false	7928	as_mkdir_p=false
7856	fi	7929	fi
7857		7930
7858	if test -x / >/dev/null 2>&1; then	7931
7859	as_test_x='test -x'	7932	# as_fn_executable_p FILE
7860	else	7933	# -----------------------
7861	if ls -dL / >/dev/null 2>&1; then	7934	# Test if FILE is an executable regular file.
7862	as_ls_L_option=L	7935	as_fn_executable_p ()
7863	else	7936	{
7864	as_ls_L_option=	7937	test -f "$1" && test -x "$1"
7865	fi	7938	} # as_fn_executable_p
7866	as_test_x='	7939	as_test_x='test -x'
7867	eval sh -c '\''	7940	as_executable_p=as_fn_executable_p
7868	if test -d "$1"; then
7869	test -d "$1/.";
7870	else
7871	case $1 in #(
7872	-*)set "./$1";;
7873	esac;
7874	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
7875	???[sx]):;;)false;;esac;fi
7876	'\'' sh
7877	'
7878	fi
7879	as_executable_p=$as_test_x
7880		7941
7881	# Sed expression to map a string onto a valid CPP name.	7942	# Sed expression to map a string onto a valid CPP name.
7882	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"	7943	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -7898,7 +7959,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 · 15 unmodified lines
7898	# values after options handling.	7959	# values after options handling.
7899	ac_log="	7960	ac_log="
7900	This file was extended by cpplib $as_me , which was	7961	This file was extended by cpplib $as_me , which was
7901	generated by GNU Autoconf 2.64. Invocation command line was	7962	generated by GNU Autoconf 2.69. Invocation command line was
7902		7963
7903	CONFIG_FILES = $CONFIG_FILES	7964	CONFIG_FILES = $CONFIG_FILES
7904	CONFIG_HEADERS = $CONFIG_HEADERS	7965	CONFIG_HEADERS = $CONFIG_HEADERS
@@ -7938,6 +7999,7 @@ Usage: $0 [OPTION]... [TAG]... · 33 unmodified lines
7938		7999
7939	-h, --help print this help, then exit	8000	-h, --help print this help, then exit
7940	-V, --version print version number and configuration settings, then exit	8001	-V, --version print version number and configuration settings, then exit
		8002	--config print configuration, then exit
7941	-q, --quiet, --silent	8003	-q, --quiet, --silent
7942	do not print progress messages	8004	do not print progress messages
7943	-d, --debug don't remove temporary files	8005	-d, --debug don't remove temporary files
@@ -7960,12 +8022,13 @@ Report bugs to <gcc-bugs@gcc.gnu.org>." · 16 unmodified lines
7960		8022
7961	_ACEOF	8023	_ACEOF
7962	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1	8024	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
		8025	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
7963	ac_cs_version="\\	8026	ac_cs_version="\\
7964	cpplib config.status	8027	cpplib config.status
7965	configured by $0, generated by GNU Autoconf 2.64,	8028	configured by $0, generated by GNU Autoconf 2.69,
7966	with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"	8029	with options \\"\$ac_cs_config\\"
7967		8030
7968	Copyright (C) 2009 Free Software Foundation, Inc.	8031	Copyright (C) 2012 Free Software Foundation, Inc.
7969	This config.status script is free software; the Free Software Foundation	8032	This config.status script is free software; the Free Software Foundation
7970	gives unlimited permission to copy, distribute and modify it."	8033	gives unlimited permission to copy, distribute and modify it."
7971		8034
@@ -7981,11 +8044,16 @@ ac_need_defaults=: · 9 unmodified lines
7981	while test $# != 0	8044	while test $# != 0
7982	do	8045	do
7983	case $1 in	8046	case $1 in
7984	--=)	8047	--=?)
7985	ac_option=`expr "X$1" : 'X$[^=]*$='`	8048	ac_option=`expr "X$1" : 'X$[^=]*$='`
7986	ac_optarg=`expr "X$1" : 'X[^=]=$.$'`	8049	ac_optarg=`expr "X$1" : 'X[^=]=$.$'`
7987	ac_shift=:	8050	ac_shift=:
7988	;;	8051	;;
		8052	--*=)
		8053	ac_option=`expr "X$1" : 'X$[^=]*$='`
		8054	ac_optarg=
		8055	ac_shift=:
		8056	;;
7989	*)	8057	*)
7990	ac_option=$1	8058	ac_option=$1
7991	ac_optarg=$2	8059	ac_optarg=$2
@@ -7999,12 +8067,15 @@ do · 7 unmodified lines
7999	ac_cs_recheck=: ;;	8067	ac_cs_recheck=: ;;
8000	--version \| --versio \| --versi \| --vers \| --ver \| --ve \| --v \| -V )	8068	--version \| --versio \| --versi \| --vers \| --ver \| --ve \| --v \| -V )
8001	$as_echo "$ac_cs_version"; exit ;;	8069	$as_echo "$ac_cs_version"; exit ;;
		8070	--config \| --confi \| --conf \| --con \| --co \| --c )
		8071	$as_echo "$ac_cs_config"; exit ;;
8002	--debug \| --debu \| --deb \| --de \| --d \| -d )	8072	--debug \| --debu \| --deb \| --de \| --d \| -d )
8003	debug=: ;;	8073	debug=: ;;
8004	--file \| --fil \| --fi \| --f )	8074	--file \| --fil \| --fi \| --f )
8005	$ac_shift	8075	$ac_shift
8006	case $ac_optarg in	8076	case $ac_optarg in
8007	\') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;	8077	\') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;
		8078	'') as_fn_error $? "missing file argument" ;;
8008	esac	8079	esac
8009	as_fn_append CONFIG_FILES " '$ac_optarg'"	8080	as_fn_append CONFIG_FILES " '$ac_optarg'"
8010	ac_need_defaults=false;;	8081	ac_need_defaults=false;;
@@ -8017,7 +8088,7 @@ do · 6 unmodified lines
8017	ac_need_defaults=false;;	8088	ac_need_defaults=false;;
8018	--he \| --h)	8089	--he \| --h)
8019	# Conflict between --help and --header	8090	# Conflict between --help and --header
8020	as_fn_error "ambiguous option: \`$1'	8091	as_fn_error $? "ambiguous option: \`$1'
8021	Try \`$0 --help' for more information.";;	8092	Try \`$0 --help' for more information.";;
8022	--help \| --hel \| -h )	8093	--help \| --hel \| -h )
8023	$as_echo "$ac_cs_usage"; exit ;;	8094	$as_echo "$ac_cs_usage"; exit ;;
@@ -8026,7 +8097,7 @@ Try \`$0 --help' for more information.";; · 2 unmodified lines
8026	ac_cs_silent=: ;;	8097	ac_cs_silent=: ;;
8027		8098
8028	# This is an error.	8099	# This is an error.
8029	-*) as_fn_error "unrecognized option: \`$1'	8100	-*) as_fn_error $? "unrecognized option: \`$1'
8030	Try \`$0 --help' for more information." ;;	8101	Try \`$0 --help' for more information." ;;
8031		8102
8032	*) as_fn_append ac_config_targets " $1"	8103	*) as_fn_append ac_config_targets " $1"
@@ -8046,7 +8117,7 @@ fi · 13 unmodified lines
8046	_ACEOF	8117	_ACEOF
8047	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1	8118	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
8048	if \$ac_cs_recheck; then	8119	if \$ac_cs_recheck; then
8049	set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion	8120	set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
8050	shift	8121	shift
8051	\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6	8122	\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
8052	CONFIG_SHELL='$SHELL'	8123	CONFIG_SHELL='$SHELL'
@@ -8084,7 +8155,7 @@ do · 31 unmodified lines
8084	"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;	8155	"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
8085	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;	8156	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
8086		8157
8087	*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;	8158	*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
8088	esac	8159	esac
8089	done	8160	done
8090		8161
@@ -8107,9 +8178,10 @@ fi · 16 unmodified lines
8107	# after its creation but before its name has been assigned to `$tmp'.	8178	# after its creation but before its name has been assigned to `$tmp'.
8108	$debug \|\|	8179	$debug \|\|
8109	{	8180	{
8110	tmp=	8181	tmp= ac_tmp=
8111	trap 'exit_status=$?	8182	trap 'exit_status=$?
8112	{ test -z "$tmp" \|\| test ! -d "$tmp" \|\| rm -fr "$tmp"; } && exit $exit_status	8183	: "${ac_tmp:=$tmp}"
		8184	{ test ! -d "$ac_tmp" \|\| rm -fr "$ac_tmp"; } && exit $exit_status
8113	' 0	8185	' 0
8114	trap 'as_fn_exit 1' 1 2 13 15	8186	trap 'as_fn_exit 1' 1 2 13 15
8115	}	8187	}
@@ -8117,12 +8189,13 @@ $debug \|\| · 1 unmodified line
8117		8189
8118	{	8190	{
8119	tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&	8191	tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
8120	test -n "$tmp" && test -d "$tmp"	8192	test -d "$tmp"
8121	} \|\|	8193	} \|\|
8122	{	8194	{
8123	tmp=./conf$$-$RANDOM	8195	tmp=./conf$$-$RANDOM
8124	(umask 077 && mkdir "$tmp")	8196	(umask 077 && mkdir "$tmp")
8125	} \|\| as_fn_error "cannot create a temporary directory in ." "$LINENO" 5	8197	} \|\| as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
		8198	ac_tmp=$tmp
8126		8199
8127	# Set up the scripts for CONFIG_FILES section.	8200	# Set up the scripts for CONFIG_FILES section.
8128	# No need to generate them if there are no CONFIG_FILES.	8201	# No need to generate them if there are no CONFIG_FILES.
@@ -8139,12 +8212,12 @@ if test "x$ac_cr" = x; then · 10 unmodified lines
8139	fi	8212	fi
8140	ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`	8213	ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
8141	if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then	8214	if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
8142	ac_cs_awk_cr='\r'	8215	ac_cs_awk_cr='\\r'
8143	else	8216	else
8144	ac_cs_awk_cr=$ac_cr	8217	ac_cs_awk_cr=$ac_cr
8145	fi	8218	fi
8146		8219
8147	echo 'BEGIN {' >"$tmp/subs1.awk" &&	8220	echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
8148	_ACEOF	8221	_ACEOF
8149		8222
8150		8223
@@ -8153,18 +8226,18 @@ _ACEOF · 2 unmodified lines
8153	echo "$ac_subst_vars" \| sed 's/.*/&!$&$ac_delim/' &&	8226	echo "$ac_subst_vars" \| sed 's/.*/&!$&$ac_delim/' &&
8154	echo "_ACEOF"	8227	echo "_ACEOF"
8155	} >conf$$subs.sh \|\|	8228	} >conf$$subs.sh \|\|
8156	as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5	8229	as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
8157	ac_delim_num=`echo "$ac_subst_vars" \| grep -c '$'`	8230	ac_delim_num=`echo "$ac_subst_vars" \| grep -c '^'`
8158	ac_delim='%!_!# '	8231	ac_delim='%!_!# '
8159	for ac_last_try in false false false false false :; do	8232	for ac_last_try in false false false false false :; do
8160	. ./conf$$subs.sh \|\|	8233	. ./conf$$subs.sh \|\|
8161	as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5	8234	as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
8162		8235
8163	ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk \| grep -c X`	8236	ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk \| grep -c X`
8164	if test $ac_delim_n = $ac_delim_num; then	8237	if test $ac_delim_n = $ac_delim_num; then
8165	break	8238	break
8166	elif $ac_last_try; then	8239	elif $ac_last_try; then
8167	as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5	8240	as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
8168	else	8241	else
8169	ac_delim="$ac_delim!$ac_delim _$ac_delim!! "	8242	ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
8170	fi	8243	fi
@@ -8172,7 +8245,7 @@ done · 1 unmodified line
8172	rm -f conf$$subs.sh	8245	rm -f conf$$subs.sh
8173		8246
8174	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1	8247	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
8175	cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&	8248	cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
8176	_ACEOF	8249	_ACEOF
8177	sed -n '	8250	sed -n '
8178	h	8251	h
@@ -8186,7 +8259,7 @@ s/'"$ac_delim"'$// · 7 unmodified lines
8186	t delim	8259	t delim
8187	:nl	8260	:nl
8188	h	8261	h
8189	s/$.\{148\}$.*/\1/	8262	s/$.\{148\}$..*/\1/
8190	t more1	8263	t more1
8191	s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/	8264	s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
8192	p	8265	p
@@ -8200,7 +8273,7 @@ s/.\{148\}// · 7 unmodified lines
8200	t nl	8273	t nl
8201	:delim	8274	:delim
8202	h	8275	h
8203	s/$.\{148\}$.*/\1/	8276	s/$.\{148\}$..*/\1/
8204	t more2	8277	t more2
8205	s/["\\]/\\&/g; s/^/"/; s/$/"/	8278	s/["\\]/\\&/g; s/^/"/; s/$/"/
8206	p	8279	p
@@ -8220,7 +8293,7 @@ t delim · 13 unmodified lines
8220	rm -f conf$$subs.awk	8293	rm -f conf$$subs.awk
8221	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1	8294	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
8222	_ACAWK	8295	_ACAWK
8223	cat >>"\$tmp/subs1.awk" <<_ACAWK &&	8296	cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
8224	for (key in S) S_is_set[key] = 1	8297	for (key in S) S_is_set[key] = 1
8225	FS = ""	8298	FS = ""
8226		8299
@@ -8252,21 +8325,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then · 25 unmodified lines
8252	sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"	8325	sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
8253	else	8326	else
8254	cat	8327	cat
8255	fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \	8328	fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
8256	\|\| as_fn_error "could not setup config files machinery" "$LINENO" 5	8329	\|\| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
8257	_ACEOF	8330	_ACEOF
8258		8331
8259	# VPATH may cause trouble with some makes, so we remove $(srcdir),	8332	# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
8260	# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and	8333	# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
8261	# trailing colons and then remove the whole line if VPATH becomes empty	8334	# trailing colons and then remove the whole line if VPATH becomes empty
8262	# (actually we leave an empty line to preserve line numbers).	8335	# (actually we leave an empty line to preserve line numbers).
8263	if test "x$srcdir" = x.; then	8336	if test "x$srcdir" = x.; then
8264	ac_vpsub='/^[ ]VPATH[ ]=/{	8337	ac_vpsub='/^[ ]VPATH[ ]=[ ]*/{
8265	s/:\$(srcdir):/:/	8338	h
8266	s/:\${srcdir}:/:/	8339	s///
8267	s/:@srcdir@:/:/	8340	s/^/:/
8268	s/^$[^=]=[ ]$:*/\1/	8341	s/[ ]*$/:/
		8342	s/:\$(srcdir):/:/g
		8343	s/:\${srcdir}:/:/g
		8344	s/:@srcdir@:/:/g
		8345	s/^:*//
8269	s/:*$//	8346	s/:*$//
		8347	x
		8348	s/$=[ ]$./\1/
		8349	G
		8350	s/\n//
8270	s/^[^=]=[ ]$//	8351	s/^[^=]=[ ]$//
8271	}'	8352	}'
8272	fi	8353	fi
@@ -8278,7 +8359,7 @@ fi # test -n "$CONFIG_FILES" · 5 unmodified lines
8278	# No need to generate them if there are no CONFIG_HEADERS.	8359	# No need to generate them if there are no CONFIG_HEADERS.
8279	# This happens for instance with `./config.status Makefile'.	8360	# This happens for instance with `./config.status Makefile'.
8280	if test -n "$CONFIG_HEADERS"; then	8361	if test -n "$CONFIG_HEADERS"; then
8281	cat >"$tmp/defines.awk" <<\_ACAWK \|\|	8362	cat >"$ac_tmp/defines.awk" <<\_ACAWK \|\|
8282	BEGIN {	8363	BEGIN {
8283	_ACEOF	8364	_ACEOF
8284		8365
@@ -8290,11 +8371,11 @@ _ACEOF · 5 unmodified lines
8290	# handling of long lines.	8371	# handling of long lines.
8291	ac_delim='%!_!# '	8372	ac_delim='%!_!# '
8292	for ac_last_try in false false :; do	8373	for ac_last_try in false false :; do
8293	ac_t=`sed -n "/$ac_delim/p" confdefs.h`	8374	ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
8294	if test -z "$ac_t"; then	8375	if test -z "$ac_tt"; then
8295	break	8376	break
8296	elif $ac_last_try; then	8377	elif $ac_last_try; then
8297	as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5	8378	as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
8298	else	8379	else
8299	ac_delim="$ac_delim!$ac_delim _$ac_delim!! "	8380	ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
8300	fi	8381	fi
@@ -8379,7 +8460,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 · 78 unmodified lines
8379	_ACAWK	8460	_ACAWK
8380	_ACEOF	8461	_ACEOF
8381	cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1	8462	cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
8382	as_fn_error "could not setup config headers machinery" "$LINENO" 5	8463	as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
8383	fi # test -n "$CONFIG_HEADERS"	8464	fi # test -n "$CONFIG_HEADERS"
8384		8465
8385		8466
@@ -8392,7 +8473,7 @@ do · 6 unmodified lines
8392	esac	8473	esac
8393	case $ac_mode$ac_tag in	8474	case $ac_mode$ac_tag in
8394	:[FHL]:);;	8475	:[FHL]:);;
8395	:L* \| :C:) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;	8476	:L* \| :C:) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
8396	:[FH]-) ac_tag=-:-;;	8477	:[FH]-) ac_tag=-:-;;
8397	:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;	8478	:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
8398	esac	8479	esac
@@ -8411,7 +8492,7 @@ do · 12 unmodified lines
8411	for ac_f	8492	for ac_f
8412	do	8493	do
8413	case $ac_f in	8494	case $ac_f in
8414	-) ac_f="$tmp/stdin";;	8495	-) ac_f="$ac_tmp/stdin";;
8415	*) # Look for the file first in the build tree, then in the source tree	8496	*) # Look for the file first in the build tree, then in the source tree
8416	# (if the path is not absolute). The absolute path cannot be DOS-style,	8497	# (if the path is not absolute). The absolute path cannot be DOS-style,
8417	# because $ac_f cannot contain `:'.	8498	# because $ac_f cannot contain `:'.
@@ -8420,7 +8501,7 @@ do · 2 unmodified lines
8420	[\\/$]*) false;;	8501	[\\/$]*) false;;
8421	*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;	8502	*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
8422	esac \|\|	8503	esac \|\|
8423	as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;	8504	as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
8424	esac	8505	esac
8425	case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac	8506	case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac
8426	as_fn_append ac_file_inputs " '$ac_f'"	8507	as_fn_append ac_file_inputs " '$ac_f'"
@@ -8446,8 +8527,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} · 19 unmodified lines
8446	esac	8527	esac
8447		8528
8448	case $ac_tag in	8529	case $ac_tag in
8449	:-: \| *:-) cat >"$tmp/stdin" \	8530	:-: \| *:-) cat >"$ac_tmp/stdin" \
8450	\|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;;	8531	\|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
8451	esac	8532	esac
8452	;;	8533	;;
8453	esac	8534	esac
@@ -8577,23 +8658,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t · 123 unmodified lines
8577	s&@INSTALL@&$ac_INSTALL&;t t	8658	s&@INSTALL@&$ac_INSTALL&;t t
8578	$ac_datarootdir_hack	8659	$ac_datarootdir_hack
8579	"	8660	"
8580	eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$tmp/subs.awk" >$tmp/out \	8661	eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$ac_tmp/subs.awk" \
8581	\|\| as_fn_error "could not create $ac_file" "$LINENO" 5	8662	>$ac_tmp/out \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
8582		8663
8583	test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&	8664	test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
8584	{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&	8665	{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
8585	{ ac_out=`sed -n '/^[ ]datarootdir[ ]:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&	8666	{ ac_out=`sed -n '/^[ ]datarootdir[ ]:*=/p' \
		8667	"$ac_tmp/out"`; test -z "$ac_out"; } &&
8586	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'	8668	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
8587	which seems to be undefined. Please make sure it is defined." >&5	8669	which seems to be undefined. Please make sure it is defined" >&5
8588	$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'	8670	$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
8589	which seems to be undefined. Please make sure it is defined." >&2;}	8671	which seems to be undefined. Please make sure it is defined" >&2;}
8590		8672
8591	rm -f "$tmp/stdin"	8673	rm -f "$ac_tmp/stdin"
8592	case $ac_file in	8674	case $ac_file in
8593	-) cat "$tmp/out" && rm -f "$tmp/out";;	8675	-) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
8594	*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;	8676	*) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
8595	esac \	8677	esac \
8596	\|\| as_fn_error "could not create $ac_file" "$LINENO" 5	8678	\|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
8597	;;	8679	;;
8598	:H)	8680	:H)
8599	#	8681	#
@@ -8602,21 +8684,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} · 2 unmodified lines
8602	if test x"$ac_file" != x-; then	8684	if test x"$ac_file" != x-; then
8603	{	8685	{
8604	$as_echo "/* $configure_input */" \	8686	$as_echo "/* $configure_input */" \
8605	&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"	8687	&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
8606	} >"$tmp/config.h" \	8688	} >"$ac_tmp/config.h" \
8607	\|\| as_fn_error "could not create $ac_file" "$LINENO" 5	8689	\|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
8608	if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then	8690	if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
8609	{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5	8691	{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
8610	$as_echo "$as_me: $ac_file is unchanged" >&6;}	8692	$as_echo "$as_me: $ac_file is unchanged" >&6;}
8611	else	8693	else
8612	rm -f "$ac_file"	8694	rm -f "$ac_file"
8613	mv "$tmp/config.h" "$ac_file" \	8695	mv "$ac_tmp/config.h" "$ac_file" \
8614	\|\| as_fn_error "could not create $ac_file" "$LINENO" 5	8696	\|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
8615	fi	8697	fi
8616	else	8698	else
8617	$as_echo "/* $configure_input */" \	8699	$as_echo "/* $configure_input */" \
8618	&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \	8700	&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
8619	\|\| as_fn_error "could not create -" "$LINENO" 5	8701	\|\| as_fn_error $? "could not create -" "$LINENO" 5
8620	fi	8702	fi
8621	;;	8703	;;
8622		8704
@@ -8639,7 +8721,7 @@ _ACEOF · 16 unmodified lines
8639	ac_clean_files=$ac_clean_files_save	8721	ac_clean_files=$ac_clean_files_save
8640		8722
8641	test $ac_write_fail = 0 \|\|	8723	test $ac_write_fail = 0 \|\|
8642	as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5	8724	as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
8643		8725
8644		8726
8645	# configure is writing to config.log, and then calls config.status.	8727	# configure is writing to config.log, and then calls config.status.
@@ -8660,7 +8742,7 @@ if test "$no_create" != yes; then · 14 unmodified lines
8660	exec 5>>config.log	8742	exec 5>>config.log
8661	# Use \|\|, not &&, to avoid exiting from the if with $? = 1, which	8743	# Use \|\|, not &&, to avoid exiting from the if with $? = 1, which
8662	# would make configure fail if this is the last instruction.	8744	# would make configure fail if this is the last instruction.
8663	$ac_cs_success \|\| as_fn_exit $?	8745	$ac_cs_success \|\| as_fn_exit 1
8664	fi	8746	fi
8665	if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then	8747	if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
8666	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5	8748	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

gcc/libcpp/configure.ac+1−2

 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)
 AC_INIT(cpplib, [ ], gcc-bugs@gcc.gnu.org, cpplib)
 AC_CONFIG_SRCDIR(ucnid.h)
 AC_CONFIG_MACRO_DIR(../config)
 # Dependency checking.
 ZW_CREATE_DEPDIR
 AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([[int i;]], [],
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [],
 		  [AC_MSG_ERROR([C++ compiler missing or inoperational])])
 AC_LANG_POP([C++])
 ZW_PROG_COMPILER_DEPENDENCIES([CXX])

gcc/libcpp/directives-only.c+2−2

@@ -1,5 +1,5 @@
1	/* CPP Library - directive only preprocessing for distributed compilation.	1	/* CPP Library - directive only preprocessing for distributed compilation.
2	Copyright (C) 2007-2018 Free Software Foundation, Inc.	2	Copyright (C) 2007-2019 Free Software Foundation, Inc.
3	Contributed by Ollie Wild <aaw@google.com>.	3	Contributed by Ollie Wild <aaw@google.com>.
4		4
5	This program is free software; you can redistribute it and/or modify it	5	This program is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ _cpp_preprocess_dir_only (cpp_reader *pfile, · 37 unmodified lines
43	unsigned flags;	43	unsigned flags;
44	linenum_type lines;	44	linenum_type lines;
45	int col;	45	int col;
46	source_location loc;	46	location_t loc;
47		47
48	restart:	48	restart:
49	/* Buffer initialization ala _cpp_clean_line(). */	49	/* Buffer initialization ala _cpp_clean_line(). */

gcc/libcpp/directives.c+142−209

@@ -1,5 +1,5 @@
1	/* CPP Library. (Directive handling.)	1	/* CPP Library. (Directive handling.)
2	Copyright (C) 1986-2018 Free Software Foundation, Inc.	2	Copyright (C) 1986-2019 Free Software Foundation, Inc.
3	Contributed by Per Bothner, 1994-95.	3	Contributed by Per Bothner, 1994-95.
4	Based on CCCP program by Paul Rubin, June 1986	4	Based on CCCP program by Paul Rubin, June 1986
5	Adapted to ANSI C, Richard Stallman, Jan 1987	5	Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -30,7 +30,7 @@ along with this program; see the file COPYING3. If not see · 24 unmodified lines
30	struct if_stack	30	struct if_stack
31	{	31	{
32	struct if_stack *next;	32	struct if_stack *next;
33	source_location line; /* Line where condition started. */	33	location_t line; /* Line where condition started. */
34	const cpp_hashnode mi_cmacro;/ macro name for #ifndef around entire file */	34	const cpp_hashnode mi_cmacro;/ macro name for #ifndef around entire file */
35	bool skip_elses; /* Can future #else / #elif be skipped? */	35	bool skip_elses; /* Can future #else / #elif be skipped? */
36	bool was_skipping; /* If were skipping on entry. */	36	bool was_skipping; /* If were skipping on entry. */
@@ -98,11 +98,12 @@ static void directive_diagnostics (cpp_reader , const directive , int); · 61 unmodified lines
98	static void run_directive (cpp_reader , int, const char , size_t);	98	static void run_directive (cpp_reader , int, const char , size_t);
99	static char glue_header_name (cpp_reader );	99	static char glue_header_name (cpp_reader );
100	static const char parse_include (cpp_reader , int , const cpp_token **,	100	static const char parse_include (cpp_reader , int , const cpp_token **,
101	source_location *);	101	location_t *);
102	static void push_conditional (cpp_reader , int, int, const cpp_hashnode );	102	static void push_conditional (cpp_reader , int, int, const cpp_hashnode );
103	static unsigned int read_flag (cpp_reader *, unsigned int);	103	static unsigned int read_flag (cpp_reader *, unsigned int);
104	static bool strtolinenum (const uchar , size_t, linenum_type , bool *);	104	static bool strtolinenum (const uchar , size_t, linenum_type , bool *);
105	static void do_diagnostic (cpp_reader *, int, int, int);	105	static void do_diagnostic (cpp_reader *, enum cpp_diagnostic_level code,
		106	enum cpp_warning_reason reason, int);
106	static cpp_hashnode lex_macro_node (cpp_reader , bool);	107	static cpp_hashnode lex_macro_node (cpp_reader , bool);
107	static int undefine_macros (cpp_reader , cpp_hashnode , void *);	108	static int undefine_macros (cpp_reader , cpp_hashnode , void *);
108	static void do_include_common (cpp_reader *, enum include_type);	109	static void do_include_common (cpp_reader *, enum include_type);
@@ -123,44 +124,39 @@ static void do_linemarker (cpp_reader *); · 14 unmodified lines
123	static const cpp_token get_token_no_padding (cpp_reader );	124	static const cpp_token get_token_no_padding (cpp_reader );
124	static const cpp_token get__Pragma_string (cpp_reader );	125	static const cpp_token get__Pragma_string (cpp_reader );
125	static void destringize_and_run (cpp_reader , const cpp_string ,	126	static void destringize_and_run (cpp_reader , const cpp_string ,
126	source_location);	127	location_t);
127	static int parse_answer (cpp_reader , struct answer *, int, source_location);	128	static bool parse_answer (cpp_reader , int, location_t, cpp_macro *);
128	static cpp_hashnode parse_assertion (cpp_reader , struct answer **, int);	129	static cpp_hashnode parse_assertion (cpp_reader , int, cpp_macro **);
129	static struct answer ** find_answer (cpp_hashnode , const struct answer );	130	static cpp_macro *find_answer (cpp_hashnode , const cpp_macro *);
130	static void handle_assertion (cpp_reader , const char , int);	131	static void handle_assertion (cpp_reader , const char , int);
131	static void do_pragma_push_macro (cpp_reader *);	132	static void do_pragma_push_macro (cpp_reader *);
132	static void do_pragma_pop_macro (cpp_reader *);	133	static void do_pragma_pop_macro (cpp_reader *);
133	static void cpp_pop_definition (cpp_reader , struct def_pragma_macro );	134	static void cpp_pop_definition (cpp_reader , struct def_pragma_macro );
134		135
135	/* This is the table of directive handlers. It is ordered by	136	/* This is the table of directive handlers. All extensions other than
136	frequency of occurrence; the numbers at the end are directive	137	#warning, #include_next, and #import are deprecated. The name is
137	counts from all the source code I have lying around (egcs and libc	138	where the extension appears to have come from. */
138	CVS as of 1999-05-18, plus grub-0.5.91, linux-2.2.9, and
139	pcmcia-cs-3.0.9). This is no longer important as directive lookup
140	is now O(1). All extensions other than #warning, #include_next,
141	and #import are deprecated. The name is where the extension
142	appears to have come from. */
143		139
144	#define DIRECTIVE_TABLE \	140	#define DIRECTIVE_TABLE \
145	D(define, T_DEFINE = 0, KANDR, IN_I) /* 270554 */ \	141	D(define, T_DEFINE = 0, KANDR, IN_I) \
146	D(include, T_INCLUDE, KANDR, INCL \| EXPAND) /* 52262 */ \	142	D(include, T_INCLUDE, KANDR, INCL \| EXPAND) \
147	D(endif, T_ENDIF, KANDR, COND) /* 45855 */ \	143	D(endif, T_ENDIF, KANDR, COND) \
148	D(ifdef, T_IFDEF, KANDR, COND \| IF_COND) /* 22000 */ \	144	D(ifdef, T_IFDEF, KANDR, COND \| IF_COND) \
149	D(if, T_IF, KANDR, COND \| IF_COND \| EXPAND) /* 18162 */ \	145	D(if, T_IF, KANDR, COND \| IF_COND \| EXPAND) \
150	D(else, T_ELSE, KANDR, COND) /* 9863 */ \	146	D(else, T_ELSE, KANDR, COND) \
151	D(ifndef, T_IFNDEF, KANDR, COND \| IF_COND) /* 9675 */ \	147	D(ifndef, T_IFNDEF, KANDR, COND \| IF_COND) \
152	D(undef, T_UNDEF, KANDR, IN_I) /* 4837 */ \	148	D(undef, T_UNDEF, KANDR, IN_I) \
153	D(line, T_LINE, KANDR, EXPAND) /* 2465 */ \	149	D(line, T_LINE, KANDR, EXPAND) \
154	D(elif, T_ELIF, STDC89, COND \| EXPAND) /* 610 */ \	150	D(elif, T_ELIF, STDC89, COND \| EXPAND) \
155	D(error, T_ERROR, STDC89, 0) /* 475 */ \	151	D(error, T_ERROR, STDC89, 0) \
156	D(pragma, T_PRAGMA, STDC89, IN_I) /* 195 */ \	152	D(pragma, T_PRAGMA, STDC89, IN_I) \
157	D(warning, T_WARNING, EXTENSION, 0) /* 22 */ \	153	D(warning, T_WARNING, EXTENSION, 0) \
158	D(include_next, T_INCLUDE_NEXT, EXTENSION, INCL \| EXPAND) /* 19 */ \	154	D(include_next, T_INCLUDE_NEXT, EXTENSION, INCL \| EXPAND) \
159	D(ident, T_IDENT, EXTENSION, IN_I) /* 11 */ \	155	D(ident, T_IDENT, EXTENSION, IN_I) \
160	D(import, T_IMPORT, EXTENSION, INCL \| EXPAND) /* 0 ObjC */ \	156	D(import, T_IMPORT, EXTENSION, INCL \| EXPAND) /* ObjC */ \
161	D(assert, T_ASSERT, EXTENSION, DEPRECATED) /* 0 SVR4 */ \	157	D(assert, T_ASSERT, EXTENSION, DEPRECATED) /* SVR4 */ \
162	D(unassert, T_UNASSERT, EXTENSION, DEPRECATED) /* 0 SVR4 */ \	158	D(unassert, T_UNASSERT, EXTENSION, DEPRECATED) /* SVR4 */ \
163	D(sccs, T_SCCS, EXTENSION, IN_I) /* 0 SVR4? */	159	D(sccs, T_SCCS, EXTENSION, IN_I) /* SVR4? */
164		160
165	/* #sccs is synonymous with #ident. */	161	/* #sccs is synonymous with #ident. */
166	#define do_sccs do_ident	162	#define do_sccs do_ident
@@ -208,8 +204,6 @@ static const directive linemarker_dir = · 41 unmodified lines
208	do_linemarker, UC"#", 1, KANDR, IN_I	204	do_linemarker, UC"#", 1, KANDR, IN_I
209	};	205	};
210		206
211	#define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
212
213	/* Skip any remaining tokens in a directive. */	207	/* Skip any remaining tokens in a directive. */
214	static void	208	static void
215	skip_rest_of_line (cpp_reader *pfile)	209	skip_rest_of_line (cpp_reader *pfile)
@@ -227,7 +221,7 @@ skip_rest_of_line (cpp_reader *pfile) · 11 unmodified lines
227	/* Helper function for check_oel. */	221	/* Helper function for check_oel. */
228		222
229	static void	223	static void
230	check_eol_1 (cpp_reader *pfile, bool expand, int reason)	224	check_eol_1 (cpp_reader *pfile, bool expand, enum cpp_warning_reason reason)
231	{	225	{
232	if (! SEEN_EOL () && (expand	226	if (! SEEN_EOL () && (expand
233	? cpp_get_token (pfile)	227	? cpp_get_token (pfile)
@@ -665,12 +659,12 @@ do_undef (cpp_reader *pfile) · 431 unmodified lines
665		659
666	/* 6.10.3.5 paragraph 2: [#undef] is ignored if the specified	660	/* 6.10.3.5 paragraph 2: [#undef] is ignored if the specified
667	identifier is not currently defined as a macro name. */	661	identifier is not currently defined as a macro name. */
668	if (node->type == NT_MACRO)	662	if (cpp_macro_p (node))
669	{	663	{
670	if (node->flags & NODE_WARN)	664	if (node->flags & NODE_WARN)
671	cpp_error (pfile, CPP_DL_WARNING,	665	cpp_error (pfile, CPP_DL_WARNING,
672	"undefining \"%s\"", NODE_NAME (node));	666	"undefining \"%s\"", NODE_NAME (node));
673	else if ((node->flags & NODE_BUILTIN)	667	else if (cpp_builtin_macro_p (node)
674	&& CPP_OPTION (pfile, warn_builtin_macro_redefined))	668	&& CPP_OPTION (pfile, warn_builtin_macro_redefined))
675	cpp_warning_with_line (pfile, CPP_W_BUILTIN_MACRO_REDEFINED,	669	cpp_warning_with_line (pfile, CPP_W_BUILTIN_MACRO_REDEFINED,
676	pfile->directive_line, 0,	670	pfile->directive_line, 0,
@@ -695,7 +689,8 @@ undefine_macros (cpp_reader pfile ATTRIBUTE_UNUSED, cpp_hashnode h, · 18 unmodified lines
695	/* Body of _cpp_free_definition inlined here for speed.	689	/* Body of _cpp_free_definition inlined here for speed.
696	Macros and assertions no longer have anything to free. */	690	Macros and assertions no longer have anything to free. */
697	h->type = NT_VOID;	691	h->type = NT_VOID;
698	h->flags &= ~(NODE_POISONED\|NODE_BUILTIN\|NODE_DISABLED\|NODE_USED);	692	h->value.answers = NULL;
		693	h->flags &= ~(NODE_POISONED\|NODE_DISABLED\|NODE_USED);
699	return 1;	694	return 1;
700	}	695	}
701		696
@@ -759,7 +754,7 @@ glue_header_name (cpp_reader *pfile) · 57 unmodified lines
759		754
760	static const char *	755	static const char *
761	parse_include (cpp_reader pfile, int pangle_brackets,	756	parse_include (cpp_reader pfile, int pangle_brackets,
762	const cpp_token **buf, source_location location)	757	const cpp_token **buf, location_t location)
763	{	758	{
764	char *fname;	759	char *fname;
765	const cpp_token *header;	760	const cpp_token *header;
@@ -817,7 +812,7 @@ do_include_common (cpp_reader *pfile, enum include_type type) · 51 unmodified lines
817	const char *fname;	812	const char *fname;
818	int angle_brackets;	813	int angle_brackets;
819	const cpp_token **buf = NULL;	814	const cpp_token **buf = NULL;
820	source_location location;	815	location_t location;
821		816
822	/* Re-enable saving of comments if requested, so that the include	817	/* Re-enable saving of comments if requested, so that the include
823	callback can dump comments which follow #include. */	818	callback can dump comments which follow #include. */
@@ -825,22 +820,15 @@ do_include_common (cpp_reader *pfile, enum include_type type) · 1 unmodified line
825		820
826	fname = parse_include (pfile, &angle_brackets, &buf, &location);	821	fname = parse_include (pfile, &angle_brackets, &buf, &location);
827	if (!fname)	822	if (!fname)
828	{	823	goto done;
829	if (buf)
830	XDELETEVEC (buf);
831	return;
832	}
833		824
834	if (!*fname)	825	if (!*fname)
835	{	826	{
836	cpp_error_with_line (pfile, CPP_DL_ERROR, location, 0,	827	cpp_error_with_line (pfile, CPP_DL_ERROR, location, 0,
837	"empty filename in #%s",	828	"empty filename in #%s",
838	pfile->directive->name);	829	pfile->directive->name);
839	XDELETEVEC (fname);	830	goto done;
840	if (buf)	831	}
841	XDELETEVEC (buf);
842	return;
843	}
844		832
845	/* Prevent #include recursion. */	833	/* Prevent #include recursion. */
846	if (pfile->line_table->depth >= CPP_STACK_MAX)	834	if (pfile->line_table->depth >= CPP_STACK_MAX)
@@ -858,6 +846,7 @@ do_include_common (cpp_reader *pfile, enum include_type type) · 11 unmodified lines
858	_cpp_stack_include (pfile, fname, angle_brackets, type, location);	846	_cpp_stack_include (pfile, fname, angle_brackets, type, location);
859	}	847	}
860		848
		849	done:
861	XDELETEVEC (fname);	850	XDELETEVEC (fname);
862	if (buf)	851	if (buf)
863	XDELETEVEC (buf);	852	XDELETEVEC (buf);
@@ -1088,10 +1077,10 @@ do_linemarker (cpp_reader *pfile) · 224 unmodified lines
1088	/* Reread map since cpp_get_token can invalidate it with a	1077	/* Reread map since cpp_get_token can invalidate it with a
1089	reallocation. */	1078	reallocation. */
1090	map = LINEMAPS_LAST_ORDINARY_MAP (line_table);	1079	map = LINEMAPS_LAST_ORDINARY_MAP (line_table);
1091	const line_map_ordinary *from;	1080	const line_map_ordinary *from
		1081	= linemap_included_from_linemap (line_table, map);
1092	if (MAIN_FILE_P (map)	1082	if (MAIN_FILE_P (map)
1093	\|\| (new_file	1083	\|\| (from
1094	&& (from = INCLUDED_FROM (pfile->line_table, map)) != NULL
1095	&& filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0))	1084	&& filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0))
1096	{	1085	{
1097	cpp_warning (pfile, CPP_W_NONE,	1086	cpp_warning (pfile, CPP_W_NONE,
@@ -1102,7 +1091,7 @@ do_linemarker (cpp_reader *pfile) · 4 unmodified lines
1102	}	1091	}
1103	/* Compensate for the increment in linemap_add that occurs in	1092	/* Compensate for the increment in linemap_add that occurs in
1104	_cpp_do_file_change. We're currently at the start of the line	1093	_cpp_do_file_change. We're currently at the start of the line
1105	following the #line directive. A separate source_location for this	1094	following the #line directive. A separate location_t for this
1106	location makes no sense (until we do the LC_LEAVE), and	1095	location makes no sense (until we do the LC_LEAVE), and
1107	complicates LAST_SOURCE_LINE_LOCATION. */	1096	complicates LAST_SOURCE_LINE_LOCATION. */
1108	pfile->line_table->highest_location--;	1097	pfile->line_table->highest_location--;
@@ -1139,11 +1128,12 @@ _cpp_do_file_change (cpp_reader *pfile, enum lc_reason reason, · 30 unmodified lines
1139	/* Report a warning or error detected by the program we are	1128	/* Report a warning or error detected by the program we are
1140	processing. Use the directive's tokens in the error message. */	1129	processing. Use the directive's tokens in the error message. */
1141	static void	1130	static void
1142	do_diagnostic (cpp_reader *pfile, int code, int reason, int print_dir)	1131	do_diagnostic (cpp_reader *pfile, enum cpp_diagnostic_level code,
		1132	enum cpp_warning_reason reason, int print_dir)
1143	{	1133	{
1144	const unsigned char *dir_name;	1134	const unsigned char *dir_name;
1145	unsigned char *line;	1135	unsigned char *line;
1146	source_location src_loc = pfile->cur_token[-1].src_loc;	1136	location_t src_loc = pfile->cur_token[-1].src_loc;
1147		1137
1148	if (print_dir)	1138	if (print_dir)
1149	dir_name = pfile->directive->name;	1139	dir_name = pfile->directive->name;
@@ -1165,7 +1155,7 @@ do_diagnostic (cpp_reader *pfile, int code, int reason, int print_dir) · 15 unmodified lines
1165	static void	1155	static void
1166	do_error (cpp_reader *pfile)	1156	do_error (cpp_reader *pfile)
1167	{	1157	{
1168	do_diagnostic (pfile, CPP_DL_ERROR, 0, 1);	1158	do_diagnostic (pfile, CPP_DL_ERROR, CPP_W_NONE, 1);
1169	}	1159	}
1170		1160
1171	static void	1161	static void
@@ -1440,7 +1430,7 @@ do_pragma (cpp_reader *pfile) · 268 unmodified lines
1440	{	1430	{
1441	const struct pragma_entry *p = NULL;	1431	const struct pragma_entry *p = NULL;
1442	const cpp_token token, pragma_token;	1432	const cpp_token token, pragma_token;
1443	source_location pragma_token_virt_loc = 0;	1433	location_t pragma_token_virt_loc = 0;
1444	cpp_token ns_token;	1434	cpp_token ns_token;
1445	unsigned int count = 1;	1435	unsigned int count = 1;
1446		1436
@@ -1546,7 +1536,7 @@ do_pragma_push_macro (cpp_reader *pfile) · 99 unmodified lines
1546	txt = get__Pragma_string (pfile);	1536	txt = get__Pragma_string (pfile);
1547	if (!txt)	1537	if (!txt)
1548	{	1538	{
1549	source_location src_loc = pfile->cur_token[-1].src_loc;	1539	location_t src_loc = pfile->cur_token[-1].src_loc;
1550	cpp_error_with_line (pfile, CPP_DL_ERROR, src_loc, 0,	1540	cpp_error_with_line (pfile, CPP_DL_ERROR, src_loc, 0,
1551	"invalid #pragma push_macro directive");	1541	"invalid #pragma push_macro directive");
1552	check_eol (pfile, false);	1542	check_eol (pfile, false);
@@ -1601,7 +1591,7 @@ do_pragma_pop_macro (cpp_reader *pfile) · 48 unmodified lines
1601	txt = get__Pragma_string (pfile);	1591	txt = get__Pragma_string (pfile);
1602	if (!txt)	1592	if (!txt)
1603	{	1593	{
1604	source_location src_loc = pfile->cur_token[-1].src_loc;	1594	location_t src_loc = pfile->cur_token[-1].src_loc;
1605	cpp_error_with_line (pfile, CPP_DL_ERROR, src_loc, 0,	1595	cpp_error_with_line (pfile, CPP_DL_ERROR, src_loc, 0,
1606	"invalid #pragma pop_macro directive");	1596	"invalid #pragma pop_macro directive");
1607	check_eol (pfile, false);	1597	check_eol (pfile, false);
@@ -1666,7 +1656,7 @@ do_pragma_poison (cpp_reader *pfile) · 58 unmodified lines
1666	if (hp->flags & NODE_POISONED)	1656	if (hp->flags & NODE_POISONED)
1667	continue;	1657	continue;
1668		1658
1669	if (hp->type == NT_MACRO)	1659	if (cpp_macro_p (hp))
1670	cpp_error (pfile, CPP_DL_WARNING, "poisoning existing macro \"%s\"",	1660	cpp_error (pfile, CPP_DL_WARNING, "poisoning existing macro \"%s\"",
1671	NODE_NAME (hp));	1661	NODE_NAME (hp));
1672	_cpp_free_definition (hp);	1662	_cpp_free_definition (hp);
@@ -1703,7 +1693,7 @@ do_pragma_dependency (cpp_reader *pfile) · 30 unmodified lines
1703	{	1693	{
1704	const char *fname;	1694	const char *fname;
1705	int angle_brackets, ordering;	1695	int angle_brackets, ordering;
1706	source_location location;	1696	location_t location;
1707		1697
1708	fname = parse_include (pfile, &angle_brackets, NULL, &location);	1698	fname = parse_include (pfile, &angle_brackets, NULL, &location);
1709	if (!fname)	1699	if (!fname)
@@ -1719,7 +1709,7 @@ do_pragma_dependency (cpp_reader *pfile) · 9 unmodified lines
1719	if (cpp_get_token (pfile)->type != CPP_EOF)	1709	if (cpp_get_token (pfile)->type != CPP_EOF)
1720	{	1710	{
1721	_cpp_backup_tokens (pfile, 1);	1711	_cpp_backup_tokens (pfile, 1);
1722	do_diagnostic (pfile, CPP_DL_WARNING, 0, 0);	1712	do_diagnostic (pfile, CPP_DL_WARNING, CPP_W_NONE, 0);
1723	}	1713	}
1724	}	1714	}
1725		1715
@@ -1809,7 +1799,7 @@ get__Pragma_string (cpp_reader *pfile) · 83 unmodified lines
1809	\" and \\ sequences, and process the result as a #pragma directive. */	1799	\" and \\ sequences, and process the result as a #pragma directive. */
1810	static void	1800	static void
1811	destringize_and_run (cpp_reader pfile, const cpp_string in,	1801	destringize_and_run (cpp_reader pfile, const cpp_string in,
1812	source_location expansion_loc)	1802	location_t expansion_loc)
1813	{	1803	{
1814	const unsigned char src, limit;	1804	const unsigned char src, limit;
1815	char dest, result;	1805	char dest, result;
@@ -1929,7 +1919,7 @@ destringize_and_run (cpp_reader pfile, const cpp_string in, · 113 unmodified lines
1929		1919
1930	/* Handle the _Pragma operator. Return 0 on error, 1 if ok. */	1920	/* Handle the _Pragma operator. Return 0 on error, 1 if ok. */
1931	int	1921	int
1932	_cpp_do__Pragma (cpp_reader *pfile, source_location expansion_loc)	1922	_cpp_do__Pragma (cpp_reader *pfile, location_t expansion_loc)
1933	{	1923	{
1934	const cpp_token *string = get__Pragma_string (pfile);	1924	const cpp_token *string = get__Pragma_string (pfile);
1935	pfile->directive_result.type = CPP_PADDING;	1925	pfile->directive_result.type = CPP_PADDING;
@@ -1960,26 +1950,9 @@ do_ifdef (cpp_reader *pfile) · 24 unmodified lines
1960	the powerpc and spu ports using conditional macros for 'vector',	1950	the powerpc and spu ports using conditional macros for 'vector',
1961	'bool', and 'pixel' to act as conditional keywords. This messes	1951	'bool', and 'pixel' to act as conditional keywords. This messes
1962	up tests like #ifndef bool. */	1952	up tests like #ifndef bool. */
1963	skip = (node->type != NT_MACRO	1953	skip = !cpp_macro_p (node) \|\| (node->flags & NODE_CONDITIONAL);
1964	\|\| ((node->flags & NODE_CONDITIONAL) != 0));
1965	_cpp_mark_macro_used (node);	1954	_cpp_mark_macro_used (node);
1966	if (!(node->flags & NODE_USED))	1955	_cpp_maybe_notify_macro_use (pfile, node);
1967	{
1968	node->flags \|= NODE_USED;
1969	if (node->type == NT_MACRO)
1970	{
1971	if ((node->flags & NODE_BUILTIN)
1972	&& pfile->cb.user_builtin_macro)
1973	pfile->cb.user_builtin_macro (pfile, node);
1974	if (pfile->cb.used_define)
1975	pfile->cb.used_define (pfile, pfile->directive_line, node);
1976	}
1977	else
1978	{
1979	if (pfile->cb.used_undef)
1980	pfile->cb.used_undef (pfile, pfile->directive_line, node);
1981	}
1982	}
1983	if (pfile->cb.used)	1956	if (pfile->cb.used)
1984	pfile->cb.used (pfile, pfile->directive_line, node);	1957	pfile->cb.used (pfile, pfile->directive_line, node);
1985	check_eol (pfile, false);	1958	check_eol (pfile, false);
@@ -2006,26 +1979,10 @@ do_ifndef (cpp_reader *pfile) · 20 unmodified lines
2006	the powerpc and spu ports using conditional macros for 'vector',	1979	the powerpc and spu ports using conditional macros for 'vector',
2007	'bool', and 'pixel' to act as conditional keywords. This messes	1980	'bool', and 'pixel' to act as conditional keywords. This messes
2008	up tests like #ifndef bool. */	1981	up tests like #ifndef bool. */
2009	skip = (node->type == NT_MACRO	1982	skip = (cpp_macro_p (node)
2010	&& ((node->flags & NODE_CONDITIONAL) == 0));	1983	&& !(node->flags & NODE_CONDITIONAL));
2011	_cpp_mark_macro_used (node);	1984	_cpp_mark_macro_used (node);
2012	if (!(node->flags & NODE_USED))	1985	_cpp_maybe_notify_macro_use (pfile, node);
2013	{
2014	node->flags \|= NODE_USED;
2015	if (node->type == NT_MACRO)
2016	{
2017	if ((node->flags & NODE_BUILTIN)
2018	&& pfile->cb.user_builtin_macro)
2019	pfile->cb.user_builtin_macro (pfile, node);
2020	if (pfile->cb.used_define)
2021	pfile->cb.used_define (pfile, pfile->directive_line, node);
2022	}
2023	else
2024	{
2025	if (pfile->cb.used_undef)
2026	pfile->cb.used_undef (pfile, pfile->directive_line, node);
2027	}
2028	}
2029	if (pfile->cb.used)	1986	if (pfile->cb.used)
2030	pfile->cb.used (pfile, pfile->directive_line, node);	1987	pfile->cb.used (pfile, pfile->directive_line, node);
2031	check_eol (pfile, false);	1988	check_eol (pfile, false);
@@ -2182,17 +2139,13 @@ push_conditional (cpp_reader *pfile, int skip, int type, · 150 unmodified lines
2182	storage, i.e. the #assert case. Returns 0 on success, and sets	2139	storage, i.e. the #assert case. Returns 0 on success, and sets
2183	ANSWERP to point to the answer. PRED_LOC is the location of the	2140	ANSWERP to point to the answer. PRED_LOC is the location of the
2184	predicate. */	2141	predicate. */
2185	static int	2142	static bool
2186	parse_answer (cpp_reader pfile, struct answer *answerp, int type,	2143	parse_answer (cpp_reader *pfile, int type, location_t pred_loc,
2187	source_location pred_loc)	2144	cpp_macro **answer_ptr)
2188	{	2145	{
2189	const cpp_token *paren;
2190	struct answer *answer;
2191	unsigned int acount;
2192
2193	/* In a conditional, it is legal to not have an open paren. We	2146	/* In a conditional, it is legal to not have an open paren. We
2194	should save the following token in this case. */	2147	should save the following token in this case. */
2195	paren = cpp_get_token (pfile);	2148	const cpp_token *paren = cpp_get_token (pfile);
2196		2149
2197	/* If not a paren, see if we're OK. */	2150	/* If not a paren, see if we're OK. */
2198	if (paren->type != CPP_OPEN_PAREN)	2151	if (paren->type != CPP_OPEN_PAREN)
@@ -2202,23 +2155,26 @@ parse_answer (cpp_reader pfile, struct answer *answerp, int type, · 3 unmodified lines
2202	if (type == T_IF)	2155	if (type == T_IF)
2203	{	2156	{
2204	_cpp_backup_tokens (pfile, 1);	2157	_cpp_backup_tokens (pfile, 1);
2205	return 0;	2158	return true;
2206	}	2159	}
2207		2160
2208	/* #unassert with no answer is valid - it removes all answers. */	2161	/* #unassert with no answer is valid - it removes all answers. */
2209	if (type == T_UNASSERT && paren->type == CPP_EOF)	2162	if (type == T_UNASSERT && paren->type == CPP_EOF)
2210	return 0;	2163	return true;
2211		2164
2212	cpp_error_with_line (pfile, CPP_DL_ERROR, pred_loc, 0,	2165	cpp_error_with_line (pfile, CPP_DL_ERROR, pred_loc, 0,
2213	"missing '(' after predicate");	2166	"missing '(' after predicate");
2214	return 1;	2167	return false;
2215	}	2168	}
2216		2169
2217	for (acount = 0;; acount++)	2170	cpp_macro *answer = _cpp_new_macro (pfile, cmk_assert,
		2171	_cpp_reserve_room (pfile, 0,
		2172	sizeof (cpp_macro)));
		2173	answer->parm.next = NULL;
		2174	unsigned count = 0;
		2175	for (;;)
2218	{	2176	{
2219	size_t room_needed;
2220	const cpp_token *token = cpp_get_token (pfile);	2177	const cpp_token *token = cpp_get_token (pfile);
2221	cpp_token *dest;
2222		2178
2223	if (token->type == CPP_CLOSE_PAREN)	2179	if (token->type == CPP_CLOSE_PAREN)
2224	break;	2180	break;
@@ -2226,57 +2182,52 @@ parse_answer (cpp_reader pfile, struct answer *answerp, int type, · 1 unmodified line
2226	if (token->type == CPP_EOF)	2182	if (token->type == CPP_EOF)
2227	{	2183	{
2228	cpp_error (pfile, CPP_DL_ERROR, "missing ')' to complete answer");	2184	cpp_error (pfile, CPP_DL_ERROR, "missing ')' to complete answer");
2229	return 1;	2185	return false;
2230	}	2186	}
2231		2187
2232	/* struct answer includes the space for one token. */	2188	answer = (cpp_macro *)_cpp_reserve_room
2233	room_needed = (sizeof (struct answer) + acount * sizeof (cpp_token));	2189	(pfile, sizeof (cpp_macro) + count * sizeof (cpp_token),
2234		2190	sizeof (cpp_token));
2235	if (BUFF_ROOM (pfile->a_buff) < room_needed)	2191	answer->exp.tokens[count++] = *token;
2236	_cpp_extend_buff (pfile, &pfile->a_buff, sizeof (struct answer));
2237
2238	dest = &((struct answer *) BUFF_FRONT (pfile->a_buff))->first[acount];
2239	dest = token;
2240
2241	/* Drop whitespace at start, for answer equivalence purposes. */
2242	if (acount == 0)
2243	dest->flags &= ~PREV_WHITE;
2244	}	2192	}
2245		2193
2246	if (acount == 0)	2194	if (!count)
2247	{	2195	{
2248	cpp_error (pfile, CPP_DL_ERROR, "predicate's answer is empty");	2196	cpp_error (pfile, CPP_DL_ERROR, "predicate's answer is empty");
2249	return 1;	2197	return false;
2250	}	2198	}
2251		2199
2252	answer = (struct answer *) BUFF_FRONT (pfile->a_buff);	2200	/* Drop whitespace at start, for answer equivalence purposes. */
2253	answer->count = acount;	2201	answer->exp.tokens[0].flags &= ~PREV_WHITE;
2254	answer->next = NULL;
2255	*answerp = answer;
2256		2202
2257	return 0;	2203	answer->count = count;
		2204	*answer_ptr = answer;
		2205
		2206	return true;
2258	}	2207	}
2259		2208
2260	/* Parses an assertion directive of type TYPE, returning a pointer to	2209	/* Parses an assertion directive of type TYPE, returning a pointer to
2261	the hash node of the predicate, or 0 on error. If an answer was	2210	the hash node of the predicate, or 0 on error. The node is
2262	supplied, it is placed in ANSWERP, otherwise it is set to 0. */	2211	guaranteed to be disjoint from the macro namespace, so can only
		2212	have type 'NT_VOID'. If an answer was supplied, it is placed in
		2213	ANSWER_PTR, which is otherwise set to 0. /
2263	static cpp_hashnode *	2214	static cpp_hashnode *
2264	parse_assertion (cpp_reader pfile, struct answer *answerp, int type)	2215	parse_assertion (cpp_reader pfile, int type, cpp_macro *answer_ptr)
2265	{	2216	{
2266	cpp_hashnode *result = 0;	2217	cpp_hashnode *result = 0;
2267	const cpp_token *predicate;
2268		2218
2269	/* We don't expand predicates or answers. */	2219	/* We don't expand predicates or answers. */
2270	pfile->state.prevent_expansion++;	2220	pfile->state.prevent_expansion++;
2271		2221
2272	*answerp = 0;	2222	*answer_ptr = NULL;
2273	predicate = cpp_get_token (pfile);	2223
		2224	const cpp_token *predicate = cpp_get_token (pfile);
2274	if (predicate->type == CPP_EOF)	2225	if (predicate->type == CPP_EOF)
2275	cpp_error (pfile, CPP_DL_ERROR, "assertion without predicate");	2226	cpp_error (pfile, CPP_DL_ERROR, "assertion without predicate");
2276	else if (predicate->type != CPP_NAME)	2227	else if (predicate->type != CPP_NAME)
2277	cpp_error_with_line (pfile, CPP_DL_ERROR, predicate->src_loc, 0,	2228	cpp_error_with_line (pfile, CPP_DL_ERROR, predicate->src_loc, 0,
2278	"predicate must be an identifier");	2229	"predicate must be an identifier");
2279	else if (parse_answer (pfile, answerp, type, predicate->src_loc) == 0)	2230	else if (parse_answer (pfile, type, predicate->src_loc, answer_ptr))
2280	{	2231	{
2281	unsigned int len = NODE_LEN (predicate->val.node.node);	2232	unsigned int len = NODE_LEN (predicate->val.node.node);
2282	unsigned char sym = (unsigned char ) alloca (len + 1);	2233	unsigned char sym = (unsigned char ) alloca (len + 1);
@@ -2288,25 +2239,27 @@ parse_assertion (cpp_reader pfile, struct answer *answerp, int type) · 5 unmodified lines
2288	}	2239	}
2289		2240
2290	pfile->state.prevent_expansion--;	2241	pfile->state.prevent_expansion--;
		2242
2291	return result;	2243	return result;
2292	}	2244	}
2293		2245
2294	/* Returns a pointer to the pointer to CANDIDATE in the answer chain,	2246	/* Returns a pointer to the pointer to CANDIDATE in the answer chain,
2295	or a pointer to NULL if the answer is not in the chain. */	2247	or a pointer to NULL if the answer is not in the chain. */
2296	static struct answer **	2248	static cpp_macro **
2297	find_answer (cpp_hashnode node, const struct answer candidate)	2249	find_answer (cpp_hashnode node, const cpp_macro candidate)
2298	{	2250	{
2299	unsigned int i;	2251	unsigned int i;
2300	struct answer **result;	2252	cpp_macro **result = NULL;
2301		2253
2302	for (result = &node->value.answers; result; result = &(result)->next)	2254	for (result = &node->value.answers; result; result = &(result)->parm.next)
2303	{	2255	{
2304	struct answer answer = result;	2256	cpp_macro answer = result;
2305		2257
2306	if (answer->count == candidate->count)	2258	if (answer->count == candidate->count)
2307	{	2259	{
2308	for (i = 0; i < answer->count; i++)	2260	for (i = 0; i < answer->count; i++)
2309	if (! _cpp_equiv_tokens (&answer->first[i], &candidate->first[i]))	2261	if (!_cpp_equiv_tokens (&answer->exp.tokens[i],
		2262	&candidate->exp.tokens[i]))
2310	break;	2263	break;
2311		2264
2312	if (i == answer->count)	2265	if (i == answer->count)
@@ -2323,18 +2276,18 @@ find_answer (cpp_hashnode node, const struct answer candidate) · 10 unmodified lines
2323	int	2276	int
2324	_cpp_test_assertion (cpp_reader pfile, unsigned int value)	2277	_cpp_test_assertion (cpp_reader pfile, unsigned int value)
2325	{	2278	{
2326	struct answer *answer;	2279	cpp_macro *answer;
2327	cpp_hashnode *node;	2280	cpp_hashnode *node = parse_assertion (pfile, T_IF, &answer);
2328
2329	node = parse_assertion (pfile, &answer, T_IF);
2330		2281
2331	/* For recovery, an erroneous assertion expression is handled as a	2282	/* For recovery, an erroneous assertion expression is handled as a
2332	failing assertion. */	2283	failing assertion. */
2333	*value = 0;	2284	*value = 0;
2334		2285
2335	if (node)	2286	if (node)
2336	*value = (node->type == NT_ASSERTION &&	2287	{
2337	(answer == 0 \|\| *find_answer (node, answer) != 0));	2288	if (node->value.answers)
		2289	value = !answer \|\| find_answer (node, answer);
		2290	}
2338	else if (pfile->cur_token[-1].type == CPP_EOF)	2291	else if (pfile->cur_token[-1].type == CPP_EOF)
2339	_cpp_backup_tokens (pfile, 1);	2292	_cpp_backup_tokens (pfile, 1);
2340		2293
@@ -2346,43 +2299,29 @@ _cpp_test_assertion (cpp_reader pfile, unsigned int value) · 5 unmodified lines
2346	static void	2299	static void
2347	do_assert (cpp_reader *pfile)	2300	do_assert (cpp_reader *pfile)
2348	{	2301	{
2349	struct answer *new_answer;	2302	cpp_macro *answer;
2350	cpp_hashnode *node;	2303	cpp_hashnode *node = parse_assertion (pfile, T_ASSERT, &answer);
2351		2304
2352	node = parse_assertion (pfile, &new_answer, T_ASSERT);
2353	if (node)	2305	if (node)
2354	{	2306	{
2355	size_t answer_size;
2356
2357	/* Place the new answer in the answer list. First check there	2307	/* Place the new answer in the answer list. First check there
2358	is not a duplicate. */	2308	is not a duplicate. */
2359	new_answer->next = 0;	2309	if (*find_answer (node, answer))
2360	if (node->type == NT_ASSERTION)
2361	{	2310	{
2362	if (*find_answer (node, new_answer))	2311	cpp_error (pfile, CPP_DL_WARNING, "\"%s\" re-asserted",
2363	{	2312	NODE_NAME (node) + 1);
2364	cpp_error (pfile, CPP_DL_WARNING, "\"%s\" re-asserted",	2313	return;
2365	NODE_NAME (node) + 1);
2366	return;
2367	}
2368	new_answer->next = node->value.answers;
2369	}	2314	}
2370		2315
2371	answer_size = sizeof (struct answer) + ((new_answer->count - 1)	2316	/* Commit or allocate storage for the answer. */
2372	* sizeof (cpp_token));	2317	answer = (cpp_macro *)_cpp_commit_buff
2373	/* Commit or allocate storage for the object. */	2318	(pfile, sizeof (cpp_macro) - sizeof (cpp_token)
2374	if (pfile->hash_table->alloc_subobject)	2319	+ sizeof (cpp_token) * answer->count);
2375	{	2320
2376	struct answer *temp_answer = new_answer;	2321	/* Chain into the list. */
2377	new_answer = (struct answer *) pfile->hash_table->alloc_subobject	2322	answer->parm.next = node->value.answers;
2378	(answer_size);	2323	node->value.answers = answer;
2379	memcpy (new_answer, temp_answer, answer_size);
2380	}
2381	else
2382	BUFF_FRONT (pfile->a_buff) += answer_size;
2383		2324
2384	node->type = NT_ASSERTION;
2385	node->value.answers = new_answer;
2386	check_eol (pfile, false);	2325	check_eol (pfile, false);
2387	}	2326	}
2388	}	2327	}
@@ -2391,25 +2330,19 @@ do_assert (cpp_reader *pfile) · 2 unmodified lines
2391	static void	2330	static void
2392	do_unassert (cpp_reader *pfile)	2331	do_unassert (cpp_reader *pfile)
2393	{	2332	{
2394	cpp_hashnode *node;	2333	cpp_macro *answer;
2395	struct answer *answer;	2334	cpp_hashnode *node = parse_assertion (pfile, T_UNASSERT, &answer);
2396		2335
2397	node = parse_assertion (pfile, &answer, T_UNASSERT);
2398	/* It isn't an error to #unassert something that isn't asserted. */	2336	/* It isn't an error to #unassert something that isn't asserted. */
2399	if (node && node->type == NT_ASSERTION)	2337	if (node)
2400	{	2338	{
2401	if (answer)	2339	if (answer)
2402	{	2340	{
2403	struct answer *p = find_answer (node, answer), temp;	2341	cpp_macro **p = find_answer (node, answer);
2404
2405	/* Remove the answer from the list. */
2406	temp = *p;
2407	if (temp)
2408	*p = temp->next;
2409		2342
2410	/* Did we free the last answer? */	2343	/* Remove the assert from the list. */
2411	if (node->value.answers == 0)	2344	if (cpp_macro temp = p)
2412	node->type = NT_VOID;	2345	*p = temp->parm.next;
2413		2346
2414	check_eol (pfile, false);	2347	check_eol (pfile, false);
2415	}	2348	}
@@ -2508,18 +2441,18 @@ cpp_pop_definition (cpp_reader pfile, struct def_pragma_macro c) · 92 unmodified lines
2508	if (pfile->cb.before_define)	2441	if (pfile->cb.before_define)
2509	pfile->cb.before_define (pfile);	2442	pfile->cb.before_define (pfile);
2510		2443
2511	if (node->type == NT_MACRO)	2444	if (cpp_macro_p (node))
2512	{	2445	{
2513	if (pfile->cb.undef)	2446	if (pfile->cb.undef)
2514	pfile->cb.undef (pfile, pfile->directive_line, node);	2447	pfile->cb.undef (pfile, pfile->directive_line, node);
2515	if (CPP_OPTION (pfile, warn_unused_macros))	2448	if (CPP_OPTION (pfile, warn_unused_macros))
2516	_cpp_warn_if_unused_macro (pfile, node, NULL);	2449	_cpp_warn_if_unused_macro (pfile, node, NULL);
		2450	_cpp_free_definition (node);
2517	}	2451	}
2518	if (node->type != NT_VOID)
2519	_cpp_free_definition (node);
2520		2452
2521	if (c->is_undef)	2453	if (c->is_undef)
2522	return;	2454	return;
		2455
2523	{	2456	{
2524	size_t namelen;	2457	size_t namelen;
2525	const uchar *dn;	2458	const uchar *dn;
@@ -2530,8 +2463,6 @@ cpp_pop_definition (cpp_reader pfile, struct def_pragma_macro c) · 4 unmodified lines
2530	h = cpp_lookup (pfile, c->definition, namelen);	2463	h = cpp_lookup (pfile, c->definition, namelen);
2531	dn = c->definition + namelen;	2464	dn = c->definition + namelen;
2532		2465
2533	h->type = NT_VOID;
2534	h->flags &= ~(NODE_POISONED\|NODE_BUILTIN\|NODE_DISABLED\|NODE_USED);
2535	nbuf = cpp_push_buffer (pfile, dn, ustrchr (dn, '\n') - dn, true);	2466	nbuf = cpp_push_buffer (pfile, dn, ustrchr (dn, '\n') - dn, true);
2536	if (nbuf != NULL)	2467	if (nbuf != NULL)
2537	{	2468	{
@@ -2674,6 +2605,8 @@ _cpp_pop_buffer (cpp_reader *pfile) · 136 unmodified lines
2674		2605
2675	_cpp_do_file_change (pfile, LC_LEAVE, 0, 0, 0);	2606	_cpp_do_file_change (pfile, LC_LEAVE, 0, 0, 0);
2676	}	2607	}
		2608	else if (to_free)
		2609	free ((void *)to_free);
2677	}	2610	}
2678		2611
2679	/* Enter all recognized directives in the hash table. */	2612	/* Enter all recognized directives in the hash table. */

gcc/libcpp/errors.c+42−34

 /* Default error handlers for CPP Library.
-   Copyright (C) 1986-2018 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
 ATTRIBUTE_FPTR_PRINTF(5,0)
 static bool
-cpp_diagnostic_at (cpp_reader * pfile, int level, int reason,
+cpp_diagnostic_at (cpp_reader * pfile, enum cpp_diagnostic_level level,
-		   rich_location *richloc,
+		   enum cpp_warning_reason reason, rich_location *richloc,
 		   const char *msgid, va_list *ap)
 {
   bool ret;
-  if (!pfile->cb.error)
+  if (!pfile->cb.diagnostic)
     abort ();
-  ret = pfile->cb.error (pfile, level, reason, richloc, _(msgid), ap);
+  ret = pfile->cb.diagnostic (pfile, level, reason, richloc, _(msgid), ap);
   return ret;
 }
 ATTRIBUTE_FPTR_PRINTF(4,0)
 static bool
-cpp_diagnostic (cpp_reader * pfile, int level, int reason,
+cpp_diagnostic (cpp_reader * pfile, enum cpp_diagnostic_level level,
-                const char *msgid, va_list *ap)
+		enum cpp_warning_reason reason,
+		const char *msgid, va_list *ap)
 {
-  source_location src_loc;
+  location_t src_loc;
   if (CPP_OPTION (pfile, traditional))
     {
 /* Print a warning or error, depending on the value of LEVEL.  */
 bool
-cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
+cpp_error (cpp_reader * pfile, enum cpp_diagnostic_level level,
+	   const char *msgid, ...)
 {
   va_list ap;
   bool ret;
 /* Print a warning.  The warning reason may be given in REASON.  */
 bool
-cpp_warning (cpp_reader * pfile, int reason, const char *msgid, ...)
+cpp_warning (cpp_reader * pfile, enum cpp_warning_reason reason,
+	     const char *msgid, ...)
 {
   va_list ap;
   bool ret;
 /* Print a pedantic warning.  The warning reason may be given in REASON.  */
 bool
-cpp_pedwarning (cpp_reader * pfile, int reason, const char *msgid, ...)
+cpp_pedwarning (cpp_reader * pfile, enum cpp_warning_reason reason,
+		const char *msgid, ...)
 {
   va_list ap;
   bool ret;
    given in REASON.  */
 bool
-cpp_warning_syshdr (cpp_reader * pfile, int reason, const char *msgid, ...)
+cpp_warning_syshdr (cpp_reader * pfile, enum cpp_warning_reason reason,
+		    const char *msgid, ...)
 {
   va_list ap;
   bool ret;
 ATTRIBUTE_FPTR_PRINTF(6,0)
 static bool
-cpp_diagnostic_with_line (cpp_reader * pfile, int level, int reason,
+cpp_diagnostic_with_line (cpp_reader * pfile, enum cpp_diagnostic_level level,
-		          source_location src_loc, unsigned int column,
+			  enum cpp_warning_reason reason,
-		          const char *msgid, va_list *ap)
+			  location_t src_loc, unsigned int column,
+			  const char *msgid, va_list *ap)
 {
   bool ret;
-  if (!pfile->cb.error)
+  if (!pfile->cb.diagnostic)
     abort ();
   rich_location richloc (pfile->line_table, src_loc);
   if (column)
     richloc.override_column (column);
-  ret = pfile->cb.error (pfile, level, reason, &richloc, _(msgid), ap);
+  ret = pfile->cb.diagnostic (pfile, level, reason, &richloc, _(msgid), ap);
   return ret;
 }
 /* Print a warning or error, depending on the value of LEVEL.  */
 bool
-cpp_error_with_line (cpp_reader *pfile, int level,
+cpp_error_with_line (cpp_reader *pfile, enum cpp_diagnostic_level level,
-		     source_location src_loc, unsigned int column,
+		     location_t src_loc, unsigned int column,
 		     const char *msgid, ...)
 {
   va_list ap;
 /* Print a warning.  The warning reason may be given in REASON.  */
 bool
-cpp_warning_with_line (cpp_reader *pfile, int reason,
+cpp_warning_with_line (cpp_reader *pfile, enum cpp_warning_reason reason,
-		       source_location src_loc, unsigned int column,
+		       location_t src_loc, unsigned int column,
 		       const char *msgid, ...)
 {
   va_list ap;
 /* Print a pedantic warning.  The warning reason may be given in REASON.  */
 bool
-cpp_pedwarning_with_line (cpp_reader *pfile, int reason,
+cpp_pedwarning_with_line (cpp_reader *pfile, enum cpp_warning_reason reason,
-		          source_location src_loc, unsigned int column,
+			  location_t src_loc, unsigned int column,
-		          const char *msgid, ...)
+			  const char *msgid, ...)
 {
   va_list ap;
   bool ret;
    given in REASON.  */
 bool
-cpp_warning_with_line_syshdr (cpp_reader *pfile, int reason,
+cpp_warning_with_line_syshdr (cpp_reader *pfile, enum cpp_warning_reason reason,
-		              source_location src_loc, unsigned int column,
+			      location_t src_loc, unsigned int column,
-		              const char *msgid, ...)
+			      const char *msgid, ...)
 {
   va_list ap;
   bool ret;
    a column override.  */
 bool
-cpp_error_at (cpp_reader * pfile, int level, source_location src_loc,
+cpp_error_at (cpp_reader * pfile, enum cpp_diagnostic_level level,
-	      const char *msgid, ...)
+	      location_t src_loc, const char *msgid, ...)
 {
   va_list ap;
   bool ret;
    a column override.  */
 bool
-cpp_error_at (cpp_reader * pfile, int level, rich_location *richloc,
+cpp_error_at (cpp_reader * pfile, enum cpp_diagnostic_level level,
-	      const char *msgid, ...)
+	      rich_location *richloc, const char *msgid, ...)
 {
   va_list ap;
   bool ret;
    information from errno.  */
 bool
-cpp_errno (cpp_reader *pfile, int level, const char *msgid)
+cpp_errno (cpp_reader *pfile, enum cpp_diagnostic_level level,
+	   const char *msgid)
 {
   return cpp_error (pfile, level, "%s: %s", _(msgid), xstrerror (errno));
 }
    that is not localized, but "" is replaced with localized "stdout".  */
 bool
-cpp_errno_filename (cpp_reader *pfile, int level, const char *filename,
+cpp_errno_filename (cpp_reader *pfile, enum cpp_diagnostic_level level,
-		    source_location loc)
+		    const char *filename,
+		    location_t loc)
 {
   if (filename[0] == '\0')
     filename = _("stdout");

gcc/libcpp/expr.c+12−28

 /* Parse C expressions for cpplib.
-   Copyright (C) 1987-2018 Free Software Foundation, Inc.
+   Copyright (C) 1987-2019 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994.
 This program is free software; you can redistribute it and/or modify it
 {
   const cpp_token *token;	/* The token forming op (for diagnostics).  */
   cpp_num value;		/* The value logically "right" of op.  */
-  source_location loc;          /* The location of this value.         */
+  location_t loc;          /* The location of this value.         */
   enum cpp_ttype op;
 };
 				enum cpp_ttype);
 static cpp_num num_mul (cpp_reader *, cpp_num, cpp_num);
 static cpp_num num_div_op (cpp_reader *, cpp_num, cpp_num, enum cpp_ttype,
-			   source_location);
+			   location_t);
 static cpp_num num_lshift (cpp_num, size_t, size_t);
 static cpp_num num_rshift (cpp_num, size_t, size_t);
 static cpp_num append_digit (cpp_num, int, int, size_t);
 static cpp_num parse_defined (cpp_reader *);
-static cpp_num eval_token (cpp_reader *, const cpp_token *, source_location);
+static cpp_num eval_token (cpp_reader *, const cpp_token *, location_t);
 static struct op *reduce (cpp_reader *, struct op *, enum cpp_ttype);
 static unsigned int interpret_float_suffix (cpp_reader *, const uchar *, size_t);
 static unsigned int interpret_int_suffix (cpp_reader *, const uchar *, size_t);
    VIRTUAL_LOCATION is the virtual location for TOKEN.  */
 unsigned int
 cpp_classify_number (cpp_reader *pfile, const cpp_token *token,
-		     const char **ud_suffix, source_location virtual_location)
+		     const char **ud_suffix, location_t virtual_location)
 {
   const uchar *str = token->val.str.text;
   const uchar *limit;
 		        "this use of \"defined\" may not be portable");
       _cpp_mark_macro_used (node);
-      if (!(node->flags & NODE_USED))
+      _cpp_maybe_notify_macro_use (pfile, node);
-	{
-	  node->flags |= NODE_USED;
-	  if (node->type == NT_MACRO)
-	    {
-	      if ((node->flags & NODE_BUILTIN)
-		  && pfile->cb.user_builtin_macro)
-		pfile->cb.user_builtin_macro (pfile, node);
-	      if (pfile->cb.used_define)
-		pfile->cb.used_define (pfile, pfile->directive_line, node);
-	    }
-	  else
-	    {
-	      if (pfile->cb.used_undef)
-		pfile->cb.used_undef (pfile, pfile->directive_line, node);
-	    }
-	}
       /* A possible controlling macro of the form #if !defined ().
 	 _cpp_parse_expr checks there was no other junk on the line.  */
   result.unsignedp = false;
   result.high = 0;
   result.overflow = false;
-  result.low = (node && node->type == NT_MACRO
+  result.low = (node && cpp_macro_p (node)
-		&& (node->flags & NODE_CONDITIONAL) == 0);
+		&& !(node->flags & NODE_CONDITIONAL));
   return result;
 }
    operators).  */
 static cpp_num
 eval_token (cpp_reader *pfile, const cpp_token *token,
-	    source_location virtual_location)
+	    location_t virtual_location)
 {
   cpp_num result;
   unsigned int temp;
   struct op *top = pfile->op_stack;
   unsigned int lex_count;
   bool saw_leading_not, want_value = true;
-  source_location virtual_location = 0;
+  location_t virtual_location = 0;
   pfile->state.skip_eval = 0;
 static cpp_num
 num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op,
-	    source_location location)
+	    location_t location)
 {
   cpp_num result, sub;
   cpp_num_part mask;
       XDELETEVEC (fname);
     }
-  if (paren && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN)
+  if (paren && !SEEN_EOL () && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN)
     cpp_error (pfile, CPP_DL_ERROR,
 	       "missing ')' after \"__has_include__\"");

gcc/libcpp/files.c+42−28

 /* Part of CPP library.  File handling.
-   Copyright (C) 1986-2018 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
 {
   struct cpp_file_hash_entry *next;
   cpp_dir *start_dir;
-  source_location location;
+  location_t location;
   union
   {
     _cpp_file *file;
 static bool pch_open_file (cpp_reader *pfile, _cpp_file *file,
 			   bool *invalid_pch);
 static bool find_file_in_dir (cpp_reader *pfile, _cpp_file *file,
-			      bool *invalid_pch, source_location loc);
+			      bool *invalid_pch, location_t loc);
 static bool read_file_guts (cpp_reader *pfile, _cpp_file *file,
-			    source_location loc);
+			    location_t loc);
 static bool read_file (cpp_reader *pfile, _cpp_file *file,
-		       source_location loc);
+		       location_t loc);
 static bool should_stack_file (cpp_reader *, _cpp_file *file, bool import,
-			       source_location loc);
+			       location_t loc);
 static struct cpp_dir *search_path_head (cpp_reader *, const char *fname,
 				 int angle_brackets, enum include_type);
 static const char *dir_name_of_file (_cpp_file *file);
 static void open_file_failed (cpp_reader *pfile, _cpp_file *file, int,
-			      source_location);
+			      location_t);
 static struct cpp_file_hash_entry *search_cache (struct cpp_file_hash_entry *head,
 					     const cpp_dir *start_dir);
 static _cpp_file *make_cpp_file (cpp_reader *, cpp_dir *, const char *fname);
 static bool
 find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch,
-		  source_location loc)
+		  location_t loc)
 {
   char *path;
   return false;
 }
-/* Return tue iff the missing_header callback found the given HEADER.  */
+/* Return true iff the missing_header callback found the given HEADER.  */
 static bool
 search_path_exhausted (cpp_reader *pfile, const char *header, _cpp_file *file)
 {
 _cpp_file *
 _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir,
 		bool fake, int angle_brackets, bool implicit_preinclude,
-		source_location loc)
+		location_t loc)
 {
   struct cpp_file_hash_entry *entry;
   void **hash_slot;
    FIXME: Flush file cache and try again if we run out of memory.  */
 static bool
-read_file_guts (cpp_reader *pfile, _cpp_file *file, source_location loc)
+read_file_guts (cpp_reader *pfile, _cpp_file *file, location_t loc)
 {
   ssize_t size, total, count;
   uchar *buf;
    have been passed through find_file() at some stage.  Use LOC for
    any diagnostics.  */
 static bool
-read_file (cpp_reader *pfile, _cpp_file *file, source_location loc)
+read_file (cpp_reader *pfile, _cpp_file *file, location_t loc)
 {
   /* If we already have its contents in memory, succeed immediately.  */
   if (file->buffer_valid)
    Use LOC for any diagnostics.  */
 static bool
 should_stack_file (cpp_reader *pfile, _cpp_file *file, bool import,
-		   source_location loc)
+		   location_t loc)
 {
   _cpp_file *f;
   /* Skip if the file had a header guard and the macro is defined.
      PCH relies on this appearing before the PCH handler below.  */
-  if (file->cmacro && file->cmacro->type == NT_MACRO)
+  if (file->cmacro && cpp_macro_p (file->cmacro))
     return false;
   /* Handle PCH files immediately; don't stack them.  */
    stacked.  Use LOC for any diagnostics.  */
 bool
 _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, bool import,
-		 source_location loc)
+		 location_t loc)
 {
   cpp_buffer *buffer;
   int sysp;
   if (!should_stack_file (pfile, file, import, loc))
-      return false;
+    return false;
   if (pfile->buffer == NULL || file->dir == NULL)
     sysp = 0;
    Returns true if a buffer was stacked.  */
 bool
 _cpp_stack_include (cpp_reader *pfile, const char *fname, int angle_brackets,
-		    enum include_type type, source_location loc)
+		    enum include_type type, location_t loc)
 {
   struct cpp_dir *dir;
   _cpp_file *file;
   bool stacked;
+  bool decremented = false;
   /* For -include command-line flags we have type == IT_CMDLINE.
      When the first -include file is processed we have the case, where
     return false;
   /* Compensate for the increment in linemap_add that occurs if
-      _cpp_stack_file actually stacks the file.  In the case of a
+     _cpp_stack_file actually stacks the file.  In the case of a normal
-     normal #include, we're currently at the start of the line
+     #include, we're currently at the start of the line *following* the
-     *following* the #include.  A separate source_location for this
+     #include.  A separate location_t for this location makes no
-     location makes no sense (until we do the LC_LEAVE), and
+     sense (until we do the LC_LEAVE), and complicates
-     complicates LAST_SOURCE_LINE_LOCATION.  This does not apply if we
+     LAST_SOURCE_LINE_LOCATION.  This does not apply if we found a PCH
-     found a PCH file (in which case linemap_add is not called) or we
+     file (in which case linemap_add is not called) or we were included
-     were included from the command-line.  */
+     from the command-line.  In the case that the #include is the last
+     line in the file, highest_location still points to the current
+     line, not the start of the next line, so we do not decrement in
+     this case.  See plugin/location-overflow-test-pr83173.h for an
+     example.  */
   if (file->pchname == NULL && file->err_no == 0
       && type != IT_CMDLINE && type != IT_DEFAULT)
-    pfile->line_table->highest_location--;
+    {
+      int highest_line = linemap_get_expansion_line (pfile->line_table,
+						     pfile->line_table->highest_location);
+      int source_line = linemap_get_expansion_line (pfile->line_table, loc);
+      if (highest_line > source_line)
+	{
+	  pfile->line_table->highest_location--;
+	  decremented = true;
+	}
+    }
   stacked = _cpp_stack_file (pfile, file, type == IT_IMPORT, loc);
-  if (!stacked)
+  if (decremented && !stacked)
     /* _cpp_stack_file didn't stack the file, so let's rollback the
        compensation dance we performed above.  */
     pfile->line_table->highest_location++;
 /* Could not open FILE.  The complication is dependency output.  */
 static void
 open_file_failed (cpp_reader *pfile, _cpp_file *file, int angle_brackets,
-		  source_location loc)
+		  location_t loc)
 {
   int sysp = pfile->line_table->highest_line > 1 && pfile->buffer ? pfile->buffer->sysp : 0;
   bool print_dep = CPP_OPTION (pfile, deps.style) > (angle_brackets || !!sysp);
    filenames aliased by links or redundant . or .. traversals etc.  */
 bool
 cpp_included_before (cpp_reader *pfile, const char *fname,
-		     source_location location)
+		     location_t location)
 {
   struct cpp_file_hash_entry *entry
     = (struct cpp_file_hash_entry *)

gcc/libcpp/identifiers.c+3−3

@@ -1,5 +1,5 @@
1	/* Hash tables for the CPP library.	1	/* Hash tables for the CPP library.
2	Copyright (C) 1986-2018 Free Software Foundation, Inc.	2	Copyright (C) 1986-2019 Free Software Foundation, Inc.
3	Written by Per Bothner, 1994.	3	Written by Per Bothner, 1994.
4	Based on CCCP program by Paul Rubin, June 1986	4	Based on CCCP program by Paul Rubin, June 1986
5	Adapted to ANSI C, Richard Stallman, Jan 1987	5	Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -104,8 +104,8 @@ cpp_defined (cpp_reader pfile, const unsigned char str, int len) · 98 unmodified lines
104		104
105	node = CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_NO_INSERT));	105	node = CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_NO_INSERT));
106		106
107	/* If it's of type NT_MACRO, it cannot be poisoned. */	107	/* If it's a macro, it cannot have been poisoned. */
108	return node && node->type == NT_MACRO;	108	return node && cpp_macro_p (node);
109	}	109	}
110		110
111	/* We don't need a proxy since the hash table's identifier comes first	111	/* We don't need a proxy since the hash table's identifier comes first

gcc/libcpp/include/cpp-id-data.h+0−82

@@ -1,82 +0,0 @@
1	/* Structures that hang off cpp_identifier, for PCH.
2	Copyright (C) 1986-2018 Free Software Foundation, Inc.
3
4	This program is free software; you can redistribute it and/or modify it
5	under the terms of the GNU General Public License as published by the
6	Free Software Foundation; either version 3, or (at your option) any
7	later version.
8
9	This program is distributed in the hope that it will be useful,
10	but WITHOUT ANY WARRANTY; without even the implied warranty of
11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	GNU General Public License for more details.
13
14	You should have received a copy of the GNU General Public License
15	along with this program; see the file COPYING3. If not see
16	<http://www.gnu.org/licenses/>. */
17
18	#include "cpplib.h"
19
20	#if !defined (HAVE_UCHAR) && !defined (IN_GCC)
21	typedef unsigned char uchar;
22	#endif
23
24	#define UC (const unsigned char ) / Intended use: UC"string" */
25
26	/* Chained list of answers to an assertion. */
27	struct GTY(()) answer {
28	struct answer *next;
29	unsigned int count;
30	cpp_token GTY ((length ("%h.count"))) first[1];
31	};
32
33	/* Each macro definition is recorded in a cpp_macro structure.
34	Variadic macros cannot occur with traditional cpp. */
35	struct GTY(()) cpp_macro {
36	/* Parameters, if any. If parameter names use extended identifiers,
37	the original spelling of those identifiers, not the canonical
38	UTF-8 spelling, goes here. */
39	cpp_hashnode ** GTY ((nested_ptr (union tree_node,
40	"%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL",
41	"%h ? HT_IDENT_TO_GCC_IDENT (HT_NODE (%h)) : NULL"),
42	length ("%h.paramc")))
43	params;
44
45	/* Replacement tokens (ISO) or replacement text (traditional). See
46	comment at top of cpptrad.c for how traditional function-like
47	macros are encoded. */
48	union cpp_macro_u
49	{
50	cpp_token * GTY ((tag ("0"), length ("%0.count"))) tokens;
51	const unsigned char * GTY ((tag ("1"))) text;
52	} GTY ((desc ("%1.traditional"))) exp;
53
54	/* Definition line number. */
55	source_location line;
56
57	/* Number of tokens in expansion, or bytes for traditional macros. */
58	unsigned int count;
59
60	/* Number of parameters. */
61	unsigned short paramc;
62
63	/* If a function-like macro. */
64	unsigned int fun_like : 1;
65
66	/* If a variadic macro. */
67	unsigned int variadic : 1;
68
69	/* If macro defined in system header. */
70	unsigned int syshdr : 1;
71
72	/* Nonzero if it has been expanded or had its existence tested. */
73	unsigned int used : 1;
74
75	/* Indicate which field of 'exp' is in use. */
76	unsigned int traditional : 1;
77
78	/* Indicate whether the tokens include extra CPP_PASTE tokens at the
79	end to track invalid redefinitions with consecutive CPP_PASTE
80	tokens. */
81	unsigned int extra_tokens : 1;
82	};

gcc/libcpp/include/cpplib.h+238−150

@@ -1,5 +1,5 @@
1	/* Definitions for CPP library.	1	/* Definitions for CPP library.
2	Copyright (C) 1995-2018 Free Software Foundation, Inc.	2	Copyright (C) 1995-2019 Free Software Foundation, Inc.
3	Written by Per Bothner, 1994-95.	3	Written by Per Bothner, 1994-95.
4		4
5	This program is free software; you can redistribute it and/or modify it	5	This program is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ typedef struct cpp_macro cpp_macro; · 30 unmodified lines
36	typedef struct cpp_callbacks cpp_callbacks;	36	typedef struct cpp_callbacks cpp_callbacks;
37	typedef struct cpp_dir cpp_dir;	37	typedef struct cpp_dir cpp_dir;
38		38
39	struct answer;
40	struct _cpp_file;	39	struct _cpp_file;
41		40
42	/* The first three groups, apart from '=', can appear in preprocessor	41	/* The first three groups, apart from '=', can appear in preprocessor
@@ -168,8 +167,9 @@ enum cpp_ttype · 125 unmodified lines
168	#undef TK	167	#undef TK
169		168
170	/* C language kind, used when calling cpp_create_reader. */	169	/* C language kind, used when calling cpp_create_reader. */
171	enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC11, CLK_GNUC17,	170	enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC11, CLK_GNUC17, CLK_GNUC2X,
172	CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_STDC11, CLK_STDC17,	171	CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_STDC11, CLK_STDC17,
		172	CLK_STDC2X,
173	CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11,	173	CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11,
174	CLK_GNUCXX14, CLK_CXX14, CLK_GNUCXX17, CLK_CXX17,	174	CLK_GNUCXX14, CLK_CXX14, CLK_GNUCXX17, CLK_CXX17,
175	CLK_GNUCXX2A, CLK_CXX2A, CLK_ASM};	175	CLK_GNUCXX2A, CLK_CXX2A, CLK_ASM};
@@ -240,8 +240,10 @@ struct GTY(()) cpp_identifier { · 64 unmodified lines
240	/* A preprocessing token. This has been carefully packed and should	240	/* A preprocessing token. This has been carefully packed and should
241	occupy 16 bytes on 32-bit hosts and 24 bytes on 64-bit hosts. */	241	occupy 16 bytes on 32-bit hosts and 24 bytes on 64-bit hosts. */
242	struct GTY(()) cpp_token {	242	struct GTY(()) cpp_token {
243	source_location src_loc; /* Location of first char of token,	243
244	together with range of full token. */	244	/* Location of first char of token, together with range of full token. */
		245	location_t src_loc;
		246
245	ENUM_BITFIELD(cpp_ttype) type : CHAR_BIT; /* token type */	247	ENUM_BITFIELD(cpp_ttype) type : CHAR_BIT; /* token type */
246	unsigned short flags; /* flags - see above */	248	unsigned short flags; /* flags - see above */
247		249
@@ -550,6 +552,59 @@ struct cpp_options · 302 unmodified lines
550	bool canonical_system_headers;	552	bool canonical_system_headers;
551	};	553	};
552		554
		555	/* Diagnostic levels. To get a diagnostic without associating a
		556	position in the translation unit with it, use cpp_error_with_line
		557	with a line number of zero. */
		558
		559	enum cpp_diagnostic_level {
		560	/* Warning, an error with -Werror. */
		561	CPP_DL_WARNING = 0,
		562	/* Same as CPP_DL_WARNING, except it is not suppressed in system headers. */
		563	CPP_DL_WARNING_SYSHDR,
		564	/* Warning, an error with -pedantic-errors or -Werror. */
		565	CPP_DL_PEDWARN,
		566	/* An error. */
		567	CPP_DL_ERROR,
		568	/* An internal consistency check failed. Prints "internal error: ",
		569	otherwise the same as CPP_DL_ERROR. */
		570	CPP_DL_ICE,
		571	/* An informative note following a warning. */
		572	CPP_DL_NOTE,
		573	/* A fatal error. */
		574	CPP_DL_FATAL
		575	};
		576
		577	/* Warning reason codes. Use a reason code of CPP_W_NONE for unclassified
		578	warnings and diagnostics that are not warnings. */
		579
		580	enum cpp_warning_reason {
		581	CPP_W_NONE = 0,
		582	CPP_W_DEPRECATED,
		583	CPP_W_COMMENTS,
		584	CPP_W_MISSING_INCLUDE_DIRS,
		585	CPP_W_TRIGRAPHS,
		586	CPP_W_MULTICHAR,
		587	CPP_W_TRADITIONAL,
		588	CPP_W_LONG_LONG,
		589	CPP_W_ENDIF_LABELS,
		590	CPP_W_NUM_SIGN_CHANGE,
		591	CPP_W_VARIADIC_MACROS,
		592	CPP_W_BUILTIN_MACRO_REDEFINED,
		593	CPP_W_DOLLARS,
		594	CPP_W_UNDEF,
		595	CPP_W_UNUSED_MACROS,
		596	CPP_W_CXX_OPERATOR_NAMES,
		597	CPP_W_NORMALIZE,
		598	CPP_W_INVALID_PCH,
		599	CPP_W_WARNING_DIRECTIVE,
		600	CPP_W_LITERAL_SUFFIX,
		601	CPP_W_DATE_TIME,
		602	CPP_W_PEDANTIC,
		603	CPP_W_C90_C99_COMPAT,
		604	CPP_W_CXX11_COMPAT,
		605	CPP_W_EXPANSION_TO_DEFINED
		606	};
		607
553	/* Callback for header lookup for HEADER, which is the name of a	608	/* Callback for header lookup for HEADER, which is the name of a
554	source file. It is used as a method of last resort to find headers	609	source file. It is used as a method of last resort to find headers
555	that are not otherwise found during the normal include processing.	610	that are not otherwise found during the normal include processing.
@@ -571,12 +626,12 @@ struct cpp_callbacks · 15 unmodified lines
571	void (file_change) (cpp_reader , const line_map_ordinary *);	626	void (file_change) (cpp_reader , const line_map_ordinary *);
572		627
573	void (dir_change) (cpp_reader , const char *);	628	void (dir_change) (cpp_reader , const char *);
574	void (include) (cpp_reader , source_location, const unsigned char *,	629	void (include) (cpp_reader , location_t, const unsigned char *,
575	const char , int, const cpp_token *);	630	const char , int, const cpp_token *);
576	void (define) (cpp_reader , source_location, cpp_hashnode *);	631	void (define) (cpp_reader , location_t, cpp_hashnode *);
577	void (undef) (cpp_reader , source_location, cpp_hashnode *);	632	void (undef) (cpp_reader , location_t, cpp_hashnode *);
578	void (ident) (cpp_reader , source_location, const cpp_string *);	633	void (ident) (cpp_reader , location_t, const cpp_string *);
579	void (def_pragma) (cpp_reader , source_location);	634	void (def_pragma) (cpp_reader , location_t);
580	int (valid_pch) (cpp_reader , const char *, int);	635	int (valid_pch) (cpp_reader , const char *, int);
581	void (read_pch) (cpp_reader , const char , int, const char );	636	void (read_pch) (cpp_reader , const char , int, const char );
582	missing_header_cb missing_header;	637	missing_header_cb missing_header;
@@ -587,26 +642,29 @@ struct cpp_callbacks · 4 unmodified lines
587		642
588	/* Called to emit a diagnostic. This callback receives the	643	/* Called to emit a diagnostic. This callback receives the
589	translated message. */	644	translated message. */
590	bool (error) (cpp_reader , int, int, rich_location *,	645	bool (diagnostic) (cpp_reader ,
591	const char , va_list )	646	enum cpp_diagnostic_level,
		647	enum cpp_warning_reason,
		648	rich_location *,
		649	const char , va_list )
592	ATTRIBUTE_FPTR_PRINTF(5,0);	650	ATTRIBUTE_FPTR_PRINTF(5,0);
593		651
594	/* Callbacks for when a macro is expanded, or tested (whether	652	/* Callbacks for when a macro is expanded, or tested (whether
595	defined or not at the time) in #ifdef, #ifndef or "defined". */	653	defined or not at the time) in #ifdef, #ifndef or "defined". */
596	void (used_define) (cpp_reader , source_location, cpp_hashnode *);	654	void (used_define) (cpp_reader , location_t, cpp_hashnode *);
597	void (used_undef) (cpp_reader , source_location, cpp_hashnode *);	655	void (used_undef) (cpp_reader , location_t, cpp_hashnode *);
598	/* Called before #define and #undef or other macro definition	656	/* Called before #define and #undef or other macro definition
599	changes are processed. */	657	changes are processed. */
600	void (before_define) (cpp_reader );	658	void (before_define) (cpp_reader );
601	/* Called whenever a macro is expanded or tested.	659	/* Called whenever a macro is expanded or tested.
602	Second argument is the location of the start of the current expansion. */	660	Second argument is the location of the start of the current expansion. */
603	void (used) (cpp_reader , source_location, cpp_hashnode *);	661	void (used) (cpp_reader , location_t, cpp_hashnode *);
604		662
605	/* Callback to identify whether an attribute exists. */	663	/* Callback to identify whether an attribute exists. */
606	int (has_attribute) (cpp_reader );	664	int (has_attribute) (cpp_reader );
607		665
608	/* Callback that can change a user builtin into normal macro. */	666	/* Callback that can change a user lazy into normal macro. */
609	bool (user_builtin_macro) (cpp_reader , cpp_hashnode *);	667	void (user_lazy_macro) (cpp_reader , cpp_macro *, unsigned);
610		668
611	/* Callback to parse SOURCE_DATE_EPOCH from environment. */	669	/* Callback to parse SOURCE_DATE_EPOCH from environment. */
612	time_t (get_source_date_epoch) (cpp_reader );	670	time_t (get_source_date_epoch) (cpp_reader );
@@ -620,7 +678,7 @@ struct cpp_callbacks · 7 unmodified lines
620	The content contains the opening slash-star (or slash-slash),	678	The content contains the opening slash-star (or slash-slash),
621	and for C-style comments contains the closing star-slash. For	679	and for C-style comments contains the closing star-slash. For
622	C++-style comments it does not include the terminating newline. */	680	C++-style comments it does not include the terminating newline. */
623	void (comment) (cpp_reader , source_location, const unsigned char *,	681	void (comment) (cpp_reader , location_t, const unsigned char *,
624	size_t);	682	size_t);
625		683
626	/* Callback for filename remapping in __FILE__ and __BASE_FILE__ macro	684	/* Callback for filename remapping in __FILE__ and __BASE_FILE__ macro
@@ -671,14 +729,81 @@ struct cpp_dir · 44 unmodified lines
671	dev_t dev;	729	dev_t dev;
672	};	730	};
673		731
674	/* The structure of a node in the hash table. The hash table has	732	/* The kind of the cpp_macro. */
675	entries for all identifiers: either macros defined by #define	733	enum cpp_macro_kind {
676	commands (type NT_MACRO), assertions created with #assert	734	cmk_macro, /* An ISO macro (token expansion). */
677	(NT_ASSERTION), or neither of the above (NT_VOID). Builtin macros	735	cmk_assert, /* An assertion. */
678	like __LINE__ are flagged NODE_BUILTIN. Poisoned identifiers are	736	cmk_traditional /* A traditional macro (text expansion). */
679	flagged NODE_POISONED. NODE_OPERATOR (C++ only) indicates an	737	};
680	identifier that behaves like an operator such as "xor".	738
681	NODE_DIAGNOSTIC is for speed in lex_token: it indicates a	739	/* Each macro definition is recorded in a cpp_macro structure.
		740	Variadic macros cannot occur with traditional cpp. */
		741	struct GTY(()) cpp_macro {
		742	union cpp_parm_u
		743	{
		744	/* Parameters, if any. If parameter names use extended identifiers,
		745	the original spelling of those identifiers, not the canonical
		746	UTF-8 spelling, goes here. */
		747	cpp_hashnode ** GTY ((tag ("false"),
		748	nested_ptr (union tree_node,
		749	"%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL",
		750	"%h ? HT_IDENT_TO_GCC_IDENT (HT_NODE (%h)) : NULL"),
		751	length ("%1.paramc"))) params;
		752
		753	/* If this is an assertion, the next one in the chain. */
		754	cpp_macro *GTY ((tag ("true"))) next;
		755	} GTY ((desc ("%1.kind == cmk_assert"))) parm;
		756
		757	/* Definition line number. */
		758	location_t line;
		759
		760	/* Number of tokens in body, or bytes for traditional macros. */
		761	/* Do we really need 2^32-1 range here? */
		762	unsigned int count;
		763
		764	/* Number of parameters. */
		765	unsigned short paramc;
		766
		767	/* Non-zero if this is a user-lazy macro, value provided by user. */
		768	unsigned char lazy;
		769
		770	/* The kind of this macro (ISO, trad or assert) */
		771	unsigned kind : 2;
		772
		773	/* If a function-like macro. */
		774	unsigned int fun_like : 1;
		775
		776	/* If a variadic macro. */
		777	unsigned int variadic : 1;
		778
		779	/* If macro defined in system header. */
		780	unsigned int syshdr : 1;
		781
		782	/* Nonzero if it has been expanded or had its existence tested. */
		783	unsigned int used : 1;
		784
		785	/* Indicate whether the tokens include extra CPP_PASTE tokens at the
		786	end to track invalid redefinitions with consecutive CPP_PASTE
		787	tokens. */
		788	unsigned int extra_tokens : 1;
		789
		790	/* 1 bits spare (32-bit). 33 on 64-bit target. */
		791
		792	union cpp_exp_u
		793	{
		794	/* Trailing array of replacement tokens (ISO), or assertion body value. */
		795	cpp_token GTY ((tag ("false"), length ("%1.count"))) tokens[1];
		796
		797	/* Pointer to replacement text (traditional). See comment at top
		798	of cpptrad.c for how traditional function-like macros are
		799	encoded. */
		800	const unsigned char *GTY ((tag ("true"))) text;
		801	} GTY ((desc ("%1.kind == cmk_traditional"))) exp;
		802	};
		803
		804	/* Poisoned identifiers are flagged NODE_POISONED. NODE_OPERATOR (C++
		805	only) indicates an identifier that behaves like an operator such as
		806	"xor". NODE_DIAGNOSTIC is for speed in lex_token: it indicates a
682	diagnostic may be required for this node. Currently this only	807	diagnostic may be required for this node. Currently this only
683	applies to __VA_ARGS__, poisoned identifiers, and -Wc++-compat	808	applies to __VA_ARGS__, poisoned identifiers, and -Wc++-compat
684	warnings about NODE_OPERATOR. */	809	warnings about NODE_OPERATOR. */
@@ -686,21 +811,21 @@ struct cpp_dir · 1 unmodified line
686	/* Hash node flags. */	811	/* Hash node flags. */
687	#define NODE_OPERATOR (1 << 0) /* C++ named operator. */	812	#define NODE_OPERATOR (1 << 0) /* C++ named operator. */
688	#define NODE_POISONED (1 << 1) /* Poisoned identifier. */	813	#define NODE_POISONED (1 << 1) /* Poisoned identifier. */
689	#define NODE_BUILTIN (1 << 2) /* Builtin macro. */	814	#define NODE_DIAGNOSTIC (1 << 2) /* Possible diagnostic when lexed. */
690	#define NODE_DIAGNOSTIC (1 << 3) /* Possible diagnostic when lexed. */	815	#define NODE_WARN (1 << 3) /* Warn if redefined or undefined. */
691	#define NODE_WARN (1 << 4) /* Warn if redefined or undefined. */	816	#define NODE_DISABLED (1 << 4) /* A disabled macro. */
692	#define NODE_DISABLED (1 << 5) /* A disabled macro. */	817	#define NODE_USED (1 << 5) /* Dumped with -dU. */
693	#define NODE_MACRO_ARG (1 << 6) /* Used during #define processing. */	818	#define NODE_CONDITIONAL (1 << 6) /* Conditional macro */
694	#define NODE_USED (1 << 7) /* Dumped with -dU. */	819	#define NODE_WARN_OPERATOR (1 << 7) /* Warn about C++ named operator. */
695	#define NODE_CONDITIONAL (1 << 8) /* Conditional macro */
696	#define NODE_WARN_OPERATOR (1 << 9) /* Warn about C++ named operator. */
697		820
698	/* Different flavors of hash node. */	821	/* Different flavors of hash node. */
699	enum node_type	822	enum node_type
700	{	823	{
701	NT_VOID = 0, /* No definition yet. */	824	NT_VOID = 0, /* Maybe an assert? */
702	NT_MACRO, /* A macro of some form. */	825	NT_MACRO_ARG, /* A macro arg. */
703	NT_ASSERTION /* Predicate for #assert. */	826	NT_USER_MACRO, /* A user macro. */
		827	NT_BUILTIN_MACRO, /* A builtin macro. */
		828	NT_MACRO_MASK = NT_USER_MACRO /* Mask for either macro kind. */
704	};	829	};
705		830
706	/* Different flavors of builtin macro. _Pragma is an operator, but we	831	/* Different flavors of builtin macro. _Pragma is an operator, but we
@@ -717,46 +842,27 @@ enum cpp_builtin_type · 10 unmodified lines
717	BT_PRAGMA, /* `_Pragma' operator */	842	BT_PRAGMA, /* `_Pragma' operator */
718	BT_TIMESTAMP, /* `__TIMESTAMP__' */	843	BT_TIMESTAMP, /* `__TIMESTAMP__' */
719	BT_COUNTER, /* `__COUNTER__' */	844	BT_COUNTER, /* `__COUNTER__' */
720	BT_HAS_ATTRIBUTE, /* `__has_attribute__(x)' */	845	BT_HAS_ATTRIBUTE /* `__has_attribute__(x)' */
721	BT_FIRST_USER, /* User defined builtin macros. */
722	BT_LAST_USER = BT_FIRST_USER + 63
723	};	846	};
724		847
725	#define CPP_HASHNODE(HNODE) ((cpp_hashnode *) (HNODE))	848	#define CPP_HASHNODE(HNODE) ((cpp_hashnode *) (HNODE))
726	#define HT_NODE(NODE) ((ht_identifier *) (NODE))	849	#define HT_NODE(NODE) (&(NODE)->ident)
727	#define NODE_LEN(NODE) HT_LEN (&(NODE)->ident)	850	#define NODE_LEN(NODE) HT_LEN (HT_NODE (NODE))
728	#define NODE_NAME(NODE) HT_STR (&(NODE)->ident)	851	#define NODE_NAME(NODE) HT_STR (HT_NODE (NODE))
729
730	/* Specify which field, if any, of the union is used. */
731
732	enum {
733	NTV_MACRO,
734	NTV_ANSWER,
735	NTV_BUILTIN,
736	NTV_ARGUMENT,
737	NTV_NONE
738	};
739
740	#define CPP_HASHNODE_VALUE_IDX(HNODE) \
741	((HNODE.flags & NODE_MACRO_ARG) ? NTV_ARGUMENT \
742	: HNODE.type == NT_MACRO ? ((HNODE.flags & NODE_BUILTIN) \
743	? NTV_BUILTIN : NTV_MACRO) \
744	: HNODE.type == NT_ASSERTION ? NTV_ANSWER \
745	: NTV_NONE)
746		852
747	/* The common part of an identifier node shared amongst all 3 C front	853	/* The common part of an identifier node shared amongst all 3 C front
748	ends. Also used to store CPP identifiers, which are a superset of	854	ends. Also used to store CPP identifiers, which are a superset of
749	identifiers in the grammatical sense. */	855	identifiers in the grammatical sense. */
750		856
751	union GTY(()) _cpp_hashnode_value {	857	union GTY(()) _cpp_hashnode_value {
752	/* If a macro. */	858	/* Assert (maybe NULL) */
753	cpp_macro * GTY((tag ("NTV_MACRO"))) macro;	859	cpp_macro * GTY((tag ("NT_VOID"))) answers;
754	/* Answers to an assertion. */	860	/* Macro (never NULL) */
755	struct answer * GTY ((tag ("NTV_ANSWER"))) answers;	861	cpp_macro * GTY((tag ("NT_USER_MACRO"))) macro;
756	/* Code for a builtin macro. */	862	/* Code for a builtin macro. */
757	enum cpp_builtin_type GTY ((tag ("NTV_BUILTIN"))) builtin;	863	enum cpp_builtin_type GTY ((tag ("NT_BUILTIN_MACRO"))) builtin;
758	/* Macro argument index. */	864	/* Macro argument index. */
759	unsigned short GTY ((tag ("NTV_ARGUMENT"))) arg_index;	865	unsigned short GTY ((tag ("NT_MACRO_ARG"))) arg_index;
760	};	866	};
761		867
762	struct GTY(()) cpp_hashnode {	868	struct GTY(()) cpp_hashnode {
@@ -766,10 +872,12 @@ struct GTY(()) cpp_hashnode { · 3 unmodified lines
766	then index into directive table.	872	then index into directive table.
767	Otherwise, a NODE_OPERATOR. */	873	Otherwise, a NODE_OPERATOR. */
768	unsigned char rid_code; /* Rid code - for front ends. */	874	unsigned char rid_code; /* Rid code - for front ends. */
769	ENUM_BITFIELD(node_type) type : 6; /* CPP node type. */	875	ENUM_BITFIELD(node_type) type : 2; /* CPP node type. */
770	unsigned int flags : 10; /* CPP flags. */	876	unsigned int flags : 8; /* CPP flags. */
		877
		878	/* 6 bits spare (plus another 32 on 64-bit hosts). */
771		879
772	union _cpp_hashnode_value GTY ((desc ("CPP_HASHNODE_VALUE_IDX (%1)"))) value;	880	union _cpp_hashnode_value GTY ((desc ("%1.type"))) value;
773	};	881	};
774		882
775	/* A class for iterating through the source locations within a	883	/* A class for iterating through the source locations within a
@@ -778,13 +886,13 @@ struct GTY(()) cpp_hashnode { · 2 unmodified lines
778		886
779	class cpp_string_location_reader {	887	class cpp_string_location_reader {
780	public:	888	public:
781	cpp_string_location_reader (source_location src_loc,	889	cpp_string_location_reader (location_t src_loc,
782	line_maps *line_table);	890	line_maps *line_table);
783		891
784	source_range get_next ();	892	source_range get_next ();
785		893
786	private:	894	private:
787	source_location m_loc;	895	location_t m_loc;
788	int m_offset_per_column;	896	int m_offset_per_column;
789	line_maps *m_line_table;	897	line_maps *m_line_table;
790	};	898	};
@@ -889,11 +997,32 @@ extern int cpp_avoid_paste (cpp_reader , const cpp_token , · 98 unmodified lines
889	const cpp_token *);	997	const cpp_token *);
890	extern const cpp_token cpp_get_token (cpp_reader );	998	extern const cpp_token cpp_get_token (cpp_reader );
891	extern const cpp_token cpp_get_token_with_location (cpp_reader ,	999	extern const cpp_token cpp_get_token_with_location (cpp_reader ,
892	source_location *);	1000	location_t *);
893	extern bool cpp_fun_like_macro_p (cpp_hashnode *);	1001	inline bool cpp_user_macro_p (const cpp_hashnode *node)
		1002	{
		1003	return node->type == NT_USER_MACRO;
		1004	}
		1005	inline bool cpp_builtin_macro_p (const cpp_hashnode *node)
		1006	{
		1007	return node->type == NT_BUILTIN_MACRO;
		1008	}
		1009	inline bool cpp_macro_p (const cpp_hashnode *node)
		1010	{
		1011	return node->type & NT_MACRO_MASK;
		1012	}
		1013
		1014	/* Returns true if NODE is a function-like user macro. */
		1015	inline bool cpp_fun_like_macro_p (cpp_hashnode *node)
		1016	{
		1017	return cpp_user_macro_p (node) && node->value.macro->fun_like;
		1018	}
		1019
894	extern const unsigned char cpp_macro_definition (cpp_reader ,	1020	extern const unsigned char cpp_macro_definition (cpp_reader ,
895	cpp_hashnode *);	1021	cpp_hashnode *);
896	extern source_location cpp_macro_definition_location (cpp_hashnode *);	1022	inline location_t cpp_macro_definition_location (cpp_hashnode *node)
		1023	{
		1024	return node->value.macro->line;
		1025	}
897	extern void _cpp_backup_tokens (cpp_reader *, unsigned int);	1026	extern void _cpp_backup_tokens (cpp_reader *, unsigned int);
898	extern const cpp_token cpp_peek_token (cpp_reader , int);	1027	extern const cpp_token cpp_peek_token (cpp_reader , int);
899		1028
@@ -926,6 +1055,9 @@ extern void cpp_assert (cpp_reader , const char ); · 26 unmodified lines
926	extern void cpp_undef (cpp_reader , const char );	1055	extern void cpp_undef (cpp_reader , const char );
927	extern void cpp_unassert (cpp_reader , const char );	1056	extern void cpp_unassert (cpp_reader , const char );
928		1057
		1058	/* Mark a node as a lazily defined macro. */
		1059	extern void cpp_define_lazily (cpp_reader , cpp_hashnode node, unsigned N);
		1060
929	/* Undefine all macros and assertions. */	1061	/* Undefine all macros and assertions. */
930	extern void cpp_undef_all (cpp_reader *);	1062	extern void cpp_undef_all (cpp_reader *);
931		1063
@@ -996,7 +1128,7 @@ struct cpp_num · 64 unmodified lines
996	/* Classify a CPP_NUMBER token. The return value is a combination of	1128	/* Classify a CPP_NUMBER token. The return value is a combination of
997	the flags from the above sets. */	1129	the flags from the above sets. */
998	extern unsigned cpp_classify_number (cpp_reader , const cpp_token ,	1130	extern unsigned cpp_classify_number (cpp_reader , const cpp_token ,
999	const char **, source_location);	1131	const char **, location_t);
1000		1132
1001	/* Return the classification flags for a float suffix. */	1133	/* Return the classification flags for a float suffix. */
1002	extern unsigned int cpp_interpret_float_suffix (cpp_reader , const char ,	1134	extern unsigned int cpp_interpret_float_suffix (cpp_reader , const char ,
@@ -1014,99 +1146,55 @@ extern cpp_num cpp_interpret_integer (cpp_reader , const cpp_token , · 11 unmodified lines
1014	others assumed clear, to fill out a cpp_num structure. */	1146	others assumed clear, to fill out a cpp_num structure. */
1015	cpp_num cpp_num_sign_extend (cpp_num, size_t);	1147	cpp_num cpp_num_sign_extend (cpp_num, size_t);
1016		1148
1017	/* Diagnostic levels. To get a diagnostic without associating a
1018	position in the translation unit with it, use cpp_error_with_line
1019	with a line number of zero. */
1020
1021	enum {
1022	/* Warning, an error with -Werror. */
1023	CPP_DL_WARNING = 0,
1024	/* Same as CPP_DL_WARNING, except it is not suppressed in system headers. */
1025	CPP_DL_WARNING_SYSHDR,
1026	/* Warning, an error with -pedantic-errors or -Werror. */
1027	CPP_DL_PEDWARN,
1028	/* An error. */
1029	CPP_DL_ERROR,
1030	/* An internal consistency check failed. Prints "internal error: ",
1031	otherwise the same as CPP_DL_ERROR. */
1032	CPP_DL_ICE,
1033	/* An informative note following a warning. */
1034	CPP_DL_NOTE,
1035	/* A fatal error. */
1036	CPP_DL_FATAL
1037	};
1038
1039	/* Warning reason codes. Use a reason code of zero for unclassified warnings
1040	and errors that are not warnings. */
1041	enum {
1042	CPP_W_NONE = 0,
1043	CPP_W_DEPRECATED,
1044	CPP_W_COMMENTS,
1045	CPP_W_MISSING_INCLUDE_DIRS,
1046	CPP_W_TRIGRAPHS,
1047	CPP_W_MULTICHAR,
1048	CPP_W_TRADITIONAL,
1049	CPP_W_LONG_LONG,
1050	CPP_W_ENDIF_LABELS,
1051	CPP_W_NUM_SIGN_CHANGE,
1052	CPP_W_VARIADIC_MACROS,
1053	CPP_W_BUILTIN_MACRO_REDEFINED,
1054	CPP_W_DOLLARS,
1055	CPP_W_UNDEF,
1056	CPP_W_UNUSED_MACROS,
1057	CPP_W_CXX_OPERATOR_NAMES,
1058	CPP_W_NORMALIZE,
1059	CPP_W_INVALID_PCH,
1060	CPP_W_WARNING_DIRECTIVE,
1061	CPP_W_LITERAL_SUFFIX,
1062	CPP_W_DATE_TIME,
1063	CPP_W_PEDANTIC,
1064	CPP_W_C90_C99_COMPAT,
1065	CPP_W_CXX11_COMPAT,
1066	CPP_W_EXPANSION_TO_DEFINED
1067	};
1068
1069	/* Output a diagnostic of some kind. */	1149	/* Output a diagnostic of some kind. */
1070	extern bool cpp_error (cpp_reader , int, const char msgid, ...)	1150	extern bool cpp_error (cpp_reader *, enum cpp_diagnostic_level,
		1151	const char *msgid, ...)
1071	ATTRIBUTE_PRINTF_3;	1152	ATTRIBUTE_PRINTF_3;
1072	extern bool cpp_warning (cpp_reader , int, const char msgid, ...)	1153	extern bool cpp_warning (cpp_reader *, enum cpp_warning_reason,
		1154	const char *msgid, ...)
1073	ATTRIBUTE_PRINTF_3;	1155	ATTRIBUTE_PRINTF_3;
1074	extern bool cpp_pedwarning (cpp_reader , int, const char msgid, ...)	1156	extern bool cpp_pedwarning (cpp_reader *, enum cpp_warning_reason,
		1157	const char *msgid, ...)
1075	ATTRIBUTE_PRINTF_3;	1158	ATTRIBUTE_PRINTF_3;
1076	extern bool cpp_warning_syshdr (cpp_reader , int, const char msgid, ...)	1159	extern bool cpp_warning_syshdr (cpp_reader *, enum cpp_warning_reason reason,
		1160	const char *msgid, ...)
1077	ATTRIBUTE_PRINTF_3;	1161	ATTRIBUTE_PRINTF_3;
1078		1162
1079	/* Output a diagnostic with "MSGID: " preceding the	1163	/* Output a diagnostic with "MSGID: " preceding the
1080	error string of errno. No location is printed. */	1164	error string of errno. No location is printed. */
1081	extern bool cpp_errno (cpp_reader , int, const char msgid);	1165	extern bool cpp_errno (cpp_reader *, enum cpp_diagnostic_level,
		1166	const char *msgid);
1082	/* Similarly, but with "FILENAME: " instead of "MSGID: ", where	1167	/* Similarly, but with "FILENAME: " instead of "MSGID: ", where
1083	the filename is not localized. */	1168	the filename is not localized. */
1084	extern bool cpp_errno_filename (cpp_reader , int, const char filename,	1169	extern bool cpp_errno_filename (cpp_reader *, enum cpp_diagnostic_level,
1085	source_location loc);	1170	const char *filename, location_t loc);
1086		1171
1087	/* Same as cpp_error, except additionally specifies a position as a	1172	/* Same as cpp_error, except additionally specifies a position as a
1088	(translation unit) physical line and physical column. If the line is	1173	(translation unit) physical line and physical column. If the line is
1089	zero, then no location is printed. */	1174	zero, then no location is printed. */
1090	extern bool cpp_error_with_line (cpp_reader *, int, source_location,	1175	extern bool cpp_error_with_line (cpp_reader *, enum cpp_diagnostic_level,
1091	unsigned, const char *msgid, ...)	1176	location_t, unsigned,
		1177	const char *msgid, ...)
1092	ATTRIBUTE_PRINTF_5;	1178	ATTRIBUTE_PRINTF_5;
1093	extern bool cpp_warning_with_line (cpp_reader *, int, source_location,	1179	extern bool cpp_warning_with_line (cpp_reader *, enum cpp_warning_reason,
1094	unsigned, const char *msgid, ...)	1180	location_t, unsigned,
		1181	const char *msgid, ...)
1095	ATTRIBUTE_PRINTF_5;	1182	ATTRIBUTE_PRINTF_5;
1096	extern bool cpp_pedwarning_with_line (cpp_reader *, int, source_location,	1183	extern bool cpp_pedwarning_with_line (cpp_reader *, enum cpp_warning_reason,
1097	unsigned, const char *msgid, ...)	1184	location_t, unsigned,
		1185	const char *msgid, ...)
1098	ATTRIBUTE_PRINTF_5;	1186	ATTRIBUTE_PRINTF_5;
1099	extern bool cpp_warning_with_line_syshdr (cpp_reader *, int, source_location,	1187	extern bool cpp_warning_with_line_syshdr (cpp_reader *, enum cpp_warning_reason,
1100	unsigned, const char *msgid, ...)	1188	location_t, unsigned,
		1189	const char *msgid, ...)
1101	ATTRIBUTE_PRINTF_5;	1190	ATTRIBUTE_PRINTF_5;
1102		1191
1103	extern bool cpp_error_at (cpp_reader * pfile, int level,	1192	extern bool cpp_error_at (cpp_reader * pfile, enum cpp_diagnostic_level,
1104	source_location src_loc, const char *msgid, ...)	1193	location_t src_loc, const char *msgid, ...)
1105	ATTRIBUTE_PRINTF_4;	1194	ATTRIBUTE_PRINTF_4;
1106		1195
1107	extern bool cpp_error_at (cpp_reader * pfile, int level,	1196	extern bool cpp_error_at (cpp_reader * pfile, enum cpp_diagnostic_level,
1108	rich_location richloc, const char msgid,	1197	rich_location richloc, const char msgid, ...)
1109	...)
1110	ATTRIBUTE_PRINTF_4;	1198	ATTRIBUTE_PRINTF_4;
1111		1199
1112	/* In lex.c */	1200	/* In lex.c */
@@ -1133,7 +1221,7 @@ typedef struct · 20 unmodified lines
1133	char *comment;	1221	char *comment;
1134		1222
1135	/* source location for the given comment. */	1223	/* source location for the given comment. */
1136	source_location sloc;	1224	location_t sloc;
1137	} cpp_comment;	1225	} cpp_comment;
1138		1226
1139	/* Structure holding all comments for a given cpp_reader. */	1227	/* Structure holding all comments for a given cpp_reader. */
@@ -1172,7 +1260,7 @@ extern unsigned char cpp_quote_string (unsigned char , const unsigned char *, · 32 unmodified lines
1172		1260
1173	/* In files.c */	1261	/* In files.c */
1174	extern bool cpp_included (cpp_reader , const char );	1262	extern bool cpp_included (cpp_reader , const char );
1175	extern bool cpp_included_before (cpp_reader , const char , source_location);	1263	extern bool cpp_included_before (cpp_reader , const char , location_t);
1176	extern void cpp_make_system_header (cpp_reader *, int, int);	1264	extern void cpp_make_system_header (cpp_reader *, int, int);
1177	extern bool cpp_push_include (cpp_reader , const char );	1265	extern bool cpp_push_include (cpp_reader , const char );
1178	extern bool cpp_push_default_include (cpp_reader , const char );	1266	extern bool cpp_push_default_include (cpp_reader , const char );
@@ -1195,7 +1283,7 @@ extern int cpp_read_state (cpp_reader , const char , FILE *, · 16 unmodified lines
1195	struct save_macro_data *);	1283	struct save_macro_data *);
1196		1284
1197	/* In lex.c */	1285	/* In lex.c */
1198	extern void cpp_force_token_locations (cpp_reader , source_location );	1286	extern void cpp_force_token_locations (cpp_reader *, location_t);
1199	extern void cpp_stop_forcing_token_locations (cpp_reader *);	1287	extern void cpp_stop_forcing_token_locations (cpp_reader *);
1200		1288
1201	/* In expr.c */	1289	/* In expr.c */

gcc/libcpp/include/line-map.h+310−210

@@ -1,5 +1,5 @@
1	/* Map (unsigned int) keys to (source file, line, column) triples.	1	/* Map (unsigned int) keys to (source file, line, column) triples.
2	Copyright (C) 2001-2018 Free Software Foundation, Inc.	2	Copyright (C) 2001-2019 Free Software Foundation, Inc.
3		3
4	This program is free software; you can redistribute it and/or modify it	4	This program is free software; you can redistribute it and/or modify it
5	under the terms of the GNU General Public License as published by the	5	under the terms of the GNU General Public License as published by the
@@ -49,36 +49,34 @@ along with this program; see the file COPYING3. If not see · 43 unmodified lines
49	/* The type of line numbers. */	49	/* The type of line numbers. */
50	typedef unsigned int linenum_type;	50	typedef unsigned int linenum_type;
51		51
		52	/* A type for doing arithmetic on line numbers. */
		53	typedef long long linenum_arith_t;
		54
52	/* A function for for use by qsort for comparing line numbers. */	55	/* A function for for use by qsort for comparing line numbers. */
53		56
54	inline int compare (linenum_type lhs, linenum_type rhs)	57	inline int compare (linenum_type lhs, linenum_type rhs)
55	{	58	{
56	/* Avoid truncation issues by using long long for the comparison,	59	/* Avoid truncation issues by using linenum_arith_t for the comparison,
57	and only consider the sign of the result. */	60	and only consider the sign of the result. */
58	long long diff = (long long)lhs - (long long)rhs;	61	linenum_arith_t diff = (linenum_arith_t)lhs - (linenum_arith_t)rhs;
59	if (diff)	62	if (diff)
60	return diff > 0 ? 1 : -1;	63	return diff > 0 ? 1 : -1;
61	return 0;	64	return 0;
62	}	65	}
63		66
64	/* Reason for creating a new line map with linemap_add. LC_ENTER is	67	/* Reason for creating a new line map with linemap_add. */
65	when including a new file, e.g. a #include directive in C.
66	LC_LEAVE is when reaching a file's end. LC_RENAME is when a file
67	name or line number changes for neither of the above reasons
68	(e.g. a #line directive in C); LC_RENAME_VERBATIM is like LC_RENAME
69	but a filename of "" is not specially interpreted as standard
70	input. LC_ENTER_MACRO is when a macro expansion is about to start. */
71	enum lc_reason	68	enum lc_reason
72	{	69	{
73	LC_ENTER = 0,	70	LC_ENTER = 0, /* Begin #include. */
74	LC_LEAVE,	71	LC_LEAVE, /* Return to including file. */
75	LC_RENAME,	72	LC_RENAME, /* Other reason for name change. */
76	LC_RENAME_VERBATIM,	73	LC_RENAME_VERBATIM, /* Likewise, but "" != stdin. */
77	LC_ENTER_MACRO	74	LC_ENTER_MACRO, /* Begin macro expansion. */
78	/* FIXME: add support for stringize and paste. */	75	/* FIXME: add support for stringize and paste. */
		76	LC_HWM /* High Water Mark. */
79	};	77	};
80		78
81	/* The typedef "source_location" is a key within the location database,	79	/* The typedef "location_t" is a key within the location database,
82	identifying a source location or macro expansion, along with range	80	identifying a source location or macro expansion, along with range
83	information, and (optionally) a pointer for use by gcc.	81	information, and (optionally) a pointer for use by gcc.
84		82
@@ -168,7 +166,7 @@ enum lc_reason · 83 unmodified lines
168	\| Beyond this point, ordinary linemaps have 0 bits per column:	166	\| Beyond this point, ordinary linemaps have 0 bits per column:
169	\| each increment of the value corresponds to a new source line.	167	\| each increment of the value corresponds to a new source line.
170	\|	168	\|
171	0x70000000 \| LINE_MAP_MAX_SOURCE_LOCATION	169	0x70000000 \| LINE_MAP_MAX_LOCATION
172	\| Beyond the point, we give up on ordinary maps; attempts to	170	\| Beyond the point, we give up on ordinary maps; attempts to
173	\| create locations in them lead to UNKNOWN_LOCATION (0).	171	\| create locations in them lead to UNKNOWN_LOCATION (0).
174	\|	172	\|
@@ -187,7 +185,7 @@ enum lc_reason · 12 unmodified lines
187	\| macromap[1]->start_location \| Start of macro map 1	185	\| macromap[1]->start_location \| Start of macro map 1
188	-----------+-------------------------------+-------------------------------	186	-----------+-------------------------------+-------------------------------
189	\| macromap[0]->start_location \| Start of macro map 0	187	\| macromap[0]->start_location \| Start of macro map 0
190	0x7fffffff \| MAX_SOURCE_LOCATION \| Also used as a mask for	188	0x7fffffff \| MAX_LOCATION_T \| Also used as a mask for
191	\| \| accessing the ad-hoc data table	189	\| \| accessing the ad-hoc data table
192	-----------+-------------------------------+-------------------------------	190	-----------+-------------------------------+-------------------------------
193	0x80000000 \| Start of ad-hoc values; the lower 31 bits are used as an index	191	0x80000000 \| Start of ad-hoc values; the lower 31 bits are used as an index
@@ -288,9 +286,9 @@ enum lc_reason · 94 unmodified lines
288	finish == ordmap->start + (23 << 12) + (19 << 5)	286	finish == ordmap->start + (23 << 12) + (19 << 5)
289	== ordmap->start + 0x17260	287	== ordmap->start + 0x17260
290		288
291	To further see how source_location works in practice, see the	289	To further see how location_t works in practice, see the
292	worked example in libcpp/location-example.txt. */	290	worked example in libcpp/location-example.txt. */
293	typedef unsigned int source_location;	291	typedef unsigned int location_t;
294		292
295	/* Do not track column numbers higher than this one. As a result, the	293	/* Do not track column numbers higher than this one. As a result, the
296	range of column_bits is [12, 18] (or 0 if column numbers are	294	range of column_bits is [12, 18] (or 0 if column numbers are
@@ -300,12 +298,15 @@ const unsigned int LINE_MAP_MAX_COLUMN_NUMBER = (1U << 12); · 3 unmodified lines
300	/* Do not pack ranges if locations get higher than this.	298	/* Do not pack ranges if locations get higher than this.
301	If you change this, update:	299	If you change this, update:
302	gcc.dg/plugin/location-overflow-test-.c. /	300	gcc.dg/plugin/location-overflow-test-.c. /
303	const source_location LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES = 0x50000000;	301	const location_t LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES = 0x50000000;
304		302
305	/* Do not track column numbers if locations get higher than this.	303	/* Do not track column numbers if locations get higher than this.
306	If you change this, update:	304	If you change this, update:
307	gcc.dg/plugin/location-overflow-test-.c. /	305	gcc.dg/plugin/location-overflow-test-.c. /
308	const source_location LINE_MAP_MAX_LOCATION_WITH_COLS = 0x60000000;	306	const location_t LINE_MAP_MAX_LOCATION_WITH_COLS = 0x60000000;
		307
		308	/* Highest possible source location encoded within an ordinary map. */
		309	const location_t LINE_MAP_MAX_LOCATION = 0x70000000;
309		310
310	/* A range of source locations.	311	/* A range of source locations.
311		312
@@ -317,15 +318,15 @@ const source_location LINE_MAP_MAX_LOCATION_WITH_COLS = 0x60000000; · 5 unmodified lines
317	let's do it the simple way, as a pair. */	318	let's do it the simple way, as a pair. */
318	struct GTY(()) source_range	319	struct GTY(()) source_range
319	{	320	{
320	source_location m_start;	321	location_t m_start;
321	source_location m_finish;	322	location_t m_finish;
322		323
323	/* We avoid using constructors, since various structs that	324	/* We avoid using constructors, since various structs that
324	don't yet have constructors will embed instances of	325	don't yet have constructors will embed instances of
325	source_range. */	326	source_range. */
326		327
327	/* Make a source_range from a source_location. */	328	/* Make a source_range from a location_t. */
328	static source_range from_location (source_location loc)	329	static source_range from_location (location_t loc)
329	{	330	{
330	source_range result;	331	source_range result;
331	result.m_start = loc;	332	result.m_start = loc;
@@ -333,9 +334,9 @@ struct GTY(()) source_range · 1 unmodified line
333	return result;	334	return result;
334	}	335	}
335		336
336	/* Make a source_range from a pair of source_location. */	337	/* Make a source_range from a pair of location_t. */
337	static source_range from_locations (source_location start,	338	static source_range from_locations (location_t start,
338	source_location finish)	339	location_t finish)
339	{	340	{
340	source_range result;	341	source_range result;
341	result.m_start = start;	342	result.m_start = start;
@@ -377,11 +378,13 @@ typedef size_t (*line_map_round_alloc_size_func) (size_t); · 35 unmodified lines
377	location of the expansion point of PLUS. That location is mapped in	378	location of the expansion point of PLUS. That location is mapped in
378	the map that is active right before the location of the invocation	379	the map that is active right before the location of the invocation
379	of PLUS. */	380	of PLUS. */
380	struct GTY((tag ("0"), desc ("%h.reason == LC_ENTER_MACRO ? 2 : 1"))) line_map {
381	source_location start_location;
382		381
383	/* The reason for creation of this line map. */	382	/* This contains GTY mark-up to support precompiled headers.
384	ENUM_BITFIELD (lc_reason) reason : CHAR_BIT;	383	line_map is an abstract class, only derived objects exist. */
		384	struct GTY((tag ("0"), desc ("MAP_ORDINARY_P (&%h) ? 1 : 2"))) line_map {
		385	location_t start_location;
		386
		387	/* Size and alignment is (usually) 4 bytes. */
385	};	388	};
386		389
387	/* An ordinary line map encodes physical source locations. Those	390	/* An ordinary line map encodes physical source locations. Those
@@ -395,15 +398,14 @@ struct GTY((tag ("0"), desc ("%h.reason == LC_ENTER_MACRO ? 2 : 1"))) line_map { · 7 unmodified lines
395	(The top line is line 1 and the leftmost column is column 1; line/column 0	398	(The top line is line 1 and the leftmost column is column 1; line/column 0
396	means "entire file/line" or "unknown line/column" or "not applicable".)	399	means "entire file/line" or "unknown line/column" or "not applicable".)
397		400
398	The highest possible source location is MAX_SOURCE_LOCATION. */	401	The highest possible source location is MAX_LOCATION_T. */
399	struct GTY((tag ("1"))) line_map_ordinary : public line_map {	402	struct GTY((tag ("1"))) line_map_ordinary : public line_map {
400	const char *to_file;	403	/* Base class is 4 bytes. */
401	linenum_type to_line;
402		404
403	/* An index into the set that gives the line mapping at whose end	405	/* 4 bytes of integers, each 1 byte for easy extraction/insertion. */
404	the current one was included. File(s) at the bottom of the	406
405	include stack have this set to -1. */	407	/* The reason for creation of this line map. */
406	int included_from;	408	ENUM_BITFIELD (lc_reason) reason : 8;
407		409
408	/* SYSP is one for a system header, two for a C system header file	410	/* SYSP is one for a system header, two for a C system header file
409	that therefore needs to be extern "C" protected in C++, and zero	411	that therefore needs to be extern "C" protected in C++, and zero
@@ -411,7 +413,7 @@ struct GTY((tag ("1"))) line_map_ordinary : public line_map { · 1 unmodified line
411	cpp_buffer. */	413	cpp_buffer. */
412	unsigned char sysp;	414	unsigned char sysp;
413		415
414	/* Number of the low-order source_location bits used for column numbers	416	/* Number of the low-order location_t bits used for column numbers
415	and ranges. */	417	and ranges. */
416	unsigned int m_column_and_range_bits : 8;	418	unsigned int m_column_and_range_bits : 8;
417		419
@@ -429,11 +431,23 @@ struct GTY((tag ("1"))) line_map_ordinary : public line_map { · 11 unmodified lines
429	\| \| (e.g. 7) \| (e.g. 5) \|	431	\| \| (e.g. 7) \| (e.g. 5) \|
430	+-------------------------+-----------------------+-------------------+ */	432	+-------------------------+-----------------------+-------------------+ */
431	unsigned int m_range_bits : 8;	433	unsigned int m_range_bits : 8;
		434
		435	/* Pointer alignment boundary on both 32 and 64-bit systems. */
		436
		437	const char *to_file;
		438	linenum_type to_line;
		439
		440	/* Location from whence this line map was included. For regular
		441	#includes, this location will be the last location of a map. For
		442	outermost file, this is 0. */
		443	location_t included_from;
		444
		445	/* Size is 20 or 24 bytes, no padding */
432	};	446	};
433		447
434	/* This is the highest possible source location encoded within an	448	/* This is the highest possible source location encoded within an
435	ordinary or macro map. */	449	ordinary or macro map. */
436	const source_location MAX_SOURCE_LOCATION = 0x7FFFFFFF;	450	const location_t MAX_LOCATION_T = 0x7FFFFFFF;
437		451
438	struct cpp_hashnode;	452	struct cpp_hashnode;
439		453
@@ -443,15 +457,20 @@ struct cpp_hashnode; · 3 unmodified lines
443	The offset from START_LOCATION is used to index into	457	The offset from START_LOCATION is used to index into
444	MACRO_LOCATIONS; this holds the original location of the token. */	458	MACRO_LOCATIONS; this holds the original location of the token. */
445	struct GTY((tag ("2"))) line_map_macro : public line_map {	459	struct GTY((tag ("2"))) line_map_macro : public line_map {
446	/* The cpp macro which expansion gave birth to this macro map. */	460	/* Base is 4 bytes. */
447	struct cpp_hashnode * GTY ((nested_ptr (union tree_node,
448	"%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL",
449	"%h ? HT_IDENT_TO_GCC_IDENT (HT_NODE (%h)) : NULL")))
450	macro;
451		461
452	/* The number of tokens inside the replacement-list of MACRO. */	462	/* The number of tokens inside the replacement-list of MACRO. */
453	unsigned int n_tokens;	463	unsigned int n_tokens;
454		464
		465	/* Pointer alignment boundary. */
		466
		467	/* The cpp macro whose expansion gave birth to this macro map. */
		468	struct cpp_hashnode *
		469	GTY ((nested_ptr (union tree_node,
		470	"%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL",
		471	"%h ? HT_IDENT_TO_GCC_IDENT (HT_NODE (%h)) : NULL")))
		472	macro;
		473
455	/* This array of location is actually an array of pairs of	474	/* This array of location is actually an array of pairs of
456	locations. The elements inside it thus look like:	475	locations. The elements inside it thus look like:
457		476
@@ -505,14 +524,16 @@ struct GTY((tag ("2"))) line_map_macro : public line_map { · 47 unmodified lines
505	In the example above x1 (for token "+") is going to be the same	524	In the example above x1 (for token "+") is going to be the same
506	as y1. x0 is the spelling location for the argument token "1",	525	as y1. x0 is the spelling location for the argument token "1",
507	and x2 is the spelling location for the argument token "2". */	526	and x2 is the spelling location for the argument token "2". */
508	source_location * GTY((atomic)) macro_locations;	527	location_t * GTY((atomic)) macro_locations;
509		528
510	/* This is the location of the expansion point of the current macro	529	/* This is the location of the expansion point of the current macro
511	map. It's the location of the macro name. That location is held	530	map. It's the location of the macro name. That location is held
512	by the map that was current right before the current one. It	531	by the map that was current right before the current one. It
513	could have been either a macro or an ordinary map, depending on	532	could have been either a macro or an ordinary map, depending on
514	if we are in a nested expansion context not. */	533	if we are in a nested expansion context not. */
515	source_location expansion;	534	location_t expansion;
		535
		536	/* Size is 20 or 32 (4 bytes padding on 64-bit). */
516	};	537	};
517		538
518	#if CHECKING_P && (GCC_VERSION >= 2007)	539	#if CHECKING_P && (GCC_VERSION >= 2007)
@@ -540,6 +561,34 @@ struct GTY((tag ("2"))) line_map_macro : public line_map { · 21 unmodified lines
540	#define linemap_assert_fails(EXPR) (! (EXPR))	561	#define linemap_assert_fails(EXPR) (! (EXPR))
541	#endif	562	#endif
542		563
		564	/* Get whether location LOC is an ad-hoc, ordinary or macro location. */
		565
		566	inline bool
		567	IS_ORDINARY_LOC (location_t loc)
		568	{
		569	return loc < LINE_MAP_MAX_LOCATION;
		570	}
		571
		572	inline bool
		573	IS_ADHOC_LOC (location_t loc)
		574	{
		575	return loc > MAX_LOCATION_T;
		576	}
		577
		578	inline bool
		579	IS_MACRO_LOC (location_t loc)
		580	{
		581	return !IS_ORDINARY_LOC (loc) && !IS_ADHOC_LOC (loc);
		582	}
		583
		584	/* Categorize line map kinds. */
		585
		586	inline bool
		587	MAP_ORDINARY_P (const line_map *map)
		588	{
		589	return IS_ORDINARY_LOC (map->start_location);
		590	}
		591
543	/* Return TRUE if MAP encodes locations coming from a macro	592	/* Return TRUE if MAP encodes locations coming from a macro
544	replacement-list at macro expansion point. */	593	replacement-list at macro expansion point. */
545	bool	594	bool
@@ -552,7 +601,7 @@ linemap_macro_expansion_map_p (const struct line_map *); · 6 unmodified lines
552	inline line_map_ordinary *	601	inline line_map_ordinary *
553	linemap_check_ordinary (struct line_map *map)	602	linemap_check_ordinary (struct line_map *map)
554	{	603	{
555	linemap_assert (!linemap_macro_expansion_map_p (map));	604	linemap_assert (MAP_ORDINARY_P (map));
556	return (line_map_ordinary *)map;	605	return (line_map_ordinary *)map;
557	}	606	}
558		607
@@ -563,7 +612,7 @@ linemap_check_ordinary (struct line_map *map) · 4 unmodified lines
563	inline const line_map_ordinary *	612	inline const line_map_ordinary *
564	linemap_check_ordinary (const struct line_map *map)	613	linemap_check_ordinary (const struct line_map *map)
565	{	614	{
566	linemap_assert (!linemap_macro_expansion_map_p (map));	615	linemap_assert (MAP_ORDINARY_P (map));
567	return (const line_map_ordinary *)map;	616	return (const line_map_ordinary *)map;
568	}	617	}
569		618
@@ -572,7 +621,7 @@ linemap_check_ordinary (const struct line_map *map) · 2 unmodified lines
572		621
573	inline line_map_macro linemap_check_macro (line_map map)	622	inline line_map_macro linemap_check_macro (line_map map)
574	{	623	{
575	linemap_assert (linemap_macro_expansion_map_p (map));	624	linemap_assert (!MAP_ORDINARY_P (map));
576	return (line_map_macro *)map;	625	return (line_map_macro *)map;
577	}	626	}
578		627
@@ -582,13 +631,13 @@ inline line_map_macro linemap_check_macro (line_map map) · 3 unmodified lines
582	inline const line_map_macro *	631	inline const line_map_macro *
583	linemap_check_macro (const line_map *map)	632	linemap_check_macro (const line_map *map)
584	{	633	{
585	linemap_assert (linemap_macro_expansion_map_p (map));	634	linemap_assert (!MAP_ORDINARY_P (map));
586	return (const line_map_macro *)map;	635	return (const line_map_macro *)map;
587	}	636	}
588		637
589	/* Read the start location of MAP. */	638	/* Read the start location of MAP. */
590		639
591	inline source_location	640	inline location_t
592	MAP_START_LOCATION (const line_map *map)	641	MAP_START_LOCATION (const line_map *map)
593	{	642	{
594	return map->start_location;	643	return map->start_location;
@@ -602,17 +651,6 @@ ORDINARY_MAP_STARTING_LINE_NUMBER (const line_map_ordinary *ord_map) · 7 unmodified lines
602	return ord_map->to_line;	651	return ord_map->to_line;
603	}	652	}
604		653
605	/* Get the index of the ordinary map at whose end
606	ordinary map MAP was included.
607
608	File(s) at the bottom of the include stack have this set. */
609
610	inline int
611	ORDINARY_MAP_INCLUDER_FILE_INDEX (const line_map_ordinary *ord_map)
612	{
613	return ord_map->included_from;
614	}
615
616	/* Return a positive value if map encodes locations from a system	654	/* Return a positive value if map encodes locations from a system
617	header, 0 otherwise. Returns 1 if ordinary map MAP encodes locations	655	header, 0 otherwise. Returns 1 if ordinary map MAP encodes locations
618	in a system header and 2 if it encodes locations in a C system header	656	in a system header and 2 if it encodes locations in a C system header
@@ -652,7 +690,7 @@ MACRO_MAP_NUM_MACRO_TOKENS (const line_map_macro *macro_map) · 33 unmodified lines
652	/* Get the array of pairs of locations within macro map MAP.	690	/* Get the array of pairs of locations within macro map MAP.
653	See the declaration of line_map_macro for more information. */	691	See the declaration of line_map_macro for more information. */
654		692
655	inline source_location *	693	inline location_t *
656	MACRO_MAP_LOCATIONS (const line_map_macro *macro_map)	694	MACRO_MAP_LOCATIONS (const line_map_macro *macro_map)
657	{	695	{
658	return macro_map->macro_locations;	696	return macro_map->macro_locations;
@@ -660,7 +698,7 @@ MACRO_MAP_LOCATIONS (const line_map_macro *macro_map) · 1 unmodified line
660		698
661	/* Get the location of the expansion point of the macro map MAP. */	699	/* Get the location of the expansion point of the macro map MAP. */
662		700
663	inline source_location	701	inline location_t
664	MACRO_MAP_EXPANSION_POINT_LOCATION (const line_map_macro *macro_map)	702	MACRO_MAP_EXPANSION_POINT_LOCATION (const line_map_macro *macro_map)
665	{	703	{
666	return macro_map->expansion;	704	return macro_map->expansion;
@@ -707,7 +745,7 @@ struct GTY(()) maps_info_macro { · 40 unmodified lines
707	/* Data structure to associate a source_range together with an arbitrary	745	/* Data structure to associate a source_range together with an arbitrary
708	data pointer with a source location. */	746	data pointer with a source location. */
709	struct GTY(()) location_adhoc_data {	747	struct GTY(()) location_adhoc_data {
710	source_location locus;	748	location_t locus;
711	source_range src_range;	749	source_range src_range;
712	void * GTY((skip)) data;	750	void * GTY((skip)) data;
713	};	751	};
@@ -726,7 +764,7 @@ struct htab; · 12 unmodified lines
726		764
727	struct GTY(()) location_adhoc_data_map {	765	struct GTY(()) location_adhoc_data_map {
728	struct htab * GTY((skip)) htab;	766	struct htab * GTY((skip)) htab;
729	source_location curr_loc;	767	location_t curr_loc;
730	unsigned int allocated;	768	unsigned int allocated;
731	struct location_adhoc_data GTY((length ("%h.allocated"))) *data;	769	struct location_adhoc_data GTY((length ("%h.allocated"))) *data;
732	};	770	};
@@ -746,18 +784,17 @@ struct GTY(()) line_maps { · 13 unmodified lines
746	/* If true, prints an include trace a la -H. */	784	/* If true, prints an include trace a la -H. */
747	bool trace_includes;	785	bool trace_includes;
748		786
749	/* Highest source_location "given out". */	787	/* Highest location_t "given out". */
750	source_location highest_location;	788	location_t highest_location;
751		789
752	/* Start of line of highest source_location "given out". */	790	/* Start of line of highest location_t "given out". */
753	source_location highest_line;	791	location_t highest_line;
754		792
755	/* The maximum column number we can quickly allocate. Higher numbers	793	/* The maximum column number we can quickly allocate. Higher numbers
756	may require allocating a new line_map. */	794	may require allocating a new line_map. */
757	unsigned int max_column_hint;	795	unsigned int max_column_hint;
758		796
759	/* If non-null, the allocator to use when resizing 'maps'. If null,	797	/* The allocator to use when resizing 'maps', defaults to xrealloc. */
760	xrealloc is used. */
761	line_map_realloc reallocator;	798	line_map_realloc reallocator;
762		799
763	/* The allocators' function used to know the actual size it	800	/* The allocators' function used to know the actual size it
@@ -768,7 +805,7 @@ struct GTY(()) line_maps { · 4 unmodified lines
768		805
769	/* The special location value that is used as spelling location for	806	/* The special location value that is used as spelling location for
770	built-in tokens. */	807	built-in tokens. */
771	source_location builtin_location;	808	location_t builtin_location;
772		809
773	/* True if we've seen a #line or # 44 "file" directive. */	810	/* True if we've seen a #line or # 44 "file" directive. */
774	bool seen_line_directive;	811	bool seen_line_directive;
@@ -998,12 +1035,12 @@ LINEMAPS_LAST_MACRO_MAP (const line_maps *set) · 223 unmodified lines
998		1035
999	/* Returns the lowest location [of a token resulting from macro	1036	/* Returns the lowest location [of a token resulting from macro
1000	expansion] encoded in this line table. */	1037	expansion] encoded in this line table. */
1001	inline source_location	1038	inline location_t
1002	LINEMAPS_MACRO_LOWEST_LOCATION (const line_maps *set)	1039	LINEMAPS_MACRO_LOWEST_LOCATION (const line_maps *set)
1003	{	1040	{
1004	return LINEMAPS_MACRO_USED (set)	1041	return LINEMAPS_MACRO_USED (set)
1005	? MAP_START_LOCATION (LINEMAPS_LAST_MACRO_MAP (set))	1042	? MAP_START_LOCATION (LINEMAPS_LAST_MACRO_MAP (set))
1006	: MAX_SOURCE_LOCATION;	1043	: MAX_LOCATION_T + 1;
1007	}	1044	}
1008		1045
1009	/* Returns the last macro map allocated in the line table SET. */	1046	/* Returns the last macro map allocated in the line table SET. */
@@ -1013,41 +1050,33 @@ LINEMAPS_LAST_ALLOCATED_MACRO_MAP (const line_maps *set) · 3 unmodified lines
1013	return (line_map_macro *)LINEMAPS_LAST_ALLOCATED_MAP (set, true);	1050	return (line_map_macro *)LINEMAPS_LAST_ALLOCATED_MAP (set, true);
1014	}	1051	}
1015		1052
1016	extern source_location get_combined_adhoc_loc (struct line_maps *,	1053	extern location_t get_combined_adhoc_loc (struct line_maps *,
1017	source_location,	1054	location_t,
1018	source_range,	1055	source_range,
1019	void *);	1056	void *);
1020	extern void get_data_from_adhoc_loc (struct line_maps , source_location);	1057	extern void get_data_from_adhoc_loc (struct line_maps , location_t);
1021	extern source_location get_location_from_adhoc_loc (struct line_maps *,	1058	extern location_t get_location_from_adhoc_loc (struct line_maps *,
1022	source_location);	1059	location_t);
1023		1060
1024	extern source_range get_range_from_loc (line_maps *set, source_location loc);	1061	extern source_range get_range_from_loc (line_maps *set, location_t loc);
1025
1026	/* Get whether location LOC is an ad-hoc location. */
1027
1028	inline bool
1029	IS_ADHOC_LOC (source_location loc)
1030	{
1031	return (loc & MAX_SOURCE_LOCATION) != loc;
1032	}
1033		1062
1034	/* Get whether location LOC is a "pure" location, or	1063	/* Get whether location LOC is a "pure" location, or
1035	whether it is an ad-hoc location, or embeds range information. */	1064	whether it is an ad-hoc location, or embeds range information. */
1036		1065
1037	bool	1066	bool
1038	pure_location_p (line_maps *set, source_location loc);	1067	pure_location_p (line_maps *set, location_t loc);
1039		1068
1040	/* Given location LOC within SET, strip away any packed range information	1069	/* Given location LOC within SET, strip away any packed range information
1041	or ad-hoc information. */	1070	or ad-hoc information. */
1042		1071
1043	extern source_location get_pure_location (line_maps *set,	1072	extern location_t get_pure_location (line_maps *set,
1044	source_location loc);	1073	location_t loc);
1045		1074
1046	/* Combine LOC and BLOCK, giving a combined adhoc location. */	1075	/* Combine LOC and BLOCK, giving a combined adhoc location. */
1047		1076
1048	inline source_location	1077	inline location_t
1049	COMBINE_LOCATION_DATA (struct line_maps *set,	1078	COMBINE_LOCATION_DATA (struct line_maps *set,
1050	source_location loc,	1079	location_t loc,
1051	source_range src_range,	1080	source_range src_range,
1052	void *block)	1081	void *block)
1053	{	1082	{
@@ -1061,19 +1090,19 @@ extern void rebuild_location_adhoc_htab (struct line_maps *); · 7 unmodified lines
1061	spelling location for built-in tokens. This BUILTIN_LOCATION has	1090	spelling location for built-in tokens. This BUILTIN_LOCATION has
1062	to be strictly less than RESERVED_LOCATION_COUNT. */	1091	to be strictly less than RESERVED_LOCATION_COUNT. */
1063	extern void linemap_init (struct line_maps *set,	1092	extern void linemap_init (struct line_maps *set,
1064	source_location builtin_location);	1093	location_t builtin_location);
1065		1094
1066	/* Check for and warn about line_maps entered but not exited. */	1095	/* Check for and warn about line_maps entered but not exited. */
1067		1096
1068	extern void linemap_check_files_exited (struct line_maps *);	1097	extern void linemap_check_files_exited (struct line_maps *);
1069		1098
1070	/* Return a source_location for the start (i.e. column==0) of	1099	/* Return a location_t for the start (i.e. column==0) of
1071	(physical) line TO_LINE in the current source file (as in the	1100	(physical) line TO_LINE in the current source file (as in the
1072	most recent linemap_add). MAX_COLUMN_HINT is the highest column	1101	most recent linemap_add). MAX_COLUMN_HINT is the highest column
1073	number we expect to use in this line (but it does not change	1102	number we expect to use in this line (but it does not change
1074	the highest_location). */	1103	the highest_location). */
1075		1104
1076	extern source_location linemap_line_start	1105	extern location_t linemap_line_start
1077	(struct line_maps *set, linenum_type to_line, unsigned int max_column_hint);	1106	(struct line_maps *set, linenum_type to_line, unsigned int max_column_hint);
1078		1107
1079	/* Add a mapping of logical source line to physical source file and	1108	/* Add a mapping of logical source line to physical source file and
@@ -1100,7 +1129,7 @@ extern const struct line_map *linemap_add · 20 unmodified lines
1100	binary search. If no line map have been allocated yet, this	1129	binary search. If no line map have been allocated yet, this
1101	function returns NULL. */	1130	function returns NULL. */
1102	extern const struct line_map *linemap_lookup	1131	extern const struct line_map *linemap_lookup
1103	(struct line_maps *, source_location);	1132	(struct line_maps *, location_t);
1104		1133
1105	/* Returns TRUE if the line table set tracks token locations across	1134	/* Returns TRUE if the line table set tracks token locations across
1106	macro expansion, FALSE otherwise. */	1135	macro expansion, FALSE otherwise. */
@@ -1119,114 +1148,86 @@ const char* linemap_map_get_macro_name (const line_map_macro *); · 12 unmodified lines
1119	that is part of a macro replacement-list defined in a system	1148	that is part of a macro replacement-list defined in a system
1120	header, but expanded in a non-system file. */	1149	header, but expanded in a non-system file. */
1121	int linemap_location_in_system_header_p (struct line_maps *,	1150	int linemap_location_in_system_header_p (struct line_maps *,
1122	source_location);	1151	location_t);
1123		1152
1124	/* Return TRUE if LOCATION is a source code location of a token that is part of	1153	/* Return TRUE if LOCATION is a source code location of a token that is part of
1125	a macro expansion, FALSE otherwise. */	1154	a macro expansion, FALSE otherwise. */
1126	bool linemap_location_from_macro_expansion_p (const struct line_maps *,	1155	bool linemap_location_from_macro_expansion_p (const struct line_maps *,
1127	source_location);	1156	location_t);
1128		1157
1129	/* TRUE if LOCATION is a source code location of a token that is part of the	1158	/* TRUE if LOCATION is a source code location of a token that is part of the
1130	definition of a macro, FALSE otherwise. */	1159	definition of a macro, FALSE otherwise. */
1131	bool linemap_location_from_macro_definition_p (struct line_maps *,	1160	bool linemap_location_from_macro_definition_p (struct line_maps *,
1132	source_location);	1161	location_t);
1133		1162
1134	/* With the precondition that LOCATION is the locus of a token that is	1163	/* With the precondition that LOCATION is the locus of a token that is
1135	an argument of a function-like macro MACRO_MAP and appears in the	1164	an argument of a function-like macro MACRO_MAP and appears in the
1136	expansion of MACRO_MAP, return the locus of that argument in the	1165	expansion of MACRO_MAP, return the locus of that argument in the
1137	context of the caller of MACRO_MAP. */	1166	context of the caller of MACRO_MAP. */
1138		1167
1139	extern source_location linemap_macro_map_loc_unwind_toward_spelling	1168	extern location_t linemap_macro_map_loc_unwind_toward_spelling
1140	(line_maps set, const line_map_macro macro_map, source_location location);	1169	(line_maps set, const line_map_macro macro_map, location_t location);
1141		1170
1142	/* source_location values from 0 to RESERVED_LOCATION_COUNT-1 will	1171	/* location_t values from 0 to RESERVED_LOCATION_COUNT-1 will
1143	be reserved for libcpp user as special values, no token from libcpp	1172	be reserved for libcpp user as special values, no token from libcpp
1144	will contain any of those locations. */	1173	will contain any of those locations. */
1145	const source_location RESERVED_LOCATION_COUNT = 2;	1174	const location_t RESERVED_LOCATION_COUNT = 2;
1146		1175
1147	/* Converts a map and a source_location to source line. */	1176	/* Converts a map and a location_t to source line. */
1148	inline linenum_type	1177	inline linenum_type
1149	SOURCE_LINE (const line_map_ordinary *ord_map, source_location loc)	1178	SOURCE_LINE (const line_map_ordinary *ord_map, location_t loc)
1150	{	1179	{
1151	return ((loc - ord_map->start_location)	1180	return ((loc - ord_map->start_location)
1152	>> ord_map->m_column_and_range_bits) + ord_map->to_line;	1181	>> ord_map->m_column_and_range_bits) + ord_map->to_line;
1153	}	1182	}
1154		1183
1155	/* Convert a map and source_location to source column number. */	1184	/* Convert a map and location_t to source column number. */
1156	inline linenum_type	1185	inline linenum_type
1157	SOURCE_COLUMN (const line_map_ordinary *ord_map, source_location loc)	1186	SOURCE_COLUMN (const line_map_ordinary *ord_map, location_t loc)
1158	{	1187	{
1159	return ((loc - ord_map->start_location)	1188	return ((loc - ord_map->start_location)
1160	& ((1 << ord_map->m_column_and_range_bits) - 1)) >> ord_map->m_range_bits;	1189	& ((1 << ord_map->m_column_and_range_bits) - 1)) >> ord_map->m_range_bits;
1161	}	1190	}
1162		1191
1163	/* Return the location of the last source line within an ordinary
1164	map. */
1165	inline source_location
1166	LAST_SOURCE_LINE_LOCATION (const line_map_ordinary *map)
1167	{
1168	return (((map[1].start_location - 1
1169	- map->start_location)
1170	& ~((1 << map->m_column_and_range_bits) - 1))
1171	+ map->start_location);
1172	}
1173
1174	/* Returns the last source line number within an ordinary map. This
1175	is the (last) line of the #include, or other directive, that caused
1176	a map change. */
1177	inline linenum_type
1178	LAST_SOURCE_LINE (const line_map_ordinary *map)
1179	{
1180	return SOURCE_LINE (map, LAST_SOURCE_LINE_LOCATION (map));
1181	}
1182
1183	/* Return the last column number within an ordinary map. */
1184		1192
1185	inline linenum_type	1193	inline location_t
1186	LAST_SOURCE_COLUMN (const line_map_ordinary *map)	1194	linemap_included_from (const line_map_ordinary *ord_map)
1187	{	1195	{
1188	return SOURCE_COLUMN (map, LAST_SOURCE_LINE_LOCATION (map));	1196	return ord_map->included_from;
1189	}	1197	}
1190		1198
1191	/* Returns the map a given map was included from, or NULL if the map	1199	/* The linemap containing the included-from location of MAP. */
1192	belongs to the main file, i.e, a file that wasn't included by	1200	const line_map_ordinary *linemap_included_from_linemap
1193	another one. */	1201	(line_maps set, const line_map_ordinary map);
1194	inline line_map_ordinary *
1195	INCLUDED_FROM (struct line_maps set, const line_map_ordinary ord_map)
1196	{
1197	return ((ord_map->included_from == -1)
1198	? NULL
1199	: LINEMAPS_ORDINARY_MAP_AT (set, ord_map->included_from));
1200	}
1201		1202
1202	/* True if the map is at the bottom of the include stack. */	1203	/* True if the map is at the bottom of the include stack. */
1203		1204
1204	inline bool	1205	inline bool
1205	MAIN_FILE_P (const line_map_ordinary *ord_map)	1206	MAIN_FILE_P (const line_map_ordinary *ord_map)
1206	{	1207	{
1207	return ord_map->included_from < 0;	1208	return ord_map->included_from == 0;
1208	}	1209	}
1209		1210
1210	/* Encode and return a source_location from a column number. The	1211	/* Encode and return a location_t from a column number. The
1211	source line considered is the last source line used to call	1212	source line considered is the last source line used to call
1212	linemap_line_start, i.e, the last source line which a location was	1213	linemap_line_start, i.e, the last source line which a location was
1213	encoded from. */	1214	encoded from. */
1214	extern source_location	1215	extern location_t
1215	linemap_position_for_column (struct line_maps *, unsigned int);	1216	linemap_position_for_column (struct line_maps *, unsigned int);
1216		1217
1217	/* Encode and return a source location from a given line and	1218	/* Encode and return a source location from a given line and
1218	column. */	1219	column. */
1219	source_location	1220	location_t
1220	linemap_position_for_line_and_column (line_maps *set,	1221	linemap_position_for_line_and_column (line_maps *set,
1221	const line_map_ordinary *,	1222	const line_map_ordinary *,
1222	linenum_type, unsigned int);	1223	linenum_type, unsigned int);
1223		1224
1224	/* Encode and return a source_location starting from location LOC and	1225	/* Encode and return a location_t starting from location LOC and
1225	shifting it by OFFSET columns. This function does not support	1226	shifting it by OFFSET columns. This function does not support
1226	virtual locations. */	1227	virtual locations. */
1227	source_location	1228	location_t
1228	linemap_position_for_loc_and_offset (struct line_maps *set,	1229	linemap_position_for_loc_and_offset (struct line_maps *set,
1229	source_location loc,	1230	location_t loc,
1230	unsigned int offset);	1231	unsigned int offset);
1231		1232
1232	/* Return the file this map is for. */	1233	/* Return the file this map is for. */
@@ -1258,16 +1259,16 @@ LINEMAP_SYSP (const line_map_ordinary *ord_map) · 25 unmodified lines
1258	the same token as the token for POST, and a negative value	1259	the same token as the token for POST, and a negative value
1259	otherwise. */	1260	otherwise. */
1260	int linemap_compare_locations (struct line_maps *set,	1261	int linemap_compare_locations (struct line_maps *set,
1261	source_location pre,	1262	location_t pre,
1262	source_location post);	1263	location_t post);
1263		1264
1264	/* Return TRUE if LOC_A denotes the location a token that comes	1265	/* Return TRUE if LOC_A denotes the location a token that comes
1265	topogically before the token denoted by location LOC_B, or if they	1266	topogically before the token denoted by location LOC_B, or if they
1266	are equal. */	1267	are equal. */
1267	inline bool	1268	inline bool
1268	linemap_location_before_p (struct line_maps *set,	1269	linemap_location_before_p (struct line_maps *set,
1269	source_location loc_a,	1270	location_t loc_a,
1270	source_location loc_b)	1271	location_t loc_b)
1271	{	1272	{
1272	return linemap_compare_locations (set, loc_a, loc_b) >= 0;	1273	return linemap_compare_locations (set, loc_a, loc_b) >= 0;
1273	}	1274	}
@@ -1288,23 +1289,50 @@ typedef struct · 14 unmodified lines
1288	bool sysp;	1289	bool sysp;
1289	} expanded_location;	1290	} expanded_location;
1290		1291
1291	/* A location within a rich_location: a caret&range, with	1292	class range_label;
1292	the caret potentially flagged for display. */
1293		1293
1294	struct location_range	1294	/* A hint to diagnostic_show_locus on how to print a source range within a
1295	{	1295	rich_location.
1296	source_location m_loc;
1297		1296
1298	/* Should a caret be drawn for this range? Typically this is	1297	Typically this is SHOW_RANGE_WITH_CARET for the 0th range, and
1299	true for the 0th range, and false for subsequent ranges,	1298	SHOW_RANGE_WITHOUT_CARET for subsequent ranges,
1300	but the Fortran frontend overrides this for rendering things like:	1299	but the Fortran frontend uses SHOW_RANGE_WITH_CARET repeatedly for
		1300	printing things like:
1301		1301
1302	x = x + y	1302	x = x + y
1303	1 2	1303	1 2
1304	Error: Shapes for operands at (1) and (2) are not conformable	1304	Error: Shapes for operands at (1) and (2) are not conformable
1305		1305
1306	where "1" and "2" are notionally carets. */	1306	where "1" and "2" are notionally carets. */
1307	bool m_show_caret_p;	1307
		1308	enum range_display_kind
		1309	{
		1310	/* Show the pertinent source line(s), the caret, and underline(s). */
		1311	SHOW_RANGE_WITH_CARET,
		1312
		1313	/* Show the pertinent source line(s) and underline(s), but don't
		1314	show the caret (just an underline). */
		1315	SHOW_RANGE_WITHOUT_CARET,
		1316
		1317	/* Just show the source lines; don't show the range itself.
		1318	This is for use when displaying some line-insertion fix-it hints (for
		1319	showing the user context on the change, for when it doesn't make sense
		1320	to highlight the first column on the next line). */
		1321	SHOW_LINES_WITHOUT_RANGE
		1322	};
		1323
		1324	/* A location within a rich_location: a caret&range, with
		1325	the caret potentially flagged for display, and an optional
		1326	label. */
		1327
		1328	struct location_range
		1329	{
		1330	location_t m_loc;
		1331
		1332	enum range_display_kind m_range_display_kind;
		1333
		1334	/* If non-NULL, the label for this range. */
		1335	const range_label *m_label;
1308	};	1336	};
1309		1337
1310	/* A partially-embedded vec for use within rich_location for storing	1338	/* A partially-embedded vec for use within rich_location for storing
@@ -1446,6 +1474,8 @@ class fixit_hint; · 135 unmodified lines
1446	Additional ranges may be added to help the user identify other	1474	Additional ranges may be added to help the user identify other
1447	pertinent clauses in a diagnostic.	1475	pertinent clauses in a diagnostic.
1448		1476
		1477	Ranges can (optionally) be given labels via class range_label.
		1478
1449	rich_location instances are intended to be allocated on the stack	1479	rich_location instances are intended to be allocated on the stack
1450	when generating diagnostics, and to be short-lived.	1480	when generating diagnostics, and to be short-lived.
1451		1481
@@ -1491,18 +1521,22 @@ class fixit_hint; · 39 unmodified lines
1491	equal to their caret point. The frontend overrides the diagnostic	1521	equal to their caret point. The frontend overrides the diagnostic
1492	context's default caret character for these ranges.	1522	context's default caret character for these ranges.
1493		1523
1494	Example E	1524	Example E (range labels)
1495	*********	1525	************************
1496	printf ("arg0: %i arg1: %s arg2: %i",	1526	printf ("arg0: %i arg1: %s arg2: %i",
1497	^~	1527	^~
		1528	\|
		1529	const char *
1498	100, 101, 102);	1530	100, 101, 102);
1499	~~~	1531	~~~
		1532	\|
		1533	int
1500	This rich location has two ranges:	1534	This rich location has two ranges:
1501	- range 0 is at the "%s" with start = caret = "%" and finish at	1535	- range 0 is at the "%s" with start = caret = "%" and finish at
1502	the "s".	1536	the "s". It has a range_label ("const char *").
1503	- range 1 has start/finish covering the "101" and is not flagged for	1537	- range 1 has start/finish covering the "101" and is not flagged for
1504	caret printing; it is perhaps at the start of "101".	1538	caret printing. The caret is at the start of "101", where its
1505		1539	range_label is printed ("int").
1506		1540
1507	Fix-it hints	1541	Fix-it hints
1508	------------	1542	------------
@@ -1562,9 +1596,21 @@ class fixit_hint; · 53 unmodified lines
1562	added via	1596	added via
1563	richloc.add_fixit_replace ("color");	1597	richloc.add_fixit_replace ("color");
1564		1598
		1599	Example J: fix-it hint: line insertion
		1600	**************************************
		1601
		1602	3 \| #include <stddef.h>
		1603	+ \|+#include <stdio.h>
		1604	4 \| int the_next_line;
		1605
		1606	This rich location has a single range at line 4 column 1, marked
		1607	with SHOW_LINES_WITHOUT_RANGE (to avoid printing a meaningless caret
		1608	on the "i" of int). It has a insertion fix-it hint of the string
		1609	"#include <stdio.h>\n".
		1610
1565	Adding a fix-it hint can fail: for example, attempts to insert content	1611	Adding a fix-it hint can fail: for example, attempts to insert content
1566	at the transition between two line maps may fail due to there being no	1612	at the transition between two line maps may fail due to there being no
1567	source_location (aka location_t) value to express the new location.	1613	location_t value to express the new location.
1568		1614
1569	Attempts to add a fix-it hint within a macro expansion will fail.	1615	Attempts to add a fix-it hint within a macro expansion will fail.
1570		1616
@@ -1594,21 +1640,25 @@ class rich_location · 23 unmodified lines
1594	/* Constructors. */	1640	/* Constructors. */
1595		1641
1596	/* Constructing from a location. */	1642	/* Constructing from a location. */
1597	rich_location (line_maps *set, source_location loc);	1643	rich_location (line_maps *set, location_t loc,
		1644	const range_label *label = NULL);
1598		1645
1599	/* Destructor. */	1646	/* Destructor. */
1600	~rich_location ();	1647	~rich_location ();
1601		1648
1602	/* Accessors. */	1649	/* Accessors. */
1603	source_location get_loc () const { return get_loc (0); }	1650	location_t get_loc () const { return get_loc (0); }
1604	source_location get_loc (unsigned int idx) const;	1651	location_t get_loc (unsigned int idx) const;
1605		1652
1606	void	1653	void
1607	add_range (source_location loc, bool show_caret_p);	1654	add_range (location_t loc,
		1655	enum range_display_kind range_display_kind
		1656	= SHOW_RANGE_WITHOUT_CARET,
		1657	const range_label *label = NULL);
1608		1658
1609	void	1659	void
1610	set_range (line_maps *set, unsigned int idx, source_location loc,	1660	set_range (unsigned int idx, location_t loc,
1611	bool show_caret_p);	1661	enum range_display_kind range_display_kind);
1612		1662
1613	unsigned int get_num_locations () const { return m_ranges.count (); }	1663	unsigned int get_num_locations () const { return m_ranges.count (); }
1614		1664
@@ -1631,7 +1681,7 @@ class rich_location · 16 unmodified lines
1631		1681
1632	/* Suggest inserting NEW_CONTENT immediately before the start of WHERE. */	1682	/* Suggest inserting NEW_CONTENT immediately before the start of WHERE. */
1633	void	1683	void
1634	add_fixit_insert_before (source_location where,	1684	add_fixit_insert_before (location_t where,
1635	const char *new_content);	1685	const char *new_content);
1636		1686
1637	/* Suggest inserting NEW_CONTENT immediately after the end of the primary	1687	/* Suggest inserting NEW_CONTENT immediately after the end of the primary
@@ -1641,7 +1691,7 @@ class rich_location · 3 unmodified lines
1641		1691
1642	/* Suggest inserting NEW_CONTENT immediately after the end of WHERE. */	1692	/* Suggest inserting NEW_CONTENT immediately after the end of WHERE. */
1643	void	1693	void
1644	add_fixit_insert_after (source_location where,	1694	add_fixit_insert_after (location_t where,
1645	const char *new_content);	1695	const char *new_content);
1646		1696
1647	/* Methods for adding removal fix-it hints. */	1697	/* Methods for adding removal fix-it hints. */
@@ -1653,7 +1703,7 @@ class rich_location · 5 unmodified lines
1653	/* Suggest removing the content covered between the start and finish	1703	/* Suggest removing the content covered between the start and finish
1654	of WHERE. */	1704	of WHERE. */
1655	void	1705	void
1656	add_fixit_remove (source_location where);	1706	add_fixit_remove (location_t where);
1657		1707
1658	/* Suggest removing the content covered by SRC_RANGE. */	1708	/* Suggest removing the content covered by SRC_RANGE. */
1659	void	1709	void
@@ -1668,7 +1718,7 @@ class rich_location · 8 unmodified lines
1668	/* Suggest replacing the content between the start and finish of	1718	/* Suggest replacing the content between the start and finish of
1669	WHERE with NEW_CONTENT. */	1719	WHERE with NEW_CONTENT. */
1670	void	1720	void
1671	add_fixit_replace (source_location where,	1721	add_fixit_replace (location_t where,
1672	const char *new_content);	1722	const char *new_content);
1673		1723
1674	/* Suggest replacing the content covered by SRC_RANGE with	1724	/* Suggest replacing the content covered by SRC_RANGE with
@@ -1704,10 +1754,10 @@ class rich_location · 29 unmodified lines
1704	}	1754	}
1705		1755
1706	private:	1756	private:
1707	bool reject_impossible_fixit (source_location where);	1757	bool reject_impossible_fixit (location_t where);
1708	void stop_supporting_fixits ();	1758	void stop_supporting_fixits ();
1709	void maybe_add_fixit (source_location start,	1759	void maybe_add_fixit (location_t start,
1710	source_location next_loc,	1760	location_t next_loc,
1711	const char *new_content);	1761	const char *new_content);
1712		1762
1713	public:	1763	public:
@@ -1729,6 +1779,56 @@ protected: · 15 unmodified lines
1729	bool m_fixits_cannot_be_auto_applied;	1779	bool m_fixits_cannot_be_auto_applied;
1730	};	1780	};
1731		1781
		1782	/* A struct for the result of range_label::get_text: a NUL-terminated buffer
		1783	of localized text, and a flag to determine if the caller should "free" the
		1784	buffer. */
		1785
		1786	struct label_text
		1787	{
		1788	label_text ()
		1789	: m_buffer (NULL), m_caller_owned (false)
		1790	{}
		1791
		1792	label_text (char *buffer, bool caller_owned)
		1793	: m_buffer (buffer), m_caller_owned (caller_owned)
		1794	{}
		1795
		1796	void maybe_free ()
		1797	{
		1798	if (m_caller_owned)
		1799	free (m_buffer);
		1800	}
		1801
		1802	char *m_buffer;
		1803	bool m_caller_owned;
		1804	};
		1805
		1806	/* Abstract base class for labelling a range within a rich_location
		1807	(e.g. for labelling expressions with their type).
		1808
		1809	Generating the text could require non-trivial work, so this work
		1810	is delayed (via the "get_text" virtual function) until the diagnostic
		1811	printing code "knows" it needs it, thus avoiding doing it e.g. for
		1812	warnings that are filtered by command-line flags. This virtual
		1813	function also isolates libcpp and the diagnostics subsystem from
		1814	the front-end and middle-end-specific code for generating the text
		1815	for the labels.
		1816
		1817	Like the rich_location instances they annotate, range_label instances
		1818	are intended to be allocated on the stack when generating diagnostics,
		1819	and to be short-lived. */
		1820
		1821	class range_label
		1822	{
		1823	public:
		1824	virtual ~range_label () {}
		1825
		1826	/* Get localized text for the label.
		1827	The RANGE_IDX is provided, allowing for range_label instances to be
		1828	shared by multiple ranges if need be (the "flyweight" design pattern). */
		1829	virtual label_text get_text (unsigned range_idx) const = 0;
		1830	};
		1831
1732	/* A fix-it hint: a suggested insertion, replacement, or deletion of text.	1832	/* A fix-it hint: a suggested insertion, replacement, or deletion of text.
1733	We handle these three types of edit with one class, by representing	1833	We handle these three types of edit with one class, by representing
1734	them as replacement of a half-open range:	1834	them as replacement of a half-open range:
@@ -1746,16 +1846,16 @@ protected: · 11 unmodified lines
1746	class fixit_hint	1846	class fixit_hint
1747	{	1847	{
1748	public:	1848	public:
1749	fixit_hint (source_location start,	1849	fixit_hint (location_t start,
1750	source_location next_loc,	1850	location_t next_loc,
1751	const char *new_content);	1851	const char *new_content);
1752	~fixit_hint () { free (m_bytes); }	1852	~fixit_hint () { free (m_bytes); }
1753		1853
1754	bool affects_line_p (const char *file, int line) const;	1854	bool affects_line_p (const char *file, int line) const;
1755	source_location get_start_loc () const { return m_start; }	1855	location_t get_start_loc () const { return m_start; }
1756	source_location get_next_loc () const { return m_next_loc; }	1856	location_t get_next_loc () const { return m_next_loc; }
1757	bool maybe_append (source_location start,	1857	bool maybe_append (location_t start,
1758	source_location next_loc,	1858	location_t next_loc,
1759	const char *new_content);	1859	const char *new_content);
1760		1860
1761	const char *get_string () const { return m_bytes; }	1861	const char *get_string () const { return m_bytes; }
@@ -1770,8 +1870,8 @@ class fixit_hint · 8 unmodified lines
1770	this is a half-open/half-closed range:	1870	this is a half-open/half-closed range:
1771	[start, next_loc)	1871	[start, next_loc)
1772	so that we can support insertion via start == next_loc. */	1872	so that we can support insertion via start == next_loc. */
1773	source_location m_start;	1873	location_t m_start;
1774	source_location m_next_loc;	1874	location_t m_next_loc;
1775	char *m_bytes;	1875	char *m_bytes;
1776	size_t m_len;	1876	size_t m_len;
1777	};	1877	};
@@ -1835,10 +1935,10 @@ enum location_resolution_kind · 57 unmodified lines
1835	resolves to a location reserved for the client code, like	1935	resolves to a location reserved for the client code, like
1836	UNKNOWN_LOCATION or BUILTINS_LOCATION in GCC. */	1936	UNKNOWN_LOCATION or BUILTINS_LOCATION in GCC. */
1837		1937
1838	source_location linemap_resolve_location (struct line_maps *,	1938	location_t linemap_resolve_location (struct line_maps *,
1839	source_location loc,	1939	location_t loc,
1840	enum location_resolution_kind lrk,	1940	enum location_resolution_kind lrk,
1841	const line_map_ordinary **loc_map);	1941	const line_map_ordinary **loc_map);
1842		1942
1843	/* Suppose that LOC is the virtual location of a token coming from the	1943	/* Suppose that LOC is the virtual location of a token coming from the
1844	expansion of a macro M. This function then steps up to get the	1944	expansion of a macro M. This function then steps up to get the
@@ -1847,9 +1947,9 @@ source_location linemap_resolve_location (struct line_maps *, · 2 unmodified lines
1847	the point where M' was expanded. LOC_MAP is an output parameter.	1947	the point where M' was expanded. LOC_MAP is an output parameter.
1848	When non-NULL, *LOC_MAP is set to the map of the returned	1948	When non-NULL, *LOC_MAP is set to the map of the returned
1849	location. */	1949	location. */
1850	source_location linemap_unwind_toward_expansion (struct line_maps *,	1950	location_t linemap_unwind_toward_expansion (struct line_maps *,
1851	source_location loc,	1951	location_t loc,
1852	const struct line_map **loc_map);	1952	const struct line_map **loc_map);
1853		1953
1854	/* If LOC is the virtual location of a token coming from the expansion	1954	/* If LOC is the virtual location of a token coming from the expansion
1855	of a macro M and if its spelling location is reserved (e.g, a	1955	of a macro M and if its spelling location is reserved (e.g, a
@@ -1865,9 +1965,9 @@ source_location linemap_unwind_toward_expansion (struct line_maps *, · 9 unmodified lines
1865		1965
1866	*MAP is set to the map of the returned location if the later is	1966	*MAP is set to the map of the returned location if the later is
1867	different from LOC. */	1967	different from LOC. */
1868	source_location linemap_unwind_to_first_non_reserved_loc (struct line_maps *,	1968	location_t linemap_unwind_to_first_non_reserved_loc (struct line_maps *,
1869	source_location loc,	1969	location_t loc,
1870	const struct line_map **map);	1970	const struct line_map **map);
1871		1971
1872	/* Expand source code location LOC and return a user readable source	1972	/* Expand source code location LOC and return a user readable source
1873	code location. LOC must be a spelling (non-virtual) location. If	1973	code location. LOC must be a spelling (non-virtual) location. If
@@ -1875,7 +1975,7 @@ source_location linemap_unwind_to_first_non_reserved_loc (struct line_maps *, · 1 unmodified line
1875	location is returned. */	1975	location is returned. */
1876	expanded_location linemap_expand_location (struct line_maps *,	1976	expanded_location linemap_expand_location (struct line_maps *,
1877	const struct line_map *,	1977	const struct line_map *,
1878	source_location loc);	1978	location_t loc);
1879		1979
1880	/* Statistics about maps allocation and usage as returned by	1980	/* Statistics about maps allocation and usage as returned by
1881	linemap_get_statistics. */	1981	linemap_get_statistics. */
@@ -1902,7 +2002,7 @@ struct linemap_stats · 20 unmodified lines
1902	location emitted for that file. */	2002	location emitted for that file. */
1903	bool linemap_get_file_highest_location (struct line_maps * set,	2003	bool linemap_get_file_highest_location (struct line_maps * set,
1904	const char *file_name,	2004	const char *file_name,
1905	source_location *loc);	2005	location_t *loc);
1906		2006
1907	/* Compute and return statistics about the memory consumption of some	2007	/* Compute and return statistics about the memory consumption of some
1908	parts of the line table SET. */	2008	parts of the line table SET. */
@@ -1910,7 +2010,7 @@ void linemap_get_statistics (struct line_maps , struct linemap_stats ); · 1 unmodified line
1910		2010
1911	/* Dump debugging information about source location LOC into the file	2011	/* Dump debugging information about source location LOC into the file
1912	stream STREAM. SET is the line map set LOC comes from. */	2012	stream STREAM. SET is the line map set LOC comes from. */
1913	void linemap_dump_location (struct line_maps , source_location, FILE );	2013	void linemap_dump_location (struct line_maps , location_t, FILE );
1914		2014
1915	/* Dump line map at index IX in line table SET to STREAM. If STREAM	2015	/* Dump line map at index IX in line table SET to STREAM. If STREAM
1916	is NULL, use stderr. IS_MACRO is true if the caller wants to	2016	is NULL, use stderr. IS_MACRO is true if the caller wants to
@@ -1922,7 +2022,7 @@ void linemap_dump (FILE , struct line_maps , unsigned, bool); · 5 unmodified lines
1922	specifies how many macro maps to dump. */	2022	specifies how many macro maps to dump. */
1923	void line_table_dump (FILE , struct line_maps , unsigned int, unsigned int);	2023	void line_table_dump (FILE , struct line_maps , unsigned int, unsigned int);
1924		2024
1925	/* An enum for distinguishing the various parts within a source_location. */	2025	/* An enum for distinguishing the various parts within a location_t. */
1926		2026
1927	enum location_aspect	2027	enum location_aspect
1928	{	2028	{
@@ -1931,14 +2031,14 @@ enum location_aspect · 2 unmodified lines
1931	LOCATION_ASPECT_FINISH	2031	LOCATION_ASPECT_FINISH
1932	};	2032	};
1933		2033
1934	/* The rich_location class requires a way to expand source_location instances.	2034	/* The rich_location class requires a way to expand location_t instances.
1935	We would directly use expand_location_to_spelling_point, which is	2035	We would directly use expand_location_to_spelling_point, which is
1936	implemented in gcc/input.c, but we also need to use it for rich_location	2036	implemented in gcc/input.c, but we also need to use it for rich_location
1937	within genmatch.c.	2037	within genmatch.c.
1938	Hence we require client code of libcpp to implement the following	2038	Hence we require client code of libcpp to implement the following
1939	symbol. */	2039	symbol. */
1940	extern expanded_location	2040	extern expanded_location
1941	linemap_client_expand_location_to_spelling_point (source_location,	2041	linemap_client_expand_location_to_spelling_point (location_t,
1942	enum location_aspect);	2042	enum location_aspect);
1943		2043
1944	#endif /* !LIBCPP_LINE_MAP_H */	2044	#endif /* !LIBCPP_LINE_MAP_H */

gcc/libcpp/include/mkdeps.h+1−1

@@ -1,5 +1,5 @@
1	/* Dependency generator for Makefile fragments.	1	/* Dependency generator for Makefile fragments.
2	Copyright (C) 2000-2018 Free Software Foundation, Inc.	2	Copyright (C) 2000-2019 Free Software Foundation, Inc.
3	Contributed by Zack Weinberg, Mar 2000	3	Contributed by Zack Weinberg, Mar 2000
4		4
5	This program is free software; you can redistribute it and/or modify it	5	This program is free software; you can redistribute it and/or modify it

gcc/libcpp/include/symtab.h+1−1

@@ -1,5 +1,5 @@
1	/* Hash tables.	1	/* Hash tables.
2	Copyright (C) 2000-2018 Free Software Foundation, Inc.	2	Copyright (C) 2000-2019 Free Software Foundation, Inc.
3		3
4	This program is free software; you can redistribute it and/or modify it	4	This program is free software; you can redistribute it and/or modify it
5	under the terms of the GNU General Public License as published by the	5	under the terms of the GNU General Public License as published by the

gcc/libcpp/init.c+9−5

 /* CPP Library.
-   Copyright (C) 1986-2018 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994-95.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
   /* GNUC99   */  { 1,  0,  1,  1,  0,  0,  1,   1,   1,   0,    0,     0,     0,   0,      1 },
   /* GNUC11   */  { 1,  0,  1,  1,  1,  0,  1,   1,   1,   0,    0,     0,     0,   0,      1 },
   /* GNUC17   */  { 1,  0,  1,  1,  1,  0,  1,   1,   1,   0,    0,     0,     0,   0,      1 },
+  /* GNUC2X   */  { 1,  0,  1,  1,  1,  0,  1,   1,   1,   0,    0,     0,     0,   0,      1 },
   /* STDC89   */  { 0,  0,  0,  0,  0,  1,  0,   0,   0,   0,    0,     0,     1,   0,      0 },
   /* STDC94   */  { 0,  0,  0,  0,  0,  1,  1,   0,   0,   0,    0,     0,     1,   0,      0 },
   /* STDC99   */  { 1,  0,  1,  1,  0,  1,  1,   0,   0,   0,    0,     0,     1,   0,      0 },
   /* STDC11   */  { 1,  0,  1,  1,  1,  1,  1,   1,   0,   0,    0,     0,     1,   0,      0 },
   /* STDC17   */  { 1,  0,  1,  1,  1,  1,  1,   1,   0,   0,    0,     0,     1,   0,      0 },
+  /* STDC2X   */  { 1,  0,  1,  1,  1,  1,  1,   1,   0,   0,    0,     0,     1,   0,      0 },
   /* GNUCXX   */  { 0,  1,  1,  1,  0,  0,  1,   0,   0,   0,    0,     0,     0,   0,      1 },
   /* CXX98    */  { 0,  1,  0,  1,  0,  1,  1,   0,   0,   0,    0,     0,     1,   0,      0 },
   /* GNUCXX11 */  { 1,  1,  1,  1,  1,  0,  1,   1,   1,   1,    0,     0,     0,   0,      1 },
   pfile->pushed_macros = 0;
   /* Do not force token locations by default.  */
-  pfile->forced_token_location_p = NULL;
+  pfile->forced_token_location = 0;
   /* Initialize source_date_epoch to -2 (not yet set).  */
   pfile->source_date_epoch = (time_t) -2;
 	      || pfile->cb.has_attribute == NULL))
 	continue;
       cpp_hashnode *hp = cpp_lookup (pfile, b->name, b->len);
-      hp->type = NT_MACRO;
+      hp->type = NT_BUILTIN_MACRO;
-      hp->flags |= NODE_BUILTIN;
       if (b->always_warn_if_redefined)
 	hp->flags |= NODE_WARN;
       hp->value.builtin = (enum cpp_builtin_type) b->value;
     _cpp_define_builtin (pfile, "__ASSEMBLER__ 1");
   else if (CPP_OPTION (pfile, lang) == CLK_STDC94)
     _cpp_define_builtin (pfile, "__STDC_VERSION__ 199409L");
+  else if (CPP_OPTION (pfile, lang) == CLK_STDC2X
+	   || CPP_OPTION (pfile, lang) == CLK_GNUC2X)
+    _cpp_define_builtin (pfile, "__STDC_VERSION__ 202000L");
   else if (CPP_OPTION (pfile, lang) == CLK_STDC17
 	   || CPP_OPTION (pfile, lang) == CLK_GNUC17)
     _cpp_define_builtin (pfile, "__STDC_VERSION__ 201710L");
 const char *
 cpp_read_main_file (cpp_reader *pfile, const char *fname)
 {
-  const source_location loc = 0;
+  const location_t loc = 0;
   if (CPP_OPTION (pfile, deps.style) != DEPS_NONE)
     {

gcc/libcpp/internal.h+51−28

 /* Part of CPP library.
-   Copyright (C) 1997-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997-2019 Free Software Foundation, Inc.
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 #define LIBCPP_INTERNAL_H
 #include "symtab.h"
-#include "cpp-id-data.h"
+#include "cpplib.h"
 #if HAVE_ICONV
 #include <iconv.h>
 #define CPP_ALIGN2(size, align) (((size) + ((align) - 1)) & ~((align) - 1))
 #define CPP_ALIGN(size) CPP_ALIGN2 (size, DEFAULT_ALIGNMENT)
-#define _cpp_mark_macro_used(NODE) do {					\
+#define _cpp_mark_macro_used(NODE) 					\
-  if ((NODE)->type == NT_MACRO && !((NODE)->flags & NODE_BUILTIN))	\
+  (cpp_user_macro_p (NODE) ? (NODE)->value.macro->used = 1 : 0)
-    (NODE)->value.macro->used = 1; } while (0)
 /* A generic memory buffer, and operations on it.  */
 typedef struct _cpp_buff _cpp_buff;
      location at index 0 is the virtual location of the token at index
      0 in the current instance of cpp_context; similarly for all the
      other virtual locations.  */
-  source_location *virt_locs;
+  location_t *virt_locs;
   /* This is a pointer to the current virtual location.  This is used
      to iterate over the virtual locations while we iterate over the
      tokens they belong to.  */
-  source_location *cur_virt_loc;
+  location_t *cur_virt_loc;
 } macro_context;
 /* The kind of tokens carried by a cpp_context.  */
   unsigned char *definition;
   /* Definition line number.  */
-  source_location line;
+  location_t line;
   /* If macro defined in system header.  */
   unsigned int syshdr   : 1;
   /* Nonzero if it has been expanded or had its existence tested.  */
   struct line_maps *line_table;
   /* The line of the '#' of the current directive.  */
-  source_location directive_line;
+  location_t directive_line;
   /* Memory buffers.  */
   _cpp_buff *a_buff;		/* Aligned permanent storage.  */
   /* When expanding a macro at top-level, this is the location of the
      macro invocation.  */
-  source_location invocation_location;
+  location_t invocation_location;
   /* This is the node representing the macro being expanded at
      top-level.  The value of this data member is valid iff
     unsigned char *base;
     unsigned char *limit;
     unsigned char *cur;
-    source_location first_line;
+    location_t first_line;
   } out;
   /* Used for buffer overlays by traditional.c.  */
   /* List of saved macros by push_macro.  */
   struct def_pragma_macro *pushed_macros;
-  /* If non-null, the lexer will use this location for the next token
+  /* If non-zero, the lexer will use this location for the next token
      instead of getting a location from the linemap.  */
-  source_location *forced_token_location_p;
+  location_t forced_token_location;
 };
 /* Character classes.  Based on the more primitive macros in safe-ctype.h.
 #define is_nvspace(x)	IS_NVSPACE(x)
 #define is_space(x)	IS_SPACE_OR_NUL(x)
+#define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
 /* This table is constant if it can be initialized at compile time,
    which is the case if cpp was compiled with GCC >=2.7, or another
    compiler that supports C99.  */
 extern unsigned char _cpp_trigraph_map[UCHAR_MAX + 1];
 #endif
+#if !defined (HAVE_UCHAR) && !defined (IN_GCC)
+typedef unsigned char uchar;
+#endif
+#define UC (const uchar *)  /* Intended use: UC"string" */
 /* Macros.  */
 static inline int cpp_in_system_header (cpp_reader *);
 }
 /* In macro.c */
+extern void _cpp_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node);
+inline void _cpp_maybe_notify_macro_use (cpp_reader *pfile, cpp_hashnode *node)
+{
+  if (!(node->flags & NODE_USED))
+    _cpp_notify_macro_use (pfile, node);
+}
+extern cpp_macro *_cpp_new_macro (cpp_reader *, cpp_macro_kind, void *);
 extern void _cpp_free_definition (cpp_hashnode *);
 extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *);
 extern void _cpp_pop_context (cpp_reader *);
 extern void _cpp_push_text_context (cpp_reader *, cpp_hashnode *,
 				    const unsigned char *, size_t);
-extern bool _cpp_save_parameter (cpp_reader *, cpp_macro *, cpp_hashnode *,
+extern bool _cpp_save_parameter (cpp_reader *, unsigned, cpp_hashnode *,
 				 cpp_hashnode *);
+extern void _cpp_unsave_parameters (cpp_reader *, unsigned);
 extern bool _cpp_arguments_ok (cpp_reader *, cpp_macro *, const cpp_hashnode *,
 			       unsigned int);
 extern const unsigned char *_cpp_builtin_macro_text (cpp_reader *,
 						     cpp_hashnode *,
-						     source_location = 0);
+						     location_t = 0);
 extern int _cpp_warn_if_unused_macro (cpp_reader *, cpp_hashnode *, void *);
 extern void _cpp_push_token_context (cpp_reader *, cpp_hashnode *,
 				     const cpp_token *, unsigned int);
 /* In files.c */
 typedef struct _cpp_file _cpp_file;
 extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *,
-				  bool, int, bool, source_location);
+				  bool, int, bool, location_t);
 extern bool _cpp_find_failed (_cpp_file *);
 extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *);
 extern void _cpp_fake_include (cpp_reader *, const char *);
 extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, bool,
-			     source_location);
+			     location_t);
 extern bool _cpp_stack_include (cpp_reader *, const char *, int,
-				enum include_type, source_location);
+				enum include_type, location_t);
 extern int _cpp_compare_file_date (cpp_reader *, const char *, int);
 extern void _cpp_report_missing_guards (cpp_reader *);
 extern void _cpp_init_files (cpp_reader *);
 extern cpp_hashnode *_cpp_lex_identifier (cpp_reader *, const char *);
 extern int _cpp_remaining_tokens_num_in_context (cpp_context *);
 extern void _cpp_init_lexer (void);
+static inline void *_cpp_reserve_room (cpp_reader *pfile, size_t have,
+				       size_t extra)
+{
+  if (BUFF_ROOM (pfile->a_buff) < (have + extra))
+    _cpp_extend_buff (pfile, &pfile->a_buff, extra);
+  return BUFF_FRONT (pfile->a_buff);
+}
+extern void *_cpp_commit_buff (cpp_reader *pfile, size_t size);
 /* In init.c.  */
 extern void _cpp_maybe_push_include_file (cpp_reader *);
 extern void _cpp_define_builtin (cpp_reader *, const char *);
 extern char ** _cpp_save_pragma_names (cpp_reader *);
 extern void _cpp_restore_pragma_names (cpp_reader *, char **);
-extern int _cpp_do__Pragma (cpp_reader *, source_location);
+extern int _cpp_do__Pragma (cpp_reader *, location_t);
 extern void _cpp_init_directives (cpp_reader *);
 extern void _cpp_init_internal_pragmas (cpp_reader *);
 extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *,
 {
   /* Called to print a block of lines. */
   void (*print_lines) (int, const void *, size_t);
-  bool (*maybe_print_line) (source_location);
+  bool (*maybe_print_line) (location_t);
 };
 extern void _cpp_preprocess_dir_only (cpp_reader *,
 extern void _cpp_overlay_buffer (cpp_reader *pfile, const unsigned char *,
 				 size_t);
 extern void _cpp_remove_overlay (cpp_reader *);
-extern bool _cpp_create_trad_definition (cpp_reader *, cpp_macro *);
+extern cpp_macro *_cpp_create_trad_definition (cpp_reader *);
 extern bool _cpp_expansions_different_trad (const cpp_macro *,
 					    const cpp_macro *);
 extern unsigned char *_cpp_copy_replacement_text (const cpp_macro *,
    the replacement-list of MACRO.  */
 const line_map_macro *linemap_enter_macro (struct line_maps *,
 					   struct cpp_hashnode*,
-					   source_location,
+					   location_t,
 					   unsigned int);
 /* Create and return a virtual location for a token that is part of a
    MACRO_DEFINITION_LOC is the location in the macro definition,
    either of the token itself or of a macro parameter that it
    replaces.  */
-source_location linemap_add_macro_token (const line_map_macro *,
+location_t linemap_add_macro_token (const line_map_macro *,
-					 unsigned int,
+				    unsigned int,
-					 source_location,
+				    location_t,
-					 source_location);
+				    location_t);
 /* Return the source line number corresponding to source location
    LOCATION.  SET is the line map set LOCATION comes from.  If
    expansion-list of a macro expansion return the line number of the
    macro expansion point.  */
 int linemap_get_expansion_line (struct line_maps *,
-				source_location);
+				location_t);
 /* Return the path of the file corresponding to source code location
    LOCATION.
    SET is the line map set LOCATION comes from.  */
 const char* linemap_get_expansion_filename (struct line_maps *,
-					    source_location);
+					    location_t);
 #ifdef __cplusplus
 }

gcc/libcpp/lex.c+44−24

 /* CPP Library - lexical analysis.
-   Copyright (C) 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
    Contributed by Per Bothner, 1994-95.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
 skip_line_comment (cpp_reader *pfile)
 {
   cpp_buffer *buffer = pfile->buffer;
-  source_location orig_line = pfile->line_table->highest_line;
+  location_t orig_line = pfile->line_table->highest_line;
   while (*buffer->cur != '\n')
     buffer->cur++;
   cpp_hashnode *result = CPP_HASHNODE (ht_lookup_with_hash (pfile->hash_table,
 					base, cur - base, hash, HT_NO_INSERT));
-  return !result ? false : (result->type == NT_MACRO);
+  return result && cpp_macro_p (result);
 }
 /* Returns true if a literal suffix does not have the expected form
 	  _cpp_process_line_notes (pfile, false);
 	  if (!_cpp_get_fresh_line (pfile))
 	    {
-	      source_location src_loc = token->src_loc;
+	      location_t src_loc = token->src_loc;
 	      token->type = CPP_EOF;
 	      /* Tell the compiler the line number of the EOF token.  */
 	      token->src_loc = pfile->line_table->highest_line;
     }
   c = *buffer->cur++;
-  if (pfile->forced_token_location_p)
+  if (pfile->forced_token_location)
-    result->src_loc = *pfile->forced_token_location_p;
+    result->src_loc = pfile->forced_token_location;
   else
     result->src_loc = linemap_position_for_column (pfile->line_table,
 					  CPP_BUF_COLUMN (buffer, buffer->cur));
 		   && CPP_PEDANTIC (pfile)
 		   && ! buffer->warned_cplusplus_comments)
 	    {
-	      cpp_error (pfile, CPP_DL_PEDWARN,
+	      if (cpp_error (pfile, CPP_DL_PEDWARN,
-			 "C++ style comments are not allowed in ISO C90");
+			     "C++ style comments are not allowed in ISO C90"))
-	      cpp_error (pfile, CPP_DL_PEDWARN,
+		cpp_error (pfile, CPP_DL_NOTE,
-			 "(this will be reported only once per input file)");
+			   "(this will be reported only once per input file)");
 	      buffer->warned_cplusplus_comments = 1;
 	    }
 	  /* Or if specifically desired via -Wc90-c99-compat.  */
 		   && ! CPP_OPTION (pfile, cplusplus)
 		   && ! buffer->warned_cplusplus_comments)
 	    {
-	      cpp_error (pfile, CPP_DL_WARNING,
+	      if (cpp_error (pfile, CPP_DL_WARNING,
-			 "C++ style comments are incompatible with C90");
+			     "C++ style comments are incompatible with C90"))
-	      cpp_error (pfile, CPP_DL_WARNING,
+		cpp_error (pfile, CPP_DL_NOTE,
-			 "(this will be reported only once per input file)");
+			   "(this will be reported only once per input file)");
 	      buffer->warned_cplusplus_comments = 1;
 	    }
 	  /* In C89/C94, C++ style comments are forbidden.  */
 		}
 	      else if (! buffer->warned_cplusplus_comments)
 		{
-		  cpp_error (pfile, CPP_DL_ERROR,
+		  if (cpp_error (pfile, CPP_DL_ERROR,
-			     "C++ style comments are not allowed in ISO C90");
+				 "C++ style comments are not allowed in "
-		  cpp_error (pfile, CPP_DL_ERROR,
+				 "ISO C90"))
-			     "(this will be reported only once per input "
+		    cpp_error (pfile, CPP_DL_NOTE,
-			     "file)");
+			       "(this will be reported only once per input "
+			       "file)");
 		  buffer->warned_cplusplus_comments = 1;
 		}
 	    }
   return result;
 }
+/* Commit or allocate storage from a buffer.  */
+void *
+_cpp_commit_buff (cpp_reader *pfile, size_t size)
+{
+  void *ptr = BUFF_FRONT (pfile->a_buff);
+  if (pfile->hash_table->alloc_subobject)
+    {
+      void *copy = pfile->hash_table->alloc_subobject (size);
+      memcpy (copy, ptr, size);
+      ptr = copy;
+    }
+  else
+    BUFF_FRONT (pfile->a_buff) += size;
+  return ptr;
+}
 /* Say which field of TOK is in use.  */
 enum cpp_token_fld_kind
     }
 }
-/* All tokens lexed in R after calling this function will be forced to have
+/* All tokens lexed in R after calling this function will be forced to
-   their source_location the same as the location referenced by P, until
+   have their location_t to be P, until
    cpp_stop_forcing_token_locations is called for R.  */
 void
-cpp_force_token_locations (cpp_reader *r, source_location *p)
+cpp_force_token_locations (cpp_reader *r, location_t loc)
 {
-  r->forced_token_location_p = p;
+  r->forced_token_location = loc;
 }
 /* Go back to assigning locations naturally for lexed tokens.  */
 void
 cpp_stop_forcing_token_locations (cpp_reader *r)
 {
-  r->forced_token_location_p = NULL;
+  r->forced_token_location = 0;
 }

gcc/libcpp/line-map.c+293−305

@@ -1,5 +1,5 @@
1	/* Map (unsigned int) keys to (source file, line, column) triples.	1	/* Map (unsigned int) keys to (source file, line, column) triples.
2	Copyright (C) 2001-2018 Free Software Foundation, Inc.	2	Copyright (C) 2001-2019 Free Software Foundation, Inc.
3		3
4	This program is free software; you can redistribute it and/or modify it	4	This program is free software; you can redistribute it and/or modify it
5	under the terms of the GNU General Public License as published by the	5	under the terms of the GNU General Public License as published by the
@@ -26,27 +26,23 @@ along with this program; see the file COPYING3. If not see · 20 unmodified lines
26	#include "internal.h"	26	#include "internal.h"
27	#include "hashtab.h"	27	#include "hashtab.h"
28		28
29	/* Highest possible source location encoded within an ordinary or
30	macro map. */
31	const source_location LINE_MAP_MAX_SOURCE_LOCATION = 0x70000000;
32
33	static void trace_include (const struct line_maps , const line_map_ordinary );	29	static void trace_include (const struct line_maps , const line_map_ordinary );
34	static const line_map_ordinary * linemap_ordinary_map_lookup (struct line_maps *,	30	static const line_map_ordinary * linemap_ordinary_map_lookup (struct line_maps *,
35	source_location);	31	location_t);
36	static const line_map_macro* linemap_macro_map_lookup (struct line_maps *,	32	static const line_map_macro* linemap_macro_map_lookup (struct line_maps *,
37	source_location);	33	location_t);
38	static source_location linemap_macro_map_loc_to_def_point	34	static location_t linemap_macro_map_loc_to_def_point
39	(const line_map_macro *, source_location);	35	(const line_map_macro *, location_t);
40	static source_location linemap_macro_map_loc_to_exp_point	36	static location_t linemap_macro_map_loc_to_exp_point
41	(const line_map_macro *, source_location);	37	(const line_map_macro *, location_t);
42	static source_location linemap_macro_loc_to_spelling_point	38	static location_t linemap_macro_loc_to_spelling_point
43	(struct line_maps , source_location, const line_map_ordinary *);	39	(struct line_maps , location_t, const line_map_ordinary *);
44	static source_location linemap_macro_loc_to_def_point (struct line_maps *,	40	static location_t linemap_macro_loc_to_def_point (line_maps *,
45	source_location,	41	location_t,
46	const line_map_ordinary **);	42	const line_map_ordinary **);
47	static source_location linemap_macro_loc_to_exp_point (struct line_maps *,	43	static location_t linemap_macro_loc_to_exp_point (line_maps *,
48	source_location,	44	location_t,
49	const line_map_ordinary **);	45	const line_map_ordinary **);
50		46
51	/* Counters defined in macro.c. */	47	/* Counters defined in macro.c. */
52	extern unsigned num_expanded_macros_counter;	48	extern unsigned num_expanded_macros_counter;
@@ -114,16 +110,16 @@ rebuild_location_adhoc_htab (struct line_maps *set) · 61 unmodified lines
114		110
115	/* Helper function for get_combined_adhoc_loc.	111	/* Helper function for get_combined_adhoc_loc.
116	Can the given LOCUS + SRC_RANGE and DATA pointer be stored compactly	112	Can the given LOCUS + SRC_RANGE and DATA pointer be stored compactly
117	within a source_location, without needing to use an ad-hoc location. */	113	within a location_t, without needing to use an ad-hoc location. */
118		114
119	static bool	115	static bool
120	can_be_stored_compactly_p (struct line_maps *set,	116	can_be_stored_compactly_p (struct line_maps *set,
121	source_location locus,	117	location_t locus,
122	source_range src_range,	118	source_range src_range,
123	void *data)	119	void *data)
124	{	120	{
125	/* If there's an ad-hoc pointer, we can't store it directly in the	121	/* If there's an ad-hoc pointer, we can't store it directly in the
126	source_location, we need the lookaside. */	122	location_t, we need the lookaside. */
127	if (data)	123	if (data)
128	return false;	124	return false;
129		125
@@ -143,7 +139,7 @@ can_be_stored_compactly_p (struct line_maps *set, · 13 unmodified lines
143		139
144	/* All 3 locations must be within ordinary maps, typically, the same	140	/* All 3 locations must be within ordinary maps, typically, the same
145	ordinary map. */	141	ordinary map. */
146	source_location lowest_macro_loc = LINEMAPS_MACRO_LOWEST_LOCATION (set);	142	location_t lowest_macro_loc = LINEMAPS_MACRO_LOWEST_LOCATION (set);
147	if (locus >= lowest_macro_loc)	143	if (locus >= lowest_macro_loc)
148	return false;	144	return false;
149	if (src_range.m_start >= lowest_macro_loc)	145	if (src_range.m_start >= lowest_macro_loc)
@@ -157,9 +153,9 @@ can_be_stored_compactly_p (struct line_maps *set, · 7 unmodified lines
157		153
158	/* Combine LOCUS and DATA to a combined adhoc loc. */	154	/* Combine LOCUS and DATA to a combined adhoc loc. */
159		155
160	source_location	156	location_t
161	get_combined_adhoc_loc (struct line_maps *set,	157	get_combined_adhoc_loc (struct line_maps *set,
162	source_location locus,	158	location_t locus,
163	source_range src_range,	159	source_range src_range,
164	void *data)	160	void *data)
165	{	161	{
@@ -168,7 +164,7 @@ get_combined_adhoc_loc (struct line_maps *set, · 2 unmodified lines
168		164
169	if (IS_ADHOC_LOC (locus))	165	if (IS_ADHOC_LOC (locus))
170	locus	166	locus
171	= set->location_adhoc_data_map.data[locus & MAX_SOURCE_LOCATION].locus;	167	= set->location_adhoc_data_map.data[locus & MAX_LOCATION_T].locus;
172	if (locus == 0 && data == NULL)	168	if (locus == 0 && data == NULL)
173	return 0;	169	return 0;
174		170
@@ -190,7 +186,7 @@ get_combined_adhoc_loc (struct line_maps *set, · 15 unmodified lines
190	unsigned int col_diff = (int_diff >> ordmap->m_range_bits);	186	unsigned int col_diff = (int_diff >> ordmap->m_range_bits);
191	if (col_diff < (1U << ordmap->m_range_bits))	187	if (col_diff < (1U << ordmap->m_range_bits))
192	{	188	{
193	source_location packed = locus \| col_diff;	189	location_t packed = locus \| col_diff;
194	set->num_optimized_ranges++;	190	set->num_optimized_ranges++;
195	return packed;	191	return packed;
196	}	192	}
@@ -247,28 +243,28 @@ get_combined_adhoc_loc (struct line_maps *set, · 50 unmodified lines
247	/* Return the data for the adhoc loc. */	243	/* Return the data for the adhoc loc. */
248		244
249	void *	245	void *
250	get_data_from_adhoc_loc (struct line_maps *set, source_location loc)	246	get_data_from_adhoc_loc (struct line_maps *set, location_t loc)
251	{	247	{
252	linemap_assert (IS_ADHOC_LOC (loc));	248	linemap_assert (IS_ADHOC_LOC (loc));
253	return set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].data;	249	return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].data;
254	}	250	}
255		251
256	/* Return the location for the adhoc loc. */	252	/* Return the location for the adhoc loc. */
257		253
258	source_location	254	location_t
259	get_location_from_adhoc_loc (struct line_maps *set, source_location loc)	255	get_location_from_adhoc_loc (struct line_maps *set, location_t loc)
260	{	256	{
261	linemap_assert (IS_ADHOC_LOC (loc));	257	linemap_assert (IS_ADHOC_LOC (loc));
262	return set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	258	return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
263	}	259	}
264		260
265	/* Return the source_range for adhoc location LOC. */	261	/* Return the source_range for adhoc location LOC. */
266		262
267	static source_range	263	static source_range
268	get_range_from_adhoc_loc (struct line_maps *set, source_location loc)	264	get_range_from_adhoc_loc (struct line_maps *set, location_t loc)
269	{	265	{
270	linemap_assert (IS_ADHOC_LOC (loc));	266	linemap_assert (IS_ADHOC_LOC (loc));
271	return set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].src_range;	267	return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].src_range;
272	}	268	}
273		269
274	/* Get the source_range of location LOC, either from the ad-hoc	270	/* Get the source_range of location LOC, either from the ad-hoc
@@ -276,7 +272,7 @@ get_range_from_adhoc_loc (struct line_maps *set, source_location loc) · 1 unmodified line
276		272
277	source_range	273	source_range
278	get_range_from_loc (struct line_maps *set,	274	get_range_from_loc (struct line_maps *set,
279	source_location loc)	275	location_t loc)
280	{	276	{
281	if (IS_ADHOC_LOC (loc))	277	if (IS_ADHOC_LOC (loc))
282	return get_range_from_adhoc_loc (set, loc);	278	return get_range_from_adhoc_loc (set, loc);
@@ -302,12 +298,14 @@ get_range_from_loc (struct line_maps *set, · 19 unmodified lines
302	whether it is an ad-hoc location, or embeds range information. */	298	whether it is an ad-hoc location, or embeds range information. */
303		299
304	bool	300	bool
305	pure_location_p (line_maps *set, source_location loc)	301	pure_location_p (line_maps *set, location_t loc)
306	{	302	{
307	if (IS_ADHOC_LOC (loc))	303	if (IS_ADHOC_LOC (loc))
308	return false;	304	return false;
309		305
310	const line_map *map = linemap_lookup (set, loc);	306	const line_map *map = linemap_lookup (set, loc);
		307	if (map == NULL)
		308	return true;
311	const line_map_ordinary *ordmap = linemap_check_ordinary (map);	309	const line_map_ordinary *ordmap = linemap_check_ordinary (map);
312		310
313	if (loc & ((1U << ordmap->m_range_bits) - 1))	311	if (loc & ((1U << ordmap->m_range_bits) - 1))
@@ -319,12 +317,12 @@ pure_location_p (line_maps *set, source_location loc) · 5 unmodified lines
319	/* Given location LOC within SET, strip away any packed range information	317	/* Given location LOC within SET, strip away any packed range information
320	or ad-hoc information. */	318	or ad-hoc information. */
321		319
322	source_location	320	location_t
323	get_pure_location (line_maps *set, source_location loc)	321	get_pure_location (line_maps *set, location_t loc)
324	{	322	{
325	if (IS_ADHOC_LOC (loc))	323	if (IS_ADHOC_LOC (loc))
326	loc	324	loc
327	= set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	325	= set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
328		326
329	if (loc >= LINEMAPS_MACRO_LOWEST_LOCATION (set))	327	if (loc >= LINEMAPS_MACRO_LOWEST_LOCATION (set))
330	return loc;	328	return loc;
@@ -342,14 +340,16 @@ get_pure_location (line_maps *set, source_location loc) · 11 unmodified lines
342		340
343	void	341	void
344	linemap_init (struct line_maps *set,	342	linemap_init (struct line_maps *set,
345	source_location builtin_location)	343	location_t builtin_location)
346	{	344	{
347	#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined (__clang__)	345	#if __GNUC__ == 4 && __GNUC_MINOR__ == 2 && !defined (__clang__)
348	/* PR33916, needed to fix PR82939. */	346	/* PR33916, needed to fix PR82939. */
349	memset (set, 0, sizeof (struct line_maps));	347	memset (set, 0, sizeof (struct line_maps));
350	#else	348	#else
351	*set = line_maps ();	349	new (set) line_maps();
352	#endif	350	#endif
		351	/* Set default reallocator (used for initial alloc too). */
		352	set->reallocator = xrealloc;
353	set->highest_location = RESERVED_LOCATION_COUNT - 1;	353	set->highest_location = RESERVED_LOCATION_COUNT - 1;
354	set->highest_line = RESERVED_LOCATION_COUNT - 1;	354	set->highest_line = RESERVED_LOCATION_COUNT - 1;
355	set->location_adhoc_data_map.htab =	355	set->location_adhoc_data_map.htab =
@@ -357,17 +357,25 @@ linemap_init (struct line_maps *set, · 1 unmodified line
357	set->builtin_location = builtin_location;	357	set->builtin_location = builtin_location;
358	}	358	}
359		359
		360	/* Return the ordinary line map from whence MAP was included. Returns
		361	NULL if MAP was not an include. */
		362
		363	const line_map_ordinary *
		364	linemap_included_from_linemap (line_maps set, const line_map_ordinary map)
		365	{
		366	return linemap_ordinary_map_lookup (set, linemap_included_from (map));
		367	}
		368
360	/* Check for and warn about line_maps entered but not exited. */	369	/* Check for and warn about line_maps entered but not exited. */
361		370
362	void	371	void
363	linemap_check_files_exited (struct line_maps *set)	372	linemap_check_files_exited (struct line_maps *set)
364	{	373	{
365	const line_map_ordinary *map;
366	/* Depending upon whether we are handling preprocessed input or	374	/* Depending upon whether we are handling preprocessed input or
367	not, this can be a user error or an ICE. */	375	not, this can be a user error or an ICE. */
368	for (map = LINEMAPS_LAST_ORDINARY_MAP (set);	376	for (const line_map_ordinary *map = LINEMAPS_LAST_ORDINARY_MAP (set);
369	! MAIN_FILE_P (map);	377	! MAIN_FILE_P (map);
370	map = INCLUDED_FROM (set, map))	378	map = linemap_included_from_linemap (set, map))
371	fprintf (stderr, "line-map.c: file \"%s\" entered but not left\n",	379	fprintf (stderr, "line-map.c: file \"%s\" entered but not left\n",
372	ORDINARY_MAP_FILE_NAME (map));	380	ORDINARY_MAP_FILE_NAME (map));
373	}	381	}
@@ -378,86 +386,62 @@ linemap_check_files_exited (struct line_maps *set) · 4 unmodified lines
378	macro maps are allocated in different memory location. */	386	macro maps are allocated in different memory location. */
379		387
380	static struct line_map *	388	static struct line_map *
381	new_linemap (struct line_maps *set,	389	new_linemap (struct line_maps *set, location_t start_location)
382	enum lc_reason reason)
383	{	390	{
384	/* Depending on this variable, a macro map would be allocated in a	391	bool macro_p = start_location >= LINE_MAP_MAX_LOCATION;
385	different memory location than an ordinary map. */	392	unsigned num_maps_allocated = LINEMAPS_ALLOCATED (set, macro_p);
386	bool macro_map_p = (reason == LC_ENTER_MACRO);	393	unsigned num_maps_used = LINEMAPS_USED (set, macro_p);
387	struct line_map *result;
388		394
389	if (LINEMAPS_USED (set, macro_map_p) == LINEMAPS_ALLOCATED (set, macro_map_p))	395	if (num_maps_used == num_maps_allocated)
390	{	396	{
391	/* We ran out of allocated line maps. Let's allocate more. */	397	/* We need more space! */
392	size_t alloc_size;	398	if (!num_maps_allocated)
393		399	num_maps_allocated = 128;
394	/* Cast away extern "C" from the type of xrealloc. */	400	num_maps_allocated *= 2;
395	line_map_realloc reallocator = (set->reallocator	401
396	? set->reallocator	402	size_t size_of_a_map;
397	: (line_map_realloc) xrealloc);	403	void *buffer;
398	line_map_round_alloc_size_func round_alloc_size =	404	if (macro_p)
399	set->round_alloc_size;	405	{
400		406	size_of_a_map = sizeof (line_map_macro);
401	size_t map_size = (macro_map_p	407	buffer = set->info_macro.maps;
402	? sizeof (line_map_macro)	408	}
403	: sizeof (line_map_ordinary));	409	else
		410	{
		411	size_of_a_map = sizeof (line_map_ordinary);
		412	buffer = set->info_ordinary.maps;
		413	}
404		414
405	/* We are going to execute some dance to try to reduce the	415	/* We are going to execute some dance to try to reduce the
406	overhead of the memory allocator, in case we are using the	416	overhead of the memory allocator, in case we are using the
407	ggc-page.c one.	417	ggc-page.c one.
408		418
409	The actual size of memory we are going to get back from the	419	The actual size of memory we are going to get back from the
410	allocator is the smallest power of 2 that is greater than the	420	allocator may well be larger than what we ask for. Use this
411	size we requested. So let's consider that size then. */	421	hook to find what that size is. */
412		422	size_t alloc_size
413	alloc_size =	423	= set->round_alloc_size (num_maps_allocated * size_of_a_map);
414	(2 * LINEMAPS_ALLOCATED (set, macro_map_p) + 256)
415	* map_size;
416
417	/* Get the actual size of memory that is going to be allocated
418	by the allocator. */
419	alloc_size = round_alloc_size (alloc_size);
420		424
421	/* Now alloc_size contains the exact memory size we would get if	425	/* Now alloc_size contains the exact memory size we would get if
422	we have asked for the initial alloc_size amount of memory.	426	we have asked for the initial alloc_size amount of memory.
423	Let's get back to the number of macro map that amounts	427	Let's get back to the number of map that amounts to. */
424	to. */	428	unsigned num_maps = alloc_size / size_of_a_map;
425	LINEMAPS_ALLOCATED (set, macro_map_p) =	429	buffer = set->reallocator (buffer, num_maps * size_of_a_map);
426	alloc_size / map_size;	430	memset ((char )buffer + num_maps_used size_of_a_map, 0,
427		431	(num_maps - num_maps_used) * size_of_a_map);
428	/* And now let's really do the re-allocation. */	432	if (macro_p)
429	if (macro_map_p)	433	set->info_macro.maps = (line_map_macro *)buffer;
430	{
431	set->info_macro.maps
432	= (line_map_macro ) (reallocator) (set->info_macro.maps,
433	(LINEMAPS_ALLOCATED (set, macro_map_p)
434	* map_size));
435	result = &set->info_macro.maps[LINEMAPS_USED (set, macro_map_p)];
436	}
437	else	434	else
438	{	435	set->info_ordinary.maps = (line_map_ordinary *)buffer;
439	set->info_ordinary.maps =	436	LINEMAPS_ALLOCATED (set, macro_p) = num_maps;
440	(line_map_ordinary ) (reallocator) (set->info_ordinary.maps,
441	(LINEMAPS_ALLOCATED (set, macro_map_p)
442	* map_size));
443	result = &set->info_ordinary.maps[LINEMAPS_USED (set, macro_map_p)];
444	}
445	memset (result, 0,
446	((LINEMAPS_ALLOCATED (set, macro_map_p)
447	- LINEMAPS_USED (set, macro_map_p))
448	* map_size));
449	}
450	else
451	{
452	if (macro_map_p)
453	result = &set->info_macro.maps[LINEMAPS_USED (set, macro_map_p)];
454	else
455	result = &set->info_ordinary.maps[LINEMAPS_USED (set, macro_map_p)];
456	}	437	}
457		438
458	LINEMAPS_USED (set, macro_map_p)++;	439	line_map result = (macro_p ? (line_map )&set->info_macro.maps[num_maps_used]
		440	: (line_map *)&set->info_ordinary.maps[num_maps_used]);
		441	LINEMAPS_USED (set, macro_p)++;
		442
		443	result->start_location = start_location;
459		444
460	result->reason = reason;
461	return result;	445	return result;
462	}	446	}
463		447
@@ -480,7 +464,7 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 16 unmodified lines
480	{	464	{
481	/* Generate a start_location above the current highest_location.	465	/* Generate a start_location above the current highest_location.
482	If possible, make the low range bits be zero. */	466	If possible, make the low range bits be zero. */
483	source_location start_location;	467	location_t start_location;
484	if (set->highest_location < LINE_MAP_MAX_LOCATION_WITH_COLS)	468	if (set->highest_location < LINE_MAP_MAX_LOCATION_WITH_COLS)
485	{	469	{
486	start_location = set->highest_location + (1 << set->default_range_bits);	470	start_location = set->highest_location + (1 << set->default_range_bits);
@@ -492,9 +476,9 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 5 unmodified lines
492	else	476	else
493	start_location = set->highest_location + 1;	477	start_location = set->highest_location + 1;
494		478
495	linemap_assert (!(LINEMAPS_ORDINARY_USED (set)	479	linemap_assert (!LINEMAPS_ORDINARY_USED (set)
496	&& (start_location	480	\|\| (start_location
497	< MAP_START_LOCATION (LINEMAPS_LAST_ORDINARY_MAP (set)))));	481	>= MAP_START_LOCATION (LINEMAPS_LAST_ORDINARY_MAP (set))));
498		482
499	/* When we enter the file for the first time reason cannot be	483	/* When we enter the file for the first time reason cannot be
500	LC_RENAME. */	484	LC_RENAME. */
@@ -510,7 +494,14 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 9 unmodified lines
510	}	494	}
511		495
512	linemap_assert (reason != LC_ENTER_MACRO);	496	linemap_assert (reason != LC_ENTER_MACRO);
513	line_map_ordinary *map = linemap_check_ordinary (new_linemap (set, reason));	497
		498	if (start_location >= LINE_MAP_MAX_LOCATION)
		499	/* We ran out of line map space. */
		500	start_location = 0;
		501
		502	line_map_ordinary *map
		503	= linemap_check_ordinary (new_linemap (set, start_location));
		504	map->reason = reason;
514		505
515	if (to_file && *to_file == '\0' && reason != LC_RENAME_VERBATIM)	506	if (to_file && *to_file == '\0' && reason != LC_RENAME_VERBATIM)
516	to_file = "<stdin>";	507	to_file = "<stdin>";
@@ -518,19 +509,19 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 1 unmodified line
518	if (reason == LC_RENAME_VERBATIM)	509	if (reason == LC_RENAME_VERBATIM)
519	reason = LC_RENAME;	510	reason = LC_RENAME;
520		511
		512	const line_map_ordinary *from = NULL;
521	if (reason == LC_LEAVE)	513	if (reason == LC_LEAVE)
522	{	514	{
523	/* When we are just leaving an "included" file, and jump to the next	515	/* When we are just leaving an "included" file, and jump to the next
524	location inside the "includer" right after the #include	516	location inside the "includer" right after the #include
525	"included", this variable points the map in use right before the	517	"included", this variable points the map in use right before the
526	#include "included", inside the same "includer" file. */	518	#include "included", inside the same "includer" file. */
527	line_map_ordinary *from;
528		519
529	linemap_assert (!MAIN_FILE_P (map - 1));	520	linemap_assert (!MAIN_FILE_P (map - 1));
530	/* (MAP - 1) points to the map we are leaving. The	521	/* (MAP - 1) points to the map we are leaving. The
531	map from which (MAP - 1) got included should be the map	522	map from which (MAP - 1) got included should be the map
532	that comes right before MAP in the same file. */	523	that comes right before MAP in the same file. */
533	from = INCLUDED_FROM (set, map - 1);	524	from = linemap_included_from_linemap (set, map - 1);
534		525
535	/* A TO_FILE of NULL is special - we use the natural values. */	526	/* A TO_FILE of NULL is special - we use the natural values. */
536	if (to_file == NULL)	527	if (to_file == NULL)
@@ -545,7 +536,6 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 8 unmodified lines
545	}	536	}
546		537
547	map->sysp = sysp;	538	map->sysp = sysp;
548	map->start_location = start_location;
549	map->to_file = to_file;	539	map->to_file = to_file;
550	map->to_line = to_line;	540	map->to_line = to_line;
551	LINEMAPS_ORDINARY_CACHE (set) = LINEMAPS_ORDINARY_USED (set) - 1;	541	LINEMAPS_ORDINARY_CACHE (set) = LINEMAPS_ORDINARY_USED (set) - 1;
@@ -563,19 +553,24 @@ linemap_add (struct line_maps *set, enum lc_reason reason, · 11 unmodified lines
563		553
564	if (reason == LC_ENTER)	554	if (reason == LC_ENTER)
565	{	555	{
566	map->included_from =	556	if (set->depth == 0)
567	set->depth == 0 ? -1 : (int) (LINEMAPS_ORDINARY_USED (set) - 2);	557	map->included_from = 0;
		558	else
		559	/* The location of the end of the just-closed map. */
		560	map->included_from
		561	= (((map[0].start_location - 1 - map[-1].start_location)
		562	& ~((1 << map[-1].m_column_and_range_bits) - 1))
		563	+ map[-1].start_location);
568	set->depth++;	564	set->depth++;
569	if (set->trace_includes)	565	if (set->trace_includes)
570	trace_include (set, map);	566	trace_include (set, map);
571	}	567	}
572	else if (reason == LC_RENAME)	568	else if (reason == LC_RENAME)
573	map->included_from = ORDINARY_MAP_INCLUDER_FILE_INDEX (&map[-1]);	569	map->included_from = linemap_included_from (&map[-1]);
574	else if (reason == LC_LEAVE)	570	else if (reason == LC_LEAVE)
575	{	571	{
576	set->depth--;	572	set->depth--;
577	map->included_from =	573	map->included_from = linemap_included_from (from);
578	ORDINARY_MAP_INCLUDER_FILE_INDEX (INCLUDED_FROM (set, map - 1));
579	}	574	}
580		575
581	return map;	576	return map;
@@ -615,34 +610,26 @@ linemap_tracks_macro_expansion_locs_p (struct line_maps *set) · 33 unmodified lines
615		610
616	const line_map_macro *	611	const line_map_macro *
617	linemap_enter_macro (struct line_maps set, struct cpp_hashnode macro_node,	612	linemap_enter_macro (struct line_maps set, struct cpp_hashnode macro_node,
618	source_location expansion, unsigned int num_tokens)	613	location_t expansion, unsigned int num_tokens)
619	{	614	{
620	line_map_macro *map;	615	location_t start_location
621	source_location start_location;	616	= LINEMAPS_MACRO_LOWEST_LOCATION (set) - num_tokens;
622	/* Cast away extern "C" from the type of xrealloc. */
623	line_map_realloc reallocator = (set->reallocator
624	? set->reallocator
625	: (line_map_realloc) xrealloc);
626		617
627	start_location = LINEMAPS_MACRO_LOWEST_LOCATION (set) - num_tokens;	618	if (start_location < LINE_MAP_MAX_LOCATION)
628
629	if (start_location <= set->highest_line
630	\|\| start_location > LINEMAPS_MACRO_LOWEST_LOCATION (set))
631	/* We ran out of macro map space. */	619	/* We ran out of macro map space. */
632	return NULL;	620	return NULL;
633		621
634	map = linemap_check_macro (new_linemap (set, LC_ENTER_MACRO));	622	line_map_macro *map = linemap_check_macro (new_linemap (set, start_location));
635		623
636	map->start_location = start_location;
637	map->macro = macro_node;	624	map->macro = macro_node;
638	map->n_tokens = num_tokens;	625	map->n_tokens = num_tokens;
639	map->macro_locations	626	map->macro_locations
640	= (source_location*) reallocator (NULL,	627	= (location_t*) set->reallocator (NULL,
641	2 * num_tokens	628	2 * num_tokens
642	* sizeof (source_location));	629	* sizeof (location_t));
643	map->expansion = expansion;	630	map->expansion = expansion;
644	memset (MACRO_MAP_LOCATIONS (map), 0,	631	memset (MACRO_MAP_LOCATIONS (map), 0,
645	num_tokens * sizeof (source_location));	632	2 * num_tokens * sizeof (location_t));
646		633
647	LINEMAPS_MACRO_CACHE (set) = LINEMAPS_MACRO_USED (set) - 1;	634	LINEMAPS_MACRO_CACHE (set) = LINEMAPS_MACRO_USED (set) - 1;
648		635
@@ -672,13 +659,13 @@ linemap_enter_macro (struct line_maps set, struct cpp_hashnode macro_node, · 23 unmodified lines
672	either of the token itself or of a macro parameter that it	659	either of the token itself or of a macro parameter that it
673	replaces. */	660	replaces. */
674		661
675	source_location	662	location_t
676	linemap_add_macro_token (const line_map_macro *map,	663	linemap_add_macro_token (const line_map_macro *map,
677	unsigned int token_no,	664	unsigned int token_no,
678	source_location orig_loc,	665	location_t orig_loc,
679	source_location orig_parm_replacement_loc)	666	location_t orig_parm_replacement_loc)
680	{	667	{
681	source_location result;	668	location_t result;
682		669
683	linemap_assert (linemap_macro_expansion_map_p (map));	670	linemap_assert (linemap_macro_expansion_map_p (map));
684	linemap_assert (token_no < MACRO_MAP_NUM_MACRO_TOKENS (map));	671	linemap_assert (token_no < MACRO_MAP_NUM_MACRO_TOKENS (map));
@@ -690,19 +677,19 @@ linemap_add_macro_token (const line_map_macro *map, · 5 unmodified lines
690	return result;	677	return result;
691	}	678	}
692		679
693	/* Return a source_location for the start (i.e. column==0) of	680	/* Return a location_t for the start (i.e. column==0) of
694	(physical) line TO_LINE in the current source file (as in the	681	(physical) line TO_LINE in the current source file (as in the
695	most recent linemap_add). MAX_COLUMN_HINT is the highest column	682	most recent linemap_add). MAX_COLUMN_HINT is the highest column
696	number we expect to use in this line (but it does not change	683	number we expect to use in this line (but it does not change
697	the highest_location). */	684	the highest_location). */
698		685
699	source_location	686	location_t
700	linemap_line_start (struct line_maps *set, linenum_type to_line,	687	linemap_line_start (struct line_maps *set, linenum_type to_line,
701	unsigned int max_column_hint)	688	unsigned int max_column_hint)
702	{	689	{
703	line_map_ordinary *map = LINEMAPS_LAST_ORDINARY_MAP (set);	690	line_map_ordinary *map = LINEMAPS_LAST_ORDINARY_MAP (set);
704	source_location highest = set->highest_location;	691	location_t highest = set->highest_location;
705	source_location r;	692	location_t r;
706	linenum_type last_line =	693	linenum_type last_line =
707	SOURCE_LINE (map, set->highest_line);	694	SOURCE_LINE (map, set->highest_line);
708	int line_delta = to_line - last_line;	695	int line_delta = to_line - last_line;
@@ -718,7 +705,7 @@ linemap_line_start (struct line_maps *set, linenum_type to_line, · 9 unmodified lines
718	\|\| (highest > LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES	705	\|\| (highest > LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES
719	&& map->m_range_bits > 0)	706	&& map->m_range_bits > 0)
720	\|\| (highest > LINE_MAP_MAX_LOCATION_WITH_COLS	707	\|\| (highest > LINE_MAP_MAX_LOCATION_WITH_COLS
721	&& (set->max_column_hint \|\| highest >= LINE_MAP_MAX_SOURCE_LOCATION)))	708	&& (set->max_column_hint \|\| highest >= LINE_MAP_MAX_LOCATION)))
722	add_map = true;	709	add_map = true;
723	else	710	else
724	max_column_hint = set->max_column_hint;	711	max_column_hint = set->max_column_hint;
@@ -730,12 +717,12 @@ linemap_line_start (struct line_maps *set, linenum_type to_line, · 5 unmodified lines
730	\|\| highest > LINE_MAP_MAX_LOCATION_WITH_COLS)	717	\|\| highest > LINE_MAP_MAX_LOCATION_WITH_COLS)
731	{	718	{
732	/* If the column number is ridiculous or we've allocated a huge	719	/* If the column number is ridiculous or we've allocated a huge
733	number of source_locations, give up on column numbers	720	number of location_ts, give up on column numbers
734	(and on packed ranges). */	721	(and on packed ranges). */
735	max_column_hint = 0;	722	max_column_hint = 0;
736	column_bits = 0;	723	column_bits = 0;
737	range_bits = 0;	724	range_bits = 0;
738	if (highest > LINE_MAP_MAX_SOURCE_LOCATION)	725	if (highest >= LINE_MAP_MAX_LOCATION)
739	return 0;	726	return 0;
740	}	727	}
741	else	728	else
@@ -755,6 +742,11 @@ linemap_line_start (struct line_maps *set, linenum_type to_line, · 13 unmodified lines
755	if (line_delta < 0	742	if (line_delta < 0
756	\|\| last_line != ORDINARY_MAP_STARTING_LINE_NUMBER (map)	743	\|\| last_line != ORDINARY_MAP_STARTING_LINE_NUMBER (map)
757	\|\| SOURCE_COLUMN (map, highest) >= (1U << (column_bits - range_bits))	744	\|\| SOURCE_COLUMN (map, highest) >= (1U << (column_bits - range_bits))
		745	\|\| ( /* We can't reuse the map if the line offset is sufficiently
		746	large to cause overflow when computing location_t values. */
		747	(to_line - ORDINARY_MAP_STARTING_LINE_NUMBER (map))
		748	>= (((uint64_t) 1)
		749	<< (CHAR_BIT * sizeof (linenum_type) - column_bits)))
758	\|\| range_bits < map->m_range_bits)	750	\|\| range_bits < map->m_range_bits)
759	map = linemap_check_ordinary	751	map = linemap_check_ordinary
760	(const_cast <line_map *>	752	(const_cast <line_map *>
@@ -773,7 +765,7 @@ linemap_line_start (struct line_maps *set, linenum_type to_line, · 12 unmodified lines
773		765
774	/* Locations of ordinary tokens are always lower than locations of	766	/* Locations of ordinary tokens are always lower than locations of
775	macro tokens. */	767	macro tokens. */
776	if (r >= LINEMAPS_MACRO_LOWEST_LOCATION (set))	768	if (r >= LINE_MAP_MAX_LOCATION)
777	return 0;	769	return 0;
778		770
779	set->highest_line = r;	771	set->highest_line = r;
@@ -795,15 +787,15 @@ linemap_line_start (struct line_maps *set, linenum_type to_line, · 15 unmodified lines
795	return r;	787	return r;
796	}	788	}
797		789
798	/* Encode and return a source_location from a column number. The	790	/* Encode and return a location_t from a column number. The
799	source line considered is the last source line used to call	791	source line considered is the last source line used to call
800	linemap_line_start, i.e, the last source line which a location was	792	linemap_line_start, i.e, the last source line which a location was
801	encoded from. */	793	encoded from. */
802		794
803	source_location	795	location_t
804	linemap_position_for_column (struct line_maps *set, unsigned int to_column)	796	linemap_position_for_column (struct line_maps *set, unsigned int to_column)
805	{	797	{
806	source_location r = set->highest_line;	798	location_t r = set->highest_line;
807		799
808	linemap_assert	800	linemap_assert
809	(!linemap_macro_expansion_map_p (LINEMAPS_LAST_ORDINARY_MAP (set)));	801	(!linemap_macro_expansion_map_p (LINEMAPS_LAST_ORDINARY_MAP (set)));
@@ -813,7 +805,7 @@ linemap_position_for_column (struct line_maps *set, unsigned int to_column) · 3 unmodified lines
813	if (r > LINE_MAP_MAX_LOCATION_WITH_COLS	805	if (r > LINE_MAP_MAX_LOCATION_WITH_COLS
814	\|\| to_column > LINE_MAP_MAX_COLUMN_NUMBER)	806	\|\| to_column > LINE_MAP_MAX_COLUMN_NUMBER)
815	{	807	{
816	/* Running low on source_locations - disable column numbers. */	808	/* Running low on location_ts - disable column numbers. */
817	return r;	809	return r;
818	}	810	}
819	else	811	else
@@ -846,7 +838,7 @@ linemap_position_for_column (struct line_maps *set, unsigned int to_column) · 26 unmodified lines
846	/* Encode and return a source location from a given line and	838	/* Encode and return a source location from a given line and
847	column. */	839	column. */
848		840
849	source_location	841	location_t
850	linemap_position_for_line_and_column (line_maps *set,	842	linemap_position_for_line_and_column (line_maps *set,
851	const line_map_ordinary *ord_map,	843	const line_map_ordinary *ord_map,
852	linenum_type line,	844	linenum_type line,
@@ -854,13 +846,13 @@ linemap_position_for_line_and_column (line_maps *set, · 1 unmodified line
854	{	846	{
855	linemap_assert (ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map) <= line);	847	linemap_assert (ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map) <= line);
856		848
857	source_location r = MAP_START_LOCATION (ord_map);	849	location_t r = MAP_START_LOCATION (ord_map);
858	r += ((line - ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map))	850	r += ((line - ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map))
859	<< ord_map->m_column_and_range_bits);	851	<< ord_map->m_column_and_range_bits);
860	if (r <= LINE_MAP_MAX_LOCATION_WITH_COLS)	852	if (r <= LINE_MAP_MAX_LOCATION_WITH_COLS)
861	r += ((column & ((1 << ord_map->m_column_and_range_bits) - 1))	853	r += ((column & ((1 << ord_map->m_column_and_range_bits) - 1))
862	<< ord_map->m_range_bits);	854	<< ord_map->m_range_bits);
863	source_location upper_limit = LINEMAPS_MACRO_LOWEST_LOCATION (set);	855	location_t upper_limit = LINEMAPS_MACRO_LOWEST_LOCATION (set);
864	if (r >= upper_limit)	856	if (r >= upper_limit)
865	r = upper_limit - 1;	857	r = upper_limit - 1;
866	if (r > set->highest_location)	858	if (r > set->highest_location)
@@ -868,19 +860,19 @@ linemap_position_for_line_and_column (line_maps *set, · 1 unmodified line
868	return r;	860	return r;
869	}	861	}
870		862
871	/* Encode and return a source_location starting from location LOC and	863	/* Encode and return a location_t starting from location LOC and
872	shifting it by COLUMN_OFFSET columns. This function does not support	864	shifting it by COLUMN_OFFSET columns. This function does not support
873	virtual locations. */	865	virtual locations. */
874		866
875	source_location	867	location_t
876	linemap_position_for_loc_and_offset (struct line_maps *set,	868	linemap_position_for_loc_and_offset (struct line_maps *set,
877	source_location loc,	869	location_t loc,
878	unsigned int column_offset)	870	unsigned int column_offset)
879	{	871	{
880	const line_map_ordinary * map = NULL;	872	const line_map_ordinary * map = NULL;
881		873
882	if (IS_ADHOC_LOC (loc))	874	if (IS_ADHOC_LOC (loc))
883	loc = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	875	loc = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
884		876
885	/* This function does not support virtual locations yet. */	877	/* This function does not support virtual locations yet. */
886	if (linemap_location_from_macro_expansion_p (set, loc))	878	if (linemap_location_from_macro_expansion_p (set, loc))
@@ -926,7 +918,7 @@ linemap_position_for_loc_and_offset (struct line_maps *set, · 39 unmodified lines
926	if (column >= (1u << (map->m_column_and_range_bits - map->m_range_bits)))	918	if (column >= (1u << (map->m_column_and_range_bits - map->m_range_bits)))
927	return loc;	919	return loc;
928		920
929	source_location r =	921	location_t r =
930	linemap_position_for_line_and_column (set, map, line, column);	922	linemap_position_for_line_and_column (set, map, line, column);
931	if (linemap_assert_fails (r <= set->highest_location)	923	if (linemap_assert_fails (r <= set->highest_location)
932	\|\| linemap_assert_fails (map == linemap_lookup (set, r)))	924	\|\| linemap_assert_fails (map == linemap_lookup (set, r)))
@@ -939,10 +931,10 @@ linemap_position_for_loc_and_offset (struct line_maps *set, · 6 unmodified lines
939	ordinary or a macro map), returns that map. */	931	ordinary or a macro map), returns that map. */
940		932
941	const struct line_map*	933	const struct line_map*
942	linemap_lookup (struct line_maps *set, source_location line)	934	linemap_lookup (struct line_maps *set, location_t line)
943	{	935	{
944	if (IS_ADHOC_LOC (line))	936	if (IS_ADHOC_LOC (line))
945	line = set->location_adhoc_data_map.data[line & MAX_SOURCE_LOCATION].locus;	937	line = set->location_adhoc_data_map.data[line & MAX_LOCATION_T].locus;
946	if (linemap_location_from_macro_expansion_p (set, line))	938	if (linemap_location_from_macro_expansion_p (set, line))
947	return linemap_macro_map_lookup (set, line);	939	return linemap_macro_map_lookup (set, line);
948	return linemap_ordinary_map_lookup (set, line);	940	return linemap_ordinary_map_lookup (set, line);
@@ -954,13 +946,13 @@ linemap_lookup (struct line_maps *set, source_location line) · 5 unmodified lines
954	binary search. */	946	binary search. */
955		947
956	static const line_map_ordinary *	948	static const line_map_ordinary *
957	linemap_ordinary_map_lookup (struct line_maps *set, source_location line)	949	linemap_ordinary_map_lookup (struct line_maps *set, location_t line)
958	{	950	{
959	unsigned int md, mn, mx;	951	unsigned int md, mn, mx;
960	const line_map_ordinary cached, result;	952	const line_map_ordinary cached, result;
961		953
962	if (IS_ADHOC_LOC (line))	954	if (IS_ADHOC_LOC (line))
963	line = set->location_adhoc_data_map.data[line & MAX_SOURCE_LOCATION].locus;	955	line = set->location_adhoc_data_map.data[line & MAX_LOCATION_T].locus;
964		956
965	if (set == NULL \|\| line < RESERVED_LOCATION_COUNT)	957	if (set == NULL \|\| line < RESERVED_LOCATION_COUNT)
966	return NULL;	958	return NULL;
@@ -1002,13 +994,13 @@ linemap_ordinary_map_lookup (struct line_maps *set, source_location line) · 35 unmodified lines
1002	binary search. */	994	binary search. */
1003		995
1004	static const line_map_macro *	996	static const line_map_macro *
1005	linemap_macro_map_lookup (struct line_maps *set, source_location line)	997	linemap_macro_map_lookup (struct line_maps *set, location_t line)
1006	{	998	{
1007	unsigned int md, mn, mx;	999	unsigned int md, mn, mx;
1008	const struct line_map_macro cached, result;	1000	const struct line_map_macro cached, result;
1009		1001
1010	if (IS_ADHOC_LOC (line))	1002	if (IS_ADHOC_LOC (line))
1011	line = set->location_adhoc_data_map.data[line & MAX_SOURCE_LOCATION].locus;	1003	line = set->location_adhoc_data_map.data[line & MAX_LOCATION_T].locus;
1012		1004
1013	linemap_assert (line >= LINEMAPS_MACRO_LOWEST_LOCATION (set));	1005	linemap_assert (line >= LINEMAPS_MACRO_LOWEST_LOCATION (set));
1014		1006
@@ -1049,9 +1041,7 @@ linemap_macro_map_lookup (struct line_maps *set, source_location line) · 34 unmodified lines
1049	bool	1041	bool
1050	linemap_macro_expansion_map_p (const struct line_map *map)	1042	linemap_macro_expansion_map_p (const struct line_map *map)
1051	{	1043	{
1052	if (!map)	1044	return map && !MAP_ORDINARY_P (map);
1053	return false;
1054	return (map->reason == LC_ENTER_MACRO);
1055	}	1045	}
1056		1046
1057	/* If LOCATION is the locus of a token in a replacement-list of a	1047	/* If LOCATION is the locus of a token in a replacement-list of a
@@ -1060,9 +1050,9 @@ linemap_macro_expansion_map_p (const struct line_map *map) · 2 unmodified lines
1060	Read the comments of struct line_map and struct line_map_macro in	1050	Read the comments of struct line_map and struct line_map_macro in
1061	line-map.h to understand what a macro expansion point is. */	1051	line-map.h to understand what a macro expansion point is. */
1062		1052
1063	static source_location	1053	static location_t
1064	linemap_macro_map_loc_to_exp_point (const line_map_macro *map,	1054	linemap_macro_map_loc_to_exp_point (const line_map_macro *map,
1065	source_location location ATTRIBUTE_UNUSED)	1055	location_t location ATTRIBUTE_UNUSED)
1066	{	1056	{
1067	linemap_assert (linemap_macro_expansion_map_p (map)	1057	linemap_assert (linemap_macro_expansion_map_p (map)
1068	&& location >= MAP_START_LOCATION (map));	1058	&& location >= MAP_START_LOCATION (map));
@@ -1080,9 +1070,9 @@ linemap_macro_map_loc_to_exp_point (const line_map_macro *map, · 11 unmodified lines
1080	Return the location of the token at the definition point of the	1070	Return the location of the token at the definition point of the
1081	macro. */	1071	macro. */
1082		1072
1083	static source_location	1073	static location_t
1084	linemap_macro_map_loc_to_def_point (const line_map_macro *map,	1074	linemap_macro_map_loc_to_def_point (const line_map_macro *map,
1085	source_location location)	1075	location_t location)
1086	{	1076	{
1087	unsigned token_no;	1077	unsigned token_no;
1088		1078
@@ -1104,10 +1094,10 @@ linemap_macro_map_loc_to_def_point (const line_map_macro *map, · 15 unmodified lines
1104		1094
1105	In other words, this returns the xI location presented in the	1095	In other words, this returns the xI location presented in the
1106	comments of line_map_macro above. */	1096	comments of line_map_macro above. */
1107	source_location	1097	location_t
1108	linemap_macro_map_loc_unwind_toward_spelling (line_maps *set,	1098	linemap_macro_map_loc_unwind_toward_spelling (line_maps *set,
1109	const line_map_macro* map,	1099	const line_map_macro* map,
1110	source_location location)	1100	location_t location)
1111	{	1101	{
1112	unsigned token_no;	1102	unsigned token_no;
1113		1103
@@ -1135,13 +1125,13 @@ linemap_macro_map_loc_unwind_toward_spelling (line_maps *set, · 21 unmodified lines
1135		1125
1136	int	1126	int
1137	linemap_get_expansion_line (struct line_maps *set,	1127	linemap_get_expansion_line (struct line_maps *set,
1138	source_location location)	1128	location_t location)
1139	{	1129	{
1140	const line_map_ordinary *map = NULL;	1130	const line_map_ordinary *map = NULL;
1141		1131
1142	if (IS_ADHOC_LOC (location))	1132	if (IS_ADHOC_LOC (location))
1143	location = set->location_adhoc_data_map.data[location	1133	location = set->location_adhoc_data_map.data[location
1144	& MAX_SOURCE_LOCATION].locus;	1134	& MAX_LOCATION_T].locus;
1145		1135
1146	if (location < RESERVED_LOCATION_COUNT)	1136	if (location < RESERVED_LOCATION_COUNT)
1147	return 0;	1137	return 0;
@@ -1163,13 +1153,13 @@ linemap_get_expansion_line (struct line_maps *set, · 15 unmodified lines
1163		1153
1164	const char*	1154	const char*
1165	linemap_get_expansion_filename (struct line_maps *set,	1155	linemap_get_expansion_filename (struct line_maps *set,
1166	source_location location)	1156	location_t location)
1167	{	1157	{
1168	const struct line_map_ordinary *map = NULL;	1158	const struct line_map_ordinary *map = NULL;
1169		1159
1170	if (IS_ADHOC_LOC (location))	1160	if (IS_ADHOC_LOC (location))
1171	location = set->location_adhoc_data_map.data[location	1161	location = set->location_adhoc_data_map.data[location
1172	& MAX_SOURCE_LOCATION].locus;	1162	& MAX_LOCATION_T].locus;
1173		1163
1174	if (location < RESERVED_LOCATION_COUNT)	1164	if (location < RESERVED_LOCATION_COUNT)
1175	return NULL;	1165	return NULL;
@@ -1201,13 +1191,13 @@ linemap_map_get_macro_name (const line_map_macro *macro_map) · 25 unmodified lines
1201		1191
1202	int	1192	int
1203	linemap_location_in_system_header_p (struct line_maps *set,	1193	linemap_location_in_system_header_p (struct line_maps *set,
1204	source_location location)	1194	location_t location)
1205	{	1195	{
1206	const struct line_map *map = NULL;	1196	const struct line_map *map = NULL;
1207		1197
1208	if (IS_ADHOC_LOC (location))	1198	if (IS_ADHOC_LOC (location))
1209	location = set->location_adhoc_data_map.data[location	1199	location = set->location_adhoc_data_map.data[location
1210	& MAX_SOURCE_LOCATION].locus;	1200	& MAX_LOCATION_T].locus;
1211		1201
1212	if (location < RESERVED_LOCATION_COUNT)	1202	if (location < RESERVED_LOCATION_COUNT)
1213	return false;	1203	return false;
@@ -1226,7 +1216,7 @@ linemap_location_in_system_header_p (struct line_maps *set, · 12 unmodified lines
1226	const line_map_macro *macro_map = linemap_check_macro (map);	1216	const line_map_macro *macro_map = linemap_check_macro (map);
1227		1217
1228	/* It's a token resulting from a macro expansion. */	1218	/* It's a token resulting from a macro expansion. */
1229	source_location loc =	1219	location_t loc =
1230	linemap_macro_map_loc_unwind_toward_spelling (set, macro_map, location);	1220	linemap_macro_map_loc_unwind_toward_spelling (set, macro_map, location);
1231	if (loc < RESERVED_LOCATION_COUNT)	1221	if (loc < RESERVED_LOCATION_COUNT)
1232	/* This token might come from a built-in macro. Let's	1222	/* This token might come from a built-in macro. Let's
@@ -1247,18 +1237,13 @@ linemap_location_in_system_header_p (struct line_maps *set, · 14 unmodified lines
1247		1237
1248	bool	1238	bool
1249	linemap_location_from_macro_expansion_p (const struct line_maps *set,	1239	linemap_location_from_macro_expansion_p (const struct line_maps *set,
1250	source_location location)	1240	location_t location)
1251	{	1241	{
1252	if (IS_ADHOC_LOC (location))	1242	if (IS_ADHOC_LOC (location))
1253	location = set->location_adhoc_data_map.data[location	1243	location = set->location_adhoc_data_map.data[location
1254	& MAX_SOURCE_LOCATION].locus;	1244	& MAX_LOCATION_T].locus;
1255		1245
1256	linemap_assert (location <= MAX_SOURCE_LOCATION	1246	return IS_MACRO_LOC (location);
1257	&& (set->highest_location
1258	< LINEMAPS_MACRO_LOWEST_LOCATION (set)));
1259	if (set == NULL)
1260	return false;
1261	return (location > set->highest_location);
1262	}	1247	}
1263		1248
1264	/* Given two virtual locations LOC0 and LOC1, return the first	1249	/* Given two virtual locations LOC0 and LOC1, return the first
@@ -1268,10 +1253,10 @@ linemap_location_from_macro_expansion_p (const struct line_maps *set, · 3 unmodified lines
1268		1253
1269	static const struct line_map*	1254	static const struct line_map*
1270	first_map_in_common_1 (struct line_maps *set,	1255	first_map_in_common_1 (struct line_maps *set,
1271	source_location *loc0,	1256	location_t *loc0,
1272	source_location *loc1)	1257	location_t *loc1)
1273	{	1258	{
1274	source_location l0 = loc0, l1 = loc1;	1259	location_t l0 = loc0, l1 = loc1;
1275	const struct line_map *map0 = linemap_lookup (set, l0),	1260	const struct line_map *map0 = linemap_lookup (set, l0),
1276	*map1 = linemap_lookup (set, l1);	1261	*map1 = linemap_lookup (set, l1);
1277		1262
@@ -1310,10 +1295,10 @@ first_map_in_common_1 (struct line_maps *set, · 32 unmodified lines
1310		1295
1311	static const struct line_map*	1296	static const struct line_map*
1312	first_map_in_common (struct line_maps *set,	1297	first_map_in_common (struct line_maps *set,
1313	source_location loc0,	1298	location_t loc0,
1314	source_location loc1,	1299	location_t loc1,
1315	source_location *res_loc0,	1300	location_t *res_loc0,
1316	source_location *res_loc1)	1301	location_t *res_loc1)
1317	{	1302	{
1318	*res_loc0 = loc0;	1303	*res_loc0 = loc0;
1319	*res_loc1 = loc1;	1304	*res_loc1 = loc1;
@@ -1328,11 +1313,11 @@ first_map_in_common (struct line_maps *set, · 8 unmodified lines
1328		1313
1329	int	1314	int
1330	linemap_compare_locations (struct line_maps *set,	1315	linemap_compare_locations (struct line_maps *set,
1331	source_location pre,	1316	location_t pre,
1332	source_location post)	1317	location_t post)
1333	{	1318	{
1334	bool pre_virtual_p, post_virtual_p;	1319	bool pre_virtual_p, post_virtual_p;
1335	source_location l0 = pre, l1 = post;	1320	location_t l0 = pre, l1 = post;
1336		1321
1337	if (IS_ADHOC_LOC (l0))	1322	if (IS_ADHOC_LOC (l0))
1338	l0 = get_location_from_adhoc_loc (set, l0);	1323	l0 = get_location_from_adhoc_loc (set, l0);
@@ -1398,28 +1383,27 @@ trace_include (const struct line_maps set, const line_map_ordinary map) · 59 unmodified lines
1398		1383
1399	This is a subroutine for linemap_resolve_location. */	1384	This is a subroutine for linemap_resolve_location. */
1400		1385
1401	static source_location	1386	static location_t
1402	linemap_macro_loc_to_spelling_point (struct line_maps *set,	1387	linemap_macro_loc_to_spelling_point (struct line_maps *set,
1403	source_location location,	1388	location_t location,
1404	const line_map_ordinary **original_map)	1389	const line_map_ordinary **original_map)
1405	{	1390	{
1406	struct line_map *map;
1407	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);	1391	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);
1408		1392
1409	while (true)	1393	while (true)
1410	{	1394	{
1411	map = const_cast <line_map *> (linemap_lookup (set, location));	1395	const struct line_map *map = linemap_lookup (set, location);
1412	if (!linemap_macro_expansion_map_p (map))	1396	if (!map \|\| MAP_ORDINARY_P (map))
1413	break;	1397	{
		1398	if (original_map)
		1399	original_map = (const line_map_ordinary )map;
		1400	break;
		1401	}
1414		1402
1415	location	1403	location = linemap_macro_map_loc_unwind_toward_spelling
1416	= linemap_macro_map_loc_unwind_toward_spelling	1404	(set, linemap_check_macro (map), location);
1417	(set, linemap_check_macro (map),
1418	location);
1419	}	1405	}
1420		1406
1421	if (original_map)
1422	*original_map = linemap_check_ordinary (map);
1423	return location;	1407	return location;
1424	}	1408	}
1425		1409
@@ -1433,34 +1417,31 @@ linemap_macro_loc_to_spelling_point (struct line_maps *set, · 7 unmodified lines
1433		1417
1434	This is a subroutine of linemap_resolve_location. */	1418	This is a subroutine of linemap_resolve_location. */
1435		1419
1436	static source_location	1420	static location_t
1437	linemap_macro_loc_to_def_point (struct line_maps *set,	1421	linemap_macro_loc_to_def_point (struct line_maps *set,
1438	source_location location,	1422	location_t location,
1439	const line_map_ordinary **original_map)	1423	const line_map_ordinary **original_map)
1440	{	1424	{
1441	struct line_map *map;
1442
1443	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);	1425	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);
1444		1426
1445	while (true)	1427	for (;;)
1446	{	1428	{
1447	source_location caret_loc;	1429	location_t caret_loc = location;
1448	if (IS_ADHOC_LOC (location))	1430	if (IS_ADHOC_LOC (caret_loc))
1449	caret_loc = get_location_from_adhoc_loc (set, location);	1431	caret_loc = get_location_from_adhoc_loc (set, caret_loc);
1450	else
1451	caret_loc = location;
1452		1432
1453	map = const_cast <line_map *> (linemap_lookup (set, caret_loc));	1433	const line_map *map = linemap_lookup (set, caret_loc);
1454	if (!linemap_macro_expansion_map_p (map))	1434	if (!map \|\| MAP_ORDINARY_P (map))
1455	break;	1435	{
		1436	if (original_map)
		1437	original_map = (const line_map_ordinary )map;
		1438	break;
		1439	}
1456		1440
1457	location =	1441	location = linemap_macro_map_loc_to_def_point
1458	linemap_macro_map_loc_to_def_point (linemap_check_macro (map),	1442	(linemap_check_macro (map), caret_loc);
1459	caret_loc);
1460	}	1443	}
1461		1444
1462	if (original_map)
1463	*original_map = linemap_check_ordinary (map);
1464	return location;	1445	return location;
1465	}	1446	}
1466		1447
@@ -1478,16 +1459,16 @@ linemap_macro_loc_to_def_point (struct line_maps *set, · 11 unmodified lines
1478		1459
1479	This is a subroutine of linemap_resolve_location. */	1460	This is a subroutine of linemap_resolve_location. */
1480		1461
1481	static source_location	1462	static location_t
1482	linemap_macro_loc_to_exp_point (struct line_maps *set,	1463	linemap_macro_loc_to_exp_point (struct line_maps *set,
1483	source_location location,	1464	location_t location,
1484	const line_map_ordinary **original_map)	1465	const line_map_ordinary **original_map)
1485	{	1466	{
1486	struct line_map *map;	1467	struct line_map *map;
1487		1468
1488	if (IS_ADHOC_LOC (location))	1469	if (IS_ADHOC_LOC (location))
1489	location = set->location_adhoc_data_map.data[location	1470	location = set->location_adhoc_data_map.data[location
1490	& MAX_SOURCE_LOCATION].locus;	1471	& MAX_LOCATION_T].locus;
1491		1472
1492	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);	1473	linemap_assert (set && location >= RESERVED_LOCATION_COUNT);
1493		1474
@@ -1553,15 +1534,15 @@ linemap_macro_loc_to_exp_point (struct line_maps *set, · 59 unmodified lines
1553	resolves to a location reserved for the client code, like	1534	resolves to a location reserved for the client code, like
1554	UNKNOWN_LOCATION or BUILTINS_LOCATION in GCC. */	1535	UNKNOWN_LOCATION or BUILTINS_LOCATION in GCC. */
1555		1536
1556	source_location	1537	location_t
1557	linemap_resolve_location (struct line_maps *set,	1538	linemap_resolve_location (struct line_maps *set,
1558	source_location loc,	1539	location_t loc,
1559	enum location_resolution_kind lrk,	1540	enum location_resolution_kind lrk,
1560	const line_map_ordinary **map)	1541	const line_map_ordinary **map)
1561	{	1542	{
1562	source_location locus = loc;	1543	location_t locus = loc;
1563	if (IS_ADHOC_LOC (loc))	1544	if (IS_ADHOC_LOC (loc))
1564	locus = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	1545	locus = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
1565		1546
1566	if (locus < RESERVED_LOCATION_COUNT)	1547	if (locus < RESERVED_LOCATION_COUNT)
1567	{	1548	{
@@ -1595,7 +1576,7 @@ linemap_resolve_location (struct line_maps *set, · 27 unmodified lines
1595		1576
1596	bool	1577	bool
1597	linemap_location_from_macro_definition_p (struct line_maps *set,	1578	linemap_location_from_macro_definition_p (struct line_maps *set,
1598	source_location loc)	1579	location_t loc)
1599	{	1580	{
1600	if (IS_ADHOC_LOC (loc))	1581	if (IS_ADHOC_LOC (loc))
1601	loc = get_location_from_adhoc_loc (set, loc);	1582	loc = get_location_from_adhoc_loc (set, loc);
@@ -1608,13 +1589,13 @@ linemap_location_from_macro_definition_p (struct line_maps *set, · 6 unmodified lines
1608	const struct line_map_macro *map	1589	const struct line_map_macro *map
1609	= linemap_check_macro (linemap_lookup (set, loc));	1590	= linemap_check_macro (linemap_lookup (set, loc));
1610		1591
1611	source_location s_loc	1592	location_t s_loc
1612	= linemap_macro_map_loc_unwind_toward_spelling (set, map, loc);	1593	= linemap_macro_map_loc_unwind_toward_spelling (set, map, loc);
1613	if (linemap_location_from_macro_expansion_p (set, s_loc))	1594	if (linemap_location_from_macro_expansion_p (set, s_loc))
1614	loc = s_loc;	1595	loc = s_loc;
1615	else	1596	else
1616	{	1597	{
1617	source_location def_loc	1598	location_t def_loc
1618	= linemap_macro_map_loc_to_def_point (map, loc);	1599	= linemap_macro_map_loc_to_def_point (map, loc);
1619	return s_loc == def_loc;	1600	return s_loc == def_loc;
1620	}	1601	}
@@ -1633,17 +1614,17 @@ linemap_location_from_macro_definition_p (struct line_maps *set, · 12 unmodified lines
1633	*LOC_MAP must be set to the map of LOC. This function then sets it	1614	*LOC_MAP must be set to the map of LOC. This function then sets it
1634	to the map of the returned location. */	1615	to the map of the returned location. */
1635		1616
1636	source_location	1617	location_t
1637	linemap_unwind_toward_expansion (struct line_maps *set,	1618	linemap_unwind_toward_expansion (struct line_maps *set,
1638	source_location loc,	1619	location_t loc,
1639	const struct line_map **map)	1620	const struct line_map **map)
1640	{	1621	{
1641	source_location resolved_location;	1622	location_t resolved_location;
1642	const line_map_macro macro_map = linemap_check_macro (map);	1623	const line_map_macro macro_map = linemap_check_macro (map);
1643	const struct line_map *resolved_map;	1624	const struct line_map *resolved_map;
1644		1625
1645	if (IS_ADHOC_LOC (loc))	1626	if (IS_ADHOC_LOC (loc))
1646	loc = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	1627	loc = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
1647		1628
1648	resolved_location =	1629	resolved_location =
1649	linemap_macro_map_loc_unwind_toward_spelling (set, macro_map, loc);	1630	linemap_macro_map_loc_unwind_toward_spelling (set, macro_map, loc);
@@ -1673,17 +1654,17 @@ linemap_unwind_toward_expansion (struct line_maps *set, · 23 unmodified lines
1673		1654
1674	*MAP is set to the map of the returned location if the later is	1655	*MAP is set to the map of the returned location if the later is
1675	different from LOC. */	1656	different from LOC. */
1676	source_location	1657	location_t
1677	linemap_unwind_to_first_non_reserved_loc (struct line_maps *set,	1658	linemap_unwind_to_first_non_reserved_loc (struct line_maps *set,
1678	source_location loc,	1659	location_t loc,
1679	const struct line_map **map)	1660	const struct line_map **map)
1680	{	1661	{
1681	source_location resolved_loc;	1662	location_t resolved_loc;
1682	const struct line_map *map0 = NULL;	1663	const struct line_map *map0 = NULL;
1683	const line_map_ordinary *map1 = NULL;	1664	const line_map_ordinary *map1 = NULL;
1684		1665
1685	if (IS_ADHOC_LOC (loc))	1666	if (IS_ADHOC_LOC (loc))
1686	loc = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	1667	loc = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
1687		1668
1688	map0 = linemap_lookup (set, loc);	1669	map0 = linemap_lookup (set, loc);
1689	if (!linemap_macro_expansion_map_p (map0))	1670	if (!linemap_macro_expansion_map_p (map0))
@@ -1720,7 +1701,7 @@ linemap_unwind_to_first_non_reserved_loc (struct line_maps *set, · 30 unmodified lines
1720	expanded_location	1701	expanded_location
1721	linemap_expand_location (struct line_maps *set,	1702	linemap_expand_location (struct line_maps *set,
1722	const struct line_map *map,	1703	const struct line_map *map,
1723	source_location loc)	1704	location_t loc)
1724		1705
1725	{	1706	{
1726	expanded_location xloc;	1707	expanded_location xloc;
@@ -1729,8 +1710,8 @@ linemap_expand_location (struct line_maps *set, · 2 unmodified lines
1729	if (IS_ADHOC_LOC (loc))	1710	if (IS_ADHOC_LOC (loc))
1730	{	1711	{
1731	xloc.data	1712	xloc.data
1732	= set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].data;	1713	= set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].data;
1733	loc = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	1714	loc = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
1734	}	1715	}
1735		1716
1736	if (loc < RESERVED_LOCATION_COUNT)	1717	if (loc < RESERVED_LOCATION_COUNT)
@@ -1770,41 +1751,42 @@ linemap_expand_location (struct line_maps *set, · 33 unmodified lines
1770	void	1751	void
1771	linemap_dump (FILE stream, struct line_maps set, unsigned ix, bool is_macro)	1752	linemap_dump (FILE stream, struct line_maps set, unsigned ix, bool is_macro)
1772	{	1753	{
1773	const char *lc_reasons_v[LC_ENTER_MACRO + 1]	1754	const char *const lc_reasons_v[LC_HWM]
1774	= { "LC_ENTER", "LC_LEAVE", "LC_RENAME", "LC_RENAME_VERBATIM",	1755	= { "LC_ENTER", "LC_LEAVE", "LC_RENAME", "LC_RENAME_VERBATIM",
1775	"LC_ENTER_MACRO" };	1756	"LC_ENTER_MACRO" };
1776	const char *reason;
1777	const line_map *map;	1757	const line_map *map;
		1758	unsigned reason;
1778		1759
1779	if (stream == NULL)	1760	if (stream == NULL)
1780	stream = stderr;	1761	stream = stderr;
1781		1762
1782	if (!is_macro)	1763	if (!is_macro)
1783	map = LINEMAPS_ORDINARY_MAP_AT (set, ix);	1764	{
		1765	map = LINEMAPS_ORDINARY_MAP_AT (set, ix);
		1766	reason = linemap_check_ordinary (map)->reason;
		1767	}
1784	else	1768	else
1785	map = LINEMAPS_MACRO_MAP_AT (set, ix);	1769	{
1786		1770	map = LINEMAPS_MACRO_MAP_AT (set, ix);
1787	reason = (map->reason <= LC_ENTER_MACRO) ? lc_reasons_v[map->reason] : "???";	1771	reason = LC_ENTER_MACRO;
		1772	}
1788		1773
1789	fprintf (stream, "Map #%u [%p] - LOC: %u - REASON: %s - SYSP: %s\n",	1774	fprintf (stream, "Map #%u [%p] - LOC: %u - REASON: %s - SYSP: %s\n",
1790	ix, (void *) map, map->start_location, reason,	1775	ix, (void *) map, map->start_location,
		1776	reason < LC_HWM ? lc_reasons_v[reason] : "???",
1791	((!is_macro	1777	((!is_macro
1792	&& ORDINARY_MAP_IN_SYSTEM_HEADER_P (linemap_check_ordinary (map)))	1778	&& ORDINARY_MAP_IN_SYSTEM_HEADER_P (linemap_check_ordinary (map)))
1793	? "yes" : "no"));	1779	? "yes" : "no"));
1794	if (!is_macro)	1780	if (!is_macro)
1795	{	1781	{
1796	const line_map_ordinary *ord_map = linemap_check_ordinary (map);	1782	const line_map_ordinary *ord_map = linemap_check_ordinary (map);
1797	unsigned includer_ix;	1783	const line_map_ordinary *includer_map
1798	const line_map_ordinary *includer_map;	1784	= linemap_included_from_linemap (set, ord_map);
1799
1800	includer_ix = ORDINARY_MAP_INCLUDER_FILE_INDEX (ord_map);
1801	includer_map = includer_ix < LINEMAPS_ORDINARY_USED (set)
1802	? LINEMAPS_ORDINARY_MAP_AT (set, includer_ix)
1803	: NULL;
1804		1785
1805	fprintf (stream, "File: %s:%d\n", ORDINARY_MAP_FILE_NAME (ord_map),	1786	fprintf (stream, "File: %s:%d\n", ORDINARY_MAP_FILE_NAME (ord_map),
1806	ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map));	1787	ORDINARY_MAP_STARTING_LINE_NUMBER (ord_map));
1807	fprintf (stream, "Included from: [%d] %s\n", includer_ix,	1788	fprintf (stream, "Included from: [%d] %s\n",
		1789	includer_map ? int (includer_map - set->info_ordinary.maps) : -1,
1808	includer_map ? ORDINARY_MAP_FILE_NAME (includer_map) : "None");	1790	includer_map ? ORDINARY_MAP_FILE_NAME (includer_map) : "None");
1809	}	1791	}
1810	else	1792	else
@@ -1824,16 +1806,16 @@ linemap_dump (FILE stream, struct line_maps set, unsigned ix, bool is_macro) · 13 unmodified lines
1824		1806
1825	void	1807	void
1826	linemap_dump_location (struct line_maps *set,	1808	linemap_dump_location (struct line_maps *set,
1827	source_location loc,	1809	location_t loc,
1828	FILE *stream)	1810	FILE *stream)
1829	{	1811	{
1830	const line_map_ordinary *map;	1812	const line_map_ordinary *map;
1831	source_location location;	1813	location_t location;
1832	const char path = "", from = "";	1814	const char path = "", from = "";
1833	int l = -1, c = -1, s = -1, e = -1;	1815	int l = -1, c = -1, s = -1, e = -1;
1834		1816
1835	if (IS_ADHOC_LOC (loc))	1817	if (IS_ADHOC_LOC (loc))
1836	loc = set->location_adhoc_data_map.data[loc & MAX_SOURCE_LOCATION].locus;	1818	loc = set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
1837		1819
1838	if (loc == 0)	1820	if (loc == 0)
1839	return;	1821	return;
@@ -1854,9 +1836,11 @@ linemap_dump_location (struct line_maps *set, · 14 unmodified lines
1854	if (e)	1836	if (e)
1855	from = "N/A";	1837	from = "N/A";
1856	else	1838	else
1857	from = (INCLUDED_FROM (set, map))	1839	{
1858	? LINEMAP_FILE (INCLUDED_FROM (set, map))	1840	const line_map_ordinary *from_map
1859	: "<NULL>";	1841	= linemap_included_from_linemap (set, map);
		1842	from = from_map ? LINEMAP_FILE (from_map) : "<NULL>";
		1843	}
1860	}	1844	}
1861		1845
1862	/* P: path, L: line, C: column, S: in-system-header, M: map address,	1846	/* P: path, L: line, C: column, S: in-system-header, M: map address,
@@ -1873,7 +1857,7 @@ linemap_dump_location (struct line_maps *set, · 10 unmodified lines
1873	bool	1857	bool
1874	linemap_get_file_highest_location (struct line_maps *set,	1858	linemap_get_file_highest_location (struct line_maps *set,
1875	const char *file_name,	1859	const char *file_name,
1876	source_location *loc)	1860	location_t *loc)
1877	{	1861	{
1878	/* If the set is empty or no ordinary map has been created then	1862	/* If the set is empty or no ordinary map has been created then
1879	there is no file to look for ... */	1863	there is no file to look for ... */
@@ -1895,7 +1879,7 @@ linemap_get_file_highest_location (struct line_maps *set, · 15 unmodified lines
1895	/* The highest location for a given map is either the starting	1879	/* The highest location for a given map is either the starting
1896	location of the next map minus one, or -- if the map is the	1880	location of the next map minus one, or -- if the map is the
1897	latest one -- the highest location of the set. */	1881	latest one -- the highest location of the set. */
1898	source_location result;	1882	location_t result;
1899	if (i == (int) set->info_ordinary.used - 1)	1883	if (i == (int) set->info_ordinary.used - 1)
1900	result = set->highest_location;	1884	result = set->highest_location;
1901	else	1885	else
@@ -1936,14 +1920,14 @@ linemap_get_statistics (struct line_maps *set, · 34 unmodified lines
1936	linemap_assert (linemap_macro_expansion_map_p (cur_map));	1920	linemap_assert (linemap_macro_expansion_map_p (cur_map));
1937		1921
1938	macro_maps_locations_size +=	1922	macro_maps_locations_size +=
1939	2 * MACRO_MAP_NUM_MACRO_TOKENS (cur_map) * sizeof (source_location);	1923	2 * MACRO_MAP_NUM_MACRO_TOKENS (cur_map) * sizeof (location_t);
1940		1924
1941	for (i = 0; i < 2 * MACRO_MAP_NUM_MACRO_TOKENS (cur_map); i += 2)	1925	for (i = 0; i < 2 * MACRO_MAP_NUM_MACRO_TOKENS (cur_map); i += 2)
1942	{	1926	{
1943	if (MACRO_MAP_LOCATIONS (cur_map)[i] ==	1927	if (MACRO_MAP_LOCATIONS (cur_map)[i] ==
1944	MACRO_MAP_LOCATIONS (cur_map)[i + 1])	1928	MACRO_MAP_LOCATIONS (cur_map)[i + 1])
1945	duplicated_macro_maps_locations_size +=	1929	duplicated_macro_maps_locations_size +=
1946	sizeof (source_location);	1930	sizeof (location_t);
1947	}	1931	}
1948	}	1932	}
1949		1933
@@ -2010,7 +1994,8 @@ line_table_dump (FILE stream, struct line_maps set, unsigned int num_ordinary, · 60 unmodified lines
2010		1994
2011	/* Construct a rich_location with location LOC as its initial range. */	1995	/* Construct a rich_location with location LOC as its initial range. */
2012		1996
2013	rich_location::rich_location (line_maps *set, source_location loc) :	1997	rich_location::rich_location (line_maps *set, location_t loc,
		1998	const range_label *label) :
2014	m_line_table (set),	1999	m_line_table (set),
2015	m_ranges (),	2000	m_ranges (),
2016	m_column_override (0),	2001	m_column_override (0),
@@ -2019,7 +2004,7 @@ rich_location::rich_location (line_maps *set, source_location loc) : · 2 unmodified lines
2019	m_seen_impossible_fixit (false),	2004	m_seen_impossible_fixit (false),
2020	m_fixits_cannot_be_auto_applied (false)	2005	m_fixits_cannot_be_auto_applied (false)
2021	{	2006	{
2022	add_range (loc, true);	2007	add_range (loc, SHOW_RANGE_WITH_CARET, label);
2023	}	2008	}
2024		2009
2025	/* The destructor for class rich_location. */	2010	/* The destructor for class rich_location. */
@@ -2032,7 +2017,7 @@ rich_location::~rich_location () · 6 unmodified lines
2032		2017
2033	/* Get location IDX within this rich_location. */	2018	/* Get location IDX within this rich_location. */
2034		2019
2035	source_location	2020	location_t
2036	rich_location::get_loc (unsigned int idx) const	2021	rich_location::get_loc (unsigned int idx) const
2037	{	2022	{
2038	const location_range *locrange = get_range (idx);	2023	const location_range *locrange = get_range (idx);
@@ -2095,16 +2080,19 @@ rich_location::override_column (int column) · 56 unmodified lines
2095	/* Add the given range. */	2080	/* Add the given range. */
2096		2081
2097	void	2082	void
2098	rich_location::add_range (source_location loc, bool show_caret_p)	2083	rich_location::add_range (location_t loc,
		2084	enum range_display_kind range_display_kind,
		2085	const range_label *label)
2099	{	2086	{
2100	location_range range;	2087	location_range range;
2101	range.m_loc = loc;	2088	range.m_loc = loc;
2102	range.m_show_caret_p = show_caret_p;	2089	range.m_range_display_kind = range_display_kind;
		2090	range.m_label = label;
2103	m_ranges.push (range);	2091	m_ranges.push (range);
2104	}	2092	}
2105		2093
2106	/* Add or overwrite the location given by IDX, setting its location to LOC,	2094	/* Add or overwrite the location given by IDX, setting its location to LOC,
2107	and setting its "should my caret be printed" flag to SHOW_CARET_P.	2095	and setting its m_range_display_kind to RANGE_DISPLAY_KIND.
2108		2096
2109	It must either overwrite an existing location, or add one exactly on	2097	It must either overwrite an existing location, or add one exactly on
2110	the end of the array.	2098	the end of the array.
@@ -2117,20 +2105,20 @@ rich_location::add_range (source_location loc, bool show_caret_p) · 6 unmodified lines
2117	- the "%C" and "%L" format codes in the Fortran frontend. */	2105	- the "%C" and "%L" format codes in the Fortran frontend. */
2118		2106
2119	void	2107	void
2120	rich_location::set_range (line_maps * /set/, unsigned int idx,	2108	rich_location::set_range (unsigned int idx, location_t loc,
2121	source_location loc, bool show_caret_p)	2109	enum range_display_kind range_display_kind)
2122	{	2110	{
2123	/* We can either overwrite an existing range, or add one exactly	2111	/* We can either overwrite an existing range, or add one exactly
2124	on the end of the array. */	2112	on the end of the array. */
2125	linemap_assert (idx <= m_ranges.count ());	2113	linemap_assert (idx <= m_ranges.count ());
2126		2114
2127	if (idx == m_ranges.count ())	2115	if (idx == m_ranges.count ())
2128	add_range (loc, show_caret_p);	2116	add_range (loc, range_display_kind);
2129	else	2117	else
2130	{	2118	{
2131	location_range *locrange = get_range (idx);	2119	location_range *locrange = get_range (idx);
2132	locrange->m_loc = loc;	2120	locrange->m_loc = loc;
2133	locrange->m_show_caret_p = show_caret_p;	2121	locrange->m_range_display_kind = range_display_kind;
2134	}	2122	}
2135		2123
2136	if (idx == 0)	2124	if (idx == 0)
@@ -2153,10 +2141,10 @@ rich_location::add_fixit_insert_before (const char *new_content) · 16 unmodified lines
2153	immediately before the start of WHERE. */	2141	immediately before the start of WHERE. */
2154		2142
2155	void	2143	void
2156	rich_location::add_fixit_insert_before (source_location where,	2144	rich_location::add_fixit_insert_before (location_t where,
2157	const char *new_content)	2145	const char *new_content)
2158	{	2146	{
2159	source_location start = get_range_from_loc (m_line_table, where).m_start;	2147	location_t start = get_range_from_loc (m_line_table, where).m_start;
2160	maybe_add_fixit (start, start, new_content);	2148	maybe_add_fixit (start, start, new_content);
2161	}	2149	}
2162		2150
@@ -2173,11 +2161,11 @@ rich_location::add_fixit_insert_after (const char *new_content) · 10 unmodified lines
2173	immediately after the end-point of WHERE. */	2161	immediately after the end-point of WHERE. */
2174		2162
2175	void	2163	void
2176	rich_location::add_fixit_insert_after (source_location where,	2164	rich_location::add_fixit_insert_after (location_t where,
2177	const char *new_content)	2165	const char *new_content)
2178	{	2166	{
2179	source_location finish = get_range_from_loc (m_line_table, where).m_finish;	2167	location_t finish = get_range_from_loc (m_line_table, where).m_finish;
2180	source_location next_loc	2168	location_t next_loc
2181	= linemap_position_for_loc_and_offset (m_line_table, finish, 1);	2169	= linemap_position_for_loc_and_offset (m_line_table, finish, 1);
2182		2170
2183	/* linemap_position_for_loc_and_offset can fail, if so, it returns	2171	/* linemap_position_for_loc_and_offset can fail, if so, it returns
@@ -2206,7 +2194,7 @@ rich_location::add_fixit_remove () · 22 unmodified lines
2206	the start and finish of WHERE. */	2194	the start and finish of WHERE. */
2207		2195
2208	void	2196	void
2209	rich_location::add_fixit_remove (source_location where)	2197	rich_location::add_fixit_remove (location_t where)
2210	{	2198	{
2211	source_range range = get_range_from_loc (m_line_table, where);	2199	source_range range = get_range_from_loc (m_line_table, where);
2212	add_fixit_remove (range);	2200	add_fixit_remove (range);
@@ -2236,7 +2224,7 @@ rich_location::add_fixit_replace (const char *new_content) · 23 unmodified lines
2236	the start and finish of WHERE with NEW_CONTENT. */	2224	the start and finish of WHERE with NEW_CONTENT. */
2237		2225
2238	void	2226	void
2239	rich_location::add_fixit_replace (source_location where,	2227	rich_location::add_fixit_replace (location_t where,
2240	const char *new_content)	2228	const char *new_content)
2241	{	2229	{
2242	source_range range = get_range_from_loc (m_line_table, where);	2230	source_range range = get_range_from_loc (m_line_table, where);
@@ -2250,11 +2238,11 @@ void · 7 unmodified lines
2250	rich_location::add_fixit_replace (source_range src_range,	2238	rich_location::add_fixit_replace (source_range src_range,
2251	const char *new_content)	2239	const char *new_content)
2252	{	2240	{
2253	source_location start = get_pure_location (m_line_table, src_range.m_start);	2241	location_t start = get_pure_location (m_line_table, src_range.m_start);
2254	source_location finish = get_pure_location (m_line_table, src_range.m_finish);	2242	location_t finish = get_pure_location (m_line_table, src_range.m_finish);
2255		2243
2256	/* Fix-it hints use half-closed ranges, so attempt to offset the endpoint. */	2244	/* Fix-it hints use half-closed ranges, so attempt to offset the endpoint. */
2257	source_location next_loc	2245	location_t next_loc
2258	= linemap_position_for_loc_and_offset (m_line_table, finish, 1);	2246	= linemap_position_for_loc_and_offset (m_line_table, finish, 1);
2259	/* linemap_position_for_loc_and_offset can fail, if so, it returns	2247	/* linemap_position_for_loc_and_offset can fail, if so, it returns
2260	its input value. */	2248	its input value. */
@@ -2285,7 +2273,7 @@ rich_location::get_last_fixit_hint () const · 24 unmodified lines
2285	Otherwise (the common case), return false. */	2273	Otherwise (the common case), return false. */
2286		2274
2287	bool	2275	bool
2288	rich_location::reject_impossible_fixit (source_location where)	2276	rich_location::reject_impossible_fixit (location_t where)
2289	{	2277	{
2290	/* Fix-its within a rich_location should either all be suggested, or	2278	/* Fix-its within a rich_location should either all be suggested, or
2291	none of them should be suggested.	2279	none of them should be suggested.
@@ -2323,8 +2311,8 @@ rich_location::stop_supporting_fixits () · 31 unmodified lines
2323	consolidating into the prior fixit if possible. */	2311	consolidating into the prior fixit if possible. */
2324		2312
2325	void	2313	void
2326	rich_location::maybe_add_fixit (source_location start,	2314	rich_location::maybe_add_fixit (location_t start,
2327	source_location next_loc,	2315	location_t next_loc,
2328	const char *new_content)	2316	const char *new_content)
2329	{	2317	{
2330	if (reject_impossible_fixit (start))	2318	if (reject_impossible_fixit (start))
@@ -2405,8 +2393,8 @@ rich_location::maybe_add_fixit (source_location start, · 74 unmodified lines
2405		2393
2406	/* class fixit_hint. */	2394	/* class fixit_hint. */
2407		2395
2408	fixit_hint::fixit_hint (source_location start,	2396	fixit_hint::fixit_hint (location_t start,
2409	source_location next_loc,	2397	location_t next_loc,
2410	const char *new_content)	2398	const char *new_content)
2411	: m_start (start),	2399	: m_start (start),
2412	m_next_loc (next_loc),	2400	m_next_loc (next_loc),
@@ -2444,8 +2432,8 @@ fixit_hint::affects_line_p (const char *file, int line) const · 31 unmodified lines
2444	Otherwise return false. */	2432	Otherwise return false. */
2445		2433
2446	bool	2434	bool
2447	fixit_hint::maybe_append (source_location start,	2435	fixit_hint::maybe_append (location_t start,
2448	source_location next_loc,	2436	location_t next_loc,
2449	const char *new_content)	2437	const char *new_content)
2450	{	2438	{
2451	/* For consolidation to be possible, START must be at this hint's	2439	/* For consolidation to be possible, START must be at this hint's

gcc/libcpp/location-example.txt+196−151

@@ -20,213 +20,258 @@ extern int foo (); · 19 unmodified lines
20		20
21		21
22	The undocumented -fdump-internal-locations option outputs this information	22	The undocumented -fdump-internal-locations option outputs this information
23	to stderr, showing what each source_location value means. Source code	23	to stderr, showing what each location_t value means. Source code
24	lines are quoted, showing both per-line source_location values and	24	lines are quoted, showing both per-line location_t values and
25	per-line&column source_location values (written vertically under the	25	per-line&column location_t values (written vertically under the
26	corresponding character of source code).	26	corresponding character of source code).
27		27
28	VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV	28	VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
29	RESERVED LOCATIONS	29	RESERVED LOCATIONS
30	source_location interval: 0 <= loc < 2	30	location_t interval: 0 <= loc < 2
31		31
32	ORDINARY MAP: 0	32	ORDINARY MAP: 0
33	source_location interval: 32 <= loc < 64	33	location_t interval: 32 <= loc < 64
34	file: test.c	34	file: test.c
35	starting at line: 1	35	starting at line: 1
36	column bits: 12	36	column and range bits: 12
		37	column bits: 7
37	range bits: 5	38	range bits: 5
		39	reason: 0 (LC_ENTER)
		40	included from location: 0
38	test.c: 1\|loc: 32\|#include "test.h"	41	test.c: 1\|loc: 32\|#include "test.h"
39	\|69269258258148147	42	\|69269258258148147
40	\|46802468024680246	43	\|46802468024680246
41		44
42	ORDINARY MAP: 1	45	ORDINARY MAP: 1
43	source_location interval: 64 <= loc < 96	46	location_t interval: 64 <= loc < 96
44	file: <built-in>	47	file: <built-in>
45	starting at line: 0	48	starting at line: 0
		49	column and range bits: 0
46	column bits: 0	50	column bits: 0
47	range bits: 0	51	range bits: 0
		52	reason: 2 (LC_RENAME)
		53	included from location: 0
48		54
49	ORDINARY MAP: 2	55	ORDINARY MAP: 2
50	source_location interval: 96 <= loc < 128	56	location_t interval: 96 <= loc < 128
51	file: <command-line>	57	file: <command-line>
52	starting at line: 0	58	starting at line: 0
		59	column and range bits: 0
53	column bits: 0	60	column bits: 0
54	range bits: 0	61	range bits: 0
		62	reason: 2 (LC_RENAME)
		63	included from location: 0
55		64
56	ORDINARY MAP: 3	65	ORDINARY MAP: 3
57	source_location interval: 128 <= loc < 160128	66	location_t interval: 128 <= loc < 250240
58	file: /usr/include/stdc-predef.h	67	file: /usr/include/stdc-predef.h
59	starting at line: 1	68	starting at line: 1
60	column bits: 12	69	column and range bits: 12
		70	column bits: 7
61	range bits: 5	71	range bits: 5
		72	reason: 0 (LC_ENTER)
		73	included from location: 127 (in ordinary map 2)
62	(contents of /usr/include/stdc-predef.h snipped for brevity)	74	(contents of /usr/include/stdc-predef.h snipped for brevity)
63		75
64	ORDINARY MAP: 4	76	ORDINARY MAP: 4
65	source_location interval: 160128 <= loc < 160160	77	location_t interval: 250240 <= loc < 250272
66	file: <command-line>	78	file: <command-line>
67	starting at line: 32	79	starting at line: 32
68	column bits: 12	80	column and range bits: 12
		81	column bits: 7
69	range bits: 5	82	range bits: 5
		83	reason: 1 (LC_LEAVE)
		84	included from location: 0
70		85
71	ORDINARY MAP: 5	86	ORDINARY MAP: 5
72	source_location interval: 160160 <= loc < 164256	87	location_t interval: 250272 <= loc < 254368
73	file: test.c	88	file: test.c
74	starting at line: 1	89	starting at line: 1
75	column bits: 12	90	column and range bits: 12
		91	column bits: 7
76	range bits: 5	92	range bits: 5
77	test.c: 1\|loc:160160\|#include "test.h"	93	reason: 2 (LC_RENAME)
78	\|00000000000000000	94	included from location: 0
79	\|12223334445556667	95	test.c: 1\|loc:250272\|#include "test.h"
80	\|92582581481470470	96	\|00000000000000000
81	\|24680246802468024	97	\|33344445556667778
		98	\|03603692692582581
		99	\|46802468024680246
82		100
83	ORDINARY MAP: 6	101	ORDINARY MAP: 6
84	source_location interval: 164256 <= loc < 173280	102	location_t interval: 254368 <= loc < 266720
85	file: test.h	103	file: test.h
86	starting at line: 1	104	starting at line: 1
87	column bits: 12	105	column and range bits: 12
		106	column bits: 7
88	range bits: 5	107	range bits: 5
89	test.h: 1\|loc:164256\|extern int foo ();	108	reason: 0 (LC_ENTER)
90	\|444444444444444444	109	included from location: 250272 (in ordinary map 5)
91	\|233344455566677788	110	test.h: 1\|loc:254368\|extern int foo ();
92	\|825814814704703603	111	\|444444444444444444
93	\|802468024680246802	112	\|444455566677788899
94	test.h: 2\|loc:168352\|	113	\|036926925825814814
95	\|	114	\|024680246802468024
96	\|	115	test.h: 2\|loc:258464\|
97	\|	116	\|
98	\|	117	\|
99	test.h: 3\|loc:172448\|#define PLUS(A, B) A + B	118	\|
100	\|222222222222222223333333	119	\|
101	\|455566677788889990001112	120	test.h: 3\|loc:262560\|#define PLUS(A, B) A + B
102	\|814704703603692692582581	121	\|222222222222233333333333
103	\|024680246802468024680246	122	\|566677788899900011122223
		123	\|925825814814704703603692
		124	\|246802468024680246802468
		125	test.h: 4\|loc:266656\|
		126	\|
		127	\|
		128	\|
		129	\|
104		130
105	ORDINARY MAP: 7	131	ORDINARY MAP: 7
106	source_location interval: 173280 <= loc < 202016	132	location_t interval: 266720 <= loc < 299520
107	file: test.c	133	file: test.c
108	starting at line: 2	134	starting at line: 2
109	column bits: 12	135	column and range bits: 12
		136	column bits: 7
110	range bits: 5	137	range bits: 5
111	test.c: 2\|loc:173280\|	138	reason: 1 (LC_LEAVE)
112	\|	139	included from location: 0
113	\|	140	test.c: 2\|loc:266720\|
114	\|	141	\|
115	\|	142	\|
116	test.c: 3\|loc:177376\|int	143	\|
117	\|777	144	\|
118	\|444	145	test.c: 3\|loc:270816\|int
119	\|047	146	\|000
120	\|802	147	\|889
121	test.c: 4\|loc:181472\|main (int argc, char **argv)	148	\|481
122	\|1111111111111111222222222222	149	\|802
123	\|5556666777888999000111222333	150	test.c: 4\|loc:274912\|main (int argc, char **argv)
124	\|0360369269258258148147047036	151	\|4455555555555555555555555555
125	\|4680246802468024680246802468	152	\|9900011122223334445556667778
126	test.c: 5\|loc:185568\|{	153	\|4704703603692692582581481470
127	\|5	154	\|4680246802468024680246802468
128	\|6	155	test.c: 5\|loc:279008\|{
129	\|0	156	\|9
130	\|0	157	\|0
131	test.c: 6\|loc:189664\| int a = PLUS (1,2);	158	\|4
132	\|999999999900000000000	159	\|0
133	\|677788899900011122233	160	test.c: 6\|loc:283104\| int a = PLUS (1,2);
134	\|926925825814814704703	161	\|333333333333333333333
135	\|680246802468024680246	162	\|112222333444555666777
136	test.c: 7\|loc:193760\| int b = PLUS (3,4);	163	\|360369269258258148147
137	\|333333344444444444444	164	\|680246802468024680246
138	\|788899900011122233344	165	test.c: 7\|loc:287200\| int b = PLUS (3,4);
139	\|925825814814704703603	166	\|777777777777777777777
140	\|246802468024680246802	167	\|222333444555666777888
141	test.c: 8\|loc:197856\| return 0;	168	\|369269258258148147047
142	\|77778888888	169	\|246802468024680246802
143	\|89990001112	170	test.c: 8\|loc:291296\| return 0;
144	\|82581481470	171	\|11111111111
145	\|80246802468	172	\|33344455566
146	test.c: 9\|loc:201952\|}	173	\|26925825814
147	\|1	174	\|80246802468
148	\|9	175	test.c: 9\|loc:295392\|}
149	\|8	176	\|5
150	\|4	177	\|4
		178	\|2
		179	\|4
		180	test.c: 10\|loc:299488\|
		181	\|
		182	\|
		183	\|
		184	\|
151		185
152	UNALLOCATED LOCATIONS	186	UNALLOCATED LOCATIONS
153	source_location interval: 202016 <= loc < 2147483633	187	location_t interval: 299520 <= loc < 2147483632
154		188
155	MACRO 1: PLUS (7 tokens)	189	MACRO 3: PLUS (7 tokens)
156	source_location interval: 2147483633 <= loc < 2147483640	190	location_t interval: 2147483632 <= loc < 2147483639
157	test.c:7:11: note: expansion point is location 194115	191	test.c:7:11: note: expansion point is location 287555
158	int b = PLUS (3,4);	192	7 \| int b = PLUS (3,4);
159	^~~~	193	\| ^~~~
		194	map->start_location: 2147483632
		195	macro_locations:
		196	0: 287744, 263200
		197	test.c:7:17: note: token 0 has x-location == 287744
		198	7 \| int b = PLUS (3,4);
		199	\| ^
		200	test.c:7:17: note: token 0 has y-location == 263200
		201	1: 263264, 263264
		202	In file included from test.c:1:
		203	test.h:3:22: note: token 1 has x-location == y-location == 263264
		204	3 \| #define PLUS(A, B) A + B
		205	\| ^
		206	2: 287808, 263328
		207	test.c:7:19: note: token 2 has x-location == 287808
		208	7 \| int b = PLUS (3,4);
		209	\| ^
		210	test.c:7:19: note: token 2 has y-location == 263328
		211	3: 0, 0
		212	cc1: note: token 3 has x-location == y-location == 0
		213	4: 0, 0
		214	cc1: note: token 4 has x-location == y-location == 0
		215	5: 0, 0
		216	cc1: note: token 5 has x-location == y-location == 0
		217	6: 0, 0
		218	cc1: note: token 6 has x-location == y-location == 0
160		219
161	map->start_location: 2147483633	220	MACRO 2: PLUS (7 tokens)
		221	location_t interval: 2147483639 <= loc < 2147483646
		222	test.c:6:11: note: expansion point is location 283459
		223	6 \| int a = PLUS (1,2);
		224	\| ^~~~
		225	map->start_location: 2147483639
162	macro_locations:	226	macro_locations:
163	0: 194304, 173088	227	0: 283648, 263200
164	test.c:7:17: note: token 0 has x-location == 194304	228	test.c:6:17: note: token 0 has x-location == 283648
165	int b = PLUS (3,4);	229	6 \| int a = PLUS (1,2);
166	^	230	\| ^
167		231	test.c:6:17: note: token 0 has y-location == 263200
168	test.c:7:17: note: token 0 has y-location == 173088	232	1: 263264, 263264
169	1: 173152, 173152	233	In file included from test.c:1:
170	In file included from test.c:1:0:	234	test.h:3:22: note: token 1 has x-location == y-location == 263264
171	test.h:3:22: note: token 1 has x-location == y-location == 173152	235	3 \| #define PLUS(A, B) A + B
172	#define PLUS(A, B) A + B	236	\| ^
173	^	237	2: 283712, 263328
174		238	test.c:6:19: note: token 2 has x-location == 283712
175	2: 194368, 173216	239	6 \| int a = PLUS (1,2);
176	test.c:7:19: note: token 2 has x-location == 194368	240	\| ^
177	int b = PLUS (3,4);	241	test.c:6:19: note: token 2 has y-location == 263328
178	^	242	3: 0, 0
179		243	cc1: note: token 3 has x-location == y-location == 0
180	test.c:7:19: note: token 2 has y-location == 173216	244	4: 0, 0
181	3: 0, 2947526575	245	cc1: note: token 4 has x-location == y-location == 0
182	cc1: note: token 3 has x-location == 0	246	5: 0, 0
183	cc1: note: token 3 has y-location == 2947526575	247	cc1: note: token 5 has x-location == y-location == 0
184	4: 2947526575, 2947526575	248	6: 0, 0
185	x-location == y-location == 2947526575 encodes token # 800042942	249	cc1: note: token 6 has x-location == y-location == 0
186	5: 2947526575, 2947526575	250
187	x-location == y-location == 2947526575 encodes token # 800042942	251	MACRO 1: __GCC_IEC_559_COMPLEX (1 tokens)
188	6: 2947526575, 2947526575	252	location_t interval: 2147483646 <= loc < 2147483647
189	x-location == y-location == 2947526575 encodes token # 800042942	253	In file included from <command-line>:31:
190		254	/usr/include/stdc-predef.h:45:6: note: expansion point is location 180564
191	MACRO 0: PLUS (7 tokens)	255	45 \| # if __GCC_IEC_559_COMPLEX > 0
192	source_location interval: 2147483640 <= loc < 2147483647	256	\| ^~~~~~~~~~~~~~~~~~~~~
193	test.c:6:11: note: expansion point is location 190019	257	map->start_location: 2147483646
194	int a = PLUS (1,2);
195	^~~~
196
197	map->start_location: 2147483640
198	macro_locations:	258	macro_locations:
199	0: 190208, 173088	259	0: 1, 1
200	test.c:6:17: note: token 0 has x-location == 190208	260	<built-in>: note: token 0 has x-location == y-location == 1
201	int a = PLUS (1,2);	261
202	^	262	MACRO 0: __GCC_IEC_559 (1 tokens)
203		263	location_t interval: 2147483647 <= loc < 2147483648
204	test.c:6:17: note: token 0 has y-location == 173088	264	/usr/include/stdc-predef.h:37:6: note: expansion point is location 147788
205	1: 173152, 173152	265	37 \| # if __GCC_IEC_559 > 0
206	In file included from test.c:1:0:	266	\| ^~~~~~~~~~~~~
207	test.h:3:22: note: token 1 has x-location == y-location == 173152	267	map->start_location: 2147483647
208	#define PLUS(A, B) A + B	268	macro_locations:
209	^	269	0: 1, 1
210		270	<built-in>: note: token 0 has x-location == y-location == 1
211	2: 190272, 173216	271
212	test.c:6:19: note: token 2 has x-location == 190272	272	MAX_LOCATION_T
213	int a = PLUS (1,2);	273	location_t interval: 2147483647 <= loc < 2147483648
214	^
215
216	test.c:6:19: note: token 2 has y-location == 173216
217	3: 0, 2947526575
218	cc1: note: token 3 has x-location == 0
219	cc1: note: token 3 has y-location == 2947526575
220	4: 2947526575, 2947526575
221	x-location == y-location == 2947526575 encodes token # 800042935
222	5: 2947526575, 2947526575
223	x-location == y-location == 2947526575 encodes token # 800042935
224	6: 2947526575, 2947526575
225	x-location == y-location == 2947526575 encodes token # 800042935
226
227	MAX_SOURCE_LOCATION
228	source_location interval: 2147483647 <= loc < 2147483648
229		274
230	AD-HOC LOCATIONS	275	AD-HOC LOCATIONS
231	source_location interval: 2147483648 <= loc < 4294967295	276	location_t interval: 2147483648 <= loc < 4294967295
232	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^	277	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

gcc/libcpp/macro.c+429−409

@@ -1,5 +1,5 @@
1	/* Part of CPP library. (Macro and #define handling.)	1	/* Part of CPP library. (Macro and #define handling.)
2	Copyright (C) 1986-2018 Free Software Foundation, Inc.	2	Copyright (C) 1986-2019 Free Software Foundation, Inc.
3	Written by Per Bothner, 1994.	3	Written by Per Bothner, 1994.
4	Based on CCCP program by Paul Rubin, June 1986	4	Based on CCCP program by Paul Rubin, June 1986
5	Adapted to ANSI C, Richard Stallman, Jan 1987	5	Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -39,9 +39,9 @@ struct macro_arg · 33 unmodified lines
39	const cpp_token stringified; / Stringified argument. */	39	const cpp_token stringified; / Stringified argument. */
40	unsigned int count; /* # of tokens in argument. */	40	unsigned int count; /* # of tokens in argument. */
41	unsigned int expanded_count; /* # of tokens in expanded argument. */	41	unsigned int expanded_count; /* # of tokens in expanded argument. */
42	source_location virt_locs; / Where virtual locations for	42	location_t virt_locs; / Where virtual locations for
43	unexpanded tokens are stored. */	43	unexpanded tokens are stored. */
44	source_location expanded_virt_locs; / Where virtual locations for	44	location_t expanded_virt_locs; / Where virtual locations for
45	expanded tokens are	45	expanded tokens are
46	stored. */	46	stored. */
47	};	47	};
@@ -72,7 +72,7 @@ struct macro_arg_token_iter · 24 unmodified lines
72	/* A pointer to the "full" location of the current token. If	72	/* A pointer to the "full" location of the current token. If
73	-ftrack-macro-expansion is used this location tracks loci across	73	-ftrack-macro-expansion is used this location tracks loci across
74	macro expansion. */	74	macro expansion. */
75	const source_location *location_ptr;	75	const location_t *location_ptr;
76	#if CHECKING_P	76	#if CHECKING_P
77	/* The number of times the iterator went forward. This useful only	77	/* The number of times the iterator went forward. This useful only
78	when checking is enabled. */	78	when checking is enabled. */
@@ -85,8 +85,9 @@ struct macro_arg_token_iter · 6 unmodified lines
85	struct macro_arg_saved_data {	85	struct macro_arg_saved_data {
86	/* The canonical (UTF-8) spelling of this identifier. */	86	/* The canonical (UTF-8) spelling of this identifier. */
87	cpp_hashnode *canonical_node;	87	cpp_hashnode *canonical_node;
88	/* The previous value of this identifier. */	88	/* The previous value & type of this identifier. */
89	union _cpp_hashnode_value value;	89	union _cpp_hashnode_value value;
		90	node_type type;
90	};	91	};
91		92
92	static const char *vaopt_paste_error =	93	static const char *vaopt_paste_error =
@@ -234,22 +235,22 @@ class vaopt_state { · 141 unmodified lines
234	int m_state;	235	int m_state;
235		236
236	/* The location of the paste token. */	237	/* The location of the paste token. */
237	source_location m_paste_location;	238	location_t m_paste_location;
238		239
239	/* Location of the __VA_OPT__ token. */	240	/* Location of the __VA_OPT__ token. */
240	source_location m_location;	241	location_t m_location;
241	};	242	};
242		243
243	/* Macro expansion. */	244	/* Macro expansion. */
244		245
245	static int enter_macro_context (cpp_reader , cpp_hashnode ,	246	static int enter_macro_context (cpp_reader , cpp_hashnode ,
246	const cpp_token *, source_location);	247	const cpp_token *, location_t);
247	static int builtin_macro (cpp_reader , cpp_hashnode ,	248	static int builtin_macro (cpp_reader , cpp_hashnode ,
248	source_location, source_location);	249	location_t, location_t);
249	static void push_ptoken_context (cpp_reader , cpp_hashnode , _cpp_buff *,	250	static void push_ptoken_context (cpp_reader , cpp_hashnode , _cpp_buff *,
250	const cpp_token **, unsigned int);	251	const cpp_token **, unsigned int);
251	static void push_extended_tokens_context (cpp_reader , cpp_hashnode ,	252	static void push_extended_tokens_context (cpp_reader , cpp_hashnode ,
252	_cpp_buff , source_location ,	253	_cpp_buff , location_t ,
253	const cpp_token **, unsigned int);	254	const cpp_token **, unsigned int);
254	static _cpp_buff collect_args (cpp_reader , const cpp_hashnode *,	255	static _cpp_buff collect_args (cpp_reader , const cpp_hashnode *,
255	_cpp_buff *, unsigned );	256	_cpp_buff *, unsigned );
@@ -259,21 +260,21 @@ static void expand_arg (cpp_reader , macro_arg ); · 3 unmodified lines
259	static const cpp_token new_string_token (cpp_reader , uchar *, unsigned int);	260	static const cpp_token new_string_token (cpp_reader , uchar *, unsigned int);
260	static const cpp_token stringify_arg (cpp_reader , macro_arg *);	261	static const cpp_token stringify_arg (cpp_reader , macro_arg *);
261	static void paste_all_tokens (cpp_reader , const cpp_token );	262	static void paste_all_tokens (cpp_reader , const cpp_token );
262	static bool paste_tokens (cpp_reader *, source_location,	263	static bool paste_tokens (cpp_reader *, location_t,
263	const cpp_token *, const cpp_token );	264	const cpp_token *, const cpp_token );
264	static void alloc_expanded_arg_mem (cpp_reader , macro_arg , size_t);	265	static void alloc_expanded_arg_mem (cpp_reader , macro_arg , size_t);
265	static void ensure_expanded_arg_room (cpp_reader , macro_arg , size_t, size_t *);	266	static void ensure_expanded_arg_room (cpp_reader , macro_arg , size_t, size_t *);
266	static void delete_macro_args (_cpp_buff*, unsigned num_args);	267	static void delete_macro_args (_cpp_buff*, unsigned num_args);
267	static void set_arg_token (macro_arg , const cpp_token ,	268	static void set_arg_token (macro_arg , const cpp_token ,
268	source_location, size_t,	269	location_t, size_t,
269	enum macro_arg_token_kind,	270	enum macro_arg_token_kind,
270	bool);	271	bool);
271	static const source_location get_arg_token_location (const macro_arg ,	272	static const location_t get_arg_token_location (const macro_arg ,
272	enum macro_arg_token_kind);	273	enum macro_arg_token_kind);
273	static const cpp_token *arg_token_ptr_at (const macro_arg ,	274	static const cpp_token *arg_token_ptr_at (const macro_arg ,
274	size_t,	275	size_t,
275	enum macro_arg_token_kind,	276	enum macro_arg_token_kind,
276	source_location **virt_location);	277	location_t **virt_location);
277		278
278	static void macro_arg_token_iter_init (macro_arg_token_iter *, bool,	279	static void macro_arg_token_iter_init (macro_arg_token_iter *, bool,
279	enum macro_arg_token_kind,	280	enum macro_arg_token_kind,
@@ -281,49 +282,48 @@ static void macro_arg_token_iter_init (macro_arg_token_iter *, bool, · 1 unmodified line
281	const cpp_token **);	282	const cpp_token **);
282	static const cpp_token *macro_arg_token_iter_get_token	283	static const cpp_token *macro_arg_token_iter_get_token
283	(const macro_arg_token_iter *it);	284	(const macro_arg_token_iter *it);
284	static source_location macro_arg_token_iter_get_location	285	static location_t macro_arg_token_iter_get_location
285	(const macro_arg_token_iter *);	286	(const macro_arg_token_iter *);
286	static void macro_arg_token_iter_forward (macro_arg_token_iter *);	287	static void macro_arg_token_iter_forward (macro_arg_token_iter *);
287	static _cpp_buff tokens_buff_new (cpp_reader , size_t,	288	static _cpp_buff tokens_buff_new (cpp_reader , size_t,
288	source_location **);	289	location_t **);
289	static size_t tokens_buff_count (_cpp_buff *);	290	static size_t tokens_buff_count (_cpp_buff *);
290	static const cpp_token *tokens_buff_last_token_ptr (_cpp_buff );	291	static const cpp_token *tokens_buff_last_token_ptr (_cpp_buff );
291	static inline const cpp_token tokens_buff_put_token_to (const cpp_token ,	292	static inline const cpp_token tokens_buff_put_token_to (const cpp_token ,
292	source_location *,	293	location_t *,
293	const cpp_token *,	294	const cpp_token *,
294	source_location,	295	location_t,
295	source_location,	296	location_t,
296	const line_map_macro *,	297	const line_map_macro *,
297	unsigned int);	298	unsigned int);
298		299
299	static const cpp_token *tokens_buff_add_token (_cpp_buff ,	300	static const cpp_token *tokens_buff_add_token (_cpp_buff ,
300	source_location *,	301	location_t *,
301	const cpp_token *,	302	const cpp_token *,
302	source_location,	303	location_t,
303	source_location,	304	location_t,
304	const line_map_macro *,	305	const line_map_macro *,
305	unsigned int);	306	unsigned int);
306	static inline void tokens_buff_remove_last_token (_cpp_buff *);	307	static inline void tokens_buff_remove_last_token (_cpp_buff *);
307	static void replace_args (cpp_reader , cpp_hashnode , cpp_macro *,	308	static void replace_args (cpp_reader , cpp_hashnode , cpp_macro *,
308	macro_arg *, source_location);	309	macro_arg *, location_t);
309	static _cpp_buff funlike_invocation_p (cpp_reader , cpp_hashnode *,	310	static _cpp_buff funlike_invocation_p (cpp_reader , cpp_hashnode *,
310	_cpp_buff *, unsigned );	311	_cpp_buff *, unsigned );
311	static bool create_iso_definition (cpp_reader , cpp_macro );	312	static cpp_macro create_iso_definition (cpp_reader );
312		313
313	/* #define directive parsing and handling. */	314	/* #define directive parsing and handling. */
314		315
315	static cpp_token alloc_expansion_token (cpp_reader , cpp_macro *);	316	static cpp_macro lex_expansion_token (cpp_reader , cpp_macro *);
316	static cpp_token lex_expansion_token (cpp_reader , cpp_macro *);
317	static bool warn_of_redefinition (cpp_reader , cpp_hashnode ,	317	static bool warn_of_redefinition (cpp_reader , cpp_hashnode ,
318	const cpp_macro *);	318	const cpp_macro *);
319	static bool parse_params (cpp_reader , cpp_macro );	319	static bool parse_params (cpp_reader , unsigned , bool *);
320	static void check_trad_stringification (cpp_reader , const cpp_macro ,	320	static void check_trad_stringification (cpp_reader , const cpp_macro ,
321	const cpp_string *);	321	const cpp_string *);
322	static bool reached_end_of_context (cpp_context *);	322	static bool reached_end_of_context (cpp_context *);
323	static void consume_next_token_from_context (cpp_reader *pfile,	323	static void consume_next_token_from_context (cpp_reader *pfile,
324	const cpp_token **,	324	const cpp_token **,
325	source_location *);	325	location_t *);
326	static const cpp_token* cpp_get_token_1 (cpp_reader , source_location );	326	static const cpp_token* cpp_get_token_1 (cpp_reader , location_t );
327		327
328	static cpp_hashnode* macro_of_context (cpp_context *context);	328	static cpp_hashnode* macro_of_context (cpp_context *context);
329		329
@@ -342,7 +342,7 @@ int · 12 unmodified lines
342	_cpp_warn_if_unused_macro (cpp_reader pfile, cpp_hashnode node,	342	_cpp_warn_if_unused_macro (cpp_reader pfile, cpp_hashnode node,
343	void *v ATTRIBUTE_UNUSED)	343	void *v ATTRIBUTE_UNUSED)
344	{	344	{
345	if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN))	345	if (cpp_user_macro_p (node))
346	{	346	{
347	cpp_macro *macro = node->value.macro;	347	cpp_macro *macro = node->value.macro;
348		348
@@ -382,7 +382,7 @@ static const char * const monthnames[] = · 33 unmodified lines
382	a builtin macro. */	382	a builtin macro. */
383	const uchar *	383	const uchar *
384	_cpp_builtin_macro_text (cpp_reader pfile, cpp_hashnode node,	384	_cpp_builtin_macro_text (cpp_reader pfile, cpp_hashnode node,
385	source_location loc)	385	location_t loc)
386	{	386	{
387	const uchar *result = NULL;	387	const uchar *result = NULL;
388	linenum_type number = 1;	388	linenum_type number = 1;
@@ -587,7 +587,7 @@ _cpp_builtin_macro_text (cpp_reader pfile, cpp_hashnode node, · 198 unmodified lines
587	point of the macro. */	587	point of the macro. */
588	static int	588	static int
589	builtin_macro (cpp_reader pfile, cpp_hashnode node,	589	builtin_macro (cpp_reader pfile, cpp_hashnode node,
590	source_location loc, source_location expand_loc)	590	location_t loc, location_t expand_loc)
591	{	591	{
592	const uchar *buf;	592	const uchar *buf;
593	size_t len;	593	size_t len;
@@ -623,7 +623,7 @@ builtin_macro (cpp_reader pfile, cpp_hashnode node, · 29 unmodified lines
623	Create a macro line map and generate a virtual location for	623	Create a macro line map and generate a virtual location for
624	the token resulting from the expansion of the built-in	624	the token resulting from the expansion of the built-in
625	macro. */	625	macro. */
626	source_location *virt_locs = NULL;	626	location_t *virt_locs = NULL;
627	_cpp_buff *token_buf = tokens_buff_new (pfile, 1, &virt_locs);	627	_cpp_buff *token_buf = tokens_buff_new (pfile, 1, &virt_locs);
628	const line_map_macro * map =	628	const line_map_macro * map =
629	linemap_enter_macro (pfile->line_table, node, loc, 1);	629	linemap_enter_macro (pfile->line_table, node, loc, 1);
@@ -773,7 +773,7 @@ stringify_arg (cpp_reader pfile, macro_arg arg) · 143 unmodified lines
773	guaranteed to not have the PASTE_LEFT flag set. LOCATION is	773	guaranteed to not have the PASTE_LEFT flag set. LOCATION is
774	the virtual location used for error reporting. */	774	the virtual location used for error reporting. */
775	static bool	775	static bool
776	paste_tokens (cpp_reader *pfile, source_location location,	776	paste_tokens (cpp_reader *pfile, location_t location,
777	const cpp_token *plhs, const cpp_token rhs)	777	const cpp_token *plhs, const cpp_token rhs)
778	{	778	{
779	unsigned char buf, end, *lhsend;	779	unsigned char buf, end, *lhsend;
@@ -803,7 +803,7 @@ paste_tokens (cpp_reader *pfile, source_location location, · 23 unmodified lines
803	lhs = _cpp_lex_direct (pfile);	803	lhs = _cpp_lex_direct (pfile);
804	if (pfile->buffer->cur != pfile->buffer->rlimit)	804	if (pfile->buffer->cur != pfile->buffer->rlimit)
805	{	805	{
806	source_location saved_loc = lhs->src_loc;	806	location_t saved_loc = lhs->src_loc;
807		807
808	_cpp_pop_buffer (pfile);	808	_cpp_pop_buffer (pfile);
809	_cpp_backup_tokens (pfile, 1);	809	_cpp_backup_tokens (pfile, 1);
@@ -841,7 +841,7 @@ paste_all_tokens (cpp_reader pfile, const cpp_token lhs) · 31 unmodified lines
841	{	841	{
842	const cpp_token *rhs = NULL;	842	const cpp_token *rhs = NULL;
843	cpp_context *context = pfile->context;	843	cpp_context *context = pfile->context;
844	source_location virt_loc = 0;	844	location_t virt_loc = 0;
845		845
846	/* We are expanding a macro and we must have been called on a token	846	/* We are expanding a macro and we must have been called on a token
847	that appears at the left hand side of a ## operator. */	847	that appears at the left hand side of a ## operator. */
@@ -903,7 +903,7 @@ paste_all_tokens (cpp_reader pfile, const cpp_token lhs) · 55 unmodified lines
903	/* Put the resulting token in its own context. */	903	/* Put the resulting token in its own context. */
904	if (context->tokens_kind == TOKENS_KIND_EXTENDED)	904	if (context->tokens_kind == TOKENS_KIND_EXTENDED)
905	{	905	{
906	source_location *virt_locs = NULL;	906	location_t *virt_locs = NULL;
907	_cpp_buff *token_buf = tokens_buff_new (pfile, 1, &virt_locs);	907	_cpp_buff *token_buf = tokens_buff_new (pfile, 1, &virt_locs);
908	tokens_buff_add_token (token_buf, virt_locs, lhs,	908	tokens_buff_add_token (token_buf, virt_locs, lhs,
909	virt_loc, 0, NULL, 0);	909	virt_loc, 0, NULL, 0);
@@ -964,6 +964,10 @@ _cpp_arguments_ok (cpp_reader pfile, cpp_macro macro, const cpp_hashnode *node · 54 unmodified lines
964	"macro \"%s\" passed %u arguments, but takes just %u",	964	"macro \"%s\" passed %u arguments, but takes just %u",
965	NODE_NAME (node), argc, macro->paramc);	965	NODE_NAME (node), argc, macro->paramc);
966		966
		967	if (macro->line > RESERVED_LOCATION_COUNT)
		968	cpp_error_at (pfile, CPP_DL_NOTE, macro->line, "macro \"%s\" defined here",
		969	NODE_NAME (node));
		970
967	return false;	971	return false;
968	}	972	}
969		973
@@ -989,7 +993,7 @@ collect_args (cpp_reader pfile, const cpp_hashnode node, · 19 unmodified lines
989	macro_arg args, arg;	993	macro_arg args, arg;
990	const cpp_token *token;	994	const cpp_token *token;
991	unsigned int argc;	995	unsigned int argc;
992	source_location virt_loc;	996	location_t virt_loc;
993	bool track_macro_expansion_p = CPP_OPTION (pfile, track_macro_expansion);	997	bool track_macro_expansion_p = CPP_OPTION (pfile, track_macro_expansion);
994	unsigned num_args_alloced = 0;	998	unsigned num_args_alloced = 0;
995		999
@@ -1026,7 +1030,7 @@ collect_args (cpp_reader pfile, const cpp_hashnode node, · 30 unmodified lines
1026	if (track_macro_expansion_p)	1030	if (track_macro_expansion_p)
1027	{	1031	{
1028	virt_locs_capacity = DEFAULT_NUM_TOKENS_PER_MACRO_ARG;	1032	virt_locs_capacity = DEFAULT_NUM_TOKENS_PER_MACRO_ARG;
1029	arg->virt_locs = XNEWVEC (source_location,	1033	arg->virt_locs = XNEWVEC (location_t,
1030	virt_locs_capacity);	1034	virt_locs_capacity);
1031	}	1035	}
1032		1036
@@ -1044,7 +1048,7 @@ collect_args (cpp_reader pfile, const cpp_hashnode node, · 11 unmodified lines
1044	&& (ntokens + 2 > virt_locs_capacity))	1048	&& (ntokens + 2 > virt_locs_capacity))
1045	{	1049	{
1046	virt_locs_capacity += ARG_TOKENS_EXTENT;	1050	virt_locs_capacity += ARG_TOKENS_EXTENT;
1047	arg->virt_locs = XRESIZEVEC (source_location,	1051	arg->virt_locs = XRESIZEVEC (location_t,
1048	arg->virt_locs,	1052	arg->virt_locs,
1049	virt_locs_capacity);	1053	virt_locs_capacity);
1050	}	1054	}
@@ -1235,13 +1239,14 @@ funlike_invocation_p (cpp_reader pfile, cpp_hashnode node, · 184 unmodified lines
1235	static inline unsigned int	1239	static inline unsigned int
1236	macro_real_token_count (const cpp_macro *macro)	1240	macro_real_token_count (const cpp_macro *macro)
1237	{	1241	{
1238	unsigned int i;
1239	if (__builtin_expect (!macro->extra_tokens, true))	1242	if (__builtin_expect (!macro->extra_tokens, true))
1240	return macro->count;	1243	return macro->count;
1241	for (i = 0; i < macro->count; i++)	1244
1242	if (macro->exp.tokens[i].type == CPP_PASTE)	1245	for (unsigned i = macro->count; i--;)
1243	return i;	1246	if (macro->exp.tokens[i].type != CPP_PASTE)
1244	abort ();	1247	return i + 1;
		1248
		1249	return 0;
1245	}	1250	}
1246		1251
1247	/* Push the context of a macro with hash entry NODE onto the context	1252	/* Push the context of a macro with hash entry NODE onto the context
@@ -1255,7 +1260,7 @@ macro_real_token_count (const cpp_macro *macro) · 7 unmodified lines
1255	macro. */	1260	macro. */
1256	static int	1261	static int
1257	enter_macro_context (cpp_reader pfile, cpp_hashnode node,	1262	enter_macro_context (cpp_reader pfile, cpp_hashnode node,
1258	const cpp_token *result, source_location location)	1263	const cpp_token *result, location_t location)
1259	{	1264	{
1260	/* The presence of a macro invalidates a file's controlling macro. */	1265	/* The presence of a macro invalidates a file's controlling macro. */
1261	pfile->mi_valid = false;	1266	pfile->mi_valid = false;
@@ -1273,17 +1278,7 @@ enter_macro_context (cpp_reader pfile, cpp_hashnode node, · 11 unmodified lines
1273	function where set this flag to FALSE. */	1278	function where set this flag to FALSE. */
1274	pfile->about_to_expand_macro_p = true;	1279	pfile->about_to_expand_macro_p = true;
1275		1280
1276	if ((node->flags & NODE_BUILTIN) && !(node->flags & NODE_USED))	1281	if (cpp_user_macro_p (node))
1277	{
1278	node->flags \|= NODE_USED;
1279	if ((!pfile->cb.user_builtin_macro
1280	\|\| !pfile->cb.user_builtin_macro (pfile, node))
1281	&& pfile->cb.used_define)
1282	pfile->cb.used_define (pfile, pfile->directive_line, node);
1283	}
1284
1285	/* Handle standard macros. */
1286	if (! (node->flags & NODE_BUILTIN))
1287	{	1282	{
1288	cpp_macro *macro = node->value.macro;	1283	cpp_macro *macro = node->value.macro;
1289	_cpp_buff *pragma_buff = NULL;	1284	_cpp_buff *pragma_buff = NULL;
@@ -1329,13 +1324,9 @@ enter_macro_context (cpp_reader pfile, cpp_hashnode node, · 39 unmodified lines
1329	/* Disable the macro within its expansion. */	1324	/* Disable the macro within its expansion. */
1330	node->flags \|= NODE_DISABLED;	1325	node->flags \|= NODE_DISABLED;
1331		1326
1332	if (!(node->flags & NODE_USED))	1327	/* Laziness can only affect the expansion tokens of the macro,
1333	{	1328	not its fun-likeness or parameters. */
1334	node->flags \|= NODE_USED;	1329	_cpp_maybe_notify_macro_use (pfile, node);
1335	if (pfile->cb.used_define)
1336	pfile->cb.used_define (pfile, pfile->directive_line, node);
1337	}
1338
1339	if (pfile->cb.used)	1330	if (pfile->cb.used)
1340	pfile->cb.used (pfile, location, node);	1331	pfile->cb.used (pfile, location, node);
1341		1332
@@ -1349,7 +1340,7 @@ enter_macro_context (cpp_reader pfile, cpp_hashnode node, · 7 unmodified lines
1349	unsigned int i;	1340	unsigned int i;
1350	const cpp_token *src = macro->exp.tokens;	1341	const cpp_token *src = macro->exp.tokens;
1351	const line_map_macro *map;	1342	const line_map_macro *map;
1352	source_location *virt_locs = NULL;	1343	location_t *virt_locs = NULL;
1353	_cpp_buff *macro_tokens	1344	_cpp_buff *macro_tokens
1354	= tokens_buff_new (pfile, tokens_count, &virt_locs);	1345	= tokens_buff_new (pfile, tokens_count, &virt_locs);
1355		1346
@@ -1410,29 +1401,23 @@ enter_macro_context (cpp_reader pfile, cpp_hashnode node, · 54 unmodified lines
1410	pfile->about_to_expand_macro_p = false;	1401	pfile->about_to_expand_macro_p = false;
1411	/* Handle built-in macros and the _Pragma operator. */	1402	/* Handle built-in macros and the _Pragma operator. */
1412	{	1403	{
1413	source_location loc, expand_loc;	1404	location_t expand_loc;
1414		1405
1415	if (/* The top-level macro invocation that triggered the expansion	1406	if (/* The top-level macro invocation that triggered the expansion
1416	we are looking at is with a standard macro ...*/	1407	we are looking at is with a function-like user macro ... */
1417	!(pfile->top_most_macro_node->flags & NODE_BUILTIN)	1408	cpp_fun_like_macro_p (pfile->top_most_macro_node)
1418	/* ... and it's a function-like macro invocation. */	1409	/* ... and we are tracking the macro expansion. */
1419	&& pfile->top_most_macro_node->value.macro->fun_like)	1410	&& CPP_OPTION (pfile, track_macro_expansion))
1420	{	1411	/* Then the location of the end of the macro invocation is the
1421	/* Then the location of the end of the macro invocation is the	1412	location of the expansion point of this macro. */
1422	location of the closing parenthesis. */	1413	expand_loc = location;
1423	loc = pfile->cur_token[-1].src_loc;
1424	expand_loc = loc;
1425	}
1426	else	1414	else
1427	{	1415	/* Otherwise, the location of the end of the macro invocation is
1428	/* Otherwise, the location of the end of the macro invocation is	1416	the location of the expansion point of that top-level macro
1429	the location of the expansion point of that top-level macro	1417	invocation. */
1430	invocation. */	1418	expand_loc = pfile->invocation_location;
1431	loc = location;
1432	expand_loc = pfile->invocation_location;
1433	}
1434		1419
1435	return builtin_macro (pfile, node, loc, expand_loc);	1420	return builtin_macro (pfile, node, location, expand_loc);
1436	}	1421	}
1437	}	1422	}
1438		1423
@@ -1482,12 +1467,12 @@ delete_macro_args (_cpp_buff *buff, unsigned num_args) · 43 unmodified lines
1482	tokens, at least. */	1467	tokens, at least. */
1483	static void	1468	static void
1484	set_arg_token (macro_arg arg, const cpp_token token,	1469	set_arg_token (macro_arg arg, const cpp_token token,
1485	source_location location, size_t index,	1470	location_t location, size_t index,
1486	enum macro_arg_token_kind kind,	1471	enum macro_arg_token_kind kind,
1487	bool track_macro_exp_p)	1472	bool track_macro_exp_p)
1488	{	1473	{
1489	const cpp_token **token_ptr;	1474	const cpp_token **token_ptr;
1490	source_location *loc = NULL;	1475	location_t *loc = NULL;
1491		1476
1492	token_ptr =	1477	token_ptr =
1493	arg_token_ptr_at (arg, index, kind,	1478	arg_token_ptr_at (arg, index, kind,
@@ -1508,13 +1493,13 @@ set_arg_token (macro_arg arg, const cpp_token token, · 14 unmodified lines
1508	/* Get the pointer to the location of the argument token of the	1493	/* Get the pointer to the location of the argument token of the
1509	function-like macro argument ARG. This function must be called	1494	function-like macro argument ARG. This function must be called
1510	only when we -ftrack-macro-expansion is on. */	1495	only when we -ftrack-macro-expansion is on. */
1511	static const source_location *	1496	static const location_t *
1512	get_arg_token_location (const macro_arg *arg,	1497	get_arg_token_location (const macro_arg *arg,
1513	enum macro_arg_token_kind kind)	1498	enum macro_arg_token_kind kind)
1514	{	1499	{
1515	const source_location *loc = NULL;	1500	const location_t *loc = NULL;
1516	const cpp_token **token_ptr =	1501	const cpp_token **token_ptr =
1517	arg_token_ptr_at (arg, 0, kind, (source_location **) &loc);	1502	arg_token_ptr_at (arg, 0, kind, (location_t **) &loc);
1518		1503
1519	if (token_ptr == NULL)	1504	if (token_ptr == NULL)
1520	return NULL;	1505	return NULL;
@@ -1531,7 +1516,7 @@ get_arg_token_location (const macro_arg *arg, · 10 unmodified lines
1531	static const cpp_token **	1516	static const cpp_token **
1532	arg_token_ptr_at (const macro_arg *arg, size_t index,	1517	arg_token_ptr_at (const macro_arg *arg, size_t index,
1533	enum macro_arg_token_kind kind,	1518	enum macro_arg_token_kind kind,
1534	source_location **virt_location)	1519	location_t **virt_location)
1535	{	1520	{
1536	const cpp_token **tokens_ptr = NULL;	1521	const cpp_token **tokens_ptr = NULL;
1537		1522
@@ -1561,7 +1546,7 @@ arg_token_ptr_at (const macro_arg *arg, size_t index, · 23 unmodified lines
1561	*virt_location = &arg->expanded_virt_locs[index];	1546	*virt_location = &arg->expanded_virt_locs[index];
1562	else if (kind == MACRO_ARG_TOKEN_STRINGIFIED)	1547	else if (kind == MACRO_ARG_TOKEN_STRINGIFIED)
1563	*virt_location =	1548	*virt_location =
1564	(source_location *) &tokens_ptr[index]->src_loc;	1549	(location_t *) &tokens_ptr[index]->src_loc;
1565	}	1550	}
1566	return &tokens_ptr[index];	1551	return &tokens_ptr[index];
1567	}	1552	}
@@ -1638,7 +1623,7 @@ macro_arg_token_iter_get_token (const macro_arg_token_iter *it) · 70 unmodified lines
1638	}	1623	}
1639		1624
1640	/* Return the location of the token pointed to by the iterator.*/	1625	/* Return the location of the token pointed to by the iterator.*/
1641	static source_location	1626	static location_t
1642	macro_arg_token_iter_get_location (const macro_arg_token_iter *it)	1627	macro_arg_token_iter_get_location (const macro_arg_token_iter *it)
1643	{	1628	{
1644	#if CHECKING_P	1629	#if CHECKING_P
@@ -1735,14 +1720,14 @@ last_token_is (_cpp_buff buff, const cpp_token *ptr) · 90 unmodified lines
1735	function-like macro invocation. */	1720	function-like macro invocation. */
1736	static void	1721	static void
1737	replace_args (cpp_reader pfile, cpp_hashnode node, cpp_macro *macro,	1722	replace_args (cpp_reader pfile, cpp_hashnode node, cpp_macro *macro,
1738	macro_arg *args, source_location expansion_point_loc)	1723	macro_arg *args, location_t expansion_point_loc)
1739	{	1724	{
1740	unsigned int i, total;	1725	unsigned int i, total;
1741	const cpp_token src, limit;	1726	const cpp_token src, limit;
1742	const cpp_token **first = NULL;	1727	const cpp_token **first = NULL;
1743	macro_arg *arg;	1728	macro_arg *arg;
1744	_cpp_buff *buff = NULL;	1729	_cpp_buff *buff = NULL;
1745	source_location *virt_locs = NULL;	1730	location_t *virt_locs = NULL;
1746	unsigned int exp_count;	1731	unsigned int exp_count;
1747	const line_map_macro *map = NULL;	1732	const line_map_macro *map = NULL;
1748	int track_macro_exp;	1733	int track_macro_exp;
@@ -1780,7 +1765,7 @@ replace_args (cpp_reader pfile, cpp_hashnode node, cpp_macro *macro, · 31 unmodified lines
1780	arg->stringified = stringify_arg (pfile, arg);	1765	arg->stringified = stringify_arg (pfile, arg);
1781	}	1766	}
1782	else if ((src->flags & PASTE_LEFT)	1767	else if ((src->flags & PASTE_LEFT)
1783	\|\| (src > macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))	1768	\|\| (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
1784	total += arg->count - 1;	1769	total += arg->count - 1;
1785	else	1770	else
1786	{	1771	{
@@ -1812,7 +1797,7 @@ replace_args (cpp_reader pfile, cpp_hashnode node, cpp_macro *macro, · 25 unmodified lines
1812		1797
1813	As far as tokens are concerned, the memory overhead of	1798	As far as tokens are concerned, the memory overhead of
1814	-ftrack-macro-expansion is proportional to the number of	1799	-ftrack-macro-expansion is proportional to the number of
1815	macros that get expanded multiplied by sizeof (source_location).	1800	macros that get expanded multiplied by sizeof (location_t).
1816	The good news is that extra memory gets freed when the macro	1801	The good news is that extra memory gets freed when the macro
1817	context is freed, i.e shortly after the macro got expanded. */	1802	context is freed, i.e shortly after the macro got expanded. */
1818		1803
@@ -2231,7 +2216,7 @@ static void · 412 unmodified lines
2231	push_extended_tokens_context (cpp_reader *pfile,	2216	push_extended_tokens_context (cpp_reader *pfile,
2232	cpp_hashnode *macro,	2217	cpp_hashnode *macro,
2233	_cpp_buff *token_buff,	2218	_cpp_buff *token_buff,
2234	source_location *virt_locs,	2219	location_t *virt_locs,
2235	const cpp_token **first,	2220	const cpp_token **first,
2236	unsigned int count)	2221	unsigned int count)
2237	{	2222	{
@@ -2277,13 +2262,13 @@ _cpp_push_text_context (cpp_reader pfile, cpp_hashnode macro, · 39 unmodified lines
2277	expansion. */	2262	expansion. */
2278	static _cpp_buff*	2263	static _cpp_buff*
2279	tokens_buff_new (cpp_reader *pfile, size_t len,	2264	tokens_buff_new (cpp_reader *pfile, size_t len,
2280	source_location **virt_locs)	2265	location_t **virt_locs)
2281	{	2266	{
2282	size_t tokens_size = len * sizeof (cpp_token *);	2267	size_t tokens_size = len * sizeof (cpp_token *);
2283	size_t locs_size = len * sizeof (source_location);	2268	size_t locs_size = len * sizeof (location_t);
2284		2269
2285	if (virt_locs != NULL)	2270	if (virt_locs != NULL)
2286	*virt_locs = XNEWVEC (source_location, locs_size);	2271	*virt_locs = XNEWVEC (location_t, locs_size);
2287	return _cpp_get_buff (pfile, tokens_size);	2272	return _cpp_get_buff (pfile, tokens_size);
2288	}	2273	}
2289		2274
@@ -2340,14 +2325,14 @@ tokens_buff_remove_last_token (_cpp_buff *tokens_buff) · 50 unmodified lines
2340	point. */	2325	point. */
2341	static inline const cpp_token **	2326	static inline const cpp_token **
2342	tokens_buff_put_token_to (const cpp_token **dest,	2327	tokens_buff_put_token_to (const cpp_token **dest,
2343	source_location *virt_loc_dest,	2328	location_t *virt_loc_dest,
2344	const cpp_token *token,	2329	const cpp_token *token,
2345	source_location virt_loc,	2330	location_t virt_loc,
2346	source_location parm_def_loc,	2331	location_t parm_def_loc,
2347	const line_map_macro *map,	2332	const line_map_macro *map,
2348	unsigned int macro_token_index)	2333	unsigned int macro_token_index)
2349	{	2334	{
2350	source_location macro_loc = virt_loc;	2335	location_t macro_loc = virt_loc;
2351	const cpp_token **result;	2336	const cpp_token **result;
2352		2337
2353	if (virt_loc_dest)	2338	if (virt_loc_dest)
@@ -2385,15 +2370,15 @@ tokens_buff_put_token_to (const cpp_token **dest, · 31 unmodified lines
2385	position of the token coming right after the insertion point. */	2370	position of the token coming right after the insertion point. */
2386	static const cpp_token **	2371	static const cpp_token **
2387	tokens_buff_add_token (_cpp_buff *buffer,	2372	tokens_buff_add_token (_cpp_buff *buffer,
2388	source_location *virt_locs,	2373	location_t *virt_locs,
2389	const cpp_token *token,	2374	const cpp_token *token,
2390	source_location virt_loc,	2375	location_t virt_loc,
2391	source_location parm_def_loc,	2376	location_t parm_def_loc,
2392	const line_map_macro *map,	2377	const line_map_macro *map,
2393	unsigned int macro_token_index)	2378	unsigned int macro_token_index)
2394	{	2379	{
2395	const cpp_token **result;	2380	const cpp_token **result;
2396	source_location *virt_loc_dest = NULL;	2381	location_t *virt_loc_dest = NULL;
2397	unsigned token_index =	2382	unsigned token_index =
2398	(BUFF_FRONT (buffer) - buffer->base) / sizeof (cpp_token *);	2383	(BUFF_FRONT (buffer) - buffer->base) / sizeof (cpp_token *);
2399		2384
@@ -2425,7 +2410,7 @@ alloc_expanded_arg_mem (cpp_reader pfile, macro_arg arg, size_t capacity) · 25 unmodified lines
2425		2410
2426	arg->expanded = XNEWVEC (const cpp_token *, capacity);	2411	arg->expanded = XNEWVEC (const cpp_token *, capacity);
2427	if (CPP_OPTION (pfile, track_macro_expansion))	2412	if (CPP_OPTION (pfile, track_macro_expansion))
2428	arg->expanded_virt_locs = XNEWVEC (source_location, capacity);	2413	arg->expanded_virt_locs = XNEWVEC (location_t, capacity);
2429		2414
2430	}	2415	}
2431		2416
@@ -2447,9 +2432,9 @@ ensure_expanded_arg_room (cpp_reader pfile, macro_arg arg, · 15 unmodified lines
2447	if (CPP_OPTION (pfile, track_macro_expansion))	2432	if (CPP_OPTION (pfile, track_macro_expansion))
2448	{	2433	{
2449	if (arg->expanded_virt_locs == NULL)	2434	if (arg->expanded_virt_locs == NULL)
2450	arg->expanded_virt_locs = XNEWVEC (source_location, size);	2435	arg->expanded_virt_locs = XNEWVEC (location_t, size);
2451	else	2436	else
2452	arg->expanded_virt_locs = XRESIZEVEC (source_location,	2437	arg->expanded_virt_locs = XRESIZEVEC (location_t,
2453	arg->expanded_virt_locs,	2438	arg->expanded_virt_locs,
2454	size);	2439	size);
2455	}	2440	}
@@ -2492,7 +2477,7 @@ expand_arg (cpp_reader pfile, macro_arg arg) · 36 unmodified lines
2492	for (;;)	2477	for (;;)
2493	{	2478	{
2494	const cpp_token *token;	2479	const cpp_token *token;
2495	source_location location;	2480	location_t location;
2496		2481
2497	ensure_expanded_arg_room (pfile, arg, arg->expanded_count + 1,	2482	ensure_expanded_arg_room (pfile, arg, arg->expanded_count + 1,
2498	&capacity);	2483	&capacity);
@@ -2631,7 +2616,7 @@ reached_end_of_context (cpp_context *context) · 132 unmodified lines
2631	static inline void	2616	static inline void
2632	consume_next_token_from_context (cpp_reader *pfile,	2617	consume_next_token_from_context (cpp_reader *pfile,
2633	const cpp_token ** token,	2618	const cpp_token ** token,
2634	source_location *location)	2619	location_t *location)
2635	{	2620	{
2636	cpp_context *c = pfile->context;	2621	cpp_context *c = pfile->context;
2637		2622
@@ -2670,8 +2655,8 @@ consume_next_token_from_context (cpp_reader *pfile, · 32 unmodified lines
2670	location if we are in the traditional mode, and just returns	2655	location if we are in the traditional mode, and just returns
2671	LOCATION otherwise. */	2656	LOCATION otherwise. */
2672		2657
2673	static inline source_location	2658	static inline location_t
2674	maybe_adjust_loc_for_trad_cpp (cpp_reader *pfile, source_location location)	2659	maybe_adjust_loc_for_trad_cpp (cpp_reader *pfile, location_t location)
2675	{	2660	{
2676	if (CPP_OPTION (pfile, traditional))	2661	if (CPP_OPTION (pfile, traditional))
2677	{	2662	{
@@ -2696,12 +2681,12 @@ maybe_adjust_loc_for_trad_cpp (cpp_reader *pfile, source_location location) · 18 unmodified lines
2696	cpp_get_token_with_location to learn more about the meaning of this	2681	cpp_get_token_with_location to learn more about the meaning of this
2697	location. */	2682	location. */
2698	static const cpp_token*	2683	static const cpp_token*
2699	cpp_get_token_1 (cpp_reader pfile, source_location location)	2684	cpp_get_token_1 (cpp_reader pfile, location_t location)
2700	{	2685	{
2701	const cpp_token *result;	2686	const cpp_token *result;
2702	/* This token is a virtual token that either encodes a location	2687	/* This token is a virtual token that either encodes a location
2703	related to macro expansion or a spelling location. */	2688	related to macro expansion or a spelling location. */
2704	source_location virt_loc = 0;	2689	location_t virt_loc = 0;
2705	/* pfile->about_to_expand_macro_p can be overriden by indirect calls	2690	/* pfile->about_to_expand_macro_p can be overriden by indirect calls
2706	to functions that push macro contexts. So let's save it so that	2691	to functions that push macro contexts. So let's save it so that
2707	we can restore it when we are about to leave this routine. */	2692	we can restore it when we are about to leave this routine. */
@@ -2750,7 +2735,7 @@ cpp_get_token_1 (cpp_reader pfile, source_location location) · 42 unmodified lines
2750		2735
2751	node = result->val.node.node;	2736	node = result->val.node.node;
2752		2737
2753	if (node->type != NT_MACRO \|\| (result->flags & NO_EXPAND))	2738	if (node->type == NT_VOID \|\| (result->flags & NO_EXPAND))
2754	break;	2739	break;
2755		2740
2756	if (!(node->flags & NODE_DISABLED))	2741	if (!(node->flags & NODE_DISABLED))
@@ -2899,7 +2884,7 @@ cpp_get_token (cpp_reader *pfile) · 142 unmodified lines
2899	location is just the same thing as its spelling location. */	2884	location is just the same thing as its spelling location. */
2900		2885
2901	const cpp_token *	2886	const cpp_token *
2902	cpp_get_token_with_location (cpp_reader pfile, source_location loc)	2887	cpp_get_token_with_location (cpp_reader pfile, location_t loc)
2903	{	2888	{
2904	return cpp_get_token_1 (pfile, loc);	2889	return cpp_get_token_1 (pfile, loc);
2905	}	2890	}
@@ -2995,23 +2980,18 @@ _cpp_backup_tokens (cpp_reader *pfile, unsigned int count) · 89 unmodified lines
2995		2980
2996	/* #define directive parsing and handling. */	2981	/* #define directive parsing and handling. */
2997		2982
2998	/* Returns nonzero if a macro redefinition warning is required. */	2983	/* Returns true if a macro redefinition warning is required. */
2999	static bool	2984	static bool
3000	warn_of_redefinition (cpp_reader pfile, cpp_hashnode node,	2985	warn_of_redefinition (cpp_reader pfile, cpp_hashnode node,
3001	const cpp_macro *macro2)	2986	const cpp_macro *macro2)
3002	{	2987	{
3003	const cpp_macro *macro1;
3004	unsigned int i;
3005
3006	/* Some redefinitions need to be warned about regardless. */	2988	/* Some redefinitions need to be warned about regardless. */
3007	if (node->flags & NODE_WARN)	2989	if (node->flags & NODE_WARN)
3008	return true;	2990	return true;
3009		2991
3010	/* Suppress warnings for builtins that lack the NODE_WARN flag,	2992	/* Suppress warnings for builtins that lack the NODE_WARN flag,
3011	unless Wbuiltin-macro-redefined. */	2993	unless Wbuiltin-macro-redefined. */
3012	if (node->flags & NODE_BUILTIN	2994	if (cpp_builtin_macro_p (node))
3013	&& (!pfile->cb.user_builtin_macro
3014	\|\| !pfile->cb.user_builtin_macro (pfile, node)))
3015	return CPP_OPTION (pfile, warn_builtin_macro_redefined);	2995	return CPP_OPTION (pfile, warn_builtin_macro_redefined);
3016		2996
3017	/* Redefinitions of conditional (context-sensitive) macros, on	2997	/* Redefinitions of conditional (context-sensitive) macros, on
@@ -3019,9 +2999,17 @@ warn_of_redefinition (cpp_reader pfile, cpp_hashnode node, · 1 unmodified line
3019	if (node->flags & NODE_CONDITIONAL)	2999	if (node->flags & NODE_CONDITIONAL)
3020	return false;	3000	return false;
3021		3001
		3002	cpp_macro *macro1 = node->value.macro;
		3003	if (macro1->lazy)
		3004	{
		3005	/* We don't want to mark MACRO as used, but do need to finalize
		3006	its laziness. */
		3007	pfile->cb.user_lazy_macro (pfile, macro1, macro1->lazy - 1);
		3008	macro1->lazy = 0;
		3009	}
		3010
3022	/* Redefinition of a macro is allowed if and only if the old and new	3011	/* Redefinition of a macro is allowed if and only if the old and new
3023	definitions are the same. (6.10.3 paragraph 2). */	3012	definitions are the same. (6.10.3 paragraph 2). */
3024	macro1 = node->value.macro;
3025		3013
3026	/* Don't check count here as it can be different in valid	3014	/* Don't check count here as it can be different in valid
3027	traditional redefinitions with just whitespace differences. */	3015	traditional redefinitions with just whitespace differences. */
@@ -3031,18 +3019,18 @@ warn_of_redefinition (cpp_reader pfile, cpp_hashnode node, · 3 unmodified lines
3031	return true;	3019	return true;
3032		3020
3033	/* Check parameter spellings. */	3021	/* Check parameter spellings. */
3034	for (i = 0; i < macro1->paramc; i++)	3022	for (unsigned i = macro1->paramc; i--; )
3035	if (macro1->params[i] != macro2->params[i])	3023	if (macro1->parm.params[i] != macro2->parm.params[i])
3036	return true;	3024	return true;
3037		3025
3038	/* Check the replacement text or tokens. */	3026	/* Check the replacement text or tokens. */
3039	if (CPP_OPTION (pfile, traditional))	3027	if (macro1->kind == cmk_traditional)
3040	return _cpp_expansions_different_trad (macro1, macro2);	3028	return _cpp_expansions_different_trad (macro1, macro2);
3041		3029
3042	if (macro1->count != macro2->count)	3030	if (macro1->count != macro2->count)
3043	return true;	3031	return true;
3044		3032
3045	for (i = 0; i < macro1->count; i++)	3033	for (unsigned i= macro1->count; i--; )
3046	if (!_cpp_equiv_tokens (&macro1->exp.tokens[i], &macro2->exp.tokens[i]))	3034	if (!_cpp_equiv_tokens (&macro1->exp.tokens[i], &macro2->exp.tokens[i]))
3047	return true;	3035	return true;
3048		3036
@@ -3055,124 +3043,164 @@ _cpp_free_definition (cpp_hashnode *h) · 6 unmodified lines
3055	{	3043	{
3056	/* Macros and assertions no longer have anything to free. */	3044	/* Macros and assertions no longer have anything to free. */
3057	h->type = NT_VOID;	3045	h->type = NT_VOID;
3058	/* Clear builtin flag in case of redefinition. */	3046	h->value.answers = NULL;
3059	h->flags &= ~(NODE_BUILTIN \| NODE_DISABLED \| NODE_USED);	3047	h->flags &= ~(NODE_DISABLED \| NODE_USED);
3060	}	3048	}
3061		3049
3062	/* Save parameter NODE (spelling SPELLING) to the parameter list of	3050	/* Save parameter NODE (spelling SPELLING) to the parameter list of
3063	macro MACRO. Returns zero on success, nonzero if the parameter is	3051	macro MACRO. Returns true on success, false on failure. */
3064	a duplicate. */
3065	bool	3052	bool
3066	_cpp_save_parameter (cpp_reader pfile, cpp_macro macro, cpp_hashnode *node,	3053	_cpp_save_parameter (cpp_reader pfile, unsigned n, cpp_hashnode node,
3067	cpp_hashnode *spelling)	3054	cpp_hashnode *spelling)
3068	{	3055	{
3069	unsigned int len;
3070	/* Constraint 6.10.3.6 - duplicate parameter names. */	3056	/* Constraint 6.10.3.6 - duplicate parameter names. */
3071	if (node->flags & NODE_MACRO_ARG)	3057	if (node->type == NT_MACRO_ARG)
3072	{	3058	{
3073	cpp_error (pfile, CPP_DL_ERROR, "duplicate macro parameter \"%s\"",	3059	cpp_error (pfile, CPP_DL_ERROR, "duplicate macro parameter \"%s\"",
3074	NODE_NAME (node));	3060	NODE_NAME (node));
3075	return true;	3061	return false;
3076	}	3062	}
3077		3063
3078	if (BUFF_ROOM (pfile->a_buff)	3064	unsigned len = (n + 1) * sizeof (struct macro_arg_saved_data);
3079	< (macro->paramc + 1) * sizeof (cpp_hashnode *))
3080	_cpp_extend_buff (pfile, &pfile->a_buff, sizeof (cpp_hashnode *));
3081
3082	((cpp_hashnode **) BUFF_FRONT (pfile->a_buff))[macro->paramc++] = spelling;
3083	node->flags \|= NODE_MACRO_ARG;
3084	len = macro->paramc * sizeof (struct macro_arg_saved_data);
3085	if (len > pfile->macro_buffer_len)	3065	if (len > pfile->macro_buffer_len)
3086	{	3066	{
3087	pfile->macro_buffer = XRESIZEVEC (unsigned char, pfile->macro_buffer,	3067	pfile->macro_buffer
3088	len);	3068	= XRESIZEVEC (unsigned char, pfile->macro_buffer, len);
3089	pfile->macro_buffer_len = len;	3069	pfile->macro_buffer_len = len;
3090	}	3070	}
3091	struct macro_arg_saved_data save;
3092	save.value = node->value;
3093	save.canonical_node = node;
3094	((struct macro_arg_saved_data *) pfile->macro_buffer)[macro->paramc - 1]
3095	= save;
3096		3071
3097	node->value.arg_index = macro->paramc;	3072	macro_arg_saved_data saved = (macro_arg_saved_data )pfile->macro_buffer;
3098	return false;	3073	saved[n].canonical_node = node;
		3074	saved[n].value = node->value;
		3075	saved[n].type = node->type;
		3076
		3077	void base = _cpp_reserve_room (pfile, n sizeof (cpp_hashnode *),
		3078	sizeof (cpp_hashnode *));
		3079	((cpp_hashnode **)base)[n] = spelling;
		3080
		3081	/* Morph into a macro arg. */
		3082	node->type = NT_MACRO_ARG;
		3083	/* Index is 1 based. */
		3084	node->value.arg_index = n + 1;
		3085
		3086	return true;
3099	}	3087	}
3100		3088
3101	/* Check the syntax of the parameters in a MACRO definition. Returns	3089	/* Restore the parameters to their previous state. */
3102	false if an error occurs. */	3090	void
		3091	_cpp_unsave_parameters (cpp_reader *pfile, unsigned n)
		3092	{
		3093	/* Clear the fast argument lookup indices. */
		3094	while (n--)
		3095	{
		3096	struct macro_arg_saved_data *save =
		3097	&((struct macro_arg_saved_data *) pfile->macro_buffer)[n];
		3098
		3099	struct cpp_hashnode *node = save->canonical_node;
		3100	node->type = save->type;
		3101	node->value = save->value;
		3102	}
		3103	}
		3104
		3105	/* Check the syntax of the parameters in a MACRO definition. Return
		3106	false on failure. Set N_PTR and VARADIC_PTR as appropriate.
		3107	'(' ')'
		3108	'(' parm-list ',' last-parm ')'
		3109	'(' last-parm ')'
		3110	parm-list: name
		3111	\| parm-list, name
		3112	last-parm: name
		3113	\| name '...'
		3114	\| '...'
		3115	*/
		3116
3103	static bool	3117	static bool
3104	parse_params (cpp_reader pfile, cpp_macro macro)	3118	parse_params (cpp_reader pfile, unsigned n_ptr, bool *varadic_ptr)
3105	{	3119	{
3106	unsigned int prev_ident = 0;	3120	unsigned nparms = 0;
		3121	bool ok = false;
3107		3122
3108	for (;;)	3123	for (bool prev_ident = false;;)
3109	{	3124	{
3110	const cpp_token *token = _cpp_lex_token (pfile);	3125	const cpp_token *token = _cpp_lex_token (pfile);
3111		3126
3112	switch (token->type)	3127	switch (token->type)
3113	{	3128	{
3114	default:	3129	case CPP_COMMENT:
3115	/* Allow/ignore comments in parameter lists if we are	3130	/* Allow/ignore comments in parameter lists if we are
3116	preserving comments in macro expansions. */	3131	preserving comments in macro expansions. */
3117	if (token->type == CPP_COMMENT	3132	if (!CPP_OPTION (pfile, discard_comments_in_macro_exp))
3118	&& ! CPP_OPTION (pfile, discard_comments_in_macro_exp))	3133	break;
3119	continue;
3120		3134
3121	cpp_error (pfile, CPP_DL_ERROR,	3135	/* FALLTHRU */
3122	"\"%s\" may not appear in macro parameter list",	3136	default:
3123	cpp_token_as_text (pfile, token));	3137	bad:
3124	return false;	3138	{
		3139	const char *const msgs[5] =
		3140	{
		3141	N_("expected parameter name, found \"%s\""),
		3142	N_("expected ',' or ')', found \"%s\""),
		3143	N_("expected parameter name before end of line"),
		3144	N_("expected ')' before end of line"),
		3145	N_("expected ')' after \"...\"")
		3146	};
		3147	unsigned ix = prev_ident;
		3148	const unsigned char *as_text = NULL;
		3149	if (*varadic_ptr)
		3150	ix = 4;
		3151	else if (token->type == CPP_EOF)
		3152	ix += 2;
		3153	else
		3154	as_text = cpp_token_as_text (pfile, token);
		3155	cpp_error (pfile, CPP_DL_ERROR, msgs[ix], as_text);
		3156	}
		3157	goto out;
3125		3158
3126	case CPP_NAME:	3159	case CPP_NAME:
3127	if (prev_ident)	3160	if (prev_ident \|\| *varadic_ptr)
3128	{	3161	goto bad;
3129	cpp_error (pfile, CPP_DL_ERROR,	3162	prev_ident = true;
3130	"macro parameters must be comma-separated");	3163
3131	return false;	3164	if (!_cpp_save_parameter (pfile, nparms, token->val.node.node,
3132	}	3165	token->val.node.spelling))
3133	prev_ident = 1;	3166	goto out;
3134		3167	nparms++;
3135	if (_cpp_save_parameter (pfile, macro, token->val.node.node,	3168	break;
3136	token->val.node.spelling))
3137	return false;
3138	continue;
3139		3169
3140	case CPP_CLOSE_PAREN:	3170	case CPP_CLOSE_PAREN:
3141	if (prev_ident \|\| macro->paramc == 0)	3171	if (prev_ident \|\| !nparms \|\| *varadic_ptr)
3142	return true;	3172	{
		3173	ok = true;
		3174	goto out;
		3175	}
3143		3176
3144	/* Fall through to pick up the error. */
3145	/* FALLTHRU */	3177	/* FALLTHRU */
3146	case CPP_COMMA:	3178	case CPP_COMMA:
3147	if (!prev_ident)	3179	if (!prev_ident \|\| *varadic_ptr)
3148	{	3180	goto bad;
3149	cpp_error (pfile, CPP_DL_ERROR, "parameter name missing");	3181	prev_ident = false;
3150	return false;	3182	break;
3151	}
3152	prev_ident = 0;
3153	continue;
3154		3183
3155	case CPP_ELLIPSIS:	3184	case CPP_ELLIPSIS:
3156	macro->variadic = 1;	3185	if (*varadic_ptr)
		3186	goto bad;
		3187	*varadic_ptr = true;
3157	if (!prev_ident)	3188	if (!prev_ident)
3158	{	3189	{
3159	_cpp_save_parameter (pfile, macro,	3190	/* An ISO bare ellipsis. */
		3191	_cpp_save_parameter (pfile, nparms,
3160	pfile->spec_nodes.n__VA_ARGS__,	3192	pfile->spec_nodes.n__VA_ARGS__,
3161	pfile->spec_nodes.n__VA_ARGS__);	3193	pfile->spec_nodes.n__VA_ARGS__);
		3194	nparms++;
3162	pfile->state.va_args_ok = 1;	3195	pfile->state.va_args_ok = 1;
3163	if (! CPP_OPTION (pfile, c99)	3196	if (! CPP_OPTION (pfile, c99)
3164	&& CPP_OPTION (pfile, cpp_pedantic)	3197	&& CPP_OPTION (pfile, cpp_pedantic)
3165	&& CPP_OPTION (pfile, warn_variadic_macros))	3198	&& CPP_OPTION (pfile, warn_variadic_macros))
3166	{	3199	cpp_pedwarning
3167	if (CPP_OPTION (pfile, cplusplus))	3200	(pfile, CPP_W_VARIADIC_MACROS,
3168	cpp_pedwarning	3201	CPP_OPTION (pfile, cplusplus)
3169	(pfile, CPP_W_VARIADIC_MACROS,	3202	? N_("anonymous variadic macros were introduced in C++11")
3170	"anonymous variadic macros were introduced in C++11");	3203	: N_("anonymous variadic macros were introduced in C99"));
3171	else
3172	cpp_pedwarning
3173	(pfile, CPP_W_VARIADIC_MACROS,
3174	"anonymous variadic macros were introduced in C99");
3175	}
3176	else if (CPP_OPTION (pfile, cpp_warn_c90_c99_compat) > 0	3204	else if (CPP_OPTION (pfile, cpp_warn_c90_c99_compat) > 0
3177	&& ! CPP_OPTION (pfile, cplusplus))	3205	&& ! CPP_OPTION (pfile, cplusplus))
3178	cpp_error (pfile, CPP_DL_WARNING,	3206	cpp_error (pfile, CPP_DL_WARNING,
@@ -3180,54 +3208,38 @@ parse_params (cpp_reader pfile, cpp_macro macro) · 1 unmodified line
3180	}	3208	}
3181	else if (CPP_OPTION (pfile, cpp_pedantic)	3209	else if (CPP_OPTION (pfile, cpp_pedantic)
3182	&& CPP_OPTION (pfile, warn_variadic_macros))	3210	&& CPP_OPTION (pfile, warn_variadic_macros))
3183	{	3211	cpp_pedwarning (pfile, CPP_W_VARIADIC_MACROS,
3184	if (CPP_OPTION (pfile, cplusplus))	3212	CPP_OPTION (pfile, cplusplus)
3185	cpp_pedwarning (pfile, CPP_W_VARIADIC_MACROS,	3213	? N_("ISO C++ does not permit named variadic macros")
3186	"ISO C++ does not permit named variadic macros");	3214	: N_("ISO C does not permit named variadic macros"));
3187	else	3215	break;
3188	cpp_pedwarning (pfile, CPP_W_VARIADIC_MACROS,
3189	"ISO C does not permit named variadic macros");
3190	}
3191
3192	/* We're at the end, and just expect a closing parenthesis. */
3193	token = _cpp_lex_token (pfile);
3194	if (token->type == CPP_CLOSE_PAREN)
3195	return true;
3196	/* Fall through. */
3197
3198	case CPP_EOF:
3199	cpp_error (pfile, CPP_DL_ERROR, "missing ')' in macro parameter list");
3200	return false;
3201	}	3216	}
3202	}	3217	}
3203	}
3204		3218
3205	/* Allocate room for a token from a macro's replacement list. */	3219	out:
3206	static cpp_token *	3220	*n_ptr = nparms;
3207	alloc_expansion_token (cpp_reader pfile, cpp_macro macro)
3208	{
3209	if (BUFF_ROOM (pfile->a_buff) < (macro->count + 1) * sizeof (cpp_token))
3210	_cpp_extend_buff (pfile, &pfile->a_buff, sizeof (cpp_token));
3211		3221
3212	return &((cpp_token *) BUFF_FRONT (pfile->a_buff))[macro->count++];	3222	return ok;
3213	}	3223	}
3214		3224
3215	/* Lex a token from the expansion of MACRO, but mark parameters as we	3225	/* Lex a token from the expansion of MACRO, but mark parameters as we
3216	find them and warn of traditional stringification. */	3226	find them and warn of traditional stringification. */
3217	static cpp_token *	3227	static cpp_macro *
3218	lex_expansion_token (cpp_reader pfile, cpp_macro macro)	3228	lex_expansion_token (cpp_reader pfile, cpp_macro macro)
3219	{	3229	{
3220	cpp_token token, saved_cur_token;	3230	macro = (cpp_macro *)_cpp_reserve_room (pfile,
3221		3231	sizeof (cpp_macro) - sizeof (cpp_token)
3222	saved_cur_token = pfile->cur_token;	3232	+ macro->count * sizeof (cpp_token),
3223	pfile->cur_token = alloc_expansion_token (pfile, macro);	3233	sizeof (cpp_token));
3224	token = _cpp_lex_direct (pfile);	3234	cpp_token *saved_cur_token = pfile->cur_token;
		3235	pfile->cur_token = &macro->exp.tokens[macro->count];
		3236	cpp_token *token = _cpp_lex_direct (pfile);
3225	pfile->cur_token = saved_cur_token;	3237	pfile->cur_token = saved_cur_token;
3226		3238
3227	/* Is this a parameter? */	3239	/* Is this a parameter? */
3228	if (token->type == CPP_NAME	3240	if (token->type == CPP_NAME && token->val.node.node->type == NT_MACRO_ARG)
3229	&& (token->val.node.node->flags & NODE_MACRO_ARG) != 0)
3230	{	3241	{
		3242	/* Morph into a parameter reference. */
3231	cpp_hashnode *spelling = token->val.node.spelling;	3243	cpp_hashnode *spelling = token->val.node.spelling;
3232	token->type = CPP_MACRO_ARG;	3244	token->type = CPP_MACRO_ARG;
3233	token->val.macro_arg.arg_no = token->val.node.node->value.arg_index;	3245	token->val.macro_arg.arg_no = token->val.node.node->value.arg_index;
@@ -3237,62 +3249,58 @@ lex_expansion_token (cpp_reader pfile, cpp_macro macro) · 3 unmodified lines
3237	&& (token->type == CPP_STRING \|\| token->type == CPP_CHAR))	3249	&& (token->type == CPP_STRING \|\| token->type == CPP_CHAR))
3238	check_trad_stringification (pfile, macro, &token->val.str);	3250	check_trad_stringification (pfile, macro, &token->val.str);
3239		3251
3240	return token;	3252	return macro;
3241	}	3253	}
3242		3254
3243	static bool	3255	static cpp_macro *
3244	create_iso_definition (cpp_reader pfile, cpp_macro macro)	3256	create_iso_definition (cpp_reader *pfile)
3245	{	3257	{
3246	cpp_token *token;
3247	const cpp_token *ctoken;
3248	bool following_paste_op = false;	3258	bool following_paste_op = false;
3249	const char *paste_op_error_msg =	3259	const char *paste_op_error_msg =
3250	N_("'##' cannot appear at either end of a macro expansion");	3260	N_("'##' cannot appear at either end of a macro expansion");
3251	unsigned int num_extra_tokens = 0;	3261	unsigned int num_extra_tokens = 0;
		3262	unsigned nparms = 0;
		3263	cpp_hashnode **params = NULL;
		3264	bool varadic = false;
		3265	bool ok = false;
		3266	cpp_macro *macro = NULL;
		3267
		3268	/* Look at the first token, to see if this is a function-like
		3269	macro. */
		3270	cpp_token first;
		3271	cpp_token *saved_cur_token = pfile->cur_token;
		3272	pfile->cur_token = &first;
		3273	cpp_token *token = _cpp_lex_direct (pfile);
		3274	pfile->cur_token = saved_cur_token;
3252		3275
3253	/* Get the first token of the expansion (or the '(' of a	3276	if (token->flags & PREV_WHITE)
3254	function-like macro). */	3277	/* Preceeded by space, must be part of expansion. */;
3255	ctoken = _cpp_lex_token (pfile);	3278	else if (token->type == CPP_OPEN_PAREN)
3256
3257	if (ctoken->type == CPP_OPEN_PAREN && !(ctoken->flags & PREV_WHITE))
3258	{	3279	{
3259	bool ok = parse_params (pfile, macro);	3280	/* An open-paren, get a parameter list. */
3260	macro->params = (cpp_hashnode **) BUFF_FRONT (pfile->a_buff);	3281	if (!parse_params (pfile, &nparms, &varadic))
3261	if (!ok)	3282	goto out;
3262	return false;
3263		3283
3264	/* Success. Commit or allocate the parameter array. */	3284	params = (cpp_hashnode **)_cpp_commit_buff
3265	if (pfile->hash_table->alloc_subobject)	3285	(pfile, sizeof (cpp_hashnode ) nparms);
3266	{	3286	token = NULL;
3267	cpp_hashnode **params =
3268	(cpp_hashnode **) pfile->hash_table->alloc_subobject
3269	(sizeof (cpp_hashnode ) macro->paramc);
3270	memcpy (params, macro->params,
3271	sizeof (cpp_hashnode ) macro->paramc);
3272	macro->params = params;
3273	}
3274	else
3275	BUFF_FRONT (pfile->a_buff) = (uchar *) &macro->params[macro->paramc];
3276	macro->fun_like = 1;
3277	}	3287	}
3278	else if (ctoken->type != CPP_EOF && !(ctoken->flags & PREV_WHITE))	3288	else if (token->type != CPP_EOF
		3289	&& !(token->type == CPP_COMMENT
		3290	&& ! CPP_OPTION (pfile, discard_comments_in_macro_exp)))
3279	{	3291	{
3280	/* While ISO C99 requires whitespace before replacement text	3292	/* While ISO C99 requires whitespace before replacement text
3281	in a macro definition, ISO C90 with TC1 allows characters	3293	in a macro definition, ISO C90 with TC1 allows characters
3282	from the basic source character set there. */	3294	from the basic source character set there. */
3283	if (CPP_OPTION (pfile, c99))	3295	if (CPP_OPTION (pfile, c99))
3284	{	3296	cpp_error (pfile, CPP_DL_PEDWARN,
3285	if (CPP_OPTION (pfile, cplusplus))	3297	CPP_OPTION (pfile, cplusplus)
3286	cpp_error (pfile, CPP_DL_PEDWARN,	3298	? N_("ISO C++11 requires whitespace after the macro name")
3287	"ISO C++11 requires whitespace after the macro name");	3299	: N_("ISO C99 requires whitespace after the macro name"));
3288	else
3289	cpp_error (pfile, CPP_DL_PEDWARN,
3290	"ISO C99 requires whitespace after the macro name");
3291	}
3292	else	3300	else
3293	{	3301	{
3294	int warntype = CPP_DL_WARNING;	3302	enum cpp_diagnostic_level warntype = CPP_DL_WARNING;
3295	switch (ctoken->type)	3303	switch (token->type)
3296	{	3304	{
3297	case CPP_ATSIGN:	3305	case CPP_ATSIGN:
3298	case CPP_AT_NAME:	3306	case CPP_AT_NAME:
@@ -3303,7 +3311,7 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 4 unmodified lines
3303	case CPP_OTHER:	3311	case CPP_OTHER:
3304	/* Basic character set sans letters, digits and _. */	3312	/* Basic character set sans letters, digits and _. */
3305	if (strchr ("!\"#%&'()*+,-./:;<=>?[\\]^{\|}~",	3313	if (strchr ("!\"#%&'()*+,-./:;<=>?[\\]^{\|}~",
3306	ctoken->val.str.text[0]) == NULL)	3314	token->val.str.text[0]) == NULL)
3307	warntype = CPP_DL_PEDWARN;	3315	warntype = CPP_DL_PEDWARN;
3308	break;	3316	break;
3309	default:	3317	default:
@@ -3316,19 +3324,32 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 6 unmodified lines
3316	}	3324	}
3317	}	3325	}
3318		3326
3319	if (macro->fun_like)	3327	macro = _cpp_new_macro (pfile, cmk_macro,
3320	token = lex_expansion_token (pfile, macro);	3328	_cpp_reserve_room (pfile, 0, sizeof (cpp_macro)));
		3329
		3330	if (!token)
		3331	{
		3332	macro->variadic = varadic;
		3333	macro->paramc = nparms;
		3334	macro->parm.params = params;
		3335	macro->fun_like = true;
		3336	}
3321	else	3337	else
3322	{	3338	{
3323	token = alloc_expansion_token (pfile, macro);	3339	/* Preserve the token we peeked, there is already a single slot for it. */
3324	token = ctoken;	3340	macro->exp.tokens[0] = *token;
		3341	token = &macro->exp.tokens[0];
		3342	macro->count = 1;
3325	}	3343	}
3326		3344
3327	/* The argument doesn't matter here. */	3345	for (vaopt_state vaopt_tracker (pfile, macro->variadic, true);; token = NULL)
3328	vaopt_state vaopt_tracker (pfile, macro->variadic, true);
3329
3330	for (;;)
3331	{	3346	{
		3347	if (!token)
		3348	{
		3349	macro = lex_expansion_token (pfile, macro);
		3350	token = &macro->exp.tokens[macro->count++];
		3351	}
		3352
3332	/* Check the stringifying # constraint 6.10.3.2.1 of	3353	/* Check the stringifying # constraint 6.10.3.2.1 of
3333	function-like macros when lexing the subsequent token. */	3354	function-like macros when lexing the subsequent token. */
3334	if (macro->count > 1 && token[-1].type == CPP_HASH && macro->fun_like)	3355	if (macro->count > 1 && token[-1].type == CPP_HASH && macro->fun_like)
@@ -3350,7 +3371,7 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 15 unmodified lines
3350	{	3371	{
3351	cpp_error (pfile, CPP_DL_ERROR,	3372	cpp_error (pfile, CPP_DL_ERROR,
3352	"'#' is not followed by a macro parameter");	3373	"'#' is not followed by a macro parameter");
3353	return false;	3374	goto out;
3354	}	3375	}
3355	}	3376	}
3356		3377
@@ -3362,8 +3383,10 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 5 unmodified lines
3362	if (following_paste_op)	3383	if (following_paste_op)
3363	{	3384	{
3364	cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);	3385	cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
3365	return false;	3386	goto out;
3366	}	3387	}
		3388	if (!vaopt_tracker.completed ())
		3389	goto out;
3367	break;	3390	break;
3368	}	3391	}
3369		3392
@@ -3375,17 +3398,19 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 5 unmodified lines
3375	if (macro->count == 1)	3398	if (macro->count == 1)
3376	{	3399	{
3377	cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);	3400	cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
3378	return false;	3401	goto out;
3379	}	3402	}
3380		3403
3381	if (token[-1].flags & PASTE_LEFT)	3404	if (following_paste_op)
3382	{	3405	{
3383	macro->extra_tokens = 1;	3406	/* Consecutive paste operators. This one will be moved
		3407	to the end. */
3384	num_extra_tokens++;	3408	num_extra_tokens++;
3385	token->val.token_no = macro->count - 1;	3409	token->val.token_no = macro->count - 1;
3386	}	3410	}
3387	else	3411	else
3388	{	3412	{
		3413	/* Drop the paste operator. */
3389	--macro->count;	3414	--macro->count;
3390	token[-1].flags \|= PASTE_LEFT;	3415	token[-1].flags \|= PASTE_LEFT;
3391	if (token->flags & DIGRAPH)	3416	if (token->flags & DIGRAPH)
@@ -3393,78 +3418,67 @@ create_iso_definition (cpp_reader pfile, cpp_macro macro) · 1 unmodified line
3393	if (token->flags & PREV_WHITE)	3418	if (token->flags & PREV_WHITE)
3394	token[-1].flags \|= SP_PREV_WHITE;	3419	token[-1].flags \|= SP_PREV_WHITE;
3395	}	3420	}
		3421	following_paste_op = true;
3396	}	3422	}
		3423	else
		3424	following_paste_op = false;
3397		3425
3398	if (vaopt_tracker.update (token) == vaopt_state::ERROR)	3426	if (vaopt_tracker.update (token) == vaopt_state::ERROR)
3399	return false;	3427	goto out;
3400
3401	following_paste_op = (token->type == CPP_PASTE);
3402	token = lex_expansion_token (pfile, macro);
3403	}	3428	}
3404		3429
3405	if (!vaopt_tracker.completed ())	3430	/* We're committed to winning now. */
3406	return false;	3431	ok = true;
3407
3408	macro->exp.tokens = (cpp_token *) BUFF_FRONT (pfile->a_buff);
3409	macro->traditional = 0;
3410		3432
3411	/* Don't count the CPP_EOF. */	3433	/* Don't count the CPP_EOF. */
3412	macro->count--;	3434	macro->count--;
3413		3435
3414	/* Clear whitespace on first token for warn_of_redefinition(). */	3436	macro = (cpp_macro *)_cpp_commit_buff
		3437	(pfile, sizeof (cpp_macro) - sizeof (cpp_token)
		3438	+ sizeof (cpp_token) * macro->count);
		3439
		3440	/* Clear whitespace on first token. */
3415	if (macro->count)	3441	if (macro->count)
3416	macro->exp.tokens[0].flags &= ~PREV_WHITE;	3442	macro->exp.tokens[0].flags &= ~PREV_WHITE;
3417		3443
3418	/* Commit or allocate the memory. */	3444	if (num_extra_tokens)
3419	if (pfile->hash_table->alloc_subobject)
3420	{	3445	{
3421	cpp_token *tokns =	3446	/* Place second and subsequent ## or %:%: tokens in sequences of
3422	(cpp_token *) pfile->hash_table->alloc_subobject (sizeof (cpp_token)	3447	consecutive such tokens at the end of the list to preserve
3423	* macro->count);	3448	information about where they appear, how they are spelt and
3424	if (num_extra_tokens)	3449	whether they are preceded by whitespace without otherwise
3425	{	3450	interfering with macro expansion. Remember, this is
3426	/* Place second and subsequent ## or %:%: tokens in	3451	extremely rare, so efficiency is not a priority. */
3427	sequences of consecutive such tokens at the end of the	3452	cpp_token temp = (cpp_token )_cpp_reserve_room
3428	list to preserve information about where they appear, how	3453	(pfile, 0, num_extra_tokens * sizeof (cpp_token));
3429	they are spelt and whether they are preceded by	3454	unsigned extra_ix = 0, norm_ix = 0;
3430	whitespace without otherwise interfering with macro	3455	cpp_token *exp = macro->exp.tokens;
3431	expansion. */	3456	for (unsigned ix = 0; ix != macro->count; ix++)
3432	cpp_token *normal_dest = tokns;	3457	if (exp[ix].type == CPP_PASTE)
3433	cpp_token *extra_dest = tokns + macro->count - num_extra_tokens;	3458	temp[extra_ix++] = exp[ix];
3434	unsigned int i;	3459	else
3435	for (i = 0; i < macro->count; i++)	3460	exp[norm_ix++] = exp[ix];
3436	{	3461	memcpy (&exp[norm_ix], temp, num_extra_tokens * sizeof (cpp_token));
3437	if (macro->exp.tokens[i].type == CPP_PASTE)	3462
3438	*extra_dest++ = macro->exp.tokens[i];	3463	/* Record there are extra tokens. */
3439	else	3464	macro->extra_tokens = 1;
3440	*normal_dest++ = macro->exp.tokens[i];
3441	}
3442	}
3443	else
3444	memcpy (tokns, macro->exp.tokens, sizeof (cpp_token) * macro->count);
3445	macro->exp.tokens = tokns;
3446	}	3465	}
3447	else
3448	BUFF_FRONT (pfile->a_buff) = (uchar *) &macro->exp.tokens[macro->count];
3449		3466
3450	return true;	3467	out:
		3468	pfile->state.va_args_ok = 0;
		3469	_cpp_unsave_parameters (pfile, nparms);
		3470
		3471	return ok ? macro : NULL;
3451	}	3472	}
3452		3473
3453	/* Parse a macro and save its expansion. Returns nonzero on success. */	3474	cpp_macro *
3454	bool	3475	_cpp_new_macro (cpp_reader pfile, cpp_macro_kind kind, void placement)
3455	_cpp_create_definition (cpp_reader pfile, cpp_hashnode node)
3456	{	3476	{
3457	cpp_macro *macro;	3477	cpp_macro macro = (cpp_macro ) placement;
3458	unsigned int i;
3459	bool ok;
3460		3478
3461	if (pfile->hash_table->alloc_subobject)
3462	macro = (cpp_macro *) pfile->hash_table->alloc_subobject
3463	(sizeof (cpp_macro));
3464	else
3465	macro = (cpp_macro *) _cpp_aligned_alloc (pfile, sizeof (cpp_macro));
3466	macro->line = pfile->directive_line;	3479	macro->line = pfile->directive_line;
3467	macro->params = 0;	3480	macro->parm.params = 0;
		3481	macro->lazy = 0;
3468	macro->paramc = 0;	3482	macro->paramc = 0;
3469	macro->variadic = 0;	3483	macro->variadic = 0;
3470	macro->used = !CPP_OPTION (pfile, warn_unused_macros);	3484	macro->used = !CPP_OPTION (pfile, warn_unused_macros);
@@ -3474,62 +3488,51 @@ _cpp_create_definition (cpp_reader pfile, cpp_hashnode node) · 3 unmodified lines
3474	/* To suppress some diagnostics. */	3488	/* To suppress some diagnostics. */
3475	macro->syshdr = pfile->buffer && pfile->buffer->sysp != 0;	3489	macro->syshdr = pfile->buffer && pfile->buffer->sysp != 0;
3476		3490
3477	if (CPP_OPTION (pfile, traditional))	3491	macro->kind = kind;
3478	ok = _cpp_create_trad_definition (pfile, macro);
3479	else
3480	{
3481	ok = create_iso_definition (pfile, macro);
3482
3483	/* We set the type for SEEN_EOL() in directives.c.
3484		3492
3485	Longer term we should lex the whole line before coming here,	3493	return macro;
3486	and just copy the expansion. */	3494	}
3487		3495
3488	/* Stop the lexer accepting __VA_ARGS__. */	3496	/* Parse a macro and save its expansion. Returns nonzero on success. */
3489	pfile->state.va_args_ok = 0;	3497	bool
3490	}	3498	_cpp_create_definition (cpp_reader pfile, cpp_hashnode node)
		3499	{
		3500	cpp_macro *macro;
3491		3501
3492	/* Clear the fast argument lookup indices. */	3502	if (CPP_OPTION (pfile, traditional))
3493	for (i = macro->paramc; i-- > 0; )	3503	macro = _cpp_create_trad_definition (pfile);
3494	{	3504	else
3495	struct macro_arg_saved_data *save =	3505	macro = create_iso_definition (pfile);
3496	&((struct macro_arg_saved_data *) pfile->macro_buffer)[i];
3497	struct cpp_hashnode *node = save->canonical_node;
3498	node->flags &= ~ NODE_MACRO_ARG;
3499	node->value = save->value;
3500	}
3501		3506
3502	if (!ok)	3507	if (!macro)
3503	return ok;	3508	return false;
3504		3509
3505	if (node->type == NT_MACRO)	3510	if (cpp_macro_p (node))
3506	{	3511	{
3507	if (CPP_OPTION (pfile, warn_unused_macros))	3512	if (CPP_OPTION (pfile, warn_unused_macros))
3508	_cpp_warn_if_unused_macro (pfile, node, NULL);	3513	_cpp_warn_if_unused_macro (pfile, node, NULL);
3509		3514
3510	if (warn_of_redefinition (pfile, node, macro))	3515	if (warn_of_redefinition (pfile, node, macro))
3511	{	3516	{
3512	const int reason = ((node->flags & NODE_BUILTIN)	3517	const enum cpp_warning_reason reason
3513	&& !(node->flags & NODE_WARN))	3518	= (cpp_builtin_macro_p (node) && !(node->flags & NODE_WARN))
3514	? CPP_W_BUILTIN_MACRO_REDEFINED : CPP_W_NONE;	3519	? CPP_W_BUILTIN_MACRO_REDEFINED : CPP_W_NONE;
3515		3520
3516	bool warned =	3521	bool warned =
3517	cpp_pedwarning_with_line (pfile, reason,	3522	cpp_pedwarning_with_line (pfile, reason,
3518	pfile->directive_line, 0,	3523	pfile->directive_line, 0,
3519	"\"%s\" redefined", NODE_NAME (node));	3524	"\"%s\" redefined", NODE_NAME (node));
3520		3525
3521	if (warned && node->type == NT_MACRO && !(node->flags & NODE_BUILTIN))	3526	if (warned && cpp_user_macro_p (node))
3522	cpp_error_with_line (pfile, CPP_DL_NOTE,	3527	cpp_error_with_line (pfile, CPP_DL_NOTE,
3523	node->value.macro->line, 0,	3528	node->value.macro->line, 0,
3524	"this is the location of the previous definition");	3529	"this is the location of the previous definition");
3525	}	3530	}
		3531	_cpp_free_definition (node);
3526	}	3532	}
3527		3533
3528	if (node->type != NT_VOID)
3529	_cpp_free_definition (node);
3530
3531	/* Enter definition in hash table. */	3534	/* Enter definition in hash table. */
3532	node->type = NT_MACRO;	3535	node->type = NT_USER_MACRO;
3533	node->value.macro = macro;	3536	node->value.macro = macro;
3534	if (! ustrncmp (NODE_NAME (node), DSC ("__STDC_"))	3537	if (! ustrncmp (NODE_NAME (node), DSC ("__STDC_"))
3535	&& ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_FORMAT_MACROS")	3538	&& ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_FORMAT_MACROS")
@@ -3545,7 +3548,52 @@ _cpp_create_definition (cpp_reader pfile, cpp_hashnode node) · 9 unmodified lines
3545	conditional flag */	3548	conditional flag */
3546	node->flags &= ~NODE_CONDITIONAL;	3549	node->flags &= ~NODE_CONDITIONAL;
3547		3550
3548	return ok;	3551	return true;
		3552	}
		3553
		3554	extern void
		3555	cpp_define_lazily (cpp_reader pfile, cpp_hashnode node, unsigned num)
		3556	{
		3557	cpp_macro *macro = node->value.macro;
		3558
		3559	gcc_checking_assert (pfile->cb.user_lazy_macro && macro && num < UCHAR_MAX);
		3560
		3561	macro->lazy = num + 1;
		3562	}
		3563
		3564	/* Notify the use of NODE in a macro-aware context (i.e. expanding it,
		3565	or testing its existance). Also applies any lazy definition. */
		3566
		3567	extern void
		3568	_cpp_notify_macro_use (cpp_reader pfile, cpp_hashnode node)
		3569	{
		3570	node->flags \|= NODE_USED;
		3571	switch (node->type)
		3572	{
		3573	case NT_USER_MACRO:
		3574	{
		3575	cpp_macro *macro = node->value.macro;
		3576	if (macro->lazy)
		3577	{
		3578	pfile->cb.user_lazy_macro (pfile, macro, macro->lazy - 1);
		3579	macro->lazy = 0;
		3580	}
		3581	}
		3582	/* FALLTHROUGH. */
		3583
		3584	case NT_BUILTIN_MACRO:
		3585	if (pfile->cb.used_define)
		3586	pfile->cb.used_define (pfile, pfile->directive_line, node);
		3587	break;
		3588
		3589	case NT_VOID:
		3590	if (pfile->cb.used_undef)
		3591	pfile->cb.used_undef (pfile, pfile->directive_line, node);
		3592	break;
		3593
		3594	default:
		3595	abort ();
		3596	}
3549	}	3597	}
3550		3598
3551	/* Warn if a token in STRING matches one of a function-like MACRO's	3599	/* Warn if a token in STRING matches one of a function-like MACRO's
@@ -3576,7 +3624,7 @@ check_trad_stringification (cpp_reader pfile, const cpp_macro macro, · 24 unmodified lines
3576	identifier inside the string matches one of them. */	3624	identifier inside the string matches one of them. */
3577	for (i = 0; i < macro->paramc; i++)	3625	for (i = 0; i < macro->paramc; i++)
3578	{	3626	{
3579	const cpp_hashnode *node = macro->params[i];	3627	const cpp_hashnode *node = macro->parm.params[i];
3580		3628
3581	if (NODE_LEN (node) == len	3629	if (NODE_LEN (node) == len
3582	&& !memcmp (p, NODE_NAME (node), len))	3630	&& !memcmp (p, NODE_NAME (node), len))
@@ -3590,15 +3638,6 @@ check_trad_stringification (cpp_reader pfile, const cpp_macro macro, · 7 unmodified lines
3590	}	3638	}
3591	}	3639	}
3592		3640
3593	/* Returns true of NODE is a function-like macro. */
3594	bool
3595	cpp_fun_like_macro_p (cpp_hashnode *node)
3596	{
3597	return (node->type == NT_MACRO
3598	&& (node->flags & (NODE_BUILTIN \| NODE_MACRO_ARG)) == 0
3599	&& node->value.macro->fun_like);
3600	}
3601
3602	/* Returns the name, arguments and expansion of a macro, in a format	3641	/* Returns the name, arguments and expansion of a macro, in a format
3603	suitable to be read back in again, and therefore also for DWARF 2	3642	suitable to be read back in again, and therefore also for DWARF 2
3604	debugging info. e.g. "PASTE(X, Y) X ## Y", or "MACNAME EXPANSION".	3643	debugging info. e.g. "PASTE(X, Y) X ## Y", or "MACNAME EXPANSION".
@@ -3608,23 +3647,12 @@ const unsigned char * · 3 unmodified lines
3608	cpp_macro_definition (cpp_reader pfile, cpp_hashnode node)	3647	cpp_macro_definition (cpp_reader pfile, cpp_hashnode node)
3609	{	3648	{
3610	unsigned int i, len;	3649	unsigned int i, len;
3611	const cpp_macro *macro;
3612	unsigned char *buffer;	3650	unsigned char *buffer;
3613		3651
3614	if (node->type != NT_MACRO \|\| (node->flags & NODE_BUILTIN))	3652	gcc_checking_assert (cpp_user_macro_p (node));
3615	{	3653
3616	if (node->type != NT_MACRO	3654	const cpp_macro *macro = node->value.macro;
3617	\|\| !pfile->cb.user_builtin_macro
3618	\|\| !pfile->cb.user_builtin_macro (pfile, node))
3619	{
3620	cpp_error (pfile, CPP_DL_ICE,
3621	"invalid hash type %d in cpp_macro_definition",
3622	node->type);
3623	return 0;
3624	}
3625	}
3626		3655
3627	macro = node->value.macro;
3628	/* Calculate length. */	3656	/* Calculate length. */
3629	len = NODE_LEN (node) * 10 + 2; /* ' ' and NUL. */	3657	len = NODE_LEN (node) * 10 + 2; /* ' ' and NUL. */
3630	if (macro->fun_like)	3658	if (macro->fun_like)
@@ -3632,7 +3660,7 @@ cpp_macro_definition (cpp_reader pfile, cpp_hashnode node) · 1 unmodified line
3632	len += 4; /* "()" plus possible final ".." of named	3660	len += 4; /* "()" plus possible final ".." of named
3633	varargs (we have + 1 below). */	3661	varargs (we have + 1 below). */
3634	for (i = 0; i < macro->paramc; i++)	3662	for (i = 0; i < macro->paramc; i++)
3635	len += NODE_LEN (macro->params[i]) + 1; /* "," */	3663	len += NODE_LEN (macro->parm.params[i]) + 1; /* "," */
3636	}	3664	}
3637		3665
3638	/* This should match below where we fill in the buffer. */	3666	/* This should match below where we fill in the buffer. */
@@ -3643,7 +3671,7 @@ cpp_macro_definition (cpp_reader pfile, cpp_hashnode node) · 4 unmodified lines
3643	unsigned int count = macro_real_token_count (macro);	3671	unsigned int count = macro_real_token_count (macro);
3644	for (i = 0; i < count; i++)	3672	for (i = 0; i < count; i++)
3645	{	3673	{
3646	cpp_token *token = &macro->exp.tokens[i];	3674	const cpp_token *token = &macro->exp.tokens[i];
3647		3675
3648	if (token->type == CPP_MACRO_ARG)	3676	if (token->type == CPP_MACRO_ARG)
3649	len += NODE_LEN (token->val.macro_arg.spelling);	3677	len += NODE_LEN (token->val.macro_arg.spelling);
@@ -3676,7 +3704,7 @@ cpp_macro_definition (cpp_reader pfile, cpp_hashnode node) · 26 unmodified lines
3676	*buffer++ = '(';	3704	*buffer++ = '(';
3677	for (i = 0; i < macro->paramc; i++)	3705	for (i = 0; i < macro->paramc; i++)
3678	{	3706	{
3679	cpp_hashnode *param = macro->params[i];	3707	cpp_hashnode *param = macro->parm.params[i];
3680		3708
3681	if (param != pfile->spec_nodes.n__VA_ARGS__)	3709	if (param != pfile->spec_nodes.n__VA_ARGS__)
3682	{	3710	{
@@ -3707,7 +3735,7 @@ cpp_macro_definition (cpp_reader pfile, cpp_hashnode node) · 24 unmodified lines
3707	unsigned int count = macro_real_token_count (macro);	3735	unsigned int count = macro_real_token_count (macro);
3708	for (i = 0; i < count; i++)	3736	for (i = 0; i < count; i++)
3709	{	3737	{
3710	cpp_token *token = &macro->exp.tokens[i];	3738	const cpp_token *token = &macro->exp.tokens[i];
3711		3739
3712	if (token->flags & PREV_WHITE)	3740	if (token->flags & PREV_WHITE)
3713	*buffer++ = ' ';	3741	*buffer++ = ' ';
@@ -3737,11 +3765,3 @@ cpp_macro_definition (cpp_reader pfile, cpp_hashnode node) · 23 unmodified lines
3737	*buffer = '\0';	3765	*buffer = '\0';
3738	return pfile->macro_buffer;	3766	return pfile->macro_buffer;
3739	}	3767	}
3740
3741	/* Get the line at which the macro was defined. */
3742
3743	source_location
3744	cpp_macro_definition_location (cpp_hashnode *node)
3745	{
3746	return node->value.macro->line;
3747	}

gcc/libcpp/makeucnid.c+2−2

@@ -1,5 +1,5 @@
1	/* Make ucnid.h from various sources.	1	/* Make ucnid.h from various sources.
2	Copyright (C) 2005-2018 Free Software Foundation, Inc.	2	Copyright (C) 2005-2019 Free Software Foundation, Inc.
3		3
4	This program is free software; you can redistribute it and/or modify it	4	This program is free software; you can redistribute it and/or modify it
5	under the terms of the GNU General Public License as published by the	5	under the terms of the GNU General Public License as published by the
@@ -378,7 +378,7 @@ write_copyright (void) · 372 unmodified lines
378	{	378	{
379	static const char copyright[] = "\	379	static const char copyright[] = "\
380	/* Unicode characters and various properties.\n\	380	/* Unicode characters and various properties.\n\
381	Copyright (C) 2003-2018 Free Software Foundation, Inc.\n\	381	Copyright (C) 2003-2019 Free Software Foundation, Inc.\n\
382	\n\	382	\n\
383	This program is free software; you can redistribute it and/or modify it\n\	383	This program is free software; you can redistribute it and/or modify it\n\
384	under the terms of the GNU General Public License as published by the\n\	384	under the terms of the GNU General Public License as published by the\n\

gcc/libcpp/mkdeps.c+1−1

@@ -1,5 +1,5 @@
1	/* Dependency generator for Makefile fragments.	1	/* Dependency generator for Makefile fragments.
2	Copyright (C) 2000-2018 Free Software Foundation, Inc.	2	Copyright (C) 2000-2019 Free Software Foundation, Inc.
3	Contributed by Zack Weinberg, Mar 2000	3	Contributed by Zack Weinberg, Mar 2000
4		4
5	This program is free software; you can redistribute it and/or modify it	5	This program is free software; you can redistribute it and/or modify it

gcc/libcpp/pch.c+51−76

 /* Part of CPP library.  (Precompiled header reading/writing.)
-   Copyright (C) 2000-2018 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
 {
   FILE *f = (FILE *) file_p;
+  bool is_void = false;
   switch (hn->type)
     {
     case NT_VOID:
       if (! (hn->flags & NODE_POISONED))
 	return 1;
-      /* XXX Really fallthru?  */
+      is_void = true;
-      /* FALLTHRU */
+      goto poisoned;
-    case NT_MACRO:
+    case NT_BUILTIN_MACRO:
-      if ((hn->flags & NODE_BUILTIN)
+      return 1;
-	  && (!pfile->cb.user_builtin_macro
-	      || !pfile->cb.user_builtin_macro (pfile, hn)))
-	return 1;
-      {
-	struct macrodef_struct s;
-	const unsigned char *defn;
-	s.name_length = NODE_LEN (hn);
+    case NT_USER_MACRO:
-	s.flags = hn->flags & NODE_POISONED;
+      if (hn->value.macro->kind != cmk_assert)
+	{
+	poisoned:
+	  struct macrodef_struct s;
+	  const unsigned char *defn;
-	if (hn->type == NT_MACRO)
+	  s.name_length = NODE_LEN (hn);
-	  {
+	  s.flags = hn->flags & NODE_POISONED;
-	    defn = cpp_macro_definition (pfile, hn);
-	    s.definition_length = ustrlen (defn);
-	  }
-	else
-	  {
-	    defn = NODE_NAME (hn);
-	    s.definition_length = s.name_length;
-	  }
-	if (fwrite (&s, sizeof (s), 1, f) != 1
+	  if (is_void)
-	    || fwrite (defn, 1, s.definition_length, f) != s.definition_length)
+	    {
-	  {
+	      defn = NODE_NAME (hn);
-	    cpp_errno (pfile, CPP_DL_ERROR,
+	      s.definition_length = s.name_length;
-		       "while writing precompiled header");
+	    }
-	    return 0;
+	  else
-	  }
+	    {
-      }
+	      defn = cpp_macro_definition (pfile, hn);
-      return 1;
+	      s.definition_length = ustrlen (defn);
+	    }
-    case NT_ASSERTION:
+	  if (fwrite (&s, sizeof (s), 1, f) != 1
-      /* Not currently implemented.  */
+	      || fwrite (defn, 1, s.definition_length, f) != s.definition_length)
+	    {
+	      cpp_errno (pfile, CPP_DL_ERROR,
+			 "while writing precompiled header");
+	      return 0;
+	    }
+	}
       return 1;
     default:
   switch (hn->type)
     {
-    case NT_MACRO:
+    case NT_BUILTIN_MACRO:
-      if (hn->flags & NODE_BUILTIN)
+      return 1;
+    case NT_USER_MACRO:
+      if (hn->value.macro->kind == cmk_assert)
 	return 1;
       /* fall through.  */
       }
       return 1;
-    case NT_ASSERTION:
-      /* Not currently implemented.  */
-      return 1;
     default:
       abort ();
     }
   switch (hn->type)
     {
-    case NT_MACRO:
+    case NT_BUILTIN_MACRO:
-      if (hn->flags & NODE_BUILTIN)
+      return 1;
+    case NT_USER_MACRO:
+      if (hn->value.macro->kind == cmk_assert)
 	return 1;
       /* fall through.  */
       }
       return 1;
-    case NT_ASSERTION:
-      /* Not currently implemented.  */
-      return 1;
     default:
       abort ();
     }
 	    return 0;
 	  p->definition = defn;
-	  if (fread (&(p->line), sizeof (source_location), 1, f) != 1)
+	  if (fread (&(p->line), sizeof (location_t), 1, f) != 1)
 	    return 0;
 	  defnlen = 0;
 	  if (fread (&defnlen, sizeof (defnlen), 1, f) != 1)
 	  if (fwrite (&defnlen, sizeof (size_t), 1, f) != 1
 	      || fwrite (pp[i]->definition, defnlen, 1, f) != 1)
 	    return 0;
-	  if (fwrite (&(pp[i]->line), sizeof (source_location), 1, f) != 1)
+	  if (fwrite (&(pp[i]->line), sizeof (location_t), 1, f) != 1)
 	    return 0;
 	  defnlen = 0;
 	  defnlen |= (pp[i]->syshdr != 0 ? 1 : 0);
 	  goto fail;
 	}
-      if (h->type != NT_MACRO)
+      if (h->type == NT_VOID)
 	{
 	  /* It's ok if __GCC_HAVE_DWARF2_CFI_ASM becomes undefined,
 	     as in, when the PCH file is created with -g and we're
 {
   struct save_macro_data *data = (struct save_macro_data *)data_p;
-  if ((h->flags & NODE_BUILTIN)
+  if (cpp_user_macro_p (h))
-      && h->type == NT_MACRO
-      && r->cb.user_builtin_macro)
-    r->cb.user_builtin_macro (r, h);
-  if (h->type != NT_VOID
-      && (h->flags & NODE_BUILTIN) == 0)
     {
       if (data->count == data->array_size)
 	{
 	  data->defns = XRESIZEVEC (uchar *, data->defns, (data->array_size));
 	}
-      switch (h->type)
+      const uchar * defn = cpp_macro_definition (r, h);
-	{
+      size_t defnlen = ustrlen (defn);
-	case NT_ASSERTION:
-	  /* Not currently implemented.  */
-	  return 1;
-	case NT_MACRO:
-	  {
-	    const uchar * defn = cpp_macro_definition (r, h);
-	    size_t defnlen = ustrlen (defn);
-	    data->defns[data->count] = (uchar *) xmemdup (defn, defnlen,
+      data->defns[data->count] = (uchar *) xmemdup (defn, defnlen, defnlen + 2);
-                                                          defnlen + 2);
+      data->defns[data->count][defnlen] = '\n';
-	    data->defns[data->count][defnlen] = '\n';
-	  }
-	  break;
-	default:
-	  abort ();
-	}
       data->count++;
     }
   return 1;
 }

gcc/libcpp/po/ChangeLog+32−6

@@ -1,6 +1,36 @@
1	2018-07-26 Release Manager	1	2019-05-03 Release Manager
2		2
3	* GCC 8.2.0 released.	3	* GCC 9.1.0 released.
		4
		5	2019-03-08 Joseph Myers <joseph@codesourcery.com>
		6
		7	* sv.po: Update.
		8
		9	2019-02-14 Joseph Myers <joseph@codesourcery.com>
		10
		11	* da.po: Update.
		12
		13	2019-02-06 Joseph Myers <joseph@codesourcery.com>
		14
		15	* eo.po: Update.
		16
		17	2019-02-06 Joseph Myers <joseph@codesourcery.com>
		18
		19	* ru.po: Update.
		20
		21	2019-02-05 Joseph Myers <joseph@codesourcery.com>
		22
		23	* be.po, ca.po, da.po, de.po, el.po, eo.po, es.po, fi.po, fr.po,
		24	id.po, ja.po, nl.po, pr_BR.po, ru.po, sr.po, sv.po, tr.po, uk.po,
		25	vi.po, zh_CN.po, zh_TW.po: Update.
		26
		27	2019-02-01 Joseph Myers <joseph@codesourcery.com>
		28
		29	* cpplib.pot: Regenerate.
		30
		31	2018-07-25 Joseph Myers <joseph@codesourcery.com>
		32
		33	* cpplib.pot: Regenerate.
4		34
5	2018-06-11 Joseph Myers <joseph@codesourcery.com>	35	2018-06-11 Joseph Myers <joseph@codesourcery.com>
6		36
@@ -10,10 +40,6 @@ · 3 unmodified lines
10		40
11	* eo.po: Update.	41	* eo.po: Update.
12		42
13	2018-05-02 Release Manager
14
15	* GCC 8.1.0 released.
16
17	2018-04-23 Joseph Myers <joseph@codesourcery.com>	43	2018-04-23 Joseph Myers <joseph@codesourcery.com>
18		44
19	* cpplib.pot: Regenerate.	45	* cpplib.pot: Regenerate.

gcc/libcpp/po/be.gmo+0−0

Binary file not shown.

gcc/libcpp/po/be.po+163−166

 msgstr ""
 "Project-Id-Version: gcc 3.1\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
 "PO-Revision-Date: 2002-05-17 15:54+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nyakhaychyk@i18n.linux.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr ""
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr ""
 msgid "missing open quote"
 msgstr "Прапушчан ідэнтыфікатар"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 #, fuzzy
 #| msgid "character constant too long"
 msgid "character constant too long for its type"
 msgstr "сімвальная канстанта вельмі доўгая"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "мнагасімвальная сімвальная канстанта"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "пустая сімвальная канстанта"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr ""
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr ""
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr ""
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr ""
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr ""
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr ""
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr ""
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr ""
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr ""
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr ""
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr ""
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr ""
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr ""
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr ""
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr ""
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr ""
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr ""
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr ""
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr ""
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr ""
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr ""
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr ""
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr ""
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr ""
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr ""
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr ""
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr ""
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr ""
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr ""
-#: directives.c:1185
+#: directives.c:1175
 #, fuzzy, c-format
 msgid "invalid #%s directive"
 msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr ""
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr ""
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr ""
-#: directives.c:1278
+#: directives.c:1268
 #, fuzzy, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "Клас \"%s\" ужо існуе"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr ""
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr ""
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr ""
-#: directives.c:1551
+#: directives.c:1541
 #, fuzzy
 msgid "invalid #pragma push_macro directive"
 msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1606
+#: directives.c:1596
 #, fuzzy
 msgid "invalid #pragma pop_macro directive"
 msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr ""
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr ""
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr ""
-#: directives.c:1714
+#: directives.c:1704
 #, fuzzy, c-format
 #| msgid "cannot find source %s"
 msgid "cannot find source file %s"
 msgstr "не магу знайсці крыніцу %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr ""
-#: directives.c:1742
+#: directives.c:1732
 #, fuzzy, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr ""
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr ""
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr ""
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr ""
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr ""
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr ""
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr ""
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr ""
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr ""
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr ""
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr ""
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr ""
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr ""
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr ""
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "незавершаныя каментарыі"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr ""
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr ""
 msgid "this use of \"defined\" may not be portable"
 msgstr ""
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr ""
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr ""
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr ""
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr ""
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr ""
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr ""
-#: expr.c:1451
+#: expr.c:1435
 #, fuzzy, c-format
 #| msgid "unbalanced #endif"
 msgid "unbalanced stack in %s"
 msgstr "незбалансаваны #endif"
-#: expr.c:1471
+#: expr.c:1455
 #, fuzzy, c-format
 #| msgid "impossible operator '%s'"
 msgid "impossible operator '%u'"
 msgstr "немагчымы апэратар '%s'"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr ""
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr ""
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr ""
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr ""
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr ""
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr ""
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr ""
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr ""
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr ""
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr ""
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr ""
 msgid "no include path in which to search for %s"
 msgstr ""
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr ""
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr ""
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr ""
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr ""
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr ""
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr ""
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr ""
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr ""
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr ""
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr ""
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr ""
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr ""
-#: lex.c:1819
+#: lex.c:1834
 #, fuzzy, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "сімвальная канстанта вельмі доўгая"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 #, fuzzy
 #| msgid "unterminated comment"
 msgid "unterminated raw string"
 msgstr "незавершаныя каментарыі"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr ""
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr ""
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "прапушчан завяршаючы сімвал %c"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr ""
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr ""
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr ""
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr ""
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr ""
-#: lex.c:3287
+#: lex.c:3299
 #, fuzzy, c-format
 msgid "unspellable token %s"
 msgstr "немагу адчыніць файл \"%s\""
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr ""
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr ""
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr ""
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr ""
-#: macro.c:429
+#: macro.c:431
 #, fuzzy
 msgid "could not determine file timestamp"
 msgstr "не магу знайсці крыніцу %s\n"
-#: macro.c:546
+#: macro.c:548
 #, fuzzy
 #| msgid "Could not open data file %s.\n"
 msgid "could not determine date and time"
 msgstr "Немагчыма адчыніць файл з дадзенымі %s.\n"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr ""
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr ""
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr ""
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr ""
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr ""
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr ""
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr ""
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr ""
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr ""
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr ""
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr ""
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr ""
-#: macro.c:3033
+#: macro.c:3141
+#, fuzzy, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
 msgstr ""
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+#, fuzzy
+msgid "expected parameter name before end of line"
+msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
+#: macro.c:3144
+msgid "expected ')' before end of line"
 msgstr ""
-#: macro.c:3060
+#: macro.c:3145
-msgid "parameter name missing"
+msgid "expected ')' after \"...\""
 msgstr ""
-#: macro.c:3081
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr ""
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr ""
-#: macro.c:3097
+#: macro.c:3213
 #, fuzzy
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C89 не падтрымлівае \"long long\""
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr ""
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr ""
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr ""
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr ""
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr ""
-#: macro.c:3226
+#: macro.c:3323
 #, fuzzy
 #| msgid "missing white space after number '%.*s'"
 msgid "missing whitespace after the macro name"
 msgstr "прапушчан прабел пасля нумара \"%.*s\""
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr ""
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr ""
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr ""
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr ""
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr ""
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr ""
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr ""
-#: pch.c:643
+#: pch.c:638
 #, fuzzy, c-format
 #| msgid "label `%s' used but not defined"
 msgid "%s: not used because `%.*s' not defined"
 msgstr "адмеціна `%s' выкарыстоўвываецца, але ня вызначана"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr ""
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr ""
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr ""
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr ""
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr ""
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr ""
 #~ msgid "can't define friend function `%s' in a local class definition"
 #~ msgstr "не магу ініцыялізаваць сяброўскую функцыю \"%s\""
-#, fuzzy
-#~ msgid "template parameters cannot be friends"
-#~ msgstr "віртуальныя функцыі не могуць быць сяброўскімі"
 #~ msgid "invalid use of `::'"
 #~ msgstr "нерэчаіснае выкарыстаньне `::'"

gcc/libcpp/po/ca.gmo+0−0

Binary file not shown.

gcc/libcpp/po/ca.po+180−165

 msgstr ""
 "Project-Id-Version: cpplib-4.0.1\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
 "PO-Revision-Date: 2005-11-25 22:56+0100\n"
 "Last-Translator: Mateu Gilles <gilles@mateu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "el nom de car�cter universal  %.*s no �s v�lid a l'inici d'un identificador"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "convertint UCN al joc font de car�cters"
 msgid "missing open quote"
 msgstr ""
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "constant de car�cter massa gran pel seu tipus"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "constant de car�cter amb m�ltiples car�cters"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "constant de car�ter buida"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "fallada convertint %s a %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "elements superflus al final de la directiva #%s"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s �s una extenci� del GCC"
-#: directives.c:390
+#: directives.c:384
 #, fuzzy, c-format
 #| msgid "#%s is a GCC extension"
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s �s una extenci� del GCC"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "es suggereix no usar #elif en C tradicional"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "C tradicional ignora #%s amb el # indentat"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "es suggereix ocultar #%s del C tradicional amb el # indentat"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "l'incrustaci� d'una directiva entre arguments de macro no �s portable"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "la directiva d'estil de l�nia �s una extenci� del GCC"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "directiva de preprocessament #%s inv�lida"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "\"defined\" no es pot usar com un nom de macro"
-#: directives.c:611
+#: directives.c:605
 #, fuzzy
 #| msgid "\"defined\" cannot be used as a macro name"
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "\"defined\" no es pot usar com un nom de macro"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "no es pot usar \"%s\" com un nom de macro perqu� �s un operador en C++"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "no es va donar un nom de macro en la directiva #%s"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "els noms de macro han de ser identificadors"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "esborrant la definici� de \"%s\""
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "falta el car�cter de terminaci� >"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s espera \"NOM_DE_FITXER\" o <NOM_DE_FITXER>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "nom de fitxer buit en #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include niat amb massa profunditat"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next en el fitxer font primari"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "indicador \"%s\" inv�lid en la directiva de l�nia"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr ""
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "\"%s\" despr�s de #line no �s un enter positiu"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "nombre de l�nia fora de rang"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "\"%s\" no �s un nom de fitxer v�lid"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "\"%s\" despr�s de # no �s un enter positiu"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr ""
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr ""
-#: directives.c:1185
+#: directives.c:1175
 #, fuzzy, c-format
 #| msgid "invalid #ident directive"
 msgid "invalid #%s directive"
 msgstr "directiva #ident inv�lida"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr ""
-#: directives.c:1257
+#: directives.c:1247
 #, fuzzy, c-format
 #| msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "ja s'ha desat #pragma %s %s"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "ja s'ha desat #pragma %s"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr ""
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma una vegada en el fitxer principal"
-#: directives.c:1551
+#: directives.c:1541
 #, fuzzy
 #| msgid "invalid #pragma GCC poison directive"
 msgid "invalid #pragma push_macro directive"
 msgstr "directiva #pragma de GCC enverinada inv�lida"
-#: directives.c:1606
+#: directives.c:1596
 #, fuzzy
 #| msgid "invalid #pragma GCC poison directive"
 msgid "invalid #pragma pop_macro directive"
 msgstr "directiva #pragma de GCC enverinada inv�lida"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "directiva #pragma de GCC enverinada inv�lida"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "enverinant la macro existent \"%s\""
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header ignorat fora del fitxer d'inclusi�"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "no es pot trobar la font %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "el fitxer actual �s m�s vell que %s"
-#: directives.c:1742
+#: directives.c:1732
 #, fuzzy, c-format
 #| msgid "invalid #pragma GCC poison directive"
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "directiva #pragma de GCC enverinada inv�lida"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma pren una cadena literal entre par�ntesis"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else sense #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else despr�s de #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "el condicional va comen�ar aqu�"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif sense #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif despr�s de #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif sense #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "falta \"(\" abans del predicat"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "falta \")\" per a completar la resposta"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "el predicat de la resposta est� buit"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "afirmaci� sense predicat"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "el predicat ha de ser un identificador"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "\"%s\" reafirmat"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "#%s sense acabar"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "comentari sense acabar"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "stdout"
 msgid "this use of \"defined\" may not be portable"
 msgstr "aquest �s de \"defined\" podria no ser portable"
-#: expr.c:1125
+#: expr.c:1109
 #, fuzzy
 #| msgid "integer overflow in preprocessor expression"
 msgid "user-defined literal in preprocessor expression"
 msgstr "desbordament d'enter en l'expressi� del preprocessador"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "constant de coma flotant en l'expressi� del preprocessador"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "nombre imaginari en l'expressi� del preprocessador"
-#: expr.c:1189
+#: expr.c:1173
 #, fuzzy, c-format
 #| msgid "\"%s\" is not defined"
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "\"%s\" no �s definit"
-#: expr.c:1202
+#: expr.c:1186
 #, fuzzy
 #| msgid "#%s is a GCC extension"
 msgid "assertions are a GCC extension"
 msgstr "#%s �s una extenci� del GCC"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr ""
-#: expr.c:1451
+#: expr.c:1435
 #, fuzzy, c-format
 #| msgid "unbalanced stack in #if"
 msgid "unbalanced stack in %s"
 msgstr "pila desequilibrada en #if"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "operador \"%u\" impossible"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "\")\" faltant en l'expressi�"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr " \"?\" sense el \":\" seg�ent"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "desbordament d'enter en l'expressi� del preprocessador"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "\"(\" faltant en l'expressi�"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "l'operant esquera de \"%s\" canvia el signe quan �s promogut"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "l'operant dreta de \"%s\" canvia el signe quan �s promogut"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "C tradicional rebutja l'operador unari m�s"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "operador coma en operant de #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "divisi� per zero en #if"
-#: expr.c:2243
+#: expr.c:2227
 #, fuzzy
 #| msgid "operator \"defined\" requires an identifier"
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "l'operador \"defined\" requereix un identificador"
-#: expr.c:2259
+#: expr.c:2243
 #, fuzzy
 #| msgid "missing ')' after \"defined\""
 msgid "missing ')' after \"__has_include__\""
 msgid "no include path in which to search for %s"
 msgstr "no hi ha ruta d'inclusi� en la qual cercar %s"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "M�ltiples gu�rdies d'inclusi� poden ser �tils per a:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t ha de ser d'un tipus unsigned"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "l'aritm�tica del preprocesador t� una precisi� m�xima de %lu bits; l'objectiu requereix %lu bits"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "l'aritm�tica de CPP ha de ser almenys tan precisa com un int de l'objectiu"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "el char de l'objectiu t� menys de 8 bits d'ampliaria"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "el wchar_t de l'objectiu �s m�s estret qu'el char de l'objectiu"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "el int de l'objectiu �s m�s estret qu'el char de l'objectiu"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "el half-integer de CPP �s m�s estret que el car�cter de CPP"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP no pot manejar constants de car�cter amples m�s enll� de %lu bits en aquest ordinador, per� l'objectiu requereix %lu bits"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr ""
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr ""
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr ""
-#: lex.c:1819
+#: lex.c:1834
 #, fuzzy, c-format
 #| msgid "universal character %.*s is not valid in an identifier"
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "el nom de car�cter universal  %.*s no �s v�lid en un identificador"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 #, fuzzy
 #| msgid "unterminated #%s"
 msgid "unterminated raw string"
 msgstr "#%s sense acabar"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr ""
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "car�cter(es) nul(s) preservats en la literal"
-#: lex.c:2027
+#: lex.c:2040
 #, fuzzy, c-format
 #| msgid "missing terminating > character"
 msgid "missing terminating %c character"
 msgstr "falta el car�cter de terminaci� >"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr ""
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "els comentaris d'estil C++ no s�n permesos en ISO C90"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(aix� es reportar� solament una vegada per cada fitxer d'entrada)"
-#: lex.c:2876
+#: lex.c:2887
 #, fuzzy
 #| msgid "C++ style comments are not allowed in ISO C90"
 msgid "C++ style comments are incompatible with C90"
 msgstr "els comentaris d'estil C++ no s�n permesos en ISO C90"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "comentari en m�ltiples l�nies"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "Element %s impronunciable"
-#: macro.c:93
+#: macro.c:94
 #, fuzzy
 #| msgid "'##' cannot appear at either end of a macro expansion"
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "\"##\" no pot apareixer en o al final d'una expansi� de macro"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "no s'usa la macro \"%s\""
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "macro interna \"%s\" inv�lida"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr ""
-#: macro.c:429
+#: macro.c:431
 #, fuzzy
 #| msgid "could not determine date and time"
 msgid "could not determine file timestamp"
 msgstr "no es pot determinar la data i l'hora"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "no es pot determinar la data i l'hora"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr ""
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "cadena literal inv�lida, s'ignora el \"\\\" final"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "enganxar \"%s\" i \"%s\" no d�na un element de preprocessament v�lid"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr ""
-#: macro.c:950
+#: macro.c:952
 #, fuzzy
 #| msgid "ISO C99 requires rest arguments to be used"
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 requereix que la resta dels arguments sigui usat"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "la macro \"%s\" requereix %u arguments, per� nom�s %u passats"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "la macro \"%s\" va rebre %u arguments, per� en va prendre solament %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "llista d'arguments sense acabar a l'invocar la macro \"%s\""
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "la funci� de macro \"%s\" s'ha d'usar amb arguments en C tradicional"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr ""
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr ""
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "par�metre de macro \"%s\" duplicat"
-#: macro.c:3033
+#: macro.c:3141
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected parameter name, found \"%s\""
-msgstr "\"%s\" podria faltar en la llista de par�metre de macro"
+msgstr ""
+#: macro.c:3142
+#, c-format
+msgid "expected ',' or ')', found \"%s\""
+msgstr ""
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "els par�metres de macro han de ser separats per comes"
+msgstr ""
+#: macro.c:3144
+msgid "expected ')' before end of line"
+msgstr ""
-#: macro.c:3060
+#: macro.c:3145
-msgid "parameter name missing"
+msgid "expected ')' after \"...\""
-msgstr "falta el nom del par�metre"
+msgstr ""
-#: macro.c:3081
+#: macro.c:3202
 #, fuzzy
 #| msgid "anonymous variadic macros were introduced in C99"
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "els macros variadic an�nims es van introduir en C99"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "els macros variadic an�nims es van introduir en C99"
-#: macro.c:3097
+#: macro.c:3213
 #, fuzzy
 #| msgid "ISO C does not permit named variadic macros"
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "\")\" faltant en la llista de par�metres de macro"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "\"##\" no pot apareixer en o al final d'una expansi� de macro"
-#: macro.c:3198
+#: macro.c:3298
 #, fuzzy
 #| msgid "ISO C99 requires whitespace after the macro name"
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C99 requereix espais en blanc despr�s del nom de macro"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 requereix espais en blanc despr�s del nom de macro"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "espais en blanc faltant despr�s del nom de macro"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "\"#\" no �s seguit per un par�metre de macro"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "\"%s\" re-definit"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "aquesta �s la ubicaci� de la definici� pr�via"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "l'argument de macro \"%s\" hauria de ser convertit en cadena en C traditional"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "tipus de hash %d inv�lid en cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "mentre escrivint cap�alera precompilada"
-#: pch.c:621
+#: pch.c:616
 #, fuzzy, c-format
 #| msgid "%s: not used because `%s' is defined"
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: no utilitzat perqu� \"%s\" �s definit"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: no utilitzat perqu� \"%.*s\" no est� definit"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: no utilitzat perqu� \"%.*s\" est� definit com a \"%s\" i no com a \"%.*s\""
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: no utilitzat perqu� \"%s\" �s definit"
-#: pch.c:716
+#: pch.c:711
 #, fuzzy, c-format
 #| msgid "%s: not used because `%s' is defined"
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: no utilitzat perqu� \"%s\" �s definit"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "mentre llegint cap�alera precompilada"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "whilst recursiu detectat en expandint la macro \"%s\""
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "error sint�ctic en la llista de par�metre de macro"
 #~ msgstr ""
 #~ ",\n"
 #~ "                 d�s de %s:%u"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "\"%s\" podria faltar en la llista de par�metre de macro"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "els par�metres de macro han de ser separats per comes"
+#~ msgid "parameter name missing"
+#~ msgstr "falta el nom del par�metre"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "\")\" faltant en la llista de par�metres de macro"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "tipus de hash %d inv�lid en cpp_macro_definition"

gcc/libcpp/po/cpplib.pot+157−157

@@ -8,7 +8,7 @@ msgid "" · 7 unmodified lines
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: PACKAGE VERSION\n"	9	"Project-Id-Version: PACKAGE VERSION\n"
10	"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"	10	"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
11	"POT-Creation-Date: 2018-04-23 20:24+0000\n"	11	"POT-Creation-Date: 2019-02-01 23:01+0000\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgid "universal character %.*s is not valid at the start of an identifier" · 74 unmodified lines
89	msgstr ""	89	msgstr ""
90		90
91	#: charset.c:1181	91	#: charset.c:1181
92	#: charset.c:2000	92	#: charset.c:2002
93	msgid "converting UCN to source character set"	93	msgid "converting UCN to source character set"
94	msgstr ""	94	msgstr ""
95		95
@@ -140,289 +140,289 @@ msgstr "" · 44 unmodified lines
140	msgid "missing open quote"	140	msgid "missing open quote"
141	msgstr ""	141	msgstr ""
142		142
143	#: charset.c:1827	143	#: charset.c:1829
144	#: charset.c:1891	144	#: charset.c:1893
145	msgid "character constant too long for its type"	145	msgid "character constant too long for its type"
146	msgstr ""	146	msgstr ""
147		147
148	#: charset.c:1830	148	#: charset.c:1832
149	msgid "multi-character character constant"	149	msgid "multi-character character constant"
150	msgstr ""	150	msgstr ""
151		151
152	#: charset.c:1931	152	#: charset.c:1933
153	msgid "empty character constant"	153	msgid "empty character constant"
154	msgstr ""	154	msgstr ""
155		155
156	#: charset.c:2047	156	#: charset.c:2049
157	#, c-format	157	#, c-format
158	msgid "failure to convert %s to %s"	158	msgid "failure to convert %s to %s"
159	msgstr ""	159	msgstr ""
160		160
161	#: directives.c:235	161	#: directives.c:229
162	#: directives.c:278	162	#: directives.c:272
163	#, c-format	163	#, c-format
164	msgid "extra tokens at end of #%s directive"	164	msgid "extra tokens at end of #%s directive"
165	msgstr ""	165	msgstr ""
166		166
167	#: directives.c:385	167	#: directives.c:379
168	#, c-format	168	#, c-format
169	msgid "#%s is a GCC extension"	169	msgid "#%s is a GCC extension"
170	msgstr ""	170	msgstr ""
171		171
172	#: directives.c:390	172	#: directives.c:384
173	#, c-format	173	#, c-format
174	msgid "#%s is a deprecated GCC extension"	174	msgid "#%s is a deprecated GCC extension"
175	msgstr ""	175	msgstr ""
176		176
177	#: directives.c:403	177	#: directives.c:397
178	msgid "suggest not using #elif in traditional C"	178	msgid "suggest not using #elif in traditional C"
179	msgstr ""	179	msgstr ""
180		180
181	#: directives.c:406	181	#: directives.c:400
182	#, c-format	182	#, c-format
183	msgid "traditional C ignores #%s with the # indented"	183	msgid "traditional C ignores #%s with the # indented"
184	msgstr ""	184	msgstr ""
185		185
186	#: directives.c:410	186	#: directives.c:404
187	#, c-format	187	#, c-format
188	msgid "suggest hiding #%s from traditional C with an indented #"	188	msgid "suggest hiding #%s from traditional C with an indented #"
189	msgstr ""	189	msgstr ""
190		190
191	#: directives.c:436	191	#: directives.c:430
192	msgid "embedding a directive within macro arguments is not portable"	192	msgid "embedding a directive within macro arguments is not portable"
193	msgstr ""	193	msgstr ""
194		194
195	#: directives.c:456	195	#: directives.c:450
196	msgid "style of line directive is a GCC extension"	196	msgid "style of line directive is a GCC extension"
197	msgstr ""	197	msgstr ""
198		198
199	#: directives.c:537	199	#: directives.c:531
200	#, c-format	200	#, c-format
201	msgid "invalid preprocessing directive #%s"	201	msgid "invalid preprocessing directive #%s"
202	msgstr ""	202	msgstr ""
203		203
204	#: directives.c:606	204	#: directives.c:600
205	msgid "\"defined\" cannot be used as a macro name"	205	msgid "\"defined\" cannot be used as a macro name"
206	msgstr ""	206	msgstr ""
207		207
208	#: directives.c:611	208	#: directives.c:605
209	msgid "\"__has_include__\" cannot be used as a macro name"	209	msgid "\"__has_include__\" cannot be used as a macro name"
210	msgstr ""	210	msgstr ""
211		211
212	#: directives.c:617	212	#: directives.c:611
213	#, c-format	213	#, c-format
214	msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"	214	msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
215	msgstr ""	215	msgstr ""
216		216
217	#: directives.c:620	217	#: directives.c:614
218	#, c-format	218	#, c-format
219	msgid "no macro name given in #%s directive"	219	msgid "no macro name given in #%s directive"
220	msgstr ""	220	msgstr ""
221		221
222	#: directives.c:623	222	#: directives.c:617
223	msgid "macro names must be identifiers"	223	msgid "macro names must be identifiers"
224	msgstr ""	224	msgstr ""
225		225
226	#: directives.c:672	226	#: directives.c:666
227	#: directives.c:677	227	#: directives.c:671
228	#, c-format	228	#, c-format
229	msgid "undefining \"%s\""	229	msgid "undefining \"%s\""
230	msgstr ""	230	msgstr ""
231		231
232	#: directives.c:732	232	#: directives.c:727
233	msgid "missing terminating > character"	233	msgid "missing terminating > character"
234	msgstr ""	234	msgstr ""
235		235
236	#: directives.c:791	236	#: directives.c:786
237	#, c-format	237	#, c-format
238	msgid "#%s expects \"FILENAME\" or <FILENAME>"	238	msgid "#%s expects \"FILENAME\" or <FILENAME>"
239	msgstr ""	239	msgstr ""
240		240
241	#: directives.c:837	241	#: directives.c:828
242	#, c-format	242	#, c-format
243	msgid "empty filename in #%s"	243	msgid "empty filename in #%s"
244	msgstr ""	244	msgstr ""
245		245
246	#: directives.c:847	246	#: directives.c:835
247	msgid "#include nested too deeply"	247	msgid "#include nested too deeply"
248	msgstr ""	248	msgstr ""
249		249
250	#: directives.c:888	250	#: directives.c:877
251	msgid "#include_next in primary source file"	251	msgid "#include_next in primary source file"
252	msgstr ""	252	msgstr ""
253		253
254	#: directives.c:914	254	#: directives.c:903
255	#, c-format	255	#, c-format
256	msgid "invalid flag \"%s\" in line directive"	256	msgid "invalid flag \"%s\" in line directive"
257	msgstr ""	257	msgstr ""
258		258
259	#: directives.c:974	259	#: directives.c:963
260	msgid "unexpected end of file after #line"	260	msgid "unexpected end of file after #line"
261	msgstr ""	261	msgstr ""
262		262
263	#: directives.c:977	263	#: directives.c:966
264	#, c-format	264	#, c-format
265	msgid "\"%s\" after #line is not a positive integer"	265	msgid "\"%s\" after #line is not a positive integer"
266	msgstr ""	266	msgstr ""
267		267
268	#: directives.c:983	268	#: directives.c:972
269	#: directives.c:985	269	#: directives.c:974
270	msgid "line number out of range"	270	msgid "line number out of range"
271	msgstr ""	271	msgstr ""
272		272
273	#: directives.c:998	273	#: directives.c:987
274	#: directives.c:1079	274	#: directives.c:1068
275	#, c-format	275	#, c-format
276	msgid "\"%s\" is not a valid filename"	276	msgid "\"%s\" is not a valid filename"
277	msgstr ""	277	msgstr ""
278		278
279	#: directives.c:1039	279	#: directives.c:1028
280	#, c-format	280	#, c-format
281	msgid "\"%s\" after # is not a positive integer"	281	msgid "\"%s\" after # is not a positive integer"
282	msgstr ""	282	msgstr ""
283		283
284	#: directives.c:1098	284	#: directives.c:1087
285	#, c-format	285	#, c-format
286	msgid "file \"%s\" linemarker ignored due to incorrect nesting"	286	msgid "file \"%s\" linemarker ignored due to incorrect nesting"
287	msgstr ""	287	msgstr ""
288		288
289	#: directives.c:1157	289	#: directives.c:1147
290	#: directives.c:1159	290	#: directives.c:1149
291	#: directives.c:1161	291	#: directives.c:1151
292	#: directives.c:1747	292	#: directives.c:1737
293	#, c-format	293	#, c-format
294	msgid "%s"	294	msgid "%s"
295	msgstr ""	295	msgstr ""
296		296
297	#: directives.c:1185	297	#: directives.c:1175
298	#, c-format	298	#, c-format
299	msgid "invalid #%s directive"	299	msgid "invalid #%s directive"
300	msgstr ""	300	msgstr ""
301		301
302	#: directives.c:1248	302	#: directives.c:1238
303	#, c-format	303	#, c-format
304	msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"	304	msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
305	msgstr ""	305	msgstr ""
306		306
307	#: directives.c:1257	307	#: directives.c:1247
308	#, c-format	308	#, c-format
309	msgid "registering pragma \"%s\" with name expansion and no namespace"	309	msgid "registering pragma \"%s\" with name expansion and no namespace"
310	msgstr ""	310	msgstr ""
311		311
312	#: directives.c:1275	312	#: directives.c:1265
313	#, c-format	313	#, c-format
314	msgid "registering \"%s\" as both a pragma and a pragma namespace"	314	msgid "registering \"%s\" as both a pragma and a pragma namespace"
315	msgstr ""	315	msgstr ""
316		316
317	#: directives.c:1278	317	#: directives.c:1268
318	#, c-format	318	#, c-format
319	msgid "#pragma %s %s is already registered"	319	msgid "#pragma %s %s is already registered"
320	msgstr ""	320	msgstr ""
321		321
322	#: directives.c:1281	322	#: directives.c:1271
323	#, c-format	323	#, c-format
324	msgid "#pragma %s is already registered"	324	msgid "#pragma %s is already registered"
325	msgstr ""	325	msgstr ""
326		326
327	#: directives.c:1311	327	#: directives.c:1301
328	msgid "registering pragma with NULL handler"	328	msgid "registering pragma with NULL handler"
329	msgstr ""	329	msgstr ""
330		330
331	#: directives.c:1528	331	#: directives.c:1518
332	msgid "#pragma once in main file"	332	msgid "#pragma once in main file"
333	msgstr ""	333	msgstr ""
334		334
335	#: directives.c:1551	335	#: directives.c:1541
336	msgid "invalid #pragma push_macro directive"	336	msgid "invalid #pragma push_macro directive"
337	msgstr ""	337	msgstr ""
338		338
339	#: directives.c:1606	339	#: directives.c:1596
340	msgid "invalid #pragma pop_macro directive"	340	msgid "invalid #pragma pop_macro directive"
341	msgstr ""	341	msgstr ""
342		342
343	#: directives.c:1661	343	#: directives.c:1651
344	msgid "invalid #pragma GCC poison directive"	344	msgid "invalid #pragma GCC poison directive"
345	msgstr ""	345	msgstr ""
346		346
347	#: directives.c:1670	347	#: directives.c:1660
348	#, c-format	348	#, c-format
349	msgid "poisoning existing macro \"%s\""	349	msgid "poisoning existing macro \"%s\""
350	msgstr ""	350	msgstr ""
351		351
352	#: directives.c:1689	352	#: directives.c:1679
353	msgid "#pragma system_header ignored outside include file"	353	msgid "#pragma system_header ignored outside include file"
354	msgstr ""	354	msgstr ""
355		355
356	#: directives.c:1714	356	#: directives.c:1704
357	#, c-format	357	#, c-format
358	msgid "cannot find source file %s"	358	msgid "cannot find source file %s"
359	msgstr ""	359	msgstr ""
360		360
361	#: directives.c:1718	361	#: directives.c:1708
362	#, c-format	362	#, c-format
363	msgid "current file is older than %s"	363	msgid "current file is older than %s"
364	msgstr ""	364	msgstr ""
365		365
366	#: directives.c:1742	366	#: directives.c:1732
367	#, c-format	367	#, c-format
368	msgid "invalid \"#pragma GCC %s\" directive"	368	msgid "invalid \"#pragma GCC %s\" directive"
369	msgstr ""	369	msgstr ""
370		370
371	#: directives.c:1943	371	#: directives.c:1933
372	msgid "_Pragma takes a parenthesized string literal"	372	msgid "_Pragma takes a parenthesized string literal"
373	msgstr ""	373	msgstr ""
374		374
375	#: directives.c:2064	375	#: directives.c:2021
376	msgid "#else without #if"	376	msgid "#else without #if"
377	msgstr ""	377	msgstr ""
378		378
379	#: directives.c:2069	379	#: directives.c:2026
380	msgid "#else after #else"	380	msgid "#else after #else"
381	msgstr ""	381	msgstr ""
382		382
383	#: directives.c:2071	383	#: directives.c:2028
384	#: directives.c:2104	384	#: directives.c:2061
385	msgid "the conditional began here"	385	msgid "the conditional began here"
386	msgstr ""	386	msgstr ""
387		387
388	#: directives.c:2097	388	#: directives.c:2054
389	msgid "#elif without #if"	389	msgid "#elif without #if"
390	msgstr ""	390	msgstr ""
391		391
392	#: directives.c:2102	392	#: directives.c:2059
393	msgid "#elif after #else"	393	msgid "#elif after #else"
394	msgstr ""	394	msgstr ""
395		395
396	#: directives.c:2133	396	#: directives.c:2090
397	msgid "#endif without #if"	397	msgid "#endif without #if"
398	msgstr ""	398	msgstr ""
399		399
400	#: directives.c:2213	400	#: directives.c:2166
401	msgid "missing '(' after predicate"	401	msgid "missing '(' after predicate"
402	msgstr ""	402	msgstr ""
403		403
404	#: directives.c:2228	404	#: directives.c:2184
405	msgid "missing ')' to complete answer"	405	msgid "missing ')' to complete answer"
406	msgstr ""	406	msgstr ""
407		407
408	#: directives.c:2248	408	#: directives.c:2196
409	msgid "predicate's answer is empty"	409	msgid "predicate's answer is empty"
410	msgstr ""	410	msgstr ""
411		411
412	#: directives.c:2275	412	#: directives.c:2226
413	msgid "assertion without predicate"	413	msgid "assertion without predicate"
414	msgstr ""	414	msgstr ""
415		415
416	#: directives.c:2278	416	#: directives.c:2229
417	msgid "predicate must be an identifier"	417	msgid "predicate must be an identifier"
418	msgstr ""	418	msgstr ""
419		419
420	#: directives.c:2364	420	#: directives.c:2311
421	#, c-format	421	#, c-format
422	msgid "\"%s\" re-asserted"	422	msgid "\"%s\" re-asserted"
423	msgstr ""	423	msgstr ""
424		424
425	#: directives.c:2656	425	#: directives.c:2587
426	#, c-format	426	#, c-format
427	msgid "unterminated #%s"	427	msgid "unterminated #%s"
428	msgstr ""	428	msgstr ""
@@ -433,12 +433,12 @@ msgstr "" · 4 unmodified lines
433	msgid "unterminated comment"	433	msgid "unterminated comment"
434	msgstr ""	434	msgstr ""
435		435
436	#: errors.c:284	436	#: errors.c:291
437	#, c-format	437	#, c-format
438	msgid "%s: %s"	438	msgid "%s: %s"
439	msgstr ""	439	msgstr ""
440		440
441	#: errors.c:296	441	#: errors.c:304
442	msgid "stdout"	442	msgid "stdout"
443	msgstr ""	443	msgstr ""
444		444
@@ -533,84 +533,84 @@ msgstr "" · 88 unmodified lines
533	msgid "this use of \"defined\" may not be portable"	533	msgid "this use of \"defined\" may not be portable"
534	msgstr ""	534	msgstr ""
535		535
536	#: expr.c:1125	536	#: expr.c:1109
537	msgid "user-defined literal in preprocessor expression"	537	msgid "user-defined literal in preprocessor expression"
538	msgstr ""	538	msgstr ""
539		539
540	#: expr.c:1130	540	#: expr.c:1114
541	msgid "floating constant in preprocessor expression"	541	msgid "floating constant in preprocessor expression"
542	msgstr ""	542	msgstr ""
543		543
544	#: expr.c:1136	544	#: expr.c:1120
545	msgid "imaginary number in preprocessor expression"	545	msgid "imaginary number in preprocessor expression"
546	msgstr ""	546	msgstr ""
547		547
548	#: expr.c:1189	548	#: expr.c:1173
549	#, c-format	549	#, c-format
550	msgid "\"%s\" is not defined, evaluates to 0"	550	msgid "\"%s\" is not defined, evaluates to 0"
551	msgstr ""	551	msgstr ""
552		552
553	#: expr.c:1202	553	#: expr.c:1186
554	msgid "assertions are a GCC extension"	554	msgid "assertions are a GCC extension"
555	msgstr ""	555	msgstr ""
556		556
557	#: expr.c:1205	557	#: expr.c:1189
558	msgid "assertions are a deprecated extension"	558	msgid "assertions are a deprecated extension"
559	msgstr ""	559	msgstr ""
560		560
561	#: expr.c:1451	561	#: expr.c:1435
562	#, c-format	562	#, c-format
563	msgid "unbalanced stack in %s"	563	msgid "unbalanced stack in %s"
564	msgstr ""	564	msgstr ""
565		565
566	#: expr.c:1471	566	#: expr.c:1455
567	#, c-format	567	#, c-format
568	msgid "impossible operator '%u'"	568	msgid "impossible operator '%u'"
569	msgstr ""	569	msgstr ""
570		570
571	#: expr.c:1572	571	#: expr.c:1556
572	msgid "missing ')' in expression"	572	msgid "missing ')' in expression"
573	msgstr ""	573	msgstr ""
574		574
575	#: expr.c:1601	575	#: expr.c:1585
576	msgid "'?' without following ':'"	576	msgid "'?' without following ':'"
577	msgstr ""	577	msgstr ""
578		578
579	#: expr.c:1611	579	#: expr.c:1595
580	msgid "integer overflow in preprocessor expression"	580	msgid "integer overflow in preprocessor expression"
581	msgstr ""	581	msgstr ""
582		582
583	#: expr.c:1616	583	#: expr.c:1600
584	msgid "missing '(' in expression"	584	msgid "missing '(' in expression"
585	msgstr ""	585	msgstr ""
586		586
587	#: expr.c:1648	587	#: expr.c:1632
588	#, c-format	588	#, c-format
589	msgid "the left operand of \"%s\" changes sign when promoted"	589	msgid "the left operand of \"%s\" changes sign when promoted"
590	msgstr ""	590	msgstr ""
591		591
592	#: expr.c:1653	592	#: expr.c:1637
593	#, c-format	593	#, c-format
594	msgid "the right operand of \"%s\" changes sign when promoted"	594	msgid "the right operand of \"%s\" changes sign when promoted"
595	msgstr ""	595	msgstr ""
596		596
597	#: expr.c:1912	597	#: expr.c:1896
598	msgid "traditional C rejects the unary plus operator"	598	msgid "traditional C rejects the unary plus operator"
599	msgstr ""	599	msgstr ""
600		600
601	#: expr.c:2010	601	#: expr.c:1994
602	msgid "comma operator in operand of #if"	602	msgid "comma operator in operand of #if"
603	msgstr ""	603	msgstr ""
604		604
605	#: expr.c:2146	605	#: expr.c:2130
606	msgid "division by zero in #if"	606	msgid "division by zero in #if"
607	msgstr ""	607	msgstr ""
608		608
609	#: expr.c:2243	609	#: expr.c:2227
610	msgid "operator \"__has_include__\" requires a header string"	610	msgid "operator \"__has_include__\" requires a header string"
611	msgstr ""	611	msgstr ""
612		612
613	#: expr.c:2259	613	#: expr.c:2243
614	msgid "missing ')' after \"__has_include__\""	614	msgid "missing ')' after \"__has_include__\""
615	msgstr ""	615	msgstr ""
616		616
@@ -627,42 +627,42 @@ msgstr "" · 10 unmodified lines
627	msgid "no include path in which to search for %s"	627	msgid "no include path in which to search for %s"
628	msgstr ""	628	msgstr ""
629		629
630	#: files.c:1441	630	#: files.c:1455
631	msgid "Multiple include guards may be useful for:\n"	631	msgid "Multiple include guards may be useful for:\n"
632	msgstr ""	632	msgstr ""
633		633
634	#: init.c:565	634	#: init.c:569
635	msgid "cppchar_t must be an unsigned type"	635	msgid "cppchar_t must be an unsigned type"
636	msgstr ""	636	msgstr ""
637		637
638	#: init.c:569	638	#: init.c:573
639	#, c-format	639	#, c-format
640	msgid ""	640	msgid ""
641	"preprocessor arithmetic has maximum precision of %lu bits; target requires "	641	"preprocessor arithmetic has maximum precision of %lu bits; target requires "
642	"%lu bits"	642	"%lu bits"
643	msgstr ""	643	msgstr ""
644		644
645	#: init.c:576	645	#: init.c:580
646	msgid "CPP arithmetic must be at least as precise as a target int"	646	msgid "CPP arithmetic must be at least as precise as a target int"
647	msgstr ""	647	msgstr ""
648		648
649	#: init.c:579	649	#: init.c:583
650	msgid "target char is less than 8 bits wide"	650	msgid "target char is less than 8 bits wide"
651	msgstr ""	651	msgstr ""
652		652
653	#: init.c:583	653	#: init.c:587
654	msgid "target wchar_t is narrower than target char"	654	msgid "target wchar_t is narrower than target char"
655	msgstr ""	655	msgstr ""
656		656
657	#: init.c:587	657	#: init.c:591
658	msgid "target int is narrower than target char"	658	msgid "target int is narrower than target char"
659	msgstr ""	659	msgstr ""
660		660
661	#: init.c:592	661	#: init.c:596
662	msgid "CPP half-integer narrower than CPP character"	662	msgid "CPP half-integer narrower than CPP character"
663	msgstr ""	663	msgstr ""
664		664
665	#: init.c:596	665	#: init.c:600
666	#, c-format	666	#, c-format
667	msgid ""	667	msgid ""
668	"CPP on this host cannot handle wide character constants over %lu bits, but "	668	"CPP on this host cannot handle wide character constants over %lu bits, but "
@@ -785,7 +785,7 @@ msgstr "" · 116 unmodified lines
785		785
786	#: lex.c:2878	786	#: lex.c:2878
787	#: lex.c:2889	787	#: lex.c:2889
788	#: lex.c:2912	788	#: lex.c:2913
789	msgid "(this will be reported only once per input file)"	789	msgid "(this will be reported only once per input file)"
790	msgstr ""	790	msgstr ""
791		791
@@ -793,16 +793,16 @@ msgstr "" · 1 unmodified line
793	msgid "C++ style comments are incompatible with C90"	793	msgid "C++ style comments are incompatible with C90"
794	msgstr ""	794	msgstr ""
795		795
796	#: lex.c:2918	796	#: lex.c:2919
797	msgid "multi-line comment"	797	msgid "multi-line comment"
798	msgstr ""	798	msgstr ""
799		799
800	#: lex.c:3298	800	#: lex.c:3299
801	#, c-format	801	#, c-format
802	msgid "unspellable token %s"	802	msgid "unspellable token %s"
803	msgstr ""	803	msgstr ""
804		804
805	#: macro.c:93	805	#: macro.c:94
806	msgid "'##' cannot appear at either end of __VA_OPT__"	806	msgid "'##' cannot appear at either end of __VA_OPT__"
807	msgstr ""	807	msgstr ""
808		808
@@ -864,154 +864,154 @@ msgstr "" · 55 unmodified lines
864	msgid "macro \"%s\" passed %u arguments, but takes just %u"	864	msgid "macro \"%s\" passed %u arguments, but takes just %u"
865	msgstr ""	865	msgstr ""
866		866
867	#: macro.c:1158	867	#: macro.c:1162
868	#: traditional.c:827	868	#: traditional.c:827
869	#, c-format	869	#, c-format
870	msgid "unterminated argument list invoking macro \"%s\""	870	msgid "unterminated argument list invoking macro \"%s\""
871	msgstr ""	871	msgstr ""
872		872
873	#: macro.c:1309	873	#: macro.c:1304
874	#, c-format	874	#, c-format
875	msgid "function-like macro \"%s\" must be used with arguments in traditional C"	875	msgid "function-like macro \"%s\" must be used with arguments in traditional C"
876	msgstr ""	876	msgstr ""
877		877
878	#: macro.c:2098	878	#: macro.c:2083
879	#, c-format	879	#, c-format
880	msgid ""	880	msgid ""
881	"invoking macro %s argument %d: empty macro arguments are undefined in ISO C+"	881	"invoking macro %s argument %d: empty macro arguments are undefined in ISO C+"
882	"+98"	882	"+98"
883	msgstr ""	883	msgstr ""
884		884
885	#: macro.c:2106	885	#: macro.c:2091
886	#: macro.c:2115	886	#: macro.c:2100
887	#, c-format	887	#, c-format
888	msgid ""	888	msgid ""
889	"invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"	889	"invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
890	msgstr ""	890	msgstr ""
891		891
892	#: macro.c:3073	892	#: macro.c:3059
893	#, c-format	893	#, c-format
894	msgid "duplicate macro parameter \"%s\""	894	msgid "duplicate macro parameter \"%s\""
895	msgstr ""	895	msgstr ""
896		896
897	#: macro.c:3122	897	#: macro.c:3141
		898	#, c-format
		899	msgid "expected parameter name, found \"%s\""
		900	msgstr ""
		901
		902	#: macro.c:3142
898	#, c-format	903	#, c-format
899	msgid "\"%s\" may not appear in macro parameter list"	904	msgid "expected ',' or ')', found \"%s\""
		905	msgstr ""
		906
		907	#: macro.c:3143
		908	msgid "expected parameter name before end of line"
900	msgstr ""	909	msgstr ""
901		910
902	#: macro.c:3130	911	#: macro.c:3144
903	msgid "macro parameters must be comma-separated"	912	msgid "expected ')' before end of line"
904	msgstr ""	913	msgstr ""
905		914
906	#: macro.c:3149	915	#: macro.c:3145
907	msgid "parameter name missing"	916	msgid "expected ')' after \"...\""
908	msgstr ""	917	msgstr ""
909		918
910	#: macro.c:3170	919	#: macro.c:3202
911	msgid "anonymous variadic macros were introduced in C++11"	920	msgid "anonymous variadic macros were introduced in C++11"
912	msgstr ""	921	msgstr ""
913		922
914	#: macro.c:3174	923	#: macro.c:3203
915	#: macro.c:3179	924	#: macro.c:3207
916	msgid "anonymous variadic macros were introduced in C99"	925	msgid "anonymous variadic macros were introduced in C99"
917	msgstr ""	926	msgstr ""
918		927
919	#: macro.c:3186	928	#: macro.c:3213
920	msgid "ISO C++ does not permit named variadic macros"	929	msgid "ISO C++ does not permit named variadic macros"
921	msgstr ""	930	msgstr ""
922		931
923	#: macro.c:3189	932	#: macro.c:3214
924	msgid "ISO C does not permit named variadic macros"	933	msgid "ISO C does not permit named variadic macros"
925	msgstr ""	934	msgstr ""
926		935
927	#: macro.c:3199	936	#: macro.c:3260
928	msgid "missing ')' in macro parameter list"
929	msgstr ""
930
931	#: macro.c:3250
932	msgid "'##' cannot appear at either end of a macro expansion"	937	msgid "'##' cannot appear at either end of a macro expansion"
933	msgstr ""	938	msgstr ""
934		939
935	#: macro.c:3287	940	#: macro.c:3298
936	msgid "ISO C++11 requires whitespace after the macro name"	941	msgid "ISO C++11 requires whitespace after the macro name"
937	msgstr ""	942	msgstr ""
938		943
939	#: macro.c:3290	944	#: macro.c:3299
940	msgid "ISO C99 requires whitespace after the macro name"	945	msgid "ISO C99 requires whitespace after the macro name"
941	msgstr ""	946	msgstr ""
942		947
943	#: macro.c:3315	948	#: macro.c:3323
944	msgid "missing whitespace after the macro name"	949	msgid "missing whitespace after the macro name"
945	msgstr ""	950	msgstr ""
946		951
947	#: macro.c:3352	952	#: macro.c:3373
948	msgid "'#' is not followed by a macro parameter"	953	msgid "'#' is not followed by a macro parameter"
949	msgstr ""	954	msgstr ""
950		955
951	#: macro.c:3519	956	#: macro.c:3524
952	#, c-format	957	#, c-format
953	msgid "\"%s\" redefined"	958	msgid "\"%s\" redefined"
954	msgstr ""	959	msgstr ""
955		960
956	#: macro.c:3524	961	#: macro.c:3529
957	msgid "this is the location of the previous definition"	962	msgid "this is the location of the previous definition"
958	msgstr ""	963	msgstr ""
959		964
960	#: macro.c:3585	965	#: macro.c:3633
961	#, c-format	966	#, c-format
962	msgid "macro argument \"%s\" would be stringified in traditional C"	967	msgid "macro argument \"%s\" would be stringified in traditional C"
963	msgstr ""	968	msgstr ""
964		969
965	#: macro.c:3621	970	#: pch.c:90
966	#, c-format	971	#: pch.c:342
967	msgid "invalid hash type %d in cpp_macro_definition"	972	#: pch.c:356
968	msgstr ""	973	#: pch.c:374
969		974	#: pch.c:380
970	#: pch.c:89	975	#: pch.c:389
971	#: pch.c:347	976	#: pch.c:396
972	#: pch.c:361
973	#: pch.c:379
974	#: pch.c:385
975	#: pch.c:394
976	#: pch.c:401
977	msgid "while writing precompiled header"	977	msgid "while writing precompiled header"
978	msgstr ""	978	msgstr ""
979		979
980	#: pch.c:621	980	#: pch.c:616
981	#, c-format	981	#, c-format
982	msgid "%s: not used because `%.*s' is poisoned"	982	msgid "%s: not used because `%.*s' is poisoned"
983	msgstr ""	983	msgstr ""
984		984
985	#: pch.c:643	985	#: pch.c:638
986	#, c-format	986	#, c-format
987	msgid "%s: not used because `%.*s' not defined"	987	msgid "%s: not used because `%.*s' not defined"
988	msgstr ""	988	msgstr ""
989		989
990	#: pch.c:655	990	#: pch.c:650
991	#, c-format	991	#, c-format
992	msgid "%s: not used because `%.s' defined as `%s' not `%.s'"	992	msgid "%s: not used because `%.s' defined as `%s' not `%.s'"
993	msgstr ""	993	msgstr ""
994		994
995	#: pch.c:696	995	#: pch.c:691
996	#, c-format	996	#, c-format
997	msgid "%s: not used because `%s' is defined"	997	msgid "%s: not used because `%s' is defined"
998	msgstr ""	998	msgstr ""
999		999
1000	#: pch.c:716	1000	#: pch.c:711
1001	#, c-format	1001	#, c-format
1002	msgid "%s: not used because `__COUNTER__' is invalid"	1002	msgid "%s: not used because `__COUNTER__' is invalid"
1003	msgstr ""	1003	msgstr ""
1004		1004
1005	#: pch.c:725	1005	#: pch.c:720
1006	#: pch.c:903	1006	#: pch.c:878
1007	msgid "while reading precompiled header"	1007	msgid "while reading precompiled header"
1008	msgstr ""	1008	msgstr ""
1009		1009
1010	#: traditional.c:897	1010	#: traditional.c:896
1011	#, c-format	1011	#, c-format
1012	msgid "detected recursion whilst expanding macro \"%s\""	1012	msgid "detected recursion whilst expanding macro \"%s\""
1013	msgstr ""	1013	msgstr ""
1014		1014
1015	#: traditional.c:1116	1015	#: traditional.c:1119
1016	msgid "syntax error in macro parameter list"	1016	msgid "syntax error in macro parameter list"
1017	msgstr ""	1017	msgstr ""

gcc/libcpp/po/da.gmo+0−0

Binary file not shown.

gcc/libcpp/po/da.po+184−169

 # Danish version of cpplib.
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
 # Ole Laursen <olau@hardworking.dk>, 2001, 02, 03.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016, 2017, 2018.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016, 2017, 2018, 2019.
 #
 # Konventioner:
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 9.1-b20190203\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
-"PO-Revision-Date: 2018-03-03 18:00+0200\n"
+"PO-Revision-Date: 2019-02-14 18:00+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "universelt tegn %.*s er ikke gyldigt i starten af et kaldenavn"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "konverterer UCN til et kildetegnsæt"
 msgid "missing open quote"
 msgstr "manglende indledende citationstegn"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "tegnkonstanten er for lang for dens type"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "flerbyte-tegnkonstant"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "tom tegnkonstant"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "kunne ikke konvertere %s til %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "ekstra symboler i slutningen af #%s-direktiv"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s er en GCC-udvidelse"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s er en forældet GCC-udvidelse"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "foreslår undladelse af brug af #elif i traditionel C"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "traditionel C ignorerer #%s når # er indrykket"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "foreslår at skjule #%s fra traditionel C vha. indrykket #"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "indlejring af et direktiv inden i makroparametre er ikke portabelt"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "linjestilsdirektiv er en GCC-udvidelse"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "ugyldigt præprocessordirektiv #%s"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "»defined« kan ikke bruges som makronavn"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "»__has_include__« kan ikke bruges som et makronavn"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "»%s« kan ikke bruges som et makronavn, da det er en operator i C++"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "intet makronavn angivet i direktivet #%s"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "makronavne skal være kaldenavne"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "fjerner definitionen af »%s«"
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "manglende afsluttende >-tegn"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s forventer »FILNAVN« eller <FILNAVN>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "tomt filnavn i #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include indlejret for dybt"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next i den primære kildekodefil"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "ugyldigt flag »%s« i linjedirektiv"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "uventet filafslutning efter #line"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "»%s« efter #line er ikke et positivt heltal"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "linjenummer er uden for det gyldige interval"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "»%s« er ikke et gyldigt filnavn"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "»%s« efter # er ikke et positivt heltal"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "filen »%s« linjemarkør ignoreret på grund af ukorrekt indlejring"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "ugyldig #%s-direktiv"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "registrerer pragmaer i navnerum »%s« med fejlmatchede navneudvidelse"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "registrerer pragma »%s« med navneudvidelse og intet navnerum"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "registrerer »%s« som både et pragma og et pragmanavnerum"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "#pragma %s %s er allerede registreret"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "#pragma %s er allerede registreret"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "registrerer pragma med NULL-håndtering"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma once i hovedfil"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "ugyldigt #pragma push_macro-direktiv"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "ugyldigt #pragma pop_macro-direktiv"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "ugyldigt #pragma GCC poison-direktiv"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "forgifter eksisterende makro »%s«"
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header ignoreret uden for inkluderingsfil"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "kan ikke finde kildefilen %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "aktuel fil er ældre end %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "ugyldigt »#pragma GCC %s«-direktiv"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma tager en strengkonstant med paranteser omkring"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else uden #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else efter #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "betingelsen begyndte her"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif uden #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif efter #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif uden #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "manglende »(« efter udsagn"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "manglende »)« til at fuldføre svar"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "udsagnets svar er tomt"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "postulat uden udsagn"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "udsagn skal være et kaldenavn"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "»%s« genpostuleret"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "uafsluttet #%s"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "uafsluttet kommentar"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "standardud"
 msgid "this use of \"defined\" may not be portable"
 msgstr "denne brug af »defined« er muligvis ikke portabel"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "brugerdefineret ordret i præprocessorudtrykket"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "kommatalskonstant i præprocessorudtryk"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "imaginært tal i præprocessorudtryk"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "»%s« er ikke defineret, evaluerer til 0"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "påstande er en GCC-udvidelse"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "påstande er en forældet udvidelse"
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "ubalanceret stak i %s"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "umulig operator »%u«"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "manglende »)« i udtryk"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "»?« uden efterfølgende »:«"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "heltallet løber over i præprocessorudtrykket"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "manglende »(« i udtryk"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "den venstre operand til »%s« ændrer fortegn ved forfremmelse"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "den højre operand til »%s« ændrer fortegn ved forfremmelse"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "traditionel C tillader ikke operatoren unær plus"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "kommaoperator i en operand til #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "division med nul i #if"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "operatoren »__has_include__« kræver en teksthovedstreng"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "manglende »)« efter »__has_include__«"
 msgid "no include path in which to search for %s"
 msgstr "der er ingen inkluderingssti at søge efter %s i"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Flere inkluderingsvagter kan være nyttige til:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t skal være en usigneret type"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "præprocessorberegning har en maksimal præcision på %lu bit; målarkitektur kræver %lu bit"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "CPP-beregning skal være mindst lige så præcis som en målarkitekturs int"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "målarkitekturs char er mindre end 8 bit bred"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "målarkitekturs wchar_t er mindre end målarkitekturs char"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "målarkitekturs int er mindre end målarkitekturs char"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "CPP-halvheltal er mindre end CPP-tegn"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP på denne vært kan ikke håndtere bredtegnkonstanter over %lu bit, men målarkitekturen kræver %lu bit"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "kaldenavn »%s« er et specielt operatornavn i C++"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "rå strengafgrænser længere end 16 tegn"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "ugyldig nylinje i rå strengafgrænser"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "ugyldigt tegn »%c« i rå strengafgrænser"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "uafsluttet rå streng"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "ugyldig suffiks på ordret; C++11 kræver et mellemrum mellem ordret og strengmakro"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "nultegn bevaret i strengkonstant"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "manglende afsluttende %c-tegn"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 kræver et mellemrum mellem ordret og strengmakro"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "kommentarer i C++-stil er ikke tilladt i ISO C90"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(dette rapporteres kun en enkelt gang per inddatafil)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "kommentarer i C++-stil er ikke kompatible med C90"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "flerlinjekommentar"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "symbol %s kan ikke staves"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "»##« må ikke optræde ved nogen af enderne i __VA_OPT__"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "makroen »%s« bliver ikke brugt"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "ugyldig indbygget makro »%s«"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "makroen »%s« kan forhindre reproducerbare bygninger"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "kunne ikke bestemme filtidsstempel"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "kunne ikke bestemme dato og tid"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "__COUNTER__ udvidet inden i direktiv med -fdirectives-only"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "ugyldig strengkonstant, ignorerer afsluttende »\\«"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "indsættelse af »%s« og »%s« giver ikke et gyldigt præprocessorsymbol"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C++11 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "makroen »%s« kræver %u parametre, men modtager kun %u"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "makroen »%s« viderebragte %u parametre, men tager kun mod %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "uafsluttet parameterliste ved kald af makroen »%s«"
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "funktionsagtig makro »%s« skal bruges med parametre i traditionel C"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C+98"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C90"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "makroparameternavnet »%s« optræder mere end en gang"
-#: macro.c:3033
+#: macro.c:3141
+#, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "forventede parameternavn, fandt »%s«"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
-msgstr "»%s« må ikke optræde i makroparameterliste"
+msgstr "forventede »,« eller »)«, fandt »%s«"
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "makroparametre skal være kommaadskilte"
+msgstr "forventede parameternavn før linjeafslutning"
-#: macro.c:3060
+#: macro.c:3144
-msgid "parameter name missing"
+msgid "expected ')' before end of line"
-msgstr "parameternavn mangler"
+msgstr "forventede »)« før linjeafslutning"
-#: macro.c:3081
+#: macro.c:3145
+msgid "expected ')' after \"...\""
+msgstr "forventede »)« efter »...«"
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C++11"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C99"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C++ tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "manglende »)« i makroparameterliste"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "»##« må ikke optræde ved nogen af enderne i en makrokrop"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C++11 kræver mellemrum efter makronavnet"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 kræver mellemrum efter makronavnet"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "manglende mellemrum efter makronavnet"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "»#« efterfølges ikke af en makroparameter"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "»%s« omdefineret"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "den foregående definition er her"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "makroparameteren »%s« ville blive gjort til en streng i traditionel C"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "ugyldig hashtype %d i cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "under skrivning af prækompileret teksthoved"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: ikke brugt da »%.*s« er forgiftet"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: ikke brugt da »%.*s« ikke er defineret"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: ikke brugt da »%.*s« er defineret som »%s« ikke »%.*s«"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s ikke brugt da »%s« er defineret"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: ikke brugt da »__COUNTER__« er ugyldig"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "under læsning af prækompileret teksthoved"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "opdagede rekursion ved udfoldelse af makroen »%s«"
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "syntaksfejl i makroparameterliste"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "»%s« må ikke optræde i makroparameterliste"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "makroparametre skal være kommaadskilte"
+#~ msgid "parameter name missing"
+#~ msgstr "parameternavn mangler"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "manglende »)« i makroparameterliste"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "ugyldig hashtype %d i cpp_macro_definition"
 #~ msgid "NULL directory in find_file"
 #~ msgstr "NULL-mappe i find_file"

gcc/libcpp/po/de.gmo+0−0

Binary file not shown.

gcc/libcpp/po/de.po+183−168

 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 9.1-b20190203\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
-"PO-Revision-Date: 2018-01-30 01:58+0100\n"
+"PO-Revision-Date: 2019-02-05 19:15+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
 #: charset.c:674
 #, c-format
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "universelles Zeichen %.*s ist nicht gültig am Anfang eines Bezeichners"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "UCN wird in Quellzeichensatz konvertiert"
 msgid "missing open quote"
 msgstr "Fehlendes öffnendes Anführungszeichen"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "Zeichenkonstante zu lang für ihren Typ"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "Zeichenkonstante mit mehreren Zeichen"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "Leere Zeichenkonstante"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "Fehler beim Konvertieren von %s nach %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "mehrere Token am Ende der Direktive #%s"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s ist eine GCC-Erweiterung"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s ist eine veraltete GCC-Erweiterung"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "es wird empfohlen, in traditionellem C nicht #elif zu verwenden"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "traditionelles C ignoriert #%s mit eingerücktem #"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "es wird empfohlen, #%s vor traditionellem C mit # zu verbergen"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "das Einbetten einer Direktive innerhalb von Makroargumenten ist nicht portierbar"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "der Stil der line-Direktive ist eine GCC-Erweiterung"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "ungültige Präprozessordirektive #%s"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "»defined« kann nicht als Makroname verwendet werden"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "»__has_include__« kann nicht als Makroname verwendet werden"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "»%s« kann nicht als Makroname verwendet werden, da es ein Operator in C++ ist"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "kein Makroname in Direktive #%s angegeben"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "Makronamen müssen Bezeichner sein"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "»%s« wird un-definiert"
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "fehlendes abschließendes »>«-Zeichen"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s erwartet \"DATEINAME\" oder <DATEINAME>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "leerer Dateiname in #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include ist zu tief geschachtelt"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next in erster Quelldatei"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "ungültiges Kennzeichen »%s« in line-Direktive"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "unerwartetes Dateiende nach #line"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "»%s« hinter #line ist keine positive Ganzzahl"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "Zeilennummer ist außerhalb des Wertebereiches"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "»%s« ist kein gültiger Dateiname"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "»%s« hinter # ist keine positive Ganzzahl"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "der Zeilenmarker in der Datei »%s« wird aufgrung falscher Schachtelung ignoriert"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "ungültige #%s-Direktive"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "Pragmas im Namensraum »%s« werden ohne passende Namensauflösung registriert"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "Pragma »%s« wird mit Namensauflösung und ohne Namensraum registriert"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "»%s« wird sowohl als Pragma als auch als Pragma-Namensraum registriert"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "#pragma %s %s ist bereits registriert"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "#pragma %s ist bereits registriert"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "Pragma mit NULL-Handler wird registriert"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma once in Hauptdatei"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "ungültige #pragma push_macro Direktive"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "ungültige #pragma pop_macro Direktive"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "ungültige #pragma GCC Poison Direktive"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "schlechtes existierendes Makro »%s«"
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header außerhalb include-Datei ignoriert"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "Quelldatei %s kann nicht gefunden werden"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "aktuelle Datei ist älter als %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "ungültige »#pragma GCC %s« Direktive"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma nimmt ein geklammertes Zeichenkettenliteral"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else ohne #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else hinter #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "die Bedingung begann hier"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif ohne #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif hinter #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif ohne #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "fehlende »(« hinter Prädikat"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "fehlende »)«, um Antwort abzuschließen"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "Prädikatantwort ist leer"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "Behauptung ohne Prädikat"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "Prädikat muss ein Bezeichner sein"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "»%s« wieder behauptet"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "unbeendetes #%s"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "nicht beendeter Kommentar"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "Standardausgabe"
 msgid "this use of \"defined\" may not be portable"
 msgstr "diese Verwendung von »defined« könnte nicht portierbar sein"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "benutzerdefiniertes Symbol in Präprozessorausdruck"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "Gleitkommakonstante in Präprozessorausdruck"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "imaginäre Zahl in Präprozessorausdruck"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "»%s« ist nicht definiert, wird zu 0 ausgewertet"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "Assertions sind eine GCC-Erweiterung"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "Assertions sind eine veraltete Erweiterung"
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "unausgeglichener Keller in %s"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "unmöglicher Operator »%u«"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "fehlende »)« in Ausdruck"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "»?« ohne folgenden »:«"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "Ganzzahlüberlauf in Präprozessorausdruck"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "fehlende »(« in Ausdruck"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "der linke Operand von »%s« ändert bei der Weitergabe das Vorzeichen"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "der rechte Operand von »%s« ändert bei der Weitergabe das Vorzeichen"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "traditionelles C weist den unären Plus-Operator zurück"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "Kommaoperator in Operand von #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "Division durch Null in #if"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "Operator »__has_include__« erfordert eine Header-Zeichenkette"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "fehlende »)« hinter »__has_include__«"
 msgid "no include path in which to search for %s"
 msgstr "kein Include-Pfad, um %s zu finden"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Mehrere Include-Wächter könnten nützlich sein für:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t muss ein vorzeichenloser Typ sein"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "Präprozessorarithmetik hat maximale Präzision von %lu Bits; Ziel erfordert %lu Bits"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "CPP-Arithmetik muss mindestens so genau sein wie das Ziel int"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "Ziel-char ist weniger als 8 Bits breit"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "Ziel-wchar_t ist schmaler als Ziel-char"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "Ziel-int ist schmaler als Ziel-char"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "CPP Halb-Ganzzahl ist schmaler als CPP-Zeichen"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP kann auf diesem Computer keine Wide-Zeichenkonstanten über %lu Bits Breite behandeln, das Ziel benötigt %lu Bits"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "Bezeichner »%s« ist ein besonderer Operatorname in C++"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "Roh-Zeichenketten-Trennsymbol länger als 16 Zeichen"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "ungültiger Zeilenumbruch (neue Zeile) in Roh-Zeichenketten-Trennsymbol"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "ungültiges Zeichen »%c« in Roh-Zeichenketten-Trennsymbol"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "unbeendete Roh-Zeichenkette"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "ungültiges Suffix an Literal; C++11 erfordert Leerzeichen zwischen Literal und Zeichenketten-Makro"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "Null-Zeichen im Literal erhalten"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "fehlendes abschließendes Zeichen %c"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 erfordert Leerzeichen zwischen Zeichenketten-Literal und Makro"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "C++-Stil-Kommentare sind in ISO-C90 nicht erlaubt"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(dies wird nur einmal pro Eingabedatei gemeldet)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "C++-Stil-Kommentare sind zu C90 inkompatibel"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "mehrzeiliger Kommentar"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "nicht buchstabierbares Token %s"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "»##« kann an einem beliebigen Enden von __VA_OPT__ auftreten"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "Makro »%s« wird nicht benutzt"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "ungültiges eingebautes Makro »%s«"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "Das Makro »%s« könnte reproduzierbare Builds verhindern"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "Zeitstempel der Datei konnte nicht ermittelt werden"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "Datum und Zeit konnten nicht bestimmt werden"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "__COUNTER__ innerhalb von Anweisung mit -fdirectives-only expandiert"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "ungültiges Zeichenkettenliteral, abschließendes »\\« wird ignoriert"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "das Einfügen von »%s« und »%s« ergibt kein gültiges Präprozessor-Token"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO-C++11 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO-C99 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "Makro »%s« erfordert %u Argumente, aber nur %u wurden angegeben"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "dem Makro »%s« wurden %u Argumente übergeben, aber es akzeptiert nur %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "unvollendete Argumentliste beim Makroaufruf »%s«"
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "funktionsähnliches Makro »%s« muss mit Argumenten in traditionellem C verwendet werden"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C++98 unbestimmt"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C90 unbestimmt"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "doppelter Makroparameter »%s«"
-#: macro.c:3033
+#: macro.c:3141
+#, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "Parametername erwartet, aber »%s« gefunden"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
-msgstr "»%s« darf nicht in Makroparameterliste auftreten"
+msgstr "»,« oder »)« erwartet, aber »%s« gefunden"
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "Makroparameter müssen mit Komma getrennt sein"
+msgstr "Parametername vor dem Zeilenende erwartet"
-#: macro.c:3060
+#: macro.c:3144
-msgid "parameter name missing"
+msgid "expected ')' before end of line"
-msgstr "Parametername fehlt"
+msgstr "»)« vor dem Zeilenende erwartet"
-#: macro.c:3081
+#: macro.c:3145
+msgid "expected ')' after \"...\""
+msgstr "»)« nach »...« erwartet"
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "anonyme variadische Makros wurden in C++11 eingeführt"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "anonyme variadische Makros wurden in C99 eingeführt"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO-C++ erlaubt keine benannten variadischen Makros"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO-C erlaubt keine benannten variadischen Makros"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "fehlendes »)« in Makroparameterliste"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "»##« kann nicht an den Enden einer Makroexpansion auftreten"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO-C++11 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO-C99 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "Leerzeichen hinter Makroname fehlt"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "»#« wird nicht von einem Makroparameter gefolgt"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "»%s« redefiniert"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "dies ist die Stelle der vorherigen Definition"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "Makroargument »%s« würde in traditionellem C zur Zeichenkette umgewandelt werden"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "ungültiger Hash-Typ %d in cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "beim Schreiben des vorkompilierten Headers"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: nicht verwendet, da »%.*s« vergiftet ist"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: nicht verwendet, da »%.*s« nicht definiert"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: nicht verwendet, da »%.*s« als »%s« statt als »%.*s« definiert wurde"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: nicht verwendet, da »%s« definiert ist"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: nicht verwendet, da »__COUNTER__« ungültig ist"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "beim Lesen des vorkompilierten Headers"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "Rekursion bei Expansion des Makros »%s« entdeckt"
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "Syntaxfehler in Makroparameterliste"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "»%s« darf nicht in Makroparameterliste auftreten"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "Makroparameter müssen mit Komma getrennt sein"
+#~ msgid "parameter name missing"
+#~ msgstr "Parametername fehlt"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "fehlendes »)« in Makroparameterliste"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "ungültiger Hash-Typ %d in cpp_macro_definition"
 #~ msgid "NULL directory in find_file"
 #~ msgstr "NULL-Verzeichnis in find_file"

gcc/libcpp/po/el.gmo+0−0

Binary file not shown.

gcc/libcpp/po/el.po+163−170

 msgstr ""
 "Project-Id-Version: gcc 3.2\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
 "PO-Revision-Date: 2002-08-18 15:46+0100\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr ""
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr ""
 msgid "missing open quote"
 msgstr "������� � ���������������� ��������"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 #, fuzzy
 msgid "character constant too long for its type"
 msgstr "�� ������� �������� ���������� ��� �������������"
-#: charset.c:1830
+#: charset.c:1832
 #, fuzzy
 msgid "multi-character character constant"
 msgstr "����� ����� ��������� `%s'"
-#: charset.c:1931
+#: charset.c:1933
 #, fuzzy
 msgid "empty character constant"
 msgstr "���� �������������"
-#: charset.c:2047
+#: charset.c:2049
 #, fuzzy, c-format
 msgid "failure to convert %s to %s"
 msgstr "��� ����� ������ �� ������������ �� %s `%s' ��� `%s'"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr ""
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr ""
-#: directives.c:390
+#: directives.c:384
 #, fuzzy, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "�� `%s' ��� ����� �������� ������"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr ""
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr ""
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr ""
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr ""
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr ""
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr ""
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr ""
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr ""
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr ""
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr ""
-#: directives.c:623
+#: directives.c:617
 #, fuzzy
 msgid "macro names must be identifiers"
 msgstr "������ ������������� ���������"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, fuzzy, c-format
 msgid "undefining \"%s\""
 msgstr "�� �������� ����� %s"
-#: directives.c:732
+#: directives.c:727
 #, fuzzy
 msgid "missing terminating > character"
 msgstr "���� ���������� �� ������ ����������"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr ""
-#: directives.c:837
+#: directives.c:828
 #, fuzzy, c-format
 msgid "empty filename in #%s"
 msgstr "�� �������� ����� %s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr ""
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr ""
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr ""
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr ""
-#: directives.c:977
+#: directives.c:966
 #, fuzzy, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "%s' ��� ����� ������ ������� ��������."
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 #, fuzzy
 msgid "line number out of range"
 msgstr "%s: ������� ������� ��� ��� �� ����"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, fuzzy, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "%s' ��� ����� ������ ������� ��������."
-#: directives.c:1039
+#: directives.c:1028
 #, fuzzy, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "%s' ��� ����� ������ ������� ��������."
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr ""
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, fuzzy, c-format
 msgid "invalid #%s directive"
 msgstr "%%%c: �������������� ������ �� ������."
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr ""
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr ""
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr ""
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr ""
-#: directives.c:1281
+#: directives.c:1271
 #, fuzzy, c-format
 msgid "#pragma %s is already registered"
 msgstr "� ������ ���������� `%s' �������� ���"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr ""
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr ""
-#: directives.c:1551
+#: directives.c:1541
 #, fuzzy
 msgid "invalid #pragma push_macro directive"
 msgstr "%%%c: �������������� ������ �� ������."
-#: directives.c:1606
+#: directives.c:1596
 #, fuzzy
 msgid "invalid #pragma pop_macro directive"
 msgstr "%%%c: �������������� ������ �� ������."
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr ""
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr ""
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr ""
-#: directives.c:1714
+#: directives.c:1704
 #, fuzzy, c-format
 msgid "cannot find source file %s"
 msgstr "�������� ���������� ��������: %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr ""
-#: directives.c:1742
+#: directives.c:1732
 #, fuzzy, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "� ���������� `%s' ��� ����� ������."
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr ""
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr ""
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else ���� ��� #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr ""
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr ""
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif ���� ��� #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr ""
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr ""
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr ""
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr ""
-#: directives.c:2275
+#: directives.c:2226
 #, fuzzy
 msgid "assertion without predicate"
 msgstr "� ���������� ��� �����������"
-#: directives.c:2278
+#: directives.c:2229
 #, fuzzy
 msgid "predicate must be an identifier"
 msgstr "������ ������������� ���������"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr ""
-#: directives.c:2656
+#: directives.c:2587
 #, fuzzy, c-format
 msgid "unterminated #%s"
 msgstr "�� ������������o �������������"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 #, fuzzy
 msgid "unterminated comment"
 msgstr "�� ������������ ������ `s'"
 # src/request.c:37
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr ""
 msgid "this use of \"defined\" may not be portable"
 msgstr ""
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr ""
-#: expr.c:1130
+#: expr.c:1114
 #, fuzzy
 msgid "floating constant in preprocessor expression"
 msgstr "�������� ������� ������������"
-#: expr.c:1136
+#: expr.c:1120
 #, fuzzy
 msgid "imaginary number in preprocessor expression"
 msgstr "�� ������� ������� ��� �������"
-#: expr.c:1189
+#: expr.c:1173
 #, fuzzy, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "�� `%s' ��� ����� �������� ������"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr ""
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr ""
 # src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
 # src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
 # src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-#: expr.c:1451
+#: expr.c:1435
 #, fuzzy, c-format
 msgid "unbalanced stack in %s"
 msgstr "�� ������������ ["
-#: expr.c:1471
+#: expr.c:1455
 #, fuzzy, c-format
 msgid "impossible operator '%u'"
 msgstr "RPC: �� �������� �������� ��� RPC"
-#: expr.c:1572
+#: expr.c:1556
 #, fuzzy
 msgid "missing ')' in expression"
 msgstr "���� ���������� � ����� �� ��� ������"
-#: expr.c:1601
+#: expr.c:1585
 #, fuzzy
 msgid "'?' without following ':'"
 msgstr "���������� ������ ���� �������: %s"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr ""
-#: expr.c:1616
+#: expr.c:1600
 #, fuzzy
 msgid "missing '(' in expression"
 msgstr "���� ���������� � ����� �� ��� ������"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr ""
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr ""
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr ""
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr ""
-#: expr.c:2146
+#: expr.c:2130
 #, fuzzy
 msgid "division by zero in #if"
 msgstr "�������� �� ����� ���� ���������: %s"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr ""
-#: expr.c:2259
+#: expr.c:2243
 #, fuzzy
 msgid "missing ')' after \"__has_include__\""
 msgstr "���� ���������� � ����� �� �� �����"
 msgid "no include path in which to search for %s"
 msgstr ""
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr ""
-#: init.c:565
+#: init.c:569
 #, fuzzy
 msgid "cppchar_t must be an unsigned type"
 msgstr "������ ������������� ���������"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr ""
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr ""
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr ""
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr ""
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr ""
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr ""
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr ""
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr ""
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr ""
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr ""
-#: lex.c:1819
+#: lex.c:1834
 #, fuzzy, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "�� ������� ���������� `%c' ��� ���� �������������� `%s'"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 #, fuzzy
 msgid "unterminated raw string"
 msgstr "�� ������������o �������������"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr ""
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr ""
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "���� ���������� ���������� ���������� %c"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr ""
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr ""
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr ""
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr ""
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr ""
-#: lex.c:3287
+#: lex.c:3299
 #, fuzzy, c-format
 msgid "unspellable token %s"
 msgstr "%s: ������� �� ������� ��� %s: %m\n"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr ""
-#: macro.c:352
+#: macro.c:354
 #, fuzzy, c-format
 msgid "macro \"%s\" is not used"
 msgstr "�� `%s' ��� ����� �������� ������"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, fuzzy, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "�� ������ ����� �������: %s"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr ""
-#: macro.c:429
+#: macro.c:431
 #, fuzzy
 msgid "could not determine file timestamp"
 msgstr "��� ������� �� ������ �� ������ %s"
-#: macro.c:546
+#: macro.c:548
 #, fuzzy
 msgid "could not determine date and time"
 msgstr "��� ������� �� ������ �� ������ %s"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr ""
-#: macro.c:758
+#: macro.c:760
 #, fuzzy
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "�� ������� ������� ������� �������: `%s'"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr ""
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr ""
-#: macro.c:950
+#: macro.c:952
 #, fuzzy
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "���� ������ ����������"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr ""
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr ""
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr ""
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr ""
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr ""
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr ""
-#: macro.c:2984
+#: macro.c:3059
 #, fuzzy, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "����� ����� ��������� `%s'"
-#: macro.c:3033
+#: macro.c:3141
+#, fuzzy, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "����� ����� ��������� `%s'"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
 msgstr ""
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+#, fuzzy
+msgid "expected parameter name before end of line"
+msgstr "%s: ���������� ���������� ����."
+#: macro.c:3144
+msgid "expected ')' before end of line"
 msgstr ""
-#: macro.c:3060
+#: macro.c:3145
-msgid "parameter name missing"
+msgid "expected ')' after \"...\""
 msgstr ""
-#: macro.c:3081
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr ""
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr ""
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr ""
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr ""
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr ""
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr ""
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr ""
-#: macro.c:3201
+#: macro.c:3299
 #, fuzzy
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "���� ������ ����������"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr ""
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr ""
-#: macro.c:3430
+#: macro.c:3524
 #, fuzzy, c-format
 msgid "\"%s\" redefined"
 msgstr "�������"
-#: macro.c:3435
+#: macro.c:3529
 #, fuzzy
 msgid "this is the location of the previous definition"
 msgstr "���� ����� � ���� ��� ������ �������"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr ""
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr ""
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr ""
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr ""
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr ""
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr ""
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr ""
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr ""
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr ""
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr ""
-#: traditional.c:1108
+#: traditional.c:1119
 #, fuzzy
 msgid "syntax error in macro parameter list"
 msgstr "���������� ������ ���� ������ ������ ����������"
 #~ msgid "parameter `%s' declared void"
 #~ msgstr "� ������ ���������� `%s' �������� ���"
-#, fuzzy
-#~ msgid "multiple parameters named `%s'"
-#~ msgstr "����� ����� ��������� `%s'"
 #, fuzzy
 #~ msgid "no return statement in function returning non-void"
 #~ msgstr "`return' ����� ����, �� ��������� ��� ���������� ��-����"
 #~ msgid "start label '%s' does not match end label '%s'"
 #~ msgstr "�� ������ ��������� ������ `%s' ��� ��������� �� �� �������������� ����������� `%s'"
-#, fuzzy
-#~ msgid "expected a name here"
-#~ msgstr "%s: ���������� ���������� ����."
 #, fuzzy
 #~ msgid "expected a name string here"
 #~ msgstr "%s: ���������� ���������� ����."

gcc/libcpp/po/eo.po+185−170

 # Translation of cpplib to Esperanto
-# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
-# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Felipe Castro <fefcas@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 9.1-b20190203\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
-"PO-Revision-Date: 2018-06-06 16:53-0300\n"
+"PO-Revision-Date: 2019-02-06 20:15+0100\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.0.7\n"
 #: charset.c:674
 #, c-format
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "la universala signo %.*s ne estas valida en komenco de identiganto"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "konverto de UCN al la fonta signaro"
 msgid "missing open quote"
 msgstr "mankas komenca citilo"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "signa konstanto tro longas por ties tipo"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "plursigna signa konstanto"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "malplena signa konstanto"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "problemo por konverti %s al %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "kromaj ĵetonoj ĉe la fino de la instrukcio #%s"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s estas aldono de GCC"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s estas evitinda aldono de GCC"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "sugesti ne uzi #elif en tradicia C"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "tradicia C preteratentas #%s kun la # krommarĝenita"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "sugesti kaŝi #%s el tradicia C per krommarĝenigo de #"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "enkorpigi instrukcion ene de makroaj argumentoj ne estas portebla"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "stilo de lini-instrukcioj estas aldono de GCC"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "malvalida antaŭproceza instrukcio #%s"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "\"defined\" ne povas estis uzata kiel makroa nomo"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "\"__has_include__\" ne povas estis uzata kiel makroa nomo"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "\"%s\" ne povas esti uzata kiel makroa nomo ĉar ĝi estas operatoro en C++"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "neniu makroa nomo estas indikita en la instrukcio #%s"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "makroaj nomoj devas esti identigantoj"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "ni maldifinas \"%s\""
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "mankas finiganta signo >"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s atendas \"DOSIERNOMO\" aŭ <DOSIERNOMO>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "malplena dosiernomo en #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include estas ingita tro profunde"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next en ĉefa fonta dosiero"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "malvalida flago \"%s\" en lini-instrukcio"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "neatendita dosierfino post #line"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "\"%s\" post #line ne estas pozitiva entjero"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "lininumero estas for de intervalo"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "\"%s\" ne estas valida dosiernomo"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "\"%s\" post # ne estas pozitiva entjero"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "linimarkilo de dosiero \"%s\" estis preteratentata pro malkorekta nesto"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "malvalida instrukcio #%s"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "registro de pragma en nomspaco \"%s\" kun nekongrua nom-disvolviĝo"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "registro de pragma \"%s\" kun nom-disvolviĝo kaj sen nomspaco"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "registro de \"%s\" kaj kiel pragma kaj kiel pragma-nomspaco"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "#pragma %s %s jam estas registrita"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "#pragma %s jam estas registrita"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "registro de pragma kun traktilo de NULL"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma unufoje en ĉefdosiero"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "malvalida instrukcio #pragma push_macro"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "malvalida instrukcio #pragma pop_macro"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "malvalida instrukcio #pragma GCC poison"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "venenigo de ekzistanta makroo \"%s\""
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header estis preteratentata for de inkluziv-dosiero"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "ne eblas trovi la fontan dosieron %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "nuna dosiero estas pli malnova ol %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "malvalida instrukcio \"#pragma GCC %s\""
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma prenas kurbkrampitan ĉenan literaĵon"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else sen #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else post #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "la kondiĉo komencis ĉi tie"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif sen #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif post #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif sen #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "mankas '(' post predikato"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "mankas ')' por kompletigi respondon"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "respondo de predikato estas malplena"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "aserto sen predikato"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "predikato devas esti identiganto"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "\"%s\" estas re-asertita"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "nefinigita #%s"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "nefinigita komento"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "ĉefeligujo"
 msgid "this use of \"defined\" may not be portable"
 msgstr "tiu ĉi uzo de \"defined\" eble ne estas portebla"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "uzant-difinita literaĵo en antaŭproceza esprimo"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "glitkoma konstanto en antaŭproceza esprimo"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "imaginara numero en antaŭproceza esprimo"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "\"%s\" ne estas difinita, rezultas al 0"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "asertoj estas aldono de GCC"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "asertoj estas evitinda aldono"
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "neekvilibrita stako en %s"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "neebla operatoro '%u'"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "mankas ')' en esprimo"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "'?' sen sekvanta ':'"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "entjera troigo en antaŭproceza esprimo"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "mankas '(' en esprimo"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "la maldekstra operaciato de \"%s\" ŝanĝas signumon kiam promociita"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "la dekstra operaciato de \"%s\" ŝanĝas signumon kiam promociita"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "tradicia C rifuzas la unuloka plusan operatoron"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "koma operatoro en operaciado de #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "divido per nulo en #if"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "la operatoro \"__has_include__\" postulas kapan ĉenon"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "mankas ')' post \"__has_include__\""
 msgid "no include path in which to search for %s"
 msgstr "estas neniu inkluziva vojo por serĉi %s"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Multoblaj inkluzivaj gardnodoj povas esti utilaj por:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t devas esti sensignuma tipo"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "antaŭproceza aritmetiko havas maksimuman precizecon de %lu bitoj; la celo postulas %lu bitojn"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "Aritmetiko de CPP devas esti minimue tiel preciza kiel la celata int"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "la celata char estas pli eta ol 8 bitoj"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "la celata wchar_t estas pli mallarĝa ol la celata char"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "la celata int estas pli mallarĝa ol la celata char"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "duon-entjero de CPP estas pli mallarĝa ol la signo de CPP"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP en tiu ĉi komputilo ne povas trakti larĝ-signajn konstantoj plilarĝaj ol %lu bitoj, sed la celato postulas %lu bitojn"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "la identiganto \"%s\" estas speciala operator-nomo en C++"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "kruda ĉen-apartigilo pli longas ol 16 signoj"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "malvalida nov-linio en kruda ĉen-apartigilo"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "malvalida signo '%c' en kruda ĉen-apartigilo"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "nefinigita kruda ĉeno"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "malvalida sufikso en literaĵo; C++11 postulas spacon inter literaĵo kaj ĉena makroo"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "nul-signo(j) tenitaj en literaĵo"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "mankas finigantan signon %c"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 postulas spacon inter ĉena literaĵo kaj makroo"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "Komentoj laŭ estilo de C++ ne estas permesataj en ISO C90"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(tio ĉi estos raportata nur po unu foje por ĉiu enigdosiero)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "Komentoj laŭ estilo de C++ ne interakordas kun C90"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "plurlinia komento"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "neliterumebla ĵetono %s"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "'##' ne povas aperi ĉe iu ajn flanko de __VA_OPT__"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "makroo \"%s\" ne estas uzata"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "malvalida enkonstruita makroo \"%s\""
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "la makroo \"%s\" povos malebligi reprodukteblajn konstruojn"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "ne eblis determini la dosieran tempomarkon"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "ne eblis determini la daton kaj horon"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "__COUNTER__ estas etendigata interne de instrukcio per -fdirectives-only"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "malvalida ĉena literaĵo, ni preterpasas finan '\\'"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "algluo de \"%s\" kaj \"%s\" ne rezultas en valida antaŭproceza ĵetono"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C++11 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "la makroo \"%s\" postulas %u argumentojn, sed nur %u estis indikataj"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "la makroo \"%s\" pasis %u argumentojn, sed ĝi prenas nur %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "nefinigita argumentlisto alvokanta la makroon \"%s\""
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "funkci-simila makroo \"%s\" devas esti uzata kun argumentoj laŭ tradicia C"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C++98"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C90"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "duobligata makro-parametro \"%s\""
-#: macro.c:3033
+#: macro.c:3141
+#, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "atendinte parametran nomon, ni trovis \"%s\""
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
-msgstr "\"%s\" ne povas aperi en makroa parametro-listo"
+msgstr "atendinte ',' aŭ ')', ni trovis \"%s\""
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "makro-parametroj devas esti apartitaj per komoj"
+msgstr "ni atendis parametran nomon antaŭ lini-fino"
-#: macro.c:3060
+#: macro.c:3144
-msgid "parameter name missing"
+msgid "expected ')' before end of line"
-msgstr "mankas parametra nomo"
+msgstr "ni atendis ')' antaŭ lini-fino"
-#: macro.c:3081
+#: macro.c:3145
+msgid "expected ')' after \"...\""
+msgstr "ni atendis ')' post \"...\""
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C++11"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C99"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C++ ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "mankas ')' en makroa parametro-listo"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "'##' ne povas aperi ĉe iu ajn flanko de makroa disvolviĝo"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C++11 postulas blankspacon post la makroa nomo"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 postulas blankspacon post la makroa nomo"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "mankas blankspacon post la makroa nomo"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "'#' ne estas sekvata de makroa parametro"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "\"%s\" estas redifinita"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "tiu ĉi estas la loko de la antaŭa difino"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "makroa argumento \"%s\" devus esti ĉenigita laŭ tradicia C"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "malvalida haketa tipo %d en cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "dum skribo de antaŭkompilita kapo"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: ne uzata ĉar '%.*s' estas venenita"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: ne uzata ĉar '%.*s' ne estas difinita"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: ne uzata ĉar '%.*s' estas difinita kiel '%s', ne '%.*s'"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: ne uzata ĉar '%s' estas difinita"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: ne uzata ĉar '__COUNTER__' estas malvalida"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "dum lego de antaŭkompilita kapo"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "estis detektata rekursigo dum etendigo de la makroo \"%s\""
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "sintaksa eraro en makroa parametro-listo"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "\"%s\" ne povas aperi en makroa parametro-listo"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "makro-parametroj devas esti apartitaj per komoj"
+#~ msgid "parameter name missing"
+#~ msgstr "mankas parametra nomo"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "mankas ')' en makroa parametro-listo"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "malvalida haketa tipo %d en cpp_macro_definition"
 #~ msgid "NULL directory in find_file"
 #~ msgstr "NULL-dosierujo en find_file"

gcc/libcpp/po/es.gmo+0−0

Binary file not shown.

gcc/libcpp/po/es.po+182−165

 msgstr ""
 "Project-Id-Version: cpplib 8.1-b20180128\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
 "PO-Revision-Date: 2018-03-23 19:16+0100\n"
 "Last-Translator: Francisco Javier Serrador <fserrador@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "convirtiendo un NUC al conjunto de caracteres fuente"
 msgid "missing open quote"
 msgstr "falta comilla abierta"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "constante de carácter demasiado grande para su tipo"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "constante de carácter con múltiples caracteres"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "constante de carácter vacía"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "no se puede convertir %s a %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "elementos extra al final de la directiva #%s"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s es una extensión de GCC"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s es una extensión de GCC obsoleta"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "se sugiere no usar #elif en C tradicional"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "C tradicional ignora #%s con el # indentado"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "se sugiere ocultar #%s de C tradicional con un # indentado"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "imbuir una directiva dentro de los argumentos de una macro no es transportable"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "la directiva de estilo de línea es una extensión de GCC"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "directiva de preprocesamiento #%s inválida"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "«defined» no se puede utilizarse como un nombre de macro"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "\"__has_include__\" no puede ser usado como un nombre de macro"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "no se puede usar «%s» como un nombre de macro porque es un operador en C++"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "no se dio un nombre de macro en la directiva #%s"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "los nombres de macro deben ser identificadores"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "borrando la definición de «%s»"
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "falta el carácter de terminación >"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s espera «NOMBREFICHERO» o <NOMBREFICHERO>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "nombre de fichero vacío en #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include anidado con demasiada profundidad"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next en fichero primario de código fuente"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "indicador «%s» inválido en la línea de la directiva"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "fin de fichero inesperado después de #line"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "«%s» después de #line no es un entero positivo"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "número de línea fuera de rango"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "«%s» no es un nombre de fichero válido"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "«%s» después de # no es un entero positivo"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "marca lineal de fichero «%s» ignorada debido a anidación incorrecta"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "directiva #%s inválida"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "se registran pragmas en el espacio de nombres «%s» con una expansión de nombre que no coincide"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "se registra el pragma «%s» con expansión de nombre y sin un espacio de nombres"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "se registra «%s» como un pragma y como un espacio de nombres de pragma"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "#pragma %s %s ya está registrado"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "#pragma %s ya está registrado"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "se registra un pragma con manejador NULL"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma una vez en el fichero principal"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "directiva #pragma push_macro inválida"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "directiva #pragma pop_macro inválida"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "directiva #pragma de GCC envenenada inválida"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "se envenena la macro existente «%s»"
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header ignorado fuera del fichero a incluir"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "no se puede encontrar el fichero fuente %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "el fichero actual es más antiguo que %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "directiva \"#pragma GCC %s\" inválida"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma lleva una cadena literal entre paréntesis"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else sin #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else tras #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "el condicional empezó aquí"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif sin #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif después de #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif sin #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "falta '(' antes del predicado"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "falta ')' para completar la respuesta"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "la respuesta del predicado está vacía"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "afirmación sin predicado"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "el predicado debe ser un identificador"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "«%s» reafirmado"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "#%s sin terminar"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "salida estándard"
 msgid "this use of \"defined\" may not be portable"
 msgstr "este uso de \"defined\" puede no ser transportable"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "literal definida por el usuario en una expresión del preprocesador"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "constante de coma flotante en una expresión del preprocesador"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "número imaginario en una expresión del preprocesador"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "«%s» no está definido, evalúa a 0"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "las aserciones son una extensión GCC"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "las aserciones son una extensión obsoleta"
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "pila desbalanceada en %s"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "operador '%u' imposible"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "falta ')' en la expresión"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "'?' sin ':' a continuación"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "desbordamiento entero en expresión del preprocesador"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "falta '(' en la expresión"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "el operando izquierdo de «%s» cambia de signo cuando es promovido"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "el operando derecho de «%s» cambia de signo cuando es promovido"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "C tradicional rechaza el operador unario mas"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "operador coma en operando de #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "división por cero en #if"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "el operador \"__has_include__\" requiere una cadena cabecera"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "falta ')' tras \"__has_include__\""
 msgid "no include path in which to search for %s"
 msgstr "no hay ruta de inclusión en la cual se pueda buscar %s"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Guardias múltiples de include pueden ser útiles para:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t debe ser de un tipo unsigned"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "la aritmética del preprocesador tiene una precisión máxima de %lu bits; el objetivo requiere de %lu bits"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "la aritmética de CPP debe se al menos tan precisa como un int del objetivo"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "el char del objetivo tiene menos de 8 bits de ancho"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "el wchar_t del objetivo es más estrecho que el char del objetivo"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "el int del objetivo es más estrecho que el char del objetivo"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "el medio-entero de CPP es más estrecho que el carácter de CPP"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP no puede manejar constantes de carácter anchas más allá de %lu bits en este objetivo, pero el objetivo requiere %lu bits"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "el identificador «%s» es un nombre de operador especial en C++"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "el delimitador de cadena cruda es más largo que 16 caracteres"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "carácter inválido nueva línea en un delimitador de cadena cruda"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "carácter inválido '%c' en un delimitador de cadena cruda"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "cadena cruda sin terminar"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "sufijo inválido en literal; C++11 requiere un espacio entre literal y cadena macro"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "caracter(es) nulo(s) preservados en la literal"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "falta el carácter de terminación %c"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 requiere un espacio entre cadena literal y macro"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "los comentarios de estilo C++ no se permiten en ISO C90"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(esto se reportará solamente una vez por cada fichero de entrada)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "los comentarios de estilo C++ son incompatibles con C90"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "comentario en múltiples líneas"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "elemento %s impronunciable"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "'##' no puede aparecer o en el final de una __VA_OPT__"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "la macro «%s» no se utiliza"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "macro interna «%s» inválida"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "macro «%s» quizá previene compilaciones reproducibles"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "no se puede determinar la marca de fecha del fichero"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "no se puede determinar la fecha y la hora"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "se expande __COUNTER__ dentro de una directiva con -fdirectives-only"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "cadena literal inválida, se ignora el '\\' final"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "pegar «%s» y «%s» no da un elemento válido de preprocesamiento"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C++ requiere al menos un argumento: para la \"...\" en una macro variadic"
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 requiere al menos un argumento para la \"...\" en una macro variadic"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "la macro «%s» requiere %u argumentos, pero solo se proporcionan %u"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "la macro «%s» pasó %u argumentos, pero solamente toma %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "lista de argumentos sin terminar al invocar la macro «%s»"
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "la función de macro «%s» se debe usar con argumentos en C tradicional"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C++98"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C90"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "parámetro de macro «%s» duplicado"
-#: macro.c:3033
+#: macro.c:3141
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected parameter name, found \"%s\""
-msgstr "«%s» podría faltar en la lista de parámetro de macro"
+msgstr ""
+#: macro.c:3142
+#, c-format
+msgid "expected ',' or ')', found \"%s\""
+msgstr ""
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "los parámetros de macro deben ser separados por comas"
+msgstr ""
+#: macro.c:3144
+#, fuzzy
+#| msgid "unexpected end of file after #line"
+msgid "expected ')' before end of line"
+msgstr "fin de fichero inesperado después de #line"
-#: macro.c:3060
+#: macro.c:3145
-msgid "parameter name missing"
+msgid "expected ')' after \"...\""
-msgstr "falta el nombre del parámetro"
+msgstr ""
-#: macro.c:3081
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "las macros variadic anónimas se introdujeron en C++11"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "los macros variadic anónimos se introdujeron en C99"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C++ no permite macros variadic nombrados"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C no permite macros variadic nombrados"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "falta ')' en la lista de parámetros de macro"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "'##' no puede aparece en o al final de una expansión de macro"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C++11 requiere espacios en blanco tras del nombre de macro"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 requiere espacios en blanco después del nombre de macro"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "faltan espacios en blanco después del nombre de macro"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "'#' no es seguido por un parámetro de macro"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "«%s» redefinido"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "esta es la ubicación de la definición previa"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "el argumento de macro «%s» debería ser convertido a cadena en C tradicional"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "tipo de hash %d inválido en cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "al escribir el encabezado precompilado"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: no se usa porque `%.*s' está envenenado"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: no se usa porque `%.*s' no está definido"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: no se usa porque `%.*s' está definido como `%s' no como `%.*s'"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: no se usa porque `%s' está definido"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: no se usa porque `__COUNTER__' es inválido"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "al leer el encabezado precompilado"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "se detectó recursión al expandir la macro «%s»"
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "error de sintaxis en la lista de parámetros de macro"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "«%s» podría faltar en la lista de parámetro de macro"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "los parámetros de macro deben ser separados por comas"
+#~ msgid "parameter name missing"
+#~ msgstr "falta el nombre del parámetro"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "falta ')' en la lista de parámetros de macro"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "tipo de hash %d inválido en cpp_macro_definition"
 #~ msgid "Character %x might not be NFKC"
 #~ msgstr "El carácter %x puede no ser NFKC"

gcc/libcpp/po/fi.gmo+0−0

Binary file not shown.

gcc/libcpp/po/fi.po+185−170

 # Finnish messages for cpplib.
-# Copyright © 2010, 2012, 2013, 2014, 2015, 2016, 2018 Free Software Foundation, Inc.
+# Copyright © 2010, 2012, 2013, 2014, 2015, 2016, 2018, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gcc package.
 # Jorma Karvonen <karvonen.jorma@gmail.com>, 2010, 2012-2015.
-# Lauri Nurmi <lanurmi@iki.fi>, 2016, 2018.
+# Lauri Nurmi <lanurmi@iki.fi>, 2016, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cpplib 8.1-b20180128\n"
+"Project-Id-Version: cpplib 9.1-b20190203\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
-"PO-Revision-Date: 2018-01-31 01:28+0200\n"
+"PO-Revision-Date: 2019-02-05 20:41+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
 #: charset.c:674
 #, c-format
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "universaali merkki %.*s ei ole kelvollinen tunnisteen alussa"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "muunnetaan UCN lähdemerkistöön"
 msgid "missing open quote"
 msgstr "avautuva sulje puuttuu"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "merkkivakio on liian pitkä tyypilleen"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "monimerkkinen merkkivakio"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "tyhjä merkkivakio"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "muunnos %s -> %s epäonnistui"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "ylimääräisiä merkkejä #%s-direktiivin lopussa"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s on GCC-laajennos"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s on vanhentunut GCC-laajennos"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "ehdotetaan #elif:in käytön välttämistä perinteisessä C:ssä"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "#%s ohitetaan perinteisessä C:ssä kun # on sisennetty"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "ehdotetaan #%s:n piilottamista perinteiseltä C:ltä sisentämällä #"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "direktiivin upottaminen makroargumenttien sisälle ei ole siirrettävää"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "rividirektiivin tyyli on GCC-laajennos"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "virheellinen esikääntäjän direktiivi #%s"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "”defined” ei ole kelvollinen makron nimi"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "”__has_include__” ei ole kelvollinen makron nimi"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "”%s” ei ole kelvollinen makron nimi, sillä se on C++:n operaattori"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "makron nimeä ei ole annettu #%s-direktiivissä"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "makrojen nimien on oltava tunnisteita"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "kumotaan määrittely ”%s”"
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "päättävä >-merkki puuttuu"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s odottaa argumenttia \"TIEDOSTONIMI\" tai <TIEDOSTONIMI>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "tyhjä tiedostonimi direktiivissä #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "liikaa sisäkkäisiä #include:ja"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next ensisijaisessa lähdetiedostossa"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "virheellinen lippu ”%s” rividirektiivissä"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "odottamaton tiedoston loppu #line-direktiivin jälkeen"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "#line:n jälkeinen ”%s”  ei ole positiivinen kokonaisluku"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "rivinumero sallitun välin ulkopuolella"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "”%s” ei ole kelvollinen tiedostonimi"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "#:n jälkeinen ”%s” ei ole positiivinen kokonaisluku"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "tiedoston ”%s” rivinmerkitsin jätetään huomiotta virheellisen sisäkkäisyyden vuoksi"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "virheellinen #%s-direktiivi"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "rekisteröidään pragmat nimiavaruudessa ”%s” epäsopivalla nimenlavennuksella"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "rekisteröidään pragma ”%s” nimenlavennuksella ja ilman nimiavaruutta"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "rekisteröidään ”%s” sekä pragmana että pragma-nimiavaruutena"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "#pragma %s %s on jo rekisteröity"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "#pragma %s on jo rekisteröity"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "rekisteröidään pragma NULL-käsittelijällä"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma once päätiedostossa"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "virheellinen #pragma push_macro -direktiivi"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "virheellinen #pragma pop_macro -direktiivi"
 #  poison tarkoittaa, että makroa tai direktiiviä ei koskaan määritellä tai käytetä
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "virheellinen #pragma GCC poison -direktiivi"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "myrkytetään olemassa oleva makro ”%s”"
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header ohitetaan otsaketiedoston ulkopuolella"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "lähdetiedostoa %s ei löydy"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "nykyinen tiedosto on vanhempi kuin %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "virheellinen ”#pragma GCC %s” -direktiivi"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma ottaa sulkeilla ympäröidyn merkkijonoliteraalin"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else ilman #if:iä"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else #else:n jälkeen"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "ehtolause alkoi tästä"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif ilman #if:iä"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif #else:n jälkeen"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif ilman #if:iä"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "’(’ puuttuu predikaatin jäljestä"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "’)’ puuttuu vastauksen täydentämisestä"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "predikaatin vastaus on tyhjä"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "väite ilman predikaattia"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "predikaatin on oltava tunniste"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "”%s” väitetty uudelleen"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "päättämätön #%s"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "päättämätön kommentti"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "vakiotuloste"
 msgid "this use of \"defined\" may not be portable"
 msgstr "tämä ”defined”-sanan käyttö ei ehkä ole siirrettävää"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "käyttäjän määrittelemä literaali esikääntäjän lausekkeessa"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "liukulukuvakio esikääntäjän lausekkeessa"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "imaginääriluku esikääntäjän lausekkeessa"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "”%s” on määrittelemättä, evaluoituu 0:ksi"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "väitteet ovat GCC-laajennos"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "väitteet ovat vanhentunut laajennos"
 # %s on #if tai #elif
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "tasapainoton pino %s:ssä"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "mahdoton operaattori ’%u’"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "’)’ puuttuu lausekkeesta"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "’?’ ilman sitä seuraavaa ’:’-merkkiä"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "kokonaislukuylivuoto esikääntäjän lausekkeessa"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "’(’ puuttuu lausekkeesta"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "”%s”:n vasen operandi vaihtaa ylennettäessä etumerkkiään"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "”%s”:n oikea operandi vaihtaa ylennettäessä etumerkkiään"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "perinteinen C ei salli unaarista plus-operaattoria"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "pilkkuoperaattori #if:in operandissa"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "jako nollalla #if-ehdossa"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "operaattori ”__has_include__” vaatii otsakemerkkijonon"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "’)’ puuttuu ”__has_include__”-sanan jäljestä"
 msgid "no include path in which to search for %s"
 msgstr "ei include-polkua, josta etsiä tiedostoa %s"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Monen includen estimet voivat olla hyödyllisiä tiedostoille:\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t:n on oltava etumerkitön tyyppi"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "esikääntäjäaritmetiikan enimmäistarkkuus on %lu bittiä; kohde vaatii %lu bittiä"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "CPP-aritmetiikan on oltava vähintään yhtä tarkka kuin kohteen int-tyypin"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "kohteen char-tyyppi on alle 8 bittiä leveä"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "kohteen wchar_t-tyyppi on kapeampi kuin kohteen char-tyyppi"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "kohteen int-tyyppi on kapeampi kuin kohteen char-tyyppi"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "CPP-puolikokonaisluku on kapeampi kuin CPP-merkki"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "tämän koneen CPP ei pysty käsittelemään yli %lu-bittisiä leveämerkkivakioita, mutta kohde vaatii %lu bittiä"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "tunniste ”%s” on operaattorin nimi C++:ssa"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "raa’an merkkijonon erotin pitempi kuin 16 merkkiä"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "virheellinen rivinvaihto raa’an merkkijonon erottimessa"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "virheellinen merkki ’%c’ raa’an merkkijonon erottimessa"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "päättämätön raaka merkkijono"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "literaalissa virheellinen jälkiliite; C++11 vaatii välilyönnin literaalin ja merkkijonomakron väliin"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "null-merkit säilytetään literaalissa"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "päättävä merkki %c puuttuu"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 vaatii välilyönnin literaalin ja merkkijonomakron väliin"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "C++-tyyliset kommentit eivät ole sallittuja ISO C90:ssä"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(tästä ilmoitetaan vain kerran syötetiedostoa kohden)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "C++-tyyliset kommentit ovat epäyhteensopivia C90:n kanssa"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "monirivinen kommentti"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "kirjoitusasuton symboli %s"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "”##” ei voi esiintyä __VA_OPT__-makron kummassakaan päässä"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "makroa ”%s” ei käytetä"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "virheellinen sisäinen makro ”%s”"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "makro ”%s” saattaa estää toistettavat käännökset"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "ei voitu selvittää tiedoston aikaleimaa"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "ei voitu selvittää päivämäärää ja aikaa"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "__COUNTER__ lavennettu direktiivin sisällä valitsimella -fdirectives-only"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "virheellinen merkijonoliteraali, ohitetaan viimeinen ’\\’"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "liittämällä ”%s” ja ”%s” ei saada kelvollista esikääntäjän symbolia"
 #  Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C++11 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
 #  Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "makro ”%s” vaatii %u argumenttia, mutta vain %u on annettu"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "makrolle ”%s” annettu %u argumenttia, mutta se ottaa vain %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "päättämätön argumenttiluettelo ”%s”-makron kutsussa"
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "funktion kaltaista makroa ”%s” on käytettävä argumenttien kanssa perinteisessä C:ssä"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C++98:ssa"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C90:ssä"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "kahdenkertainen makroparametri ”%s”"
-#: macro.c:3033
+#: macro.c:3141
+#, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "odotettiin parametrin nimeä, löytyi ”%s”"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
-msgstr "”%s” ei saa esiintyä makron parametriluettelossa"
+msgstr "odotettiin ”,” tai ”)”, löytyi ”%s”"
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "makron parametrien on oltava pilkuin eroteltuja"
+msgstr "odotettiin parametrin nimeä ennen rivin loppua"
-#: macro.c:3060
+#: macro.c:3144
-msgid "parameter name missing"
+msgid "expected ')' before end of line"
-msgstr "parametrin nimi puuttuu"
+msgstr "odotettiin tulevan ”)” ennen rivin loppua"
-#: macro.c:3081
+#: macro.c:3145
+msgid "expected ')' after \"...\""
+msgstr "odotettiin ”...”:n jälkeen tulevan ”)”"
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "anonyymit variadiset makrot esiteltiin C++11:ssä"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "anonyymit variadiset makrot esiteltiin C99:ssä"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C++ ei salli nimettyjä variadisia makroja"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C ei salli nimettyjä variadisia makroja"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "’)’ puuttuu makron parametriluettelosta"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "”##” ei voi esiintyä makrolavennuksen kummassakaan päässä"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C++11 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "tyhjemerkki puuttuu makron nimen jäljestä"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "”#” ilman sitä seuraavaa makroparametria"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "”%s” määritelty uudelleen"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "tämä on edellisen määrittelyn sijainti"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "makron argumentti ”%s” merkkijonostettaisiin perinteisessä C:ssä"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "virheellinen hash-tyyppi %d funktiossa cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "kirjoitettaessa esikäännettyä otsaketta"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: ei käytetä, koska ”%.*s” on myrkytetty"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: ei käytetä, koska ”%.*s” on määrittelemättä"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: ei käytetä, koska ”%.*s” on määritelty arvoon ”%s” eikä ”%.*s”"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: ei käytetä, koska ”%s” on määritelty"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: ei käytetä, koska ”__COUNTER__” on virheellinen"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "luettaessa esikäännettyä otsaketta"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "havaittiin rekursio lavennettaessa makroa ”%s”"
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "syntaksivirhe makron parameteriluettelossa"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "”%s” ei saa esiintyä makron parametriluettelossa"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "makron parametrien on oltava pilkuin eroteltuja"
+#~ msgid "parameter name missing"
+#~ msgstr "parametrin nimi puuttuu"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "’)’ puuttuu makron parametriluettelosta"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "virheellinen hash-tyyppi %d funktiossa cpp_macro_definition"
 #~ msgid "NULL directory in find_file"
 #~ msgstr "NULL-hakemisto funktiossa find_file"

gcc/libcpp/po/fr.gmo+0−0

Binary file not shown.

gcc/libcpp/po/fr.po+183−168

 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 # François-Xavier Coudert <fxcoudert@gcc.gnu.org>, 2008.
 # Stéphane Aulery <lkppo@free.fr>, 2015, 2016, 2017.
-# Frédéric Marchal <fmarchal@perso.be>, 2018.
+# Frédéric Marchal <fmarchal@perso.be>, 2019.
 #
 # Vocabulaire utilisé
 # 	lvalue	 	= membre gauche
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU cpplib 8.1-b20180128\n"
+"Project-Id-Version: GNU cpplib 9.1-b20190203\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
-"POT-Creation-Date: 2018-01-26 22:47+0000\n"
+"POT-Creation-Date: 2019-02-01 23:01+0000\n"
-"PO-Revision-Date: 2018-06-10 14:01+0200\n"
+"PO-Revision-Date: 2019-02-05 20:35+0100\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 msgid "universal character %.*s is not valid at the start of an identifier"
 msgstr "le caractère universel %.*s n’est pas valide au début d’un identificateur"
-#: charset.c:1181 charset.c:2000
+#: charset.c:1181 charset.c:2002
 msgid "converting UCN to source character set"
 msgstr "conversion d'un UCN vers le jeu de caractères source"
 msgid "missing open quote"
 msgstr "guillemet ouvrant de chaîne de caractères manquant"
-#: charset.c:1827 charset.c:1891
+#: charset.c:1829 charset.c:1893
 msgid "character constant too long for its type"
 msgstr "constante caractère trop longue pour son type"
-#: charset.c:1830
+#: charset.c:1832
 msgid "multi-character character constant"
 msgstr "constante caractère multi-caractères"
-#: charset.c:1931
+#: charset.c:1933
 msgid "empty character constant"
 msgstr "constante caractère vide"
-#: charset.c:2047
+#: charset.c:2049
 #, c-format
 msgid "failure to convert %s to %s"
 msgstr "échec de conversion de %s vers %s"
-#: directives.c:235 directives.c:278
+#: directives.c:229 directives.c:272
 #, c-format
 msgid "extra tokens at end of #%s directive"
 msgstr "éléments lexicaux superflus à la fin de la directive #%s"
-#: directives.c:385
+#: directives.c:379
 #, c-format
 msgid "#%s is a GCC extension"
 msgstr "#%s est une extension GCC"
-#: directives.c:390
+#: directives.c:384
 #, c-format
 msgid "#%s is a deprecated GCC extension"
 msgstr "#%s est une extension obsolète de GCC"
-#: directives.c:403
+#: directives.c:397
 msgid "suggest not using #elif in traditional C"
 msgstr "il est suggéré de ne pas utiliser #elif en C traditionnel"
-#: directives.c:406
+#: directives.c:400
 #, c-format
 msgid "traditional C ignores #%s with the # indented"
 msgstr "le C traditionnel ignore la directive #%s si le caractère # est indenté"
-#: directives.c:410
+#: directives.c:404
 #, c-format
 msgid "suggest hiding #%s from traditional C with an indented #"
 msgstr "il est suggéré de cacher #%s au C traditionnel en indentant le « # »"
-#: directives.c:436
+#: directives.c:430
 msgid "embedding a directive within macro arguments is not portable"
 msgstr "placer une directive dans les arguments d’une macro n’est pas portable"
-#: directives.c:456
+#: directives.c:450
 msgid "style of line directive is a GCC extension"
 msgstr "la directive de style de ligne est une extension GCC"
-#: directives.c:537
+#: directives.c:531
 #, c-format
 msgid "invalid preprocessing directive #%s"
 msgstr "la directive de pré-traitement #%s invalide"
-#: directives.c:606
+#: directives.c:600
 msgid "\"defined\" cannot be used as a macro name"
 msgstr "« defined » ne peut être utilisé comme nom de macro"
-#: directives.c:611
+#: directives.c:605
 msgid "\"__has_include__\" cannot be used as a macro name"
 msgstr "« __has_include__ » ne peut être utilisé comme nom de macro"
-#: directives.c:617
+#: directives.c:611
 #, c-format
 msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
 msgstr "« %s » ne peut être utilisé comme nom de macro car c’est un opérateur C++"
-#: directives.c:620
+#: directives.c:614
 #, c-format
 msgid "no macro name given in #%s directive"
 msgstr "aucun nom de macro donné dans la directive #%s"
-#: directives.c:623
+#: directives.c:617
 msgid "macro names must be identifiers"
 msgstr "les noms de macro doivent être des identificateurs"
-#: directives.c:672 directives.c:677
+#: directives.c:666 directives.c:671
 #, c-format
 msgid "undefining \"%s\""
 msgstr "suppression de la définition de « %s »"
-#: directives.c:732
+#: directives.c:727
 msgid "missing terminating > character"
 msgstr "caractère > de terminaison manquant"
-#: directives.c:791
+#: directives.c:786
 #, c-format
 msgid "#%s expects \"FILENAME\" or <FILENAME>"
 msgstr "#%s attend \"NOM_DE_FICHIER\" ou <NOM_DE_FICHIER>"
-#: directives.c:837
+#: directives.c:828
 #, c-format
 msgid "empty filename in #%s"
 msgstr "nom de fichier vide dans #%s"
-#: directives.c:847
+#: directives.c:835
 msgid "#include nested too deeply"
 msgstr "#include imbriqué trop profondément"
-#: directives.c:888
+#: directives.c:877
 msgid "#include_next in primary source file"
 msgstr "#include_next dans un fichier source primaire"
-#: directives.c:914
+#: directives.c:903
 #, c-format
 msgid "invalid flag \"%s\" in line directive"
 msgstr "drapeau « %s » invalide dans la ligne de directive"
-#: directives.c:974
+#: directives.c:963
 msgid "unexpected end of file after #line"
 msgstr "fin de fichier inattendue après #line"
-#: directives.c:977
+#: directives.c:966
 #, c-format
 msgid "\"%s\" after #line is not a positive integer"
 msgstr "« %s » après #line n’est pas un nombre entier positif"
-#: directives.c:983 directives.c:985
+#: directives.c:972 directives.c:974
 msgid "line number out of range"
 msgstr "numéro de ligne hors intervalle"
-#: directives.c:998 directives.c:1079
+#: directives.c:987 directives.c:1068
 #, c-format
 msgid "\"%s\" is not a valid filename"
 msgstr "« %s » n’est pas un nom de fichier valide"
-#: directives.c:1039
+#: directives.c:1028
 #, c-format
 msgid "\"%s\" after # is not a positive integer"
 msgstr "« %s » après # n’est pas un nombre entier positif"
-#: directives.c:1098
+#: directives.c:1087
 #, c-format
 msgid "file \"%s\" linemarker ignored due to incorrect nesting"
 msgstr "le marqueur de ligne du fichier « %s » est ignoré à cause d’une imbrication incorrecte"
-#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747
+#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
 #, c-format
 msgid "%s"
 msgstr "%s"
-#: directives.c:1185
+#: directives.c:1175
 #, c-format
 msgid "invalid #%s directive"
 msgstr "directive #%s invalide"
-#: directives.c:1248
+#: directives.c:1238
 #, c-format
 msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
 msgstr "enregistrement des pragmas dans l'espace de nom « %s » avec une expansion de nom ne correspondant pas"
-#: directives.c:1257
+#: directives.c:1247
 #, c-format
 msgid "registering pragma \"%s\" with name expansion and no namespace"
 msgstr "enregistrement du pragma « %s » avec une expansion de nom mais pas d’espace de nom"
-#: directives.c:1275
+#: directives.c:1265
 #, c-format
 msgid "registering \"%s\" as both a pragma and a pragma namespace"
 msgstr "enregistrement de « %s » à la fois comme un pragma et un espace de nom de pragma"
-#: directives.c:1278
+#: directives.c:1268
 #, c-format
 msgid "#pragma %s %s is already registered"
 msgstr "le #pragma %s %s est déjà enregistré"
-#: directives.c:1281
+#: directives.c:1271
 #, c-format
 msgid "#pragma %s is already registered"
 msgstr "le #pragma %s est déjà enregistré"
-#: directives.c:1311
+#: directives.c:1301
 msgid "registering pragma with NULL handler"
 msgstr "enregistrement d’un pragma avec un handler NULL"
-#: directives.c:1528
+#: directives.c:1518
 msgid "#pragma once in main file"
 msgstr "#pragma once utilisé une seule fois dans le fichier principal"
-#: directives.c:1551
+#: directives.c:1541
 msgid "invalid #pragma push_macro directive"
 msgstr "directive #pragma push_macro invalide"
-#: directives.c:1606
+#: directives.c:1596
 msgid "invalid #pragma pop_macro directive"
 msgstr "directive #pragma pop_macro invalide"
-#: directives.c:1661
+#: directives.c:1651
 msgid "invalid #pragma GCC poison directive"
 msgstr "directive #pragma GCC poison invalide"
-#: directives.c:1670
+#: directives.c:1660
 #, c-format
 msgid "poisoning existing macro \"%s\""
 msgstr "empoisonnement de la macro existante « %s »"
-#: directives.c:1689
+#: directives.c:1679
 msgid "#pragma system_header ignored outside include file"
 msgstr "#pragma system_header ignoré en dehors du fichier d'inclusion"
-#: directives.c:1714
+#: directives.c:1704
 #, c-format
 msgid "cannot find source file %s"
 msgstr "impossible de trouver le fichier source %s"
-#: directives.c:1718
+#: directives.c:1708
 #, c-format
 msgid "current file is older than %s"
 msgstr "le fichier courant est plus vieux que %s"
-#: directives.c:1742
+#: directives.c:1732
 #, c-format
 msgid "invalid \"#pragma GCC %s\" directive"
 msgstr "directive « #pragma GCC %s » invalide"
-#: directives.c:1943
+#: directives.c:1933
 msgid "_Pragma takes a parenthesized string literal"
 msgstr "_Pragma attend une chaîne entourée de parenthèses"
-#: directives.c:2064
+#: directives.c:2021
 msgid "#else without #if"
 msgstr "#else sans #if"
-#: directives.c:2069
+#: directives.c:2026
 msgid "#else after #else"
 msgstr "#else après #else"
-#: directives.c:2071 directives.c:2104
+#: directives.c:2028 directives.c:2061
 msgid "the conditional began here"
 msgstr "la condition débute ici"
-#: directives.c:2097
+#: directives.c:2054
 msgid "#elif without #if"
 msgstr "#elif sans #if"
-#: directives.c:2102
+#: directives.c:2059
 msgid "#elif after #else"
 msgstr "#elif après #else"
-#: directives.c:2133
+#: directives.c:2090
 msgid "#endif without #if"
 msgstr "#endif sans #if"
-#: directives.c:2213
+#: directives.c:2166
 msgid "missing '(' after predicate"
 msgstr "« ( » manquante après le prédicat"
-#: directives.c:2228
+#: directives.c:2184
 msgid "missing ')' to complete answer"
 msgstr "« ) » manquante pour compléter la réponse"
-#: directives.c:2248
+#: directives.c:2196
 msgid "predicate's answer is empty"
 msgstr "la réponse du prédicat est vide"
-#: directives.c:2275
+#: directives.c:2226
 msgid "assertion without predicate"
 msgstr "assertion sans prédicat"
-#: directives.c:2278
+#: directives.c:2229
 msgid "predicate must be an identifier"
 msgstr "le prédicat doit être un identificateur"
-#: directives.c:2364
+#: directives.c:2311
 #, c-format
 msgid "\"%s\" re-asserted"
 msgstr "assertion « %s » redondante"
-#: directives.c:2656
+#: directives.c:2587
 #, c-format
 msgid "unterminated #%s"
 msgstr "#%s non terminé"
-#: directives-only.c:221 lex.c:2851 traditional.c:167
+#: directives-only.c:221 lex.c:2862 traditional.c:175
 msgid "unterminated comment"
 msgstr "commentaire non terminé"
-#: errors.c:284
+#: errors.c:291
 #, c-format
 msgid "%s: %s"
 msgstr "%s : %s"
-#: errors.c:296
+#: errors.c:304
 msgid "stdout"
 msgstr "sortie standard"
 msgid "this use of \"defined\" may not be portable"
 msgstr "cette utilisation de « defined » peut ne pas être portable"
-#: expr.c:1125
+#: expr.c:1109
 msgid "user-defined literal in preprocessor expression"
 msgstr "chaîne définie par l'utilisateur dans une expression pour le préprocesseur"
-#: expr.c:1130
+#: expr.c:1114
 msgid "floating constant in preprocessor expression"
 msgstr "constante flottante dans une expression pour le préprocesseur"
-#: expr.c:1136
+#: expr.c:1120
 msgid "imaginary number in preprocessor expression"
 msgstr "constante complexe dans une expression pour le préprocesseur"
-#: expr.c:1189
+#: expr.c:1173
 #, c-format
 msgid "\"%s\" is not defined, evaluates to 0"
 msgstr "« %s » n’est pas défini, évalué à 0"
-#: expr.c:1202
+#: expr.c:1186
 msgid "assertions are a GCC extension"
 msgstr "les assertions sont une extension GCC"
-#: expr.c:1205
+#: expr.c:1189
 msgid "assertions are a deprecated extension"
 msgstr "les assertions sont une extension obsolète"
-#: expr.c:1451
+#: expr.c:1435
 #, c-format
 msgid "unbalanced stack in %s"
 msgstr "pile non balancée dans %s"
-#: expr.c:1471
+#: expr.c:1455
 #, c-format
 msgid "impossible operator '%u'"
 msgstr "opérateur « %u » impossible"
-#: expr.c:1572
+#: expr.c:1556
 msgid "missing ')' in expression"
 msgstr "« ) » manquante dans l'expression"
-#: expr.c:1601
+#: expr.c:1585
 msgid "'?' without following ':'"
 msgstr "« ? » n’est pas suivi de « : »"
-#: expr.c:1611
+#: expr.c:1595
 msgid "integer overflow in preprocessor expression"
 msgstr "débordement d’entier dans l'expression pour le préprocesseur"
-#: expr.c:1616
+#: expr.c:1600
 msgid "missing '(' in expression"
 msgstr "« ( » manquante dans l'expression"
-#: expr.c:1648
+#: expr.c:1632
 #, c-format
 msgid "the left operand of \"%s\" changes sign when promoted"
 msgstr "L'opérande de gauche de « %s » change de signe lors de sa promotion"
-#: expr.c:1653
+#: expr.c:1637
 #, c-format
 msgid "the right operand of \"%s\" changes sign when promoted"
 msgstr "L'opérande de droite de « %s » change de signe lors de sa promotion"
-#: expr.c:1912
+#: expr.c:1896
 msgid "traditional C rejects the unary plus operator"
 msgstr "le C traditionnel rejette l'opérateur d'addition unaire"
-#: expr.c:2010
+#: expr.c:1994
 msgid "comma operator in operand of #if"
 msgstr "opérateur virgule dans l'opérande de #if"
-#: expr.c:2146
+#: expr.c:2130
 msgid "division by zero in #if"
 msgstr "division par zéro dans #if"
-#: expr.c:2243
+#: expr.c:2227
 msgid "operator \"__has_include__\" requires a header string"
 msgstr "l'opérateur « __has_include__ » requiert un chaîne d'entête"
-#: expr.c:2259
+#: expr.c:2243
 msgid "missing ')' after \"__has_include__\""
 msgstr "« ) » manquante après « __has_include__ »"
 msgid "no include path in which to search for %s"
 msgstr "aucun chemin d’inclusion dans lequel on pourrait rechercher %s"
-#: files.c:1441
+#: files.c:1455
 msgid "Multiple include guards may be useful for:\n"
 msgstr "Des garde-fous contre les inclusions multiples peuvent être utiles pour :\n"
-#: init.c:565
+#: init.c:569
 msgid "cppchar_t must be an unsigned type"
 msgstr "cppchar_t doit être d’un type non signé"
-#: init.c:569
+#: init.c:573
 #, c-format
 msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits"
 msgstr "l'arithmétique du préprocesseur a une précision maximale de %lu bits ; la cible requière %lu bits"
-#: init.c:576
+#: init.c:580
 msgid "CPP arithmetic must be at least as precise as a target int"
 msgstr "l'arithmétique du CPP doit être au moins aussi précise que le type int de la cible"
-#: init.c:579
+#: init.c:583
 msgid "target char is less than 8 bits wide"
 msgstr "sur la cible, char fait moins de 8 bits"
-#: init.c:583
+#: init.c:587
 msgid "target wchar_t is narrower than target char"
 msgstr "sur la cible, wchar_t est plus petit que char"
-#: init.c:587
+#: init.c:591
 msgid "target int is narrower than target char"
 msgstr "sur la cible, int est plus petit que char"
-#: init.c:592
+#: init.c:596
 msgid "CPP half-integer narrower than CPP character"
 msgstr "les demi-entiers de CPP sont plus petits que les caractères de CPP"
-#: init.c:596
+#: init.c:600
 #, c-format
 msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits"
 msgstr "CPP sur cette machine ne peut gérer les constantes de caractères larges de plus de %lu bits, mais la cible requière %lu bits"
 msgid "identifier \"%s\" is a special operator name in C++"
 msgstr "l'identifiant « %s » est un nom d’opérateur spécial en C++"
-#: lex.c:1811
+#: lex.c:1826
 msgid "raw string delimiter longer than 16 characters"
 msgstr "délimiteur de chaîne brute plus long que 16 caractères"
-#: lex.c:1815
+#: lex.c:1830
 msgid "invalid new-line in raw string delimiter"
 msgstr "caractère de nouvelle ligne invalide dans un délimiteur de chaîne brute"
-#: lex.c:1819
+#: lex.c:1834
 #, c-format
 msgid "invalid character '%c' in raw string delimiter"
 msgstr "caractère « %c » invalide dans un délimiteur de chaîne brute"
-#: lex.c:1868 lex.c:1890
+#: lex.c:1883 lex.c:1905
 msgid "unterminated raw string"
 msgstr "chaîne brute non terminée"
-#: lex.c:1912 lex.c:2043
+#: lex.c:1925 lex.c:2054
 msgid "invalid suffix on literal; C++11 requires a space between literal and string macro"
 msgstr "suffixe de chaîne invalide ; C++11 requière un espace entre une chaîne et une macro de chaîne"
-#: lex.c:2024
+#: lex.c:2037
 msgid "null character(s) preserved in literal"
 msgstr "caractère(s) nul préservé(s) dans la chaîne"
-#: lex.c:2027
+#: lex.c:2040
 #, c-format
 msgid "missing terminating %c character"
 msgstr "caractère %c de terminaison manquant"
-#: lex.c:2061
+#: lex.c:2072
 msgid "C++11 requires a space between string literal and macro"
 msgstr "C++11 requière un espace entre une chaîne et une macro"
-#: lex.c:2865 lex.c:2899
+#: lex.c:2876 lex.c:2910
 msgid "C++ style comments are not allowed in ISO C90"
 msgstr "La syntaxe des commentaires du C++ n’est pas permise en C90 ISO"
-#: lex.c:2867 lex.c:2878 lex.c:2901
+#: lex.c:2878 lex.c:2889 lex.c:2913
 msgid "(this will be reported only once per input file)"
 msgstr "(ceci sera rapporté une seule fois seulement par fichier d'entrée)"
-#: lex.c:2876
+#: lex.c:2887
 msgid "C++ style comments are incompatible with C90"
 msgstr "La syntaxe des commentaires du C++ n’est pas permise en C90"
-#: lex.c:2907
+#: lex.c:2919
 msgid "multi-line comment"
 msgstr "commentaire multi-lignes"
-#: lex.c:3287
+#: lex.c:3299
 #, c-format
 msgid "unspellable token %s"
 msgstr "l'élément lexical %s ne peut être épelé"
-#: macro.c:93
+#: macro.c:94
 msgid "'##' cannot appear at either end of __VA_OPT__"
 msgstr "« ## » ne peut apparaître à aucune extrémité de __VA_OPT__"
-#: macro.c:352
+#: macro.c:354
 #, c-format
 msgid "macro \"%s\" is not used"
 msgstr "la macro « %s » n’est pas utilisée"
-#: macro.c:391 macro.c:639
+#: macro.c:393 macro.c:641
 #, c-format
 msgid "invalid built-in macro \"%s\""
 msgstr "macro interne « %s » invalide"
-#: macro.c:398 macro.c:500
+#: macro.c:400 macro.c:502
 #, c-format
 msgid "macro \"%s\" might prevent reproducible builds"
 msgstr "la macro « %s » pourrait empêcher les compilations reproductibles"
-#: macro.c:429
+#: macro.c:431
 msgid "could not determine file timestamp"
 msgstr "date de modification du fichier indéterminable"
-#: macro.c:546
+#: macro.c:548
 msgid "could not determine date and time"
 msgstr "date et heure indéterminable"
-#: macro.c:562
+#: macro.c:564
 msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
 msgstr "Expansion de __COUNTER__ à l'intérieur d’une directive avec -fdirectives-only"
-#: macro.c:758
+#: macro.c:760
 msgid "invalid string literal, ignoring final '\\'"
 msgstr "chaîne invalide, le « \\ » final est ignoré"
-#: macro.c:820
+#: macro.c:822
 #, c-format
 msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
 msgstr "le collage de « %s » et de « %s » ne donne pas un élément lexical de pré-traitement valide"
-#: macro.c:946
+#: macro.c:948
 msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C++11 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:950
+#: macro.c:952
 msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
 msgstr "ISO C99 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:957
+#: macro.c:959
 #, c-format
 msgid "macro \"%s\" requires %u arguments, but only %u given"
 msgstr "la macro « %s » requiert %u arguments, mais seulement %u ont été passés"
-#: macro.c:962
+#: macro.c:964
 #, c-format
 msgid "macro \"%s\" passed %u arguments, but takes just %u"
 msgstr "la macro « %s » a reçu %u arguments, mais elle n’en prend que %u"
-#: macro.c:1156 traditional.c:819
+#: macro.c:1162 traditional.c:827
 #, c-format
 msgid "unterminated argument list invoking macro \"%s\""
 msgstr "liste d'arguments non terminée en invoquant la macro « %s »"
-#: macro.c:1307
+#: macro.c:1304
 #, c-format
 msgid "function-like macro \"%s\" must be used with arguments in traditional C"
 msgstr "la macro « %s » ressemblant à une fonction doit être utilisée avec des arguments en C traditionnel"
-#: macro.c:2003
+#: macro.c:2083
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
 msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++98"
-#: macro.c:2011 macro.c:2020
+#: macro.c:2091 macro.c:2100
 #, c-format
 msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
 msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++90"
-#: macro.c:2984
+#: macro.c:3059
 #, c-format
 msgid "duplicate macro parameter \"%s\""
 msgstr "paramètre de macro « %s » dupliqués"
-#: macro.c:3033
+#: macro.c:3141
+#, c-format
+msgid "expected parameter name, found \"%s\""
+msgstr "nom de paramètre attendu, « %s » rencontré"
+#: macro.c:3142
 #, c-format
-msgid "\"%s\" may not appear in macro parameter list"
+msgid "expected ',' or ')', found \"%s\""
-msgstr "« %s » ne peut pas apparaître parmi la liste des paramètres de macro"
+msgstr "« , » ou « ) » attendue, « %s » rencontré"
-#: macro.c:3041
+#: macro.c:3143
-msgid "macro parameters must be comma-separated"
+msgid "expected parameter name before end of line"
-msgstr "les paramètres de macro doivent être séparés par des virgules"
+msgstr "nom de paramètre attendu avant la fin de la ligne"
-#: macro.c:3060
+#: macro.c:3144
-msgid "parameter name missing"
+msgid "expected ')' before end of line"
-msgstr "nom de paramètre manquant"
+msgstr "« ) » attendue avant la fin de la ligne"
-#: macro.c:3081
+#: macro.c:3145
+msgid "expected ')' after \"...\""
+msgstr "« ) » attendue après « ... »"
+#: macro.c:3202
 msgid "anonymous variadic macros were introduced in C++11"
 msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C++11"
-#: macro.c:3085 macro.c:3090
+#: macro.c:3203 macro.c:3207
 msgid "anonymous variadic macros were introduced in C99"
 msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C99"
-#: macro.c:3097
+#: macro.c:3213
 msgid "ISO C++ does not permit named variadic macros"
 msgstr "ISO C++ ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:3100
+#: macro.c:3214
 msgid "ISO C does not permit named variadic macros"
 msgstr "ISO C ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:3110
+#: macro.c:3260
-msgid "missing ')' in macro parameter list"
-msgstr "« ) » manquante dans la liste des paramètres de macro"
-#: macro.c:3161
 msgid "'##' cannot appear at either end of a macro expansion"
 msgstr "« ## » ne peut apparaître à aucune des extrémités d’une expansion de macro"
-#: macro.c:3198
+#: macro.c:3298
 msgid "ISO C++11 requires whitespace after the macro name"
 msgstr "ISO C++11 requiert un blanc après le nom de la macro"
-#: macro.c:3201
+#: macro.c:3299
 msgid "ISO C99 requires whitespace after the macro name"
 msgstr "ISO C99 requiert un blanc après le nom de la macro"
-#: macro.c:3226
+#: macro.c:3323
 msgid "missing whitespace after the macro name"
 msgstr "espacement manquant après le nom de la macro"
-#: macro.c:3263
+#: macro.c:3373
 msgid "'#' is not followed by a macro parameter"
 msgstr "« # » n'est pas suivi d’un paramètre de macro"
-#: macro.c:3430
+#: macro.c:3524
 #, c-format
 msgid "\"%s\" redefined"
 msgstr "« %s » redéfini"
-#: macro.c:3435
+#: macro.c:3529
 msgid "this is the location of the previous definition"
 msgstr "ceci est l'emplacement d’une précédente définition"
-#: macro.c:3496
+#: macro.c:3633
 #, c-format
 msgid "macro argument \"%s\" would be stringified in traditional C"
 msgstr "l'argument de macro « %s » serait changé en chaine dans le C traditionnel"
-#: macro.c:3532
+#: pch.c:90 pch.c:342 pch.c:356 pch.c:374 pch.c:380 pch.c:389 pch.c:396
-#, c-format
-msgid "invalid hash type %d in cpp_macro_definition"
-msgstr "type de hachage %d invalide dans cpp_macro_definition"
-#: pch.c:89 pch.c:347 pch.c:361 pch.c:379 pch.c:385 pch.c:394 pch.c:401
 msgid "while writing precompiled header"
 msgstr "lors de l'écriture de l'en-tête pré-compilée"
-#: pch.c:621
+#: pch.c:616
 #, c-format
 msgid "%s: not used because `%.*s' is poisoned"
 msgstr "%s: n'est pas utilisé parce que « %.*s » est empoisonné"
-#: pch.c:643
+#: pch.c:638
 #, c-format
 msgid "%s: not used because `%.*s' not defined"
 msgstr "%s: n'est pas utilisé parce que « %.*s » n’est pas défini"
-#: pch.c:655
+#: pch.c:650
 #, c-format
 msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'"
 msgstr "%s: n’est pas utilisé parce que « %.*s » est défini en tant « %s » et non pas « %.*s »"
-#: pch.c:696
+#: pch.c:691
 #, c-format
 msgid "%s: not used because `%s' is defined"
 msgstr "%s: n'est pas utilisé parce que « %s » est défini"
-#: pch.c:716
+#: pch.c:711
 #, c-format
 msgid "%s: not used because `__COUNTER__' is invalid"
 msgstr "%s: non utilisé parce que « __COUNTER__ » est invalide"
-#: pch.c:725 pch.c:903
+#: pch.c:720 pch.c:878
 msgid "while reading precompiled header"
 msgstr "lors de la lecture d’un entête pré-compilée"
-#: traditional.c:889
+#: traditional.c:896
 #, c-format
 msgid "detected recursion whilst expanding macro \"%s\""
 msgstr "récursion détectée lors de l'expansion de la macro « %s »"
-#: traditional.c:1108
+#: traditional.c:1119
 msgid "syntax error in macro parameter list"
 msgstr "erreur de syntaxe dans la liste des paramètres de macro"
+#~ msgid "\"%s\" may not appear in macro parameter list"
+#~ msgstr "« %s » ne peut pas apparaître parmi la liste des paramètres de macro"
+#~ msgid "macro parameters must be comma-separated"
+#~ msgstr "les paramètres de macro doivent être séparés par des virgules"
+#~ msgid "parameter name missing"
+#~ msgstr "nom de paramètre manquant"
+#~ msgid "missing ')' in macro parameter list"
+#~ msgstr "« ) » manquante dans la liste des paramètres de macro"
+#~ msgid "invalid hash type %d in cpp_macro_definition"
+#~ msgstr "type de hachage %d invalide dans cpp_macro_definition"

gcc/libcpp/po/id.gmo+0−0

Binary file not shown.

gcc/libcpp/po/id.po+182−165

@@ -7,7 +7,7 @@ msgid "" · 6 unmodified lines
7	msgstr ""	7	msgstr ""
8	"Project-Id-Version: cpplib 4.5-b20100204\n"	8	"Project-Id-Version: cpplib 4.5-b20100204\n"
9	"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"	9	"Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
10	"POT-Creation-Date: 2018-01-26 22:47+0000\n"	10	"POT-Creation-Date: 2019-02-01 23:01+0000\n"
11	"PO-Revision-Date: 2010-02-05 19:00+0700\n"	11	"PO-Revision-Date: 2010-02-05 19:00+0700\n"
12	"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"	12	"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
13	"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"	13	"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -88,7 +88,7 @@ msgstr "karakter universal %.*s tidak valid dalam sebuah pengidentifikasi" · 74 unmodified lines
88	msgid "universal character %.*s is not valid at the start of an identifier"	88	msgid "universal character %.*s is not valid at the start of an identifier"
89	msgstr "karakter universal %.*s tidak valid di awal dari sebuah pengidentifikasi"	89	msgstr "karakter universal %.*s tidak valid di awal dari sebuah pengidentifikasi"
90		90
91	#: charset.c:1181 charset.c:2000	91	#: charset.c:1181 charset.c:2002
92	msgid "converting UCN to source character set"	92	msgid "converting UCN to source character set"
93	msgstr "mengubah UCN ke set karakter asal"	93	msgstr "mengubah UCN ke set karakter asal"
94		94
@@ -139,297 +139,297 @@ msgstr "mengubah escape sequence ke set karakter eksekusi" · 44 unmodified lines
139	msgid "missing open quote"	139	msgid "missing open quote"
140	msgstr ""	140	msgstr ""
141		141
142	#: charset.c:1827 charset.c:1891	142	#: charset.c:1829 charset.c:1893
143	msgid "character constant too long for its type"	143	msgid "character constant too long for its type"
144	msgstr "konstanta karakter terlalu panjang untuk tipenya"	144	msgstr "konstanta karakter terlalu panjang untuk tipenya"
145		145
146	#: charset.c:1830	146	#: charset.c:1832
147	msgid "multi-character character constant"	147	msgid "multi-character character constant"
148	msgstr "konstanta karakter multi-karakter"	148	msgstr "konstanta karakter multi-karakter"
149		149
150	#: charset.c:1931	150	#: charset.c:1933
151	msgid "empty character constant"	151	msgid "empty character constant"
152	msgstr "konstanta karakter kosong"	152	msgstr "konstanta karakter kosong"
153		153
154	#: charset.c:2047	154	#: charset.c:2049
155	#, c-format	155	#, c-format
156	msgid "failure to convert %s to %s"	156	msgid "failure to convert %s to %s"
157	msgstr "gagal untuk mengubah %s ke %s"	157	msgstr "gagal untuk mengubah %s ke %s"
158		158
159	#: directives.c:235 directives.c:278	159	#: directives.c:229 directives.c:272
160	#, c-format	160	#, c-format
161	msgid "extra tokens at end of #%s directive"	161	msgid "extra tokens at end of #%s directive"
162	msgstr "ekstra token di akhir dari #%s direktif"	162	msgstr "ekstra token di akhir dari #%s direktif"
163		163
164	#: directives.c:385	164	#: directives.c:379
165	#, c-format	165	#, c-format
166	msgid "#%s is a GCC extension"	166	msgid "#%s is a GCC extension"
167	msgstr "#%s adalah sebuah ekstensi GCC"	167	msgstr "#%s adalah sebuah ekstensi GCC"
168		168
169	#: directives.c:390	169	#: directives.c:384
170	#, c-format	170	#, c-format
171	msgid "#%s is a deprecated GCC extension"	171	msgid "#%s is a deprecated GCC extension"
172	msgstr "#%s adalah sebuah ekstensi GCC yang sudah ditinggalkan"	172	msgstr "#%s adalah sebuah ekstensi GCC yang sudah ditinggalkan"
173		173
174	#: directives.c:403	174	#: directives.c:397
175	msgid "suggest not using #elif in traditional C"	175	msgid "suggest not using #elif in traditional C"
176	msgstr "disarankan tidak menggunakan #elif dalam tradisional C"	176	msgstr "disarankan tidak menggunakan #elif dalam tradisional C"
177		177
178	#: directives.c:406	178	#: directives.c:400
179	#, c-format	179	#, c-format
180	msgid "traditional C ignores #%s with the # indented"	180	msgid "traditional C ignores #%s with the # indented"
181	msgstr "tradisional C mengabaikan #%s dengan # terindentasi"	181	msgstr "tradisional C mengabaikan #%s dengan # terindentasi"
182		182
183	#: directives.c:410	183	#: directives.c:404
184	#, c-format	184	#, c-format
185	msgid "suggest hiding #%s from traditional C with an indented #"	185	msgid "suggest hiding #%s from traditional C with an indented #"
186	msgstr "disarankan menyembunyikan #%s dari tradisional C dengan sebuah indentasi #"	186	msgstr "disarankan menyembunyikan #%s dari tradisional C dengan sebuah indentasi #"
187		187
188	#: directives.c:436	188	#: directives.c:430
189	msgid "embedding a directive within macro arguments is not portable"	189	msgid "embedding a directive within macro arguments is not portable"
190	msgstr "embedding sebuah direktif didalam argumen makro yang bukan portabel"	190	msgstr "embedding sebuah direktif didalam argumen makro yang bukan portabel"
191		191
192	#: directives.c:456	192	#: directives.c:450
193	msgid "style of line directive is a GCC extension"	193	msgid "style of line directive is a GCC extension"
194	msgstr "gaya dari baris direktif bukan sebuah ekstensi GCC"	194	msgstr "gaya dari baris direktif bukan sebuah ekstensi GCC"
195		195
196	#: directives.c:537	196	#: directives.c:531
197	#, c-format	197	#, c-format
198	msgid "invalid preprocessing directive #%s"	198	msgid "invalid preprocessing directive #%s"
199	msgstr "preprosesing direktif #%s tidak valid"	199	msgstr "preprosesing direktif #%s tidak valid"
200		200
201	#: directives.c:606	201	#: directives.c:600
202	msgid "\"defined\" cannot be used as a macro name"	202	msgid "\"defined\" cannot be used as a macro name"
203	msgstr "\"defined\" tidak dapat digunakan sebagai sebuah nama makro"	203	msgstr "\"defined\" tidak dapat digunakan sebagai sebuah nama makro"
204		204
205	#: directives.c:611	205	#: directives.c:605
206	#, fuzzy	206	#, fuzzy
207	#\| msgid "\"defined\" cannot be used as a macro name"	207	#\| msgid "\"defined\" cannot be used as a macro name"
208	msgid "\"__has_include__\" cannot be used as a macro name"	208	msgid "\"__has_include__\" cannot be used as a macro name"
209	msgstr "\"defined\" tidak dapat digunakan sebagai sebuah nama makro"	209	msgstr "\"defined\" tidak dapat digunakan sebagai sebuah nama makro"
210		210
211	#: directives.c:617	211	#: directives.c:611
212	#, c-format	212	#, c-format
213	msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"	213	msgid "\"%s\" cannot be used as a macro name as it is an operator in C++"
214	msgstr "\"%s\" tidak dapat digunakan sebagai sebuah nama makro karena ini adalah sebuah operator dalam C++"	214	msgstr "\"%s\" tidak dapat digunakan sebagai sebuah nama makro karena ini adalah sebuah operator dalam C++"
215		215
216	#: directives.c:620	216	#: directives.c:614
217	#, c-format	217	#, c-format
218	msgid "no macro name given in #%s directive"	218	msgid "no macro name given in #%s directive"
219	msgstr "tidak ada nama makro yang diberikan dalam direktif #%s"	219	msgstr "tidak ada nama makro yang diberikan dalam direktif #%s"
220		220
221	#: directives.c:623	221	#: directives.c:617
222	msgid "macro names must be identifiers"	222	msgid "macro names must be identifiers"
223	msgstr "nama makro harus berupa pengidentifikasi"	223	msgstr "nama makro harus berupa pengidentifikasi"
224		224
225	#: directives.c:672 directives.c:677	225	#: directives.c:666 directives.c:671
226	#, c-format	226	#, c-format
227	msgid "undefining \"%s\""	227	msgid "undefining \"%s\""
228	msgstr "tidak terdefinisi \"%s\""	228	msgstr "tidak terdefinisi \"%s\""
229		229
230	#: directives.c:732	230	#: directives.c:727
231	msgid "missing terminating > character"	231	msgid "missing terminating > character"
232	msgstr "hilang karakter pengakhir >"	232	msgstr "hilang karakter pengakhir >"
233		233
234	#: directives.c:791	234	#: directives.c:786
235	#, c-format	235	#, c-format
236	msgid "#%s expects \"FILENAME\" or <FILENAME>"	236	msgid "#%s expects \"FILENAME\" or <FILENAME>"
237	msgstr "#%s diduga \"NAMA BERKAS\" atau <NAMA BERKAS>"	237	msgstr "#%s diduga \"NAMA BERKAS\" atau <NAMA BERKAS>"
238		238
239	#: directives.c:837	239	#: directives.c:828
240	#, c-format	240	#, c-format
241	msgid "empty filename in #%s"	241	msgid "empty filename in #%s"
242	msgstr "nama berkas kosong dalam #%s"	242	msgstr "nama berkas kosong dalam #%s"
243		243
244	#: directives.c:847	244	#: directives.c:835
245	msgid "#include nested too deeply"	245	msgid "#include nested too deeply"
246	msgstr "#include nested terlalu dalam"	246	msgstr "#include nested terlalu dalam"
247		247
248	#: directives.c:888	248	#: directives.c:877
249	msgid "#include_next in primary source file"	249	msgid "#include_next in primary source file"
250	msgstr "#include_next dalam berkas kode program utama"	250	msgstr "#include_next dalam berkas kode program utama"
251		251
252	#: directives.c:914	252	#: directives.c:903
253	#, c-format	253	#, c-format
254	msgid "invalid flag \"%s\" in line directive"	254	msgid "invalid flag \"%s\" in line directive"
255	msgstr "tanda \"%s\" tidak valid dalam baris direktif"	255	msgstr "tanda \"%s\" tidak valid dalam baris direktif"
256		256
257	#: directives.c:974	257	#: directives.c:963
258	msgid "unexpected end of file after #line"	258	msgid "unexpected end of file after #line"
259	msgstr "tidak terduga akhir dari berkas setelah #line"	259	msgstr "tidak terduga akhir dari berkas setelah #line"
260		260
261	#: directives.c:977	261	#: directives.c:966
262	#, c-format	262	#, c-format
263	msgid "\"%s\" after #line is not a positive integer"	263	msgid "\"%s\" after #line is not a positive integer"
264	msgstr "\"%s\" setelah #line bukan sebuah integer positif"	264	msgstr "\"%s\" setelah #line bukan sebuah integer positif"
265		265
266	#: directives.c:983 directives.c:985	266	#: directives.c:972 directives.c:974
267	msgid "line number out of range"	267	msgid "line number out of range"
268	msgstr "nomor baris diluar dari jangkauan"	268	msgstr "nomor baris diluar dari jangkauan"
269		269
270	#: directives.c:998 directives.c:1079	270	#: directives.c:987 directives.c:1068
271	#, c-format	271	#, c-format
272	msgid "\"%s\" is not a valid filename"	272	msgid "\"%s\" is not a valid filename"
273	msgstr "\"%s\" bukan sebuah nama berkas yang valid"	273	msgstr "\"%s\" bukan sebuah nama berkas yang valid"
274		274
275	#: directives.c:1039	275	#: directives.c:1028
276	#, c-format	276	#, c-format
277	msgid "\"%s\" after # is not a positive integer"	277	msgid "\"%s\" after # is not a positive integer"
278	msgstr "\"%s\" setelah # bukan sebuah integer positif"	278	msgstr "\"%s\" setelah # bukan sebuah integer positif"
279		279
280	#: directives.c:1098	280	#: directives.c:1087
281	#, c-format	281	#, c-format
282	msgid "file \"%s\" linemarker ignored due to incorrect nesting"	282	msgid "file \"%s\" linemarker ignored due to incorrect nesting"
283	msgstr ""	283	msgstr ""
284		284
285	#: directives.c:1157 directives.c:1159 directives.c:1161 directives.c:1747	285	#: directives.c:1147 directives.c:1149 directives.c:1151 directives.c:1737
286	#, c-format	286	#, c-format
287	msgid "%s"	287	msgid "%s"
288	msgstr "%s"	288	msgstr "%s"
289		289
290	#: directives.c:1185	290	#: directives.c:1175
291	#, c-format	291	#, c-format
292	msgid "invalid #%s directive"	292	msgid "invalid #%s directive"
293	msgstr "direktif #%s tidak valid"	293	msgstr "direktif #%s tidak valid"
294		294
295	#: directives.c:1248	295	#: directives.c:1238
296	#, c-format	296	#, c-format
297	msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"	297	msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
298	msgstr "mendaftarkan pragma dalam ruang-nama \"%s\" dengan ekspansi nama yang tidak cocok"	298	msgstr "mendaftarkan pragma dalam ruang-nama \"%s\" dengan ekspansi nama yang tidak cocok"
299		299
300	#: directives.c:1257	300	#: directives.c:1247
301	#, c-format	301	#, c-format
302	msgid "registering pragma \"%s\" with name expansion and no namespace"	302	msgid "registering pragma \"%s\" with name expansion and no namespace"
303	msgstr "mendaftarkan pragma \"%s\" dengan ekspansi nama dan tidak ada ruang-nama"	303	msgstr "mendaftarkan pragma \"%s\" dengan ekspansi nama dan tidak ada ruang-nama"
304		304
305	#: directives.c:1275	305	#: directives.c:1265
306	#, c-format	306	#, c-format
307	msgid "registering \"%s\" as both a pragma and a pragma namespace"	307	msgid "registering \"%s\" as both a pragma and a pragma namespace"
308	msgstr "mendaftarkan \"%s\" sebagai baik sebuah pragma dan sebuah ruang-nama"	308	msgstr "mendaftarkan \"%s\" sebagai baik sebuah pragma dan sebuah ruang-nama"
309		309
310	#: directives.c:1278	310	#: directives.c:1268
311	#, c-format	311	#, c-format
312	msgid "#pragma %s %s is already registered"	312	msgid "#pragma %s %s is already registered"
313	msgstr "#pragma %s %s telah terdaftar"	313	msgstr "#pragma %s %s telah terdaftar"
314		314
315	#: directives.c:1281	315	#: directives.c:1271
316	#, c-format	316	#, c-format
317	msgid "#pragma %s is already registered"	317	msgid "#pragma %s is already registered"
318	msgstr "#pragma %s telah terdaftar"	318	msgstr "#pragma %s telah terdaftar"
319		319
320	#: directives.c:1311	320	#: directives.c:1301
321	msgid "registering pragma with NULL handler"	321	msgid "registering pragma with NULL handler"
322	msgstr "mendaftarkan pragma dengan penanganan KOSONG"	322	msgstr "mendaftarkan pragma dengan penanganan KOSONG"
323		323
324	#: directives.c:1528	324	#: directives.c:1518
325	msgid "#pragma once in main file"	325	msgid "#pragma once in main file"
326	msgstr "#pragma sekali dalam berkas utama"	326	msgstr "#pragma sekali dalam berkas utama"
327		327
328	#: directives.c:1551	328	#: directives.c:1541
329	msgid "invalid #pragma push_macro directive"	329	msgid "invalid #pragma push_macro directive"
330	msgstr "#pragma push_macro direktif tidak valid"	330	msgstr "#pragma push_macro direktif tidak valid"
331		331
332	#: directives.c:1606	332	#: directives.c:1596
333	msgid "invalid #pragma pop_macro directive"	333	msgid "invalid #pragma pop_macro directive"
334	msgstr "#pragma pop_macro direktif tidak valid"	334	msgstr "#pragma pop_macro direktif tidak valid"
335		335
336	#: directives.c:1661	336	#: directives.c:1651
337	msgid "invalid #pragma GCC poison directive"	337	msgid "invalid #pragma GCC poison directive"
338	msgstr "#pragma GCC tidak valid merusak direktif"	338	msgstr "#pragma GCC tidak valid merusak direktif"
339		339
340	#: directives.c:1670	340	#: directives.c:1660
341	#, c-format	341	#, c-format
342	msgid "poisoning existing macro \"%s\""	342	msgid "poisoning existing macro \"%s\""
343	msgstr "merusak makro \"%s\" yang sudah ada"	343	msgstr "merusak makro \"%s\" yang sudah ada"
344		344
345	#: directives.c:1689	345	#: directives.c:1679
346	msgid "#pragma system_header ignored outside include file"	346	msgid "#pragma system_header ignored outside include file"
347	msgstr "#pragma system_header diabaikan diluar berkas include"	347	msgstr "#pragma system_header diabaikan diluar berkas include"
348		348
349	#: directives.c:1714	349	#: directives.c:1704
350	#, c-format	350	#, c-format
351	msgid "cannot find source file %s"	351	msgid "cannot find source file %s"
352	msgstr "tidak dapat menemukan berkas sumber %s"	352	msgstr "tidak dapat menemukan berkas sumber %s"
353		353
354	#: directives.c:1718	354	#: directives.c:1708
355	#, c-format	355	#, c-format
356	msgid "current file is older than %s"	356	msgid "current file is older than %s"
357	msgstr "berkas ini lebih lama daripada %s"	357	msgstr "berkas ini lebih lama daripada %s"
358		358
359	#: directives.c:1742	359	#: directives.c:1732
360	#, fuzzy, c-format	360	#, fuzzy, c-format
361	#\| msgid "invalid #pragma GCC poison directive"	361	#\| msgid "invalid #pragma GCC poison directive"
362	msgid "invalid \"#pragma GCC %s\" directive"	362	msgid "invalid \"#pragma GCC %s\" directive"
363	msgstr "#pragma GCC tidak valid merusak direktif"	363	msgstr "#pragma GCC tidak valid merusak direktif"
364		364
365	#: directives.c:1943	365	#: directives.c:1933
366	msgid "_Pragma takes a parenthesized string literal"	366	msgid "_Pragma takes a parenthesized string literal"
367	msgstr "_Pragma mengambil sebuah string literal tanda kurung"	367	msgstr "_Pragma mengambil sebuah string literal tanda kurung"
368		368
369	#: directives.c:2064	369	#: directives.c:2021
370	msgid "#else without #if"	370	msgid "#else without #if"
371	msgstr "#else tanpa #if"	371	msgstr "#else tanpa #if"
372		372
373	#: directives.c:2069	373	#: directives.c:2026
374	msgid "#else after #else"	374	msgid "#else after #else"
375	msgstr "#else setelah #else"	375	msgstr "#else setelah #else"
376		376
377	#: directives.c:2071 directives.c:2104	377	#: directives.c:2028 directives.c:2061
378	msgid "the conditional began here"	378	msgid "the conditional began here"
379	msgstr "kondisional berawal disini"	379	msgstr "kondisional berawal disini"
380		380
381	#: directives.c:2097	381	#: directives.c:2054
382	msgid "#elif without #if"	382	msgid "#elif without #if"
383	msgstr "#elif tanpa #if"	383	msgstr "#elif tanpa #if"
384		384
385	#: directives.c:2102	385	#: directives.c:2059
386	msgid "#elif after #else"	386	msgid "#elif after #else"
387	msgstr "#elif setelah #else"	387	msgstr "#elif setelah #else"
388		388
389	#: directives.c:2133	389	#: directives.c:2090
390	msgid "#endif without #if"	390	msgid "#endif without #if"
391	msgstr "#endif tanpa #if"	391	msgstr "#endif tanpa #if"
392		392
393	#: directives.c:2213	393	#: directives.c:2166
394	msgid "missing '(' after predicate"	394	msgid "missing '(' after predicate"
395	msgstr "hilang '(' setelah predikat"	395	msgstr "hilang '(' setelah predikat"
396		396
397	#: directives.c:2228	397	#: directives.c:2184
398	msgid "missing ')' to complete answer"	398	msgid "missing ')' to complete answer"
399	msgstr "hilang ')' untuk melengkapi jawaban"	399	msgstr "hilang ')' untuk melengkapi jawaban"
400		400
401	#: directives.c:2248	401	#: directives.c:2196
402	msgid "predicate's answer is empty"	402	msgid "predicate's answer is empty"
403	msgstr "jawaban predikat kosong"	403	msgstr "jawaban predikat kosong"
404		404
405	#: directives.c:2275	405	#: directives.c:2226
406	msgid "assertion without predicate"	406	msgid "assertion without predicate"
407	msgstr "assertion tanpa predikat"	407	msgstr "assertion tanpa predikat"
408		408
409	#: directives.c:2278	409	#: directives.c:2229
410	msgid "predicate must be an identifier"	410	msgid "predicate must be an identifier"
411	msgstr "predikat harus berupa sebuah pengidentifikasi"	411	msgstr "predikat harus berupa sebuah pengidentifikasi"
412		412
413	#: directives.c:2364	413	#: directives.c:2311
414	#, c-format	414	#, c-format
415	msgid "\"%s\" re-asserted"	415	msgid "\"%s\" re-asserted"
416	msgstr "\"%s\" re-asserted"	416	msgstr "\"%s\" re-asserted"
417		417
418	#: directives.c:2656	418	#: directives.c:2587
419	#, c-format	419	#, c-format
420	msgid "unterminated #%s"	420	msgid "unterminated #%s"
421	msgstr "tidak terakhiri #%s"	421	msgstr "tidak terakhiri #%s"
422		422
423	#: directives-only.c:221 lex.c:2851 traditional.c:167	423	#: directives-only.c:221 lex.c:2862 traditional.c:175
424	msgid "unterminated comment"	424	msgid "unterminated comment"
425	msgstr "komentar tidak terakhiri"	425	msgstr "komentar tidak terakhiri"
426		426
427	#: errors.c:284	427	#: errors.c:291
428	#, c-format	428	#, c-format
429	msgid "%s: %s"	429	msgid "%s: %s"
430	msgstr "%s: %s"	430	msgstr "%s: %s"
431		431
432	#: errors.c:296	432	#: errors.c:304
433	msgid "stdout"	433	msgid "stdout"
434	msgstr "stdout"	434	msgstr "stdout"
435		435
@@ -530,89 +530,89 @@ msgstr "(\"%s\" adalah sebuah tanda alternatif untuk \"%s\" dalam C++)" · 94 unmodified lines
530	msgid "this use of \"defined\" may not be portable"	530	msgid "this use of \"defined\" may not be portable"
531	msgstr "penggunaan ini dari \"defined\" mungkin tidak portabel"	531	msgstr "penggunaan ini dari \"defined\" mungkin tidak portabel"
532		532
533	#: expr.c:1125	533	#: expr.c:1109
534	#, fuzzy	534	#, fuzzy
535	#\| msgid "integer overflow in preprocessor expression"	535	#\| msgid "integer overflow in preprocessor expression"
536	msgid "user-defined literal in preprocessor expression"	536	msgid "user-defined literal in preprocessor expression"
537	msgstr "integer overflow dalam ekspresi preprosesor"	537	msgstr "integer overflow dalam ekspresi preprosesor"
538		538
539	#: expr.c:1130	539	#: expr.c:1114
540	msgid "floating constant in preprocessor expression"	540	msgid "floating constant in preprocessor expression"
541	msgstr "konstanta pecahan dalam ekspresi preprosesor"	541	msgstr "konstanta pecahan dalam ekspresi preprosesor"
542		542
543	#: expr.c:1136	543	#: expr.c:1120
544	msgid "imaginary number in preprocessor expression"	544	msgid "imaginary number in preprocessor expression"
545	msgstr "angka imaginari dalam ekspresi preprosesor"	545	msgstr "angka imaginari dalam ekspresi preprosesor"
546		546
547	#: expr.c:1189	547	#: expr.c:1173
548	#, fuzzy, c-format	548	#, fuzzy, c-format
549	#\| msgid "\"%s\" is not defined"	549	#\| msgid "\"%s\" is not defined"
550	msgid "\"%s\" is not defined, evaluates to 0"	550	msgid "\"%s\" is not defined, evaluates to 0"
551	msgstr "\"%s\" tidak didefinisikan"	551	msgstr "\"%s\" tidak didefinisikan"
552		552
553	#: expr.c:1202	553	#: expr.c:1186
554	msgid "assertions are a GCC extension"	554	msgid "assertions are a GCC extension"
555	msgstr "assertions adalah sebuah ekstensi GCC"	555	msgstr "assertions adalah sebuah ekstensi GCC"
556		556
557	#: expr.c:1205	557	#: expr.c:1189
558	msgid "assertions are a deprecated extension"	558	msgid "assertions are a deprecated extension"
559	msgstr "assertions adalah sebuah ekstensi yang sudah ditinggalkan"	559	msgstr "assertions adalah sebuah ekstensi yang sudah ditinggalkan"
560		560
561	#: expr.c:1451	561	#: expr.c:1435
562	#, c-format	562	#, c-format
563	msgid "unbalanced stack in %s"	563	msgid "unbalanced stack in %s"
564	msgstr "stack dalam %s tidak seimbang"	564	msgstr "stack dalam %s tidak seimbang"
565		565
566	#: expr.c:1471	566	#: expr.c:1455
567	#, c-format	567	#, c-format
568	msgid "impossible operator '%u'"	568	msgid "impossible operator '%u'"
569	msgstr "operator '%u' tidak mungkin"	569	msgstr "operator '%u' tidak mungkin"
570		570
571	#: expr.c:1572	571	#: expr.c:1556
572	msgid "missing ')' in expression"	572	msgid "missing ')' in expression"
573	msgstr "hilang ')' dalam ekspresi"	573	msgstr "hilang ')' dalam ekspresi"
574		574
575	#: expr.c:1601	575	#: expr.c:1585
576	msgid "'?' without following ':'"	576	msgid "'?' without following ':'"
577	msgstr "'?' tanpa diikuti ':'"	577	msgstr "'?' tanpa diikuti ':'"
578		578
579	#: expr.c:1611	579	#: expr.c:1595
580	msgid "integer overflow in preprocessor expression"	580	msgid "integer overflow in preprocessor expression"
581	msgstr "integer overflow dalam ekspresi preprosesor"	581	msgstr "integer overflow dalam ekspresi preprosesor"
582		582
583	#: expr.c:1616	583	#: expr.c:1600
584	msgid "missing '(' in expression"	584	msgid "missing '(' in expression"
585	msgstr "hilang '(' dalam ekspresi"	585	msgstr "hilang '(' dalam ekspresi"
586		586
587	#: expr.c:1648	587	#: expr.c:1632
588	#, c-format	588	#, c-format
589	msgid "the left operand of \"%s\" changes sign when promoted"	589	msgid "the left operand of \"%s\" changes sign when promoted"
590	msgstr "operan kiri dari \"%s\" berubah tanda ketika dipromosikan"	590	msgstr "operan kiri dari \"%s\" berubah tanda ketika dipromosikan"
591		591
592	#: expr.c:1653	592	#: expr.c:1637
593	#, c-format	593	#, c-format
594	msgid "the right operand of \"%s\" changes sign when promoted"	594	msgid "the right operand of \"%s\" changes sign when promoted"
595	msgstr "operan kanan dari \"%s\" berubah tanda ketika dipromosikan"	595	msgstr "operan kanan dari \"%s\" berubah tanda ketika dipromosikan"
596		596
597	#: expr.c:1912	597	#: expr.c:1896
598	msgid "traditional C rejects the unary plus operator"	598	msgid "traditional C rejects the unary plus operator"
599	msgstr "tradisional C menolak operator unary plus"	599	msgstr "tradisional C menolak operator unary plus"
600		600
601	#: expr.c:2010	601	#: expr.c:1994
602	msgid "comma operator in operand of #if"	602	msgid "comma operator in operand of #if"
603	msgstr "operator koma dalam operator dari #if"	603	msgstr "operator koma dalam operator dari #if"
604		604
605	#: expr.c:2146	605	#: expr.c:2130
606	msgid "division by zero in #if"	606	msgid "division by zero in #if"
607	msgstr "pembagian oleh nol dalam #if"	607	msgstr "pembagian oleh nol dalam #if"
608		608
609	#: expr.c:2243	609	#: expr.c:2227
610	#, fuzzy	610	#, fuzzy
611	#\| msgid "operator \"defined\" requires an identifier"	611	#\| msgid "operator \"defined\" requires an identifier"
612	msgid "operator \"__has_include__\" requires a header string"	612	msgid "operator \"__has_include__\" requires a header string"
613	msgstr "operator \"defined\" membutuhkan sebuah pengidentifikasi"	613	msgstr "operator \"defined\" membutuhkan sebuah pengidentifikasi"
614		614
615	#: expr.c:2259	615	#: expr.c:2243
616	#, fuzzy	616	#, fuzzy
617	#\| msgid "missing ')' after \"defined\""	617	#\| msgid "missing ')' after \"defined\""
618	msgid "missing ')' after \"__has_include__\""	618	msgid "missing ')' after \"__has_include__\""
@@ -631,40 +631,40 @@ msgstr "gunakan -Winvalid-pch untuk informasi lebih lanjut" · 12 unmodified lines
631	msgid "no include path in which to search for %s"	631	msgid "no include path in which to search for %s"
632	msgstr "tidak ada jalur include yang biasa digunakan untuk pencarian untuk %s"	632	msgstr "tidak ada jalur include yang biasa digunakan untuk pencarian untuk %s"