diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 252f8aa6..6011a711 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -101,8 +101,8 @@ def ProcessFlags(env):
 
 def GlobCXXFiles(env, path):
     files = []
-    for suff in ["*.c", "*.cpp", "*.S"]:
-        _list = env.Glob(join(path, suff))
+    for suff in ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"]:
+        _list = env.Glob(join(path, "*.%s" % suff))
         if _list:
             files += _list
     return files