| Message ID | 1395135379-9129-1-git-send-email-martin@martin.st |
|---|---|
| State | Committed |
| Commit | 8ac411652004d365376a3183d609d887de30ea54 |
| Headers | show |
On 2014-03-18 11:36:19 +0200, Martin Storsjö wrote: > --- > gas-preprocessor.pl | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl > index 36cef69..914c41c 100755 > --- a/gas-preprocessor.pl > +++ b/gas-preprocessor.pl > @@ -143,7 +143,7 @@ if ((grep /^-c$/, @gcc_cmd) && !(grep /^-o/, @gcc_cmd)) { > } > } > } > -@preprocess_c_cmd = map { /\.o$/ ? "-" : $_ } @preprocess_c_cmd; > +@preprocess_c_cmd = map { /\.(o|obj)$/ ? "-" : $_ } @preprocess_c_cmd; > my $tempfile; > if ($as_type ne "armasm") { > @gcc_cmd = map { /\.[csS]$/ ? qw(-x assembler -) : $_ } @gcc_cmd; > @@ -165,7 +165,7 @@ if ($as_type ne "armasm") { > @gcc_cmd = grep ! /^-EHsc$/, @gcc_cmd; > @gcc_cmd = grep ! /^-O/, @gcc_cmd; > > - my @outfiles = grep /\.o$/, @gcc_cmd; > + my @outfiles = grep /\.(o|obj)$/, @gcc_cmd; > $tempfile = $outfiles[0].".asm"; > > # Remove most parameters from gcc_cmd, which actually is the armasm command, ok Janne
diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl index 36cef69..914c41c 100755 --- a/gas-preprocessor.pl +++ b/gas-preprocessor.pl @@ -143,7 +143,7 @@ if ((grep /^-c$/, @gcc_cmd) && !(grep /^-o/, @gcc_cmd)) { } } } -@preprocess_c_cmd = map { /\.o$/ ? "-" : $_ } @preprocess_c_cmd; +@preprocess_c_cmd = map { /\.(o|obj)$/ ? "-" : $_ } @preprocess_c_cmd; my $tempfile; if ($as_type ne "armasm") { @gcc_cmd = map { /\.[csS]$/ ? qw(-x assembler -) : $_ } @gcc_cmd; @@ -165,7 +165,7 @@ if ($as_type ne "armasm") { @gcc_cmd = grep ! /^-EHsc$/, @gcc_cmd; @gcc_cmd = grep ! /^-O/, @gcc_cmd; - my @outfiles = grep /\.o$/, @gcc_cmd; + my @outfiles = grep /\.(o|obj)$/, @gcc_cmd; $tempfile = $outfiles[0].".asm"; # Remove most parameters from gcc_cmd, which actually is the armasm command,