This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] fix lib/pascal.exp dest snafu
- From: Doug Evans <xdje42 at gmail dot com>
- To: gdb-patches at sourceware dot org, pierre dot muller at ics-cnrs dot unistra dot fr
- Date: Tue, 10 Feb 2015 22:17:36 -0800
- Subject: [PATCH] fix lib/pascal.exp dest snafu
- Authentication-results: sourceware.org; auth=none
The "dest" parameter to fpc_compile/gpc_compile is the name of
compilation destination file, not a board name.
This patch fixes this by using names consistent with
lib/future.exp:gdb_default_target_compile.
2015-02-10 Doug Evans <xdje42@gmail.com>
* lib/pascal.exp (gpc_compile): Rename dest arg to destfile.
Fix dest parameter to board_info.
(fpc_compile): Ditto.
(gdb_compile_pascal): Rename dest arg to destfile.
diff --git a/gdb/testsuite/lib/pascal.exp b/gdb/testsuite/lib/pascal.exp
index 994e3da..89b552d 100644
--- a/gdb/testsuite/lib/pascal.exp
+++ b/gdb/testsuite/lib/pascal.exp
@@ -68,9 +68,11 @@ proc pascal_init {} {
set pascal_init_done 1
}
-proc gpc_compile {source dest type options} {
+proc gpc_compile {source destfile type options} {
global gpc_compiler
set add_flags ""
+ set dest [target_info name]
+
if {$type == "object"} {
append add_flags " -c"
}
@@ -93,13 +95,15 @@ proc gpc_compile {source dest type options} {
}
}
- set result [remote_exec host $gpc_compiler "-o $dest --automake $add_flags $source"]
+ set result [remote_exec host $gpc_compiler "-o $destfile --automake $add_flags $source"]
return $result
}
-proc fpc_compile {source dest type options} {
+proc fpc_compile {source destfile type options} {
global fpc_compiler
set add_flags ""
+ set dest [target_info name]
+
if {$type == "object"} {
append add_flags " -Cn"
}
@@ -122,11 +127,11 @@ proc fpc_compile {source dest type options} {
}
}
- set result [remote_exec host $fpc_compiler "-o$dest $add_flags $source"]
+ set result [remote_exec host $fpc_compiler "-o$destfile $add_flags $source"]
return $result
}
-proc gdb_compile_pascal {source dest type options} {
+proc gdb_compile_pascal {source destfile type options} {
global pascal_init_done
global pascal_compiler_is_gpc
global pascal_compiler_is_fpc
@@ -136,15 +141,15 @@ proc gdb_compile_pascal {source dest type options} {
}
if { $pascal_compiler_is_fpc == 1 } {
- set result [fpc_compile $source $dest $type $options]
+ set result [fpc_compile $source $destfile $type $options]
} elseif { $pascal_compiler_is_gpc == 1 } {
- set result [gpc_compile $source $dest $type $options]
+ set result [gpc_compile $source $destfile $type $options]
} else {
unsupported "No pascal compiler found"
return "No pascal compiler. Compilation failed."
}
- if ![file exists $dest] {
+ if ![file exists $destfile] {
unsupported "Pascal compilation failed: $result"
return "Pascal compilation failed."
}