diff options
| author | Nathan Sidwell <nathan@acm.org> | 2021-02-18 12:46:25 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2021-02-18 13:22:48 -0800 |
| commit | 1f9db6929d926222aee0628b93f77cd20cf3adc4 (patch) | |
| tree | d00d2d912c714d8f13253ed49331aed0b66aed86 /libcpp/internal.h | |
| parent | d82f829905cfe6cb47d073825f680900274ce764 (diff) | |
| download | gcc-1f9db6929d926222aee0628b93f77cd20cf3adc4.zip gcc-1f9db6929d926222aee0628b93f77cd20cf3adc4.tar.gz gcc-1f9db6929d926222aee0628b93f77cd20cf3adc4.tar.bz2 | |
c++: header-unit build capability [PR 99023]
This defect really required building header-units and include translation
of pieces of the standard library. This adds smarts to the modules
test harness to do that -- accept .X files as the source file, but
provide '-x c++-system-header $HDR' in the options. The .X file will
be considered by the driver to be a linker script and ignored (with a
warning).
Using this we can add 2 tests that end up building list_initializer
and iostream, along with a test that iostream's build
include-translates list_initializer's #include. That discovered a set
of issues with the -flang-info-include-translate=HDR handling, also
fixed and documented here.
PR c++/99023
gcc/cp/
* module.cc (canonicalize_header_name): Use
cpp_probe_header_unit.
(maybe_translate_include): Fix note_includes comparison.
(init_modules): Fix note_includes string termination.
libcpp/
* include/cpplib.h (cpp_find_header_unit): Rename to ...
(cpp_probe_header_unit): ... this.
* internal.h (_cp_find_header_unit): Declare.
* files.c (cpp_find_header_unit): Break apart to ..
(test_header_unit): ... this, and ...
(_cpp_find_header_unit): ... and, or and ...
(cpp_probe_header_unit): ... this.
* macro.c (cpp_get_token_1): Call _cpp_find_header_unit.
gcc/
* doc/invoke.texi (flang-info-include-translate): Document header
lookup behaviour.
gcc/testsuite/
* g++.dg/modules/modules.exp: Bail on cross-testing. Add support
for .X files.
* g++.dg/modules/pr99023_a.X: New.
* g++.dg/modules/pr99023_b.X: New.
Diffstat (limited to 'libcpp/internal.h')
| -rw-r--r-- | libcpp/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcpp/internal.h b/libcpp/internal.h index 32f9f50..fd44de6 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -703,6 +703,8 @@ extern _cpp_file *_cpp_find_file (cpp_reader *, const char *, cpp_dir *, int angle, _cpp_find_file_kind, location_t); extern bool _cpp_find_failed (_cpp_file *); extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *); +extern const char *_cpp_find_header_unit (cpp_reader *, const char *file, + bool angle_p, location_t); extern void _cpp_fake_include (cpp_reader *, const char *); extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, include_type, location_t); extern bool _cpp_stack_include (cpp_reader *, const char *, int, |