From 98ff89d1ac5872f29020fe5b5edfdf5abce59014 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 13 Mar 2020 13:50:01 +0100 Subject: [PATCH] Do not strcat to result of getenv. PR lto/94157 * lto-wrapper.c (run_gcc): Use concat for appending to collect_gcc_options. PR lto/94157 * gcc.dg/lto/pr94157_0.c: New test. --- gcc/ChangeLog | 6 ++++++ gcc/lto-wrapper.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/lto/pr94157_0.c | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/lto/pr94157_0.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 448c1e138fa..679296ffcac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-03-13 Martin Liska + + PR lto/94157 + * lto-wrapper.c (run_gcc): Use concat for appending + to collect_gcc_options. + 2020-03-13 Jakub Jelinek PR target/94121 diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index b8a35c85714..46a88b233f6 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -1317,7 +1317,8 @@ run_gcc (unsigned argc, char *argv[]) char *xassembler_opts_string = XOBFINISH (&temporary_obstack, char *); - strcat (collect_gcc_options, xassembler_opts_string); + collect_gcc_options = concat (collect_gcc_options, xassembler_opts_string, + NULL); } get_options_from_collect_gcc_options (collect_gcc, collect_gcc_options, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4c6d7edda7e..6e2099bec5a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-13 Martin Liska + + PR lto/94157 + * gcc.dg/lto/pr94157_0.c: New test. + 2020-03-13 Kewen Lin PR testsuite/93935 diff --git a/gcc/testsuite/gcc.dg/lto/pr94157_0.c b/gcc/testsuite/gcc.dg/lto/pr94157_0.c new file mode 100644 index 00000000000..3bca677c4fb --- /dev/null +++ b/gcc/testsuite/gcc.dg/lto/pr94157_0.c @@ -0,0 +1,6 @@ +/* { dg-lto-do link } */ +/* { dg-lto-options { { -O0 -fipa-vrp -flto -Wa,--noexecstack -Wa,--noexecstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack -Wa,--execstack } } } */ + +int main() { + +} -- 2.30.2