diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java
index 1b46bfd772e..a3d89df57e3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/GCCBuiltinSymbolProvider.java
@@ -177,7 +177,9 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider {
 			function(type, 		"__atomic_fetch_nadd", typePtr, type, "int");
 		}
 		function("bool",	"__atomic_test_and_set", "void*", "int");
+		function("bool",	"__atomic_test_and_set", "volatile void*", "int");
 		function("void",	"__atomic_clear", "bool*", "int");
+		function("void",	"__atomic_clear", "volatile bool*", "int");
 		function("void",	"__atomic_thread_fence", "int");
 		function("void",	"__atomic_signal_fence", "int");
 		function("bool",	"__atomic_always_lock_free", "size_t", "void*");
@@ -263,24 +265,24 @@ public class GCCBuiltinSymbolProvider implements IBuiltinBindingsProvider {
 		function("double", 		"__builtin_fabs", "double");
 		function("float", 		"__builtin_fabsf", "float");
 		function("long double", "__builtin_fabsl", "long double");
-		function("double", 		"__builtin_fdim", "double");
-		function("float", 		"__builtin_fdimf", "float");
-		function("long double", "__builtin_fdiml", "long double");
+		function("double", 		"__builtin_fdim", "double", "double");
+		function("float", 		"__builtin_fdimf", "float", "float");
+		function("long double", "__builtin_fdiml", "long double", "long double");
 		function("int", 		"__builtin_ffs", "unsigned int");
 		function("int", 		"__builtin_ffsl", "unsigned long");
 		function("int", 		"__builtin_ffsll", "unsigned long long");
 		function("double", 		"__builtin_floor", "double");
 		function("float", 		"__builtin_floorf", "float");
 		function("long double", "__builtin_floorl", "long double");
-		function("double", 		"__builtin_fma", "double");
-		function("float", 		"__builtin_fmaf", "float");
-		function("long double", "__builtin_fmal", "long double");
-		function("double", 		"__builtin_fmax", "double");
-		function("float", 		"__builtin_fmaxf", "float");
-		function("long double", "__builtin_fmaxl", "long double");
-		function("double", 		"__builtin_fmin", "double");
-		function("float", 		"__builtin_fminf", "float");
-		function("long double", "__builtin_fminl", "long double");
+		function("double", 		"__builtin_fma", "double", "double", "double");
+		function("float", 		"__builtin_fmaf", "float", "float", "float");
+		function("long double", "__builtin_fmal", "long double", "long double", "long double");
+		function("double", 		"__builtin_fmax", "double", "double");
+		function("float", 		"__builtin_fmaxf", "float", "float");
+		function("long double", "__builtin_fmaxl", "long double", "long double");
+		function("double", 		"__builtin_fmin", "double", "double");
+		function("float", 		"__builtin_fminf", "float", "float");
+		function("long double", "__builtin_fminl", "long double", "long double");
 		function("double", 		"__builtin_fmod", "double", "double");
 		function("float", 		"__builtin_fmodf", "float", "float");
 		function("long double", "__builtin_fmodl", "long double", "long double");