libvpx: Pull from upstream

source/libvpx/build/make/ads2gas_apple.pl

 #!/usr/bin/env perl
 ##
 ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
 ##
 ##  Use of this source code is governed by a BSD-style license
 ##  that can be found in the LICENSE file in the root of the source
 ##  tree. An additional intellectual property rights grant can be found
 ##  in the file PATENTS.  All contributing project authors may
 ##  be found in the AUTHORS file in the root of the source tree.
 ##
 
+
 # ads2gas_apple.pl
 # Author: Eric Fung (efung (at) acm.org)
 #
 # Convert ARM Developer Suite 1.0.1 syntax assembly source to GNU as format
 #
 # Usage: cat inputfile | perl ads2gas_apple.pl > outputfile
 #
+
+my $chromium = 0;
+
+foreach my $arg (@ARGV) {
+    $chromium = 1 if ($arg eq "-chromium");
+}
+
 print "@ This file was created from a .asm file\n";
 print "@  using the ads2gas_apple.pl script.\n\n";
 print "\t.set WIDE_REFERENCE, 0\n";
 print "\t.set ARCHITECTURE, 5\n";
 print "\t.set DO1STROUNDING, 0\n";
 
 my %register_aliases;
 my %macro_aliases;
 
 my @mapping_list = ("\$0", "\$1", "\$2", "\$3", "\$4", "\$5", "\$6", "\$7", "\$8", "\$9");
@@ skipping 151 matching lines @@
     {
         # Process next line down, which will be the macro definition
         $_ = <STDIN>;
 
         $trimmed = trim($_);
 
         # remove commas that are separating list
         $trimmed =~ s/,//g;
 
         # string to array
-        @incoming_array = split(/ /, $trimmed);
+        @incoming_array = split(/\s+/, $trimmed);
 
         print ".macro @incoming_array[0]\n";
 
         # remove the first element, as that is the name of the macro
         shift (@incoming_array);
 
         @macro_aliases{@incoming_array} = @mapping_list;
 
         next;
     }
 
     while (($key, $value) = each(%macro_aliases))
     {
         $key =~ s/\$/\\\$/;
         s/$key\b/$value/g;
     }
 
     # For macros, use \ to reference formal params
 #   s/\$/\\/g;                  # End macro definition
     s/MEND/.endm/;              # No need to tell it where to stop assembling
     next if /^\s*END\s*$/;
 
-    s/qsubaddx/qsax/i;
-    s/qaddsubx/qasx/i;
-    s/ldrneb/ldrbne/i;
-    s/ldrneh/ldrhne/i;
-    s/(vqshrun\.s16 .*, \#)0$/${1}8/i;
-    s/\.include/#include/;
+    # Clang used by Chromium differs slightly from clang in XCode in what it
+    # will accept in the assembly.
+    if ($chromium) {
+        s/qsubaddx/qsax/i;
+        s/qaddsubx/qasx/i;
+        s/ldrneb/ldrbne/i;
+        s/ldrneh/ldrhne/i;
+        s/(vqshrun\.s16 .*, \#)0$/${1}8/i;
+
+        # http://llvm.org/bugs/show_bug.cgi?id=16022
+        s/\.include/#include/;
+    }
 
     print;
 }