From 06e8a0825b9fd8ed9b815434b6acef1166a24a62 Mon Sep 17 00:00:00 2001
From: Mihail Stoyanov <wm@smode.org>
Date: Thu, 9 Apr 2015 20:45:43 +0300
Subject: [PATCH] Improve armcc output regex pattern to handle armasm messages

---
 workspace_tools/toolchains/arm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace_tools/toolchains/arm.py b/workspace_tools/toolchains/arm.py
index 9f391e8f40..36cddd042d 100644
--- a/workspace_tools/toolchains/arm.py
+++ b/workspace_tools/toolchains/arm.py
@@ -27,7 +27,7 @@ class ARM(mbedToolchain):
     LIBRARY_EXT = '.ar'
 
     STD_LIB_NAME = "%s.ar"
-    DIAGNOSTIC_PATTERN  = re.compile('"(?P<file>[^"]+)", line (?P<line>\d+): (?P<severity>Warning|Error): (?P<message>.+)')
+    DIAGNOSTIC_PATTERN  = re.compile('"(?P<file>[^"]+)", line (?P<line>\d+)( \(column (?P<column>\d+)\)|): (?P<severity>Warning|Error): (?P<message>.+)')
     DEP_PATTERN = re.compile('\S+:\s(?P<file>.+)\n')
 
     def __init__(self, target, options=None, notify=None, macros=None, silent=False):