cpp directives

syntax/arm.vim

@@ -10,9 +10,9 @@ endif
 
 syn case ignore
 
-if version >= 508 || !exists("did_armv6_syntax_inits")
+if version >= 508 || !exists("did_arm_syntax_inits")
   if version < 508
-    let did_armv6_syntax_inits = 1
+    let did_arm_syntax_inits = 1
     command -nargs=+ HiLink hi link <args>
   else
     command -nargs=+ HiLink hi def link <args>

syntax/include/arm_base_syntax.vim

@@ -26,8 +26,8 @@ syn region armString    start="'" skip=+\\'+ end="'\|$"
 " Assembler identifiers/labels/directives
 syn match armIdentifier "\<\h\w*\>"
 syn match armLabel      "\<\h\w*:"
-syn match armLabel	"\d\{1,2\}[:fb]"
-syn match armCPreProc   "#\h\w*\>"
+syn match armLabel	"\<\d\{1,3\}[:fb]"
+syn match armCPreProc   "^\s*#\(include\|define\|undef\|if\|ifdef\|ifndef\|elif\|else\|endif\|error\|pragma\)\>"
 
 so <sfile>:p:h/gas_directives.vim
 so <sfile>:p:h/arm_directives.vim

test/armv7-test.s

@@ -15,7 +15,7 @@ fcmpezs
 fcmpzs
 fdivs
 
-vmul
+vmul Q15, Q16, d31, s31, s32, d32
 vdiv
 vsqrt