darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* lib/pascal.exp (gpc_compile): Rename dest arg to destfile.

Browse source 
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.

gdb/testsuite/ChangeLog:

	* 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.
This commit is contained in:
Doug Evans 2015-04-06 08:45:06 -07:00
parent 2c26b84f45
commit 01b622d4c7
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2015-04-06 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.
2015-04-03 Pierre-Marie de Rodat <derodat@adacore.com> 2015-04-03 Pierre-Marie de Rodat <derodat@adacore.com>
* gdb.ada/funcall_ref.exp: New file. * gdb.ada/funcall_ref.exp: New file.

20
gdb/testsuite/lib/pascal.exp
View file

@ -68,9 +68,11 @@ proc pascal_init {} {
set pascal_init_done 1 set pascal_init_done 1
} }
proc gpc_compile {source dest type options} { proc gpc_compile {source destfile type options} {
global gpc_compiler global gpc_compiler
set add_flags "" set add_flags ""
set dest [target_info name]
if {$type == "object"} { if {$type == "object"} {
append add_flags " -c" 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 return $result
} }
proc fpc_compile {source dest type options} { proc fpc_compile {source destfile type options} {
global fpc_compiler global fpc_compiler
set add_flags "" set add_flags ""
set dest [target_info name]
if {$type == "object"} { if {$type == "object"} {
append add_flags " -Cn" append add_flags " -Cn"
} }
@ -122,11 +126,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 return $result
} }
proc gdb_compile_pascal {source dest type options} { proc gdb_compile_pascal {source destfile type options} {
global pascal_init_done global pascal_init_done
global pascal_compiler_is_gpc global pascal_compiler_is_gpc
global pascal_compiler_is_fpc global pascal_compiler_is_fpc
@ -136,15 +140,15 @@ proc gdb_compile_pascal {source dest type options} {
} }
if { $pascal_compiler_is_fpc == 1 } { 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 } { } elseif { $pascal_compiler_is_gpc == 1 } {
set result [gpc_compile $source $dest $type $options] set result [gpc_compile $source $destfile $type $options]
} else { } else {
unsupported "No pascal compiler found" unsupported "No pascal compiler found"
return "No pascal compiler. Compilation failed." return "No pascal compiler. Compilation failed."
} }
if ![file exists $dest] { if ![file exists $destfile] {
unsupported "Pascal compilation failed: $result" unsupported "Pascal compilation failed: $result"
return "Pascal compilation failed." return "Pascal compilation failed."
} }