On 2014-03-17 12:41:54 +0200, Martin Storsjö wrote:
> ---
>  gas-preprocessor.pl | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
> index 0417f47..eefe571 100755
> --- a/gas-preprocessor.pl
> +++ b/gas-preprocessor.pl
> @@ -28,6 +28,8 @@ my $as_type = "apple-gas";
>  
>  my $fix_unreq = $^O eq "darwin";
>  
> +my $arm_cond_codes = "eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo";
> +
>  my $usage_str = "
>  $0\n
>  Gas-preprocessor.pl converts assembler files using modern GNU as syntax for
> @@ -591,7 +593,7 @@ foreach my $line (@pass1_lines) {
>          my $cond = $3;
>          my $label = $4;
>          # Don't interpret e.g. bic as b<cc> with ic as conditional code
> -        if ($cond =~ /|eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo/) {
> +        if ($cond =~ /|$arm_cond_codes/) {
>              if (exists $thumb_labels{$label}) {
>                  print ASMFILE ".thumb_func $label\n";
>              } else {
> @@ -814,7 +816,7 @@ sub handle_serialized_line {
>              my $cond = $3;
>              my $target = $4;
>              # Don't interpret e.g. bic as b<cc> with ic as conditional code
> -            if ($cond !~ 
> /|eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo/) {
> +            if ($cond !~ /|$arm_cond_codes/) {
>                  # Not actually a branch
>              } elsif ($target =~ /(\d+)([bf])/) {
>                  # The target is a local label

ok

Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to