Merge branch 'master' into curl-update

src/actions/vstudio/vs2010_vcxproj.lua

@@ -1352,7 +1352,7 @@
 
 
 	function m.floatingPointModel(cfg)
-		if cfg.floatingpoint then
+		if cfg.floatingpoint and cfg.floatingpoint ~= "Default" then
 			m.element("FloatingPointModel", nil, cfg.floatingpoint)
 		end
 	end

src/tools/clang.lua

@@ -44,7 +44,9 @@
 	clang.shared = {
 		architecture = gcc.shared.architecture,
 		flags = gcc.shared.flags,
-		floatingpoint = gcc.shared.floatingpoint,
+		floatingpoint = {
+			Fast = "-ffast-math",
+		},
 		strictaliasing = gcc.shared.strictaliasing,
 		optimize = {
 			Off = "-O0",

tests/actions/vstudio/vc2010/test_floatingpoint.lua

@@ -30,7 +30,7 @@
 
 
 	function suite.floatingPoint_onFloatFast()
-		flags "FloatFast"
+		floatingpoint "fast"
 		prepare()
 		test.capture [[
 <FloatingPointModel>Fast</FloatingPointModel>
@@ -38,12 +38,15 @@
 	end
 
 	function suite.floatingPoint_onFloatStrict()
-		flags "FloatStrict"
+		floatingpoint "strict"
 		prepare()
 		test.capture [[
 <FloatingPointModel>Strict</FloatingPointModel>
 		]]
 	end
 
-
-
+	function suite.floatingPoint_onDefault()
+		floatingpoint "Default"
+		prepare()
+		test.isemptycapture()
+	end