https://gcc.gnu.org/g:7188d74b4e68ecdd3d1441dc82f1da3f892e013c
commit r17-5761-g7188d74b4e68ecdd3d1441dc82f1da3f892e013c Author: Paul-Antoine Arras <[email protected]> Date: Thu Oct 29 16:10:29 2026 +0000 amdgcn, nvptx: Use read_collect_gcc_options in mkoffload [PR111527] Since r17-1526-g619a5e5586759a "driver: Spill long COLLECT_GCC_OPTIONS to a response file [PR111527]" it is not safe to use a raw getenv call to read COLLECT_GCC_OPTIONS. Even though these instances only check whether the env var is set but do not look up its value, change to use read_collect_gcc_options for consistency and to avoid future issues. PR driver/111527 gcc/ChangeLog: * config/gcn/mkoffload.cc (compile_native): Use read_collect_gcc_options instead of getenv. * config/nvptx/mkoffload.cc (compile_native): Likewise. Diff: --- gcc/config/gcn/mkoffload.cc | 2 +- gcc/config/nvptx/mkoffload.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc index 65bd81b9ba42..1fb586837789 100644 --- a/gcc/config/gcn/mkoffload.cc +++ b/gcc/config/gcn/mkoffload.cc @@ -806,7 +806,7 @@ static void compile_native (const char *infile, const char *outfile, const char *compiler, bool fPIC, bool fpic) { - const char *collect_gcc_options = getenv ("COLLECT_GCC_OPTIONS"); + const char *collect_gcc_options = read_collect_gcc_options (); if (!collect_gcc_options) fatal_error (input_location, "environment variable %<COLLECT_GCC_OPTIONS%> must be set"); diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc index 6a2a3bc939b0..fb85143603b7 100644 --- a/gcc/config/nvptx/mkoffload.cc +++ b/gcc/config/nvptx/mkoffload.cc @@ -592,7 +592,7 @@ static void compile_native (const char *infile, const char *outfile, const char *compiler, bool fPIC, bool fpic) { - const char *collect_gcc_options = getenv ("COLLECT_GCC_OPTIONS"); + const char *collect_gcc_options = read_collect_gcc_options (); if (!collect_gcc_options) fatal_error (input_location, "environment variable COLLECT_GCC_OPTIONS must be set");
