diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-18 13:13:50 -0700 |
|---|---|---|
| committer | Jeff Law <jlaw@ventanamicro.com> | 2022-11-18 13:13:50 -0700 |
| commit | 11543b27fe16d81ca5483ecb98ec7a5b2426e0c0 (patch) | |
| tree | 23cf7c6e67f1321b7000b1e75783b330f81baea5 /libcpp | |
| parent | 59cc4da605e5cb8e31e9f1d54ef2b5ba47fc8f88 (diff) | |
| download | gcc-11543b27fe16d81ca5483ecb98ec7a5b2426e0c0.zip gcc-11543b27fe16d81ca5483ecb98ec7a5b2426e0c0.tar.gz gcc-11543b27fe16d81ca5483ecb98ec7a5b2426e0c0.tar.bz2 | |
libcpp: Avoid remapping filenames within directives
Code such as:
#include __FILE__
can interact poorly with the *-prefix-map options when cross compiling. In
general you're after to remap filenames for use in target context but the
local paths should be used to find include files at compile time. Ingoring
filename remapping for directives allows avoiding such failures.
Fix this to improve such usage and then document this against file-prefix-map
(referenced by the other *-prefix-map options) to make the behaviour clear
and defined.
libcpp/ChangeLog:
* macro.cc (_cpp_builtin_macro_text): Don't remap filenames within
directives.
gcc/ChangeLog:
* doc/invoke.texi: Document prefix-maps don't affect directives.
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/macro.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcpp/macro.cc b/libcpp/macro.cc index 8ebf360..7d5a0d0 100644 --- a/libcpp/macro.cc +++ b/libcpp/macro.cc @@ -563,7 +563,7 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node, if (!name) abort (); } - if (pfile->cb.remap_filename) + if (pfile->cb.remap_filename && !pfile->state.in_directive) name = pfile->cb.remap_filename (name); len = strlen (name); buf = _cpp_unaligned_alloc (pfile, len * 2 + 3); |