Parse deps the same for GCC_ARM and ARMC6

Author: theotherjimmy

tools/toolchains/__init__.py

@@ -1030,7 +1030,6 @@ def compile_command(self, source, object, includes):
 
         return None
 
-    @abstractmethod
     def parse_dependencies(self, dep_path):
         """Parse the dependency information generated by the compiler.
 
@@ -1042,8 +1041,21 @@ def parse_dependencies(self, dep_path):
 
         Side effects:
         None
+
+        Note: A default implementation is provided for make-like file formats
         """
-        raise NotImplemented
+        dependencies = []
+        buff = open(dep_path).readlines()
+        if buff:
+            buff[0] = re.sub('^(.*?)\: ', '', buff[0])
+            for line in buff:
+                filename = line.replace('\\\n', '').strip()
+                if file:
+                    filename = filename.replace('\\ ', '\a')
+                    dependencies.extend(((self.CHROOT if self.CHROOT else '') +
+                                         f.replace('\a', ' '))
+                                        for f in filename.split(" "))
+        return list(filter(None, dependencies))
 
     def is_not_supported_error(self, output):
         return "#error directive: [NOT_SUPPORTED]" in output

tools/toolchains/arm.py

@@ -85,10 +85,6 @@ def __init__(self, target, *args, **kwargs):
         self.ar = [join(ARMC6_PATH, "armar")]
         self.elf2bin = join(ARMC6_PATH, "fromelf")
 
-
-    def parse_dependencies(self, dep_path):
-        return []
-
     def parse_output(self, output):
         pass
 

tools/toolchains/gcc.py

@@ -100,27 +100,6 @@ def __init__(self, target,  notify=None, macros=None,
         self.ar = join(tool_path, "arm-none-eabi-ar")
         self.elf2bin = join(tool_path, "arm-none-eabi-objcopy")
 
-    def parse_dependencies(self, dep_path):
-        dependencies = []
-        buff = open(dep_path).readlines()
-        buff[0] = re.sub('^(.*?)\: ', '', buff[0])
-        for line in buff:
-            file = line.replace('\\\n', '').strip()
-            if file:
-                # GCC might list more than one dependency on a single line, in this case
-                # the dependencies are separated by a space. However, a space might also
-                # indicate an actual space character in a dependency path, but in this case
-                # the space character is prefixed by a backslash.
-                # Temporary replace all '\ ' with a special char that is not used (\a in this
-                # case) to keep them from being interpreted by 'split' (they will be converted
-                # back later to a space char)
-                file = file.replace('\\ ', '\a')
-                if file.find(" ") == -1:
-                    dependencies.append((self.CHROOT if self.CHROOT else '') + file.replace('\a', ' '))
-                else:
-                    dependencies = dependencies + [(self.CHROOT if self.CHROOT else '') + f.replace('\a', ' ') for f in file.split(" ")]
-        return dependencies
-
     def is_not_supported_error(self, output):
         return "error: #error [NOT_SUPPORTED]" in output