]> git.sesse.net Git - x264/commitdiff
checkasm: fix build on ARM
authorMans Rullgard <mans@mansr.com>
Tue, 29 Nov 2011 00:29:12 +0000 (16:29 -0800)
committerFiona Glaser <fiona@x264.com>
Wed, 30 Nov 2011 08:29:21 +0000 (00:29 -0800)
Because of how ALIGNED_ARRAY_16 is defined on ARM, array initialisers cannot be used here.  Use memset() instead.

tools/checkasm.c

index 3eaab658cce055f5b4894dd32dfe85096175ec37..c83b5991f39cdbf944bf594f87566cd9e1e55ed3 100644 (file)
@@ -516,8 +516,10 @@ static int check_pixel( int cpu_ref, int cpu_new )
         set_func_name( #name ); \
         used_asm = 1; \
         ALIGNED_ARRAY_64( uint16_t, bitcosts,[17] ); \
-        ALIGNED_ARRAY_16( uint16_t, satds_c,[16] ) = {0}; \
-        ALIGNED_ARRAY_16( uint16_t, satds_a,[16] ) = {0}; \
+        ALIGNED_ARRAY_16( uint16_t, satds_c,[16] ); \
+        ALIGNED_ARRAY_16( uint16_t, satds_a,[16] ); \
+        memset( satds_c, 0, 16 * sizeof(*satds_c) ); \
+        memset( satds_a, 0, 16 * sizeof(*satds_a) ); \
         for( int i=0; i<17; i++ ) \
             bitcosts[i] = 9*(i!=8); \
         for( int i=0; i<32; i++ ) \