[gdb/testsuite] Fix options arg handling in compile_jit_elf_main_as_so

In commit 80ad340c90 ("[gdb/testsuite] use -Ttext-segment for jit-elf tests")
the following change was made:
...
 proc compile_jit_elf_main_as_so {main_solib_srcfile main_solib_binfile options} {
-    set options [concat $options debug]
+    global jit_load_address jit_load_increment
+
+    set options [list \
+       additional_flags="-DMAIN=jit_dl_main" \
+       additional_flags=-DLOAD_ADDRESS=$jit_load_address \
+       additional_flags=-DLOAD_INCREMENT=$jit_load_increment \
+       debug]
...

Before the change, the options argument was used, but after the change not
anymore.

Fix this by reverting back to using "set options [concat $options ...]".

Fixing this gets us twice the -DMAIN=jit_dl_main bit, once from a caller, and
once from compile_jit_elf_main_as_so.  Fix this by removing the bit from
compile_jit_elf_main_as_so, which makes the code similar to compile_jit_main.

Tested on x86_64-linux.
This commit is contained in:
Tom de Vries 2021-12-07 09:44:36 +01:00
parent c178f2a133
commit 4281b0c8fc

View File

@ -55,8 +55,8 @@ proc compile_jit_main {main_srcfile main_binfile options} {
proc compile_jit_elf_main_as_so {main_solib_srcfile main_solib_binfile options} {
global jit_load_address jit_load_increment
set options [list \
additional_flags="-DMAIN=jit_dl_main" \
set options [concat \
$options \
additional_flags=-DLOAD_ADDRESS=$jit_load_address \
additional_flags=-DLOAD_INCREMENT=$jit_load_increment \
debug]