From f82e85f8ffc833aebce3c91ed8dfa28bf2992497 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 23 Jun 2017 11:38:31 -0400
Subject: [PATCH] cmake remove -fno-math-errno and -fmerge-all-constants
 (#7462)

---
 cmake/common/px4_base.cmake      | 1 -
 cmake/nuttx/px4_impl_nuttx.cmake | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index b38c93f91a..e13dc023da 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -371,7 +371,6 @@ function(px4_add_common_flags)
 		-funsafe-math-optimizations
 		-ffunction-sections
 		-fdata-sections
-		-fmerge-all-constants
 		${PIC_FLAG}
 		)
 
diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake
index 382119a4e0..d9b943c743 100644
--- a/cmake/nuttx/px4_impl_nuttx.cmake
+++ b/cmake/nuttx/px4_impl_nuttx.cmake
@@ -579,9 +579,7 @@ function(px4_os_add_flags)
 		-nostdlib
 		)
 
-	set(added_optimization_flags
-		-fno-math-errno
-		)
+	set(added_optimization_flags)
 
 	set(added_exe_linker_flags) # none currently