* [PATCH] fix lib/pascal.exp dest snafu
@ 2015-02-11 6:18 Doug Evans
2015-02-11 11:22 ` Pierre Muller
[not found] ` <54db3bc4.a2ac440a.5576.1b7bSMTPIN_ADDED_BROKEN@mx.google.com>
0 siblings, 2 replies; 3+ messages in thread
From: Doug Evans @ 2015-02-11 6:18 UTC (permalink / raw)
To: gdb-patches, pierre.muller
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."
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] fix lib/pascal.exp dest snafu
2015-02-11 6:18 [PATCH] fix lib/pascal.exp dest snafu Doug Evans
@ 2015-02-11 11:22 ` Pierre Muller
[not found] ` <54db3bc4.a2ac440a.5576.1b7bSMTPIN_ADDED_BROKEN@mx.google.com>
1 sibling, 0 replies; 3+ messages in thread
From: Pierre Muller @ 2015-02-11 11:22 UTC (permalink / raw)
To: 'Doug Evans', gdb-patches
Hi Doug,
> -----Message d'origine-----
> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] De la part de Doug Evans
> Envoyé : mercredi 11 février 2015 07:18
> À : gdb-patches@sourceware.org; pierre.muller@ics-cnrs.unistra.fr
> Objet : [PATCH] fix lib/pascal.exp dest snafu
>
> 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.
Thank you very much for finding out this
horrible mistake.
Patch approved,
Pierre Muller
as pascal language maintainer.
> 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."
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix lib/pascal.exp dest snafu
[not found] ` <54db3bc4.a2ac440a.5576.1b7bSMTPIN_ADDED_BROKEN@mx.google.com>
@ 2015-04-06 15:49 ` Doug Evans
0 siblings, 0 replies; 3+ messages in thread
From: Doug Evans @ 2015-04-06 15:49 UTC (permalink / raw)
To: Pierre Muller; +Cc: gdb-patches
On Wed, Feb 11, 2015 at 3:21 AM, Pierre Muller
<pierre.muller@ics-cnrs.unistra.fr> wrote:
> Hi Doug,
>
>> -----Message d'origine-----
>> De : gdb-patches-owner@sourceware.org [mailto:gdb-patches-
>> owner@sourceware.org] De la part de Doug Evans
>> Envoyé : mercredi 11 février 2015 07:18
>> À : gdb-patches@sourceware.org; pierre.muller@ics-cnrs.unistra.fr
>> Objet : [PATCH] fix lib/pascal.exp dest snafu
>>
>> 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.
>
> Thank you very much for finding out this
> horrible mistake.
>
> Patch approved,
>
> Pierre Muller
> as pascal language maintainer.
>
>> 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.
Committed.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-06 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-11 6:18 [PATCH] fix lib/pascal.exp dest snafu Doug Evans
2015-02-11 11:22 ` Pierre Muller
[not found] ` <54db3bc4.a2ac440a.5576.1b7bSMTPIN_ADDED_BROKEN@mx.google.com>
2015-04-06 15:49 ` Doug Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox