[PATCH v2 5/7] gdb.base/: Introduce jit_compile_options

[Ilya Leoshkevich via Gdb-patches <gdb-patches@sourceware.org>]

Move setting LOAD_ADDRESS and LOAD_INCREMENT to a separate global
variable.  This eliminates repetition and is useful for sharing with
performance tests.  Also make them unsigned long long in order to
prevent overflows when using a lot of shared libraries.
---
 gdb/testsuite/lib/jit-elf-helpers.exp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/lib/jit-elf-helpers.exp b/gdb/testsuite/lib/jit-elf-helpers.exp
index b699917f209..7c17178f800 100644
--- a/gdb/testsuite/lib/jit-elf-helpers.exp
+++ b/gdb/testsuite/lib/jit-elf-helpers.exp
@@ -19,6 +19,9 @@
 
 set jit_load_address   0x7000000
 set jit_load_increment 0x1000000
+set jit_compile_options [list \
+    additional_flags=-DLOAD_ADDRESS=${jit_load_address}ull \
+    additional_flags=-DLOAD_INCREMENT=${jit_load_increment}ull]
 
 # Compile jit-elf-main.c as an executable.
 #
@@ -28,12 +31,11 @@ set jit_load_increment 0x1000000
 # On success, return 0.
 # On failure, return -1.
 proc compile_jit_main {main_srcfile main_binfile options} {
-    global jit_load_address jit_load_increment
+    global jit_compile_options
 
     set options [concat \
 	$options \
-	additional_flags=-DLOAD_ADDRESS=$jit_load_address \
-	additional_flags=-DLOAD_INCREMENT=$jit_load_increment \
+	$jit_compile_options \
 	debug]
 
     if { [gdb_compile ${main_srcfile} ${main_binfile} \
@@ -53,12 +55,11 @@ proc compile_jit_main {main_srcfile main_binfile options} {
 # On success, return 0.
 # On failure, return -1.
 proc compile_jit_elf_main_as_so {main_solib_srcfile main_solib_binfile options} {
-    global jit_load_address jit_load_increment
+    global jit_compile_options
 
     set options [concat \
 	$options \
-	additional_flags=-DLOAD_ADDRESS=$jit_load_address \
-	additional_flags=-DLOAD_INCREMENT=$jit_load_increment \
+	$jit_compile_options \
 	debug]
 
     if { [gdb_compile_shlib ${main_solib_srcfile} ${main_solib_binfile} \
-- 
2.35.3