diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 1dec302f7c3..22b1e3f4d7b 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -178,181 +178,14 @@
             class="org.eclipse.cdt.core.errorparsers.RegexErrorParser"
             id="org.eclipse.cdt.core.GmakeErrorParser"
             name="%CDTGNUMakeErrorParser.name">
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make: \*\*\* \[.*\] Error .*"
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*\[.*\] Error [-]{0,1}\d*.*"
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*missing separator.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*missing separator \(did you mean TAB instead of 8 spaces?\).\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*commands commence before first target.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*missing rule before commands.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*No rule to make target `.*'."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*No rule to make target `.*', needed by `.*'."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*No targets specified and no makefile found.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*No targets.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*Makefile `.*' was not found."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*Included makefile `.*' was not found."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*warning: overriding commands for target `.*'"
-               severity="Warning"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*warning: ignoring old commands for target `.*'"
-               severity="Warning"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*Circular .+ &lt;- .+ dependency dropped."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*Recursive variable `.*' references itself \(eventually\).\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*[uU]nterminated variable reference.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*insufficient arguments to function `.*'.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*missing target pattern.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*multiple target patterns.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*target pattern contains no `%'.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*mixed implicit and static pattern rules.\s*Stop."
-               severity="Error"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*warning: -jN forced in submake: disabling jobserver mode."
-               severity="Warning"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*warning: jobserver unavailable: using -j1. Add `+' to parent make rule."
-               severity="Warning"/>
-         <pattern
-               description-expr="$0"
-               eat-processed-line="true"
-               file-expr=""
-               line-expr=""
-               regex="make.*target `.*' doesn't match the target pattern"
-               severity="Error"/>
+         <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex="make.*:.*Error.*\(ignored\)" severity="Info"/>
+         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (\*\*\* .*)" severity="Error"/>
+         <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex="make.*: \*\*\* .*" severity="Error"/>
+         <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex="make.*: Target (.*) not remade because of errors." severity="Error"/>
+         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): warning: (.*)" severity="Warning"/>
+         <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex="make.*\[.*\] Error [-]{0,1}\d*.*" severity="Warning"/>
+         <pattern description-expr="make: $3" eat-processed-line="true" file-expr="$1" line-expr="$2" regex="(.*):(\d*): (.*No such file or directory)" severity="Warning"/>
+         <pattern description-expr="$0" eat-processed-line="true" file-expr="" line-expr="" regex="make.*: Circular .* dependency dropped." severity="Warning"/>
       </errorparser>
    </extension>
    <extension