From af26601c2f657535af68cc3cec2af969838877da Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 13 Sep 2020 21:28:09 +0100 Subject: [PATCH] Fix gdb.base/share-env-with-gdbserver.exp with Clang The testcase has GDB call my_getenv in the inferior, and that fails with Clang, because Clang optimizes out my_getenv completely, since it isn't called anywhere (in the program). This commit fixes it. gdb/testsuite/ChangeLog: * gdb.base/share-env-with-gdbserver.c (main): Call my_getenv instead of getenv. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/share-env-with-gdbserver.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 397c6161324..5c37401dd2f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-09-13 Pedro Alves + + * gdb.base/share-env-with-gdbserver.c (main): Call my_getenv + instead of getenv. + 2020-09-13 Pedro Alves * gdb.base/dbx.exp (dbx_gdb_start): Adjust to use gdb_spawn diff --git a/gdb/testsuite/gdb.base/share-env-with-gdbserver.c b/gdb/testsuite/gdb.base/share-env-with-gdbserver.c index 740bfdcc43c..17e95756a0a 100644 --- a/gdb/testsuite/gdb.base/share-env-with-gdbserver.c +++ b/gdb/testsuite/gdb.base/share-env-with-gdbserver.c @@ -31,7 +31,9 @@ main (int argc, char *argv[]) { /* Call malloc to ensure it is linked in. */ char *tmp = malloc (1); - const char *myvar = getenv ("GDB_TEST_VAR"); + /* Similarly call my_getenv instead of getenv directly to make sure + the former isn't optimized out. my_getenv is called by GDB. */ + const char *myvar = my_getenv ("GDB_TEST_VAR"); if (myvar != NULL) printf ("It worked! myvar = '%s'\n", myvar); -- 2.30.2