Fix arm/LTO build by moving neon asm files to intrinsics target.

libvpx_srcs_arm_neon_cpu_detect_intrinsics.gypi

 # This file is generated. Do not edit.
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'libvpx_intrinsics_neon',
       'type': 'static_library',
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
         '<(libvpx_source)',
       ],
       'sources': [
+        '<(libvpx_source)/vp8/common/arm/armv6/bilinearfilter_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/copymem16x16_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/copymem8x4_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/copymem8x8_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/dc_only_idct_add_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/dequant_idct_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/dequantize_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/filter_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/idct_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/iwalsh_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/loopfilter_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm',
+        '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm',

[Johann, 2015/04/15 15:38:45]

although we managed to transition all the vp8 neon to intrinsics, not all the
vp9 code made the cut. while i don't think there will be an issue with
specifying -mfpu=neon on the armv6 files (there is significantly less leeway for
the compiler to surreptitiously insert unintended instructions), it is a bit
strange.

[pcc1, 2015/04/15 18:50:33]

Moved as a result of the regex change.

FWIW, it looks like we are already doing this in the GN build (grep for
libvpx_srcs_arm_neon_cpu_detect_assembly in BUILD.gn and libvpx_srcs.gni). That
should probably be fixed as well. On the other hand, I'm not too familiar with
arm, but I'd be surprised if selecting a different FPU caused the assembler to
emit different instructions for the same source file (rather than changing the
set of instructions to allow).

In any case, it seems more useful as a guard against accidentally using neon
instructions in the non-neon asm files.

         '<(libvpx_source)/vp8/common/arm/neon/bilinearpredict_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/copymem_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/dc_only_idct_add_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/dequant_idct_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/dequantizeb_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/idct_blk_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/idct_dequant_0_2x_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/idct_dequant_full_2x_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/iwalsh_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/loopfilter_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/mbloopfilter_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/reconintra_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/sad_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/shortidct4x4llm_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/sixtappredict_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/variance_neon.c',
         '<(libvpx_source)/vp8/common/arm/neon/vp8_subpixelvariance_neon.c',
+        '<(libvpx_source)/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm',
+        '<(libvpx_source)/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm',
+        '<(libvpx_source)/vp8/encoder/arm/armv6/walsh_v6.asm',
         '<(libvpx_source)/vp8/encoder/arm/neon/denoising_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/fastquantizeb_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/shortfdct_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/subtract_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/vp8_mse16x16_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_avg_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve_neon.c',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_copy_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_neon.c',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_iht4x4_add_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_iht8x8_add_neon.c',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_neon.c',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_mb_lpf_neon.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm',
+        '<(libvpx_source)/vp9/common/arm/neon/vp9_save_reg_neon.asm',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_avg_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_dct_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_quantize_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_sad4d_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_sad_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_subtract_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_variance_neon.c',
       ],
+      'includes': [ 'ads2gas.gypi' ],
       'cflags!': [ '-mfpu=vfpv3-d16' ],
       'conditions': [
         # Disable LTO in neon targets due to compiler bug
         # crbug.com/408997
         ['use_lto==1', {
           'cflags!': [
             '-flto',
             '-ffat-lto-objects',
           ],
         }],
       ],
       'cflags': [ '-mfpu=neon', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-mfpu=neon' ] },
     },
   ],
 }